Merge remote-tracking branch 'refs/remotes/origin/master' into group-chat

package.json

@@ -39,7 +39,7 @@
     "mkdirp": "~0.5.0",
     "morgan": "^1.3.2",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "1.0.24",
+    "nodebb-plugin-composer-default": "1.0.26",
     "nodebb-plugin-dbsearch": "0.3.0",
     "nodebb-plugin-emoji-extended": "0.4.17",
     "nodebb-plugin-markdown": "4.0.9",
@@ -48,7 +48,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.5",
     "nodebb-rewards-essentials": "0.0.6",
     "nodebb-theme-lavender": "3.0.2",
-    "nodebb-theme-persona": "4.0.44",
+    "nodebb-theme-persona": "4.0.45",
     "nodebb-theme-vanilla": "5.0.17",
     "nodebb-widget-essentials": "2.0.5",
     "nodemailer": "0.7.1",

public/language/ar/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "لديك تنبيهات غير مقروءة.",
     "new_message_from": "رسالة جديدة من <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> أضاف صوتًا إيجابيا إلى مشاركتك في <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> أضاف مشاركتك في <strong>%2</strong> إلى مفضلته.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> أشعَرَ بمشاركة مخلة في <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> أضاف ردا إلى: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> أنشأ موضوعًا جديدًا: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> صار يتابعك.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
     "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",

public/language/bg/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Имате непрочетени известия",
     "new_message_from": "Ново съобщение от <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> гласува положително за Ваша публикация в <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> и <strong>%2</strong> гласуваха положително за Ваша публикация в <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> и %2 други гласуваха положително за Ваша публикация в <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> премести публикацията Ви в <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> премести <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> отбеляза Ваша публикация в <strong>%2</strong> като любима.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> и <strong>%2</strong> отбелязаха Ваша публикация в <strong>%3</strong> като любима.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> и %2 други отбелязаха Ваша публикация в <strong>%3</strong> като любима.",
     "user_flagged_post_in": "<strong>%1</strong> докладва Ваша публикация в <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> и <strong>%2</strong> докладваха Ваша публикация в <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> и %2 други докладваха Ваша публикация в <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> публикува отговор на: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> и <strong>%2</strong> публикуваха отговори на: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> и %2 други публикуваха отговори на: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> публикува нова тема: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> започна да Ви следва.",
+    "user_started_following_you_dual": "<strong>%1</strong> и <strong>%2</strong> започнаха да Ви следват.",
+    "user_started_following_you_multiple": "<strong>%1</strong> и %2 започнаха да Ви следват.",
     "new_register": "<strong>%1</strong> изпрати заявка за регистрация.",
     "email-confirmed": "Е-пощата беше потвърдена",
     "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.",

public/language/bn/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "আপনার অপঠিত বিজ্ঞপ্তি আছে।",
     "new_message_from": "<strong>%1</strong> থেকে নতুন বার্তা",
     "upvoted_your_post_in": "<strong>%1</strong> , <strong>%2</strong> এ আপানার পোষ্টকে আপভোট করেছেন। ",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> একটি উত্তর দিয়েছেন: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> আপনাকে অনুসরন করা শুরু করেছেন।",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে",
     "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।",

public/language/cs/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "You have unread notifications.",
     "new_message_from": "New message from <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Email Confirmed",
     "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",

public/language/da/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Du har ulæste notifikationer.",
     "new_message_from": "Ny besked fra <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> har upvotet dit indlæg i <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> har flyttet dit indlæg til <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> har flyttet <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> har favoriseret dit indlæg i <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> har anmeldt et indlæg i <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> har skrevet et svar til: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> har oprettet en ny tråd: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> har valgt at følge dig.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> har sendt en registrerings anmodning.",
     "email-confirmed": "Email bekræftet",
     "email-confirmed-message": "Tak fordi du validerede din email. Din konto er nu fuldt ud aktiveret.",

public/language/de/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.",
     "new_message_from": "Neue Nachricht von <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> hat deinen Beitrag in <strong>%2</strong> positiv bewertet.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> hat deinen Beitrag nach <strong>%2</strong> verschoben.",
     "moved_your_topic": "<strong>%1</strong> hat <strong>%2</strong> verschoben.",
     "favourited_your_post_in": "<strong>%1</strong> hat deinen Beitrag in <strong>%2</strong> favorisiert.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> hat einen Beitrag in </strong>%2</strong> gemeldet",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> hat auf <strong>%2</strong> geantwortet.",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> hat ein neues Thema erstellt: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> folgt dir jetzt.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> hat eine Registrationsanfrage geschickt.",
     "email-confirmed": "E-Mail bestätigt",
     "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.",

public/language/el/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Έχεις μη αναγνωσμένες ειδοποιήσεις.",
     "new_message_from": "Νέο μήνυμα από τον/την <strong>%1</strong>",
     "upvoted_your_post_in": "Ο/Η <strong>%1</strong> υπερψήφισε την δημοσίευσή σου στο <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "Η δημοσίευσή σου στο <strong>%2</strong> αρέσει στον/ην <strong>%1</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "Ο/Η <strong>%1</strong> επεσήμανε μια δημοσίευσή σου στο <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "Ο/Η <strong>%1</strong> έγραψε μια απάντηση στο: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_started_following_you": "Ο/Η <strong>%1</strong> σε ακολουθεί.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Το Εmail Επιβεβαιώθηκε",
     "email-confirmed-message": "Ευχαριστούμε που επιβεβαίωσες το email σου. Ο λογαριασμός σου είναι πλέον πλήρως ενεργοποιημένος.",

public/language/en@pirate/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "You have unread notifications.",
     "new_message_from": "New message from <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Email Confirmed",
     "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",

public/language/en_GB/notifications.json

@@ -14,13 +14,23 @@
 
 	"new_message_from": "New message from <strong>%1</strong>",
 	"upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+	"upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+	"upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
 	"moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
 	"moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
 	"favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+	"favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+	"favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
 	"user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+	"user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+	"user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
 	"user_posted_to" : "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+	"user_posted_to_dual" : "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+	"user_posted_to_multiple" : "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
 	"user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
 	"user_started_following_you": "<strong>%1</strong> started following you.",
+	"user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+	"user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
 	"new_register": "<strong>%1</strong> sent a registration request.",
 
 	"email-confirmed": "Email Confirmed",

public/language/en_US/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "You have unread notifications.",
     "new_message_from": "New message from <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> has favorited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Email Confirmed",
     "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",

public/language/es/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Tienes notificaciones sin leer.",
     "new_message_from": "Nuevo mensaje de <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> ha votado positivamente tu respuesta en <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> su tema ha sido movido a <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> se ha movido <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> ha marcado como favorito su publicación en <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> ha reportado una respuesta en <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> ha respondido a: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> ha publicado un nuevo tema: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> comenzó a seguirte.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> envió una solicitud de registro.",
     "email-confirmed": "Correo electrónico confirmado",
     "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.",

public/language/et/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Sul ei ole lugemata teateid.",
     "new_message_from": "Uus sõnum kasutajalt <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> hääletas sinu postituse poolt  teemas <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> märgistas sinu postituse lemmikuks teemas <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> raporteeris postitust <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "Kasutaja <strong>%1</strong> postitas vastuse teemasse <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> on postitanud uue teema: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> hakkas sind jälgima.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> saatis registreerimistaotluse.",
     "email-confirmed": "Emaili aadress kinnitatud",
     "email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja on nüüd täielikult aktiveeritud.",

public/language/fa_IR/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "شما آگاه‌سازی‌های نخوانده دارید.",
     "new_message_from": "پیام تازه از <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> امتیاز مثبت به دیدگاه شما در <strong>%2</strong> داده",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> پست شما را به <strong>%2</strong> انتقال داده است",
     "moved_your_topic": "<strong>%2</strong> <strong>%1</strong> را منتقل کرده است",
     "favourited_your_post_in": "<strong>%1</strong> دیدگاه شما را در <strong>%2</strong> برگزیده کرده.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> دیدگاه شما را در <strong>%2</strong> علامتدار کرده",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "پاسخ دادن به <strong>%2</strong> از سوی <strong>%1</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> یک جستار جدید ارسال کرده: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> شروع به دنبال کردن شما کرده",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> یک درخواست ثبت نام ارسال کرده است",
     "email-confirmed": "رایانامه تایید شد",
     "email-confirmed-message": "بابت تایید ایمیلتان سپاس‌گزاریم. حساب کاربری شما اکنون به صورت کامل فعال شده است.",

public/language/fi/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Sinulla on lukemattomia ilmoituksia.",
     "new_message_from": "Uusi viesti käyttäjältä <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> on vastannut viestiin: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> on kirjoittanut uuden aiheen: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> alkoi seurata sinua.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Sähköpostiosoite vahvistettu",
     "email-confirmed-message": "Kiitos sähköpostiosoitteesi vahvistamisesta. Käyttäjätilisi on nyt täysin aktivoitu.",

public/language/fr/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Vous avez des notifications non-lues",
     "new_message_from": "Nouveau message de <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> a voté pour votre message dans <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> et <strong>%2</strong> ont voté pour votre message dans <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> et %2 autres on voté pour votre message dans <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> a déplacé votre message vers <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> a déplacé <strong>%2</strong>.",
     "favourited_your_post_in": "<strong>%1</strong> a mis votre message en favoris dans <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> et <strong>%2</strong> ont mis votre message dans <strong>%3</strong> en favori.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> et %2 autres on mis votre message en favori <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> a signalé un message dans <strong>%2</strong>.",
+    "user_flagged_post_in_dual": "<strong>%1</strong> et <strong>%2</strong> ont signalé un message dans <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> et %2 autres on signalé un message dans <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> a répondu à : <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> et <strong>%2</strong> ont posté une réponse à : <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> et %2 autres ont posté une réponse à : <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> a posté un nouveau sujet: <strong>%2</strong>.",
     "user_started_following_you": "<strong>%1</strong> vous suit.",
+    "user_started_following_you_dual": "<strong>%1</strong> et <strong>%2</strong> vous suivent.",
+    "user_started_following_you_multiple": "<strong>%1</strong> et %2 autres vous suivent.",
     "new_register": "<strong>%1</strong> a envoyé une demande d'incription.",
     "email-confirmed": "Email vérifié",
     "email-confirmed-message": "Merci pour la validation de votre adresse email. Votre compte est désormais activé.",

public/language/gl/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Tes notificacións non lidas",
     "new_message_from": "Nova mensaxe de <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> votoute positivo en <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> moveu a túa publicación a<strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> foi movido <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> marcou favorita a túa publicación en <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> reportou unha mensaxe en <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> publicou unha resposta en: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> publicou un novo tema: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> comezou a seguirte.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> enviou unha petición de rexistro.",
     "email-confirmed": "Correo confirmado",
     "email-confirmed-message": "Grazas por validar o teu correo. A túa conta agora está activada.",

public/language/he/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "יש לך התראות שלא נקראו.",
     "new_message_from": "הודעה חדשה מ <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> הצביע בעד הפוסט שלך ב <strong>%2</strong>",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> הוסיף את הפוסט שלך ב <strong>%2</strong> למועדפים שלו.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> דיווח על פוסט ב <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> פרסם תגובה ל: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> העלה נושא חדש: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> התחיל לעקוב אחריך.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "כתובת המייל אושרה",
     "email-confirmed-message": "תודה שאישרת את כתובת המייל שלך. החשבון שלך פעיל כעת.",

public/language/hu/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "You have unread notifications.",
     "new_message_from": "New message from <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Email Confirmed",
     "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",

public/language/id/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Kamu memiliki pemberitahuan yang belum dibaca.",
     "new_message_from": "Pesan baru dari <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> telah melakukan upvote untuk posting kamu di <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> telah memfavoritkan posting mu di <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> menandai sebuah posting di <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> telah mengirim sebuah balasan kepada: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> telah membuat topik baru: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> mulai mengikutimu.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> mengirim permintaan registrasi.",
     "email-confirmed": "Email telah Dikonfirmasi",
     "email-confirmed-message": "Terimakasih telah melakukan validasi email. Akunmu saat ini telah aktif sepenuhnya.",

public/language/it/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Hai notifiche non lette.",
     "new_message_from": "Nuovo messaggio da <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> ha votato positivamente il tuo post in <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> ha messo nei favoriti il tuo post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> ha segnalato un post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> ha postato una risposta a: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> ha postato un nuovo Topic: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> ha iniziato a seguirti.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> ha inviato una richiesta di registrazione.",
     "email-confirmed": "Email Confermata",
     "email-confirmed-message": "Grazie per aver validato la tua email. Il tuo account è ora completamente attivato.",

public/language/ja/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "未読の通知があります。",
     "new_message_from": "<strong>%1</strong>からの新しいメッセージ",
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> は <strong>%2</strong> への返事を作成しました。",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Email Confirmed",
     "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",

public/language/ko/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "읽지 않은 알림이 있습니다.",
     "new_message_from": "<strong>%1</strong>님이 메시지를 보냈습니다.",
     "upvoted_your_post_in": "<strong>%1</strong>님이 <strong>%2</strong>의 내 게시물을 추천했습니다.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong>님이 <strong>%2</strong>의 내 게시물을 좋아합니다.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong>님이 <strong>%2</strong>의 게시물을 신고했습니다.",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong>님이 <strong>%2</strong>에 답글을 작성했습니다.",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong>님이 새 주제를 작성했습니다: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong>님이 나를 팔로우합니다.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "확인된 이메일",
     "email-confirmed-message": "이메일을 확인해주셔서 감사합니다. 계정이 완전히 활성화되었습니다.",

public/language/lt/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Jūs turite neperskaitytų pranešimų.",
     "new_message_from": "Nauja žinutė nuo <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong>  užbalsavo už jūsų pranešima čia  <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> patinka jūsų pranešimas čia <strong>%2</strong>",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong>pagrįso nuomone čia <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> parašė atsaką <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> paskelbė naują temą: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> pradėjo sekti tave",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> atsiuntė registracijos prašymą",
     "email-confirmed": "El. paštas patvirtintas",
     "email-confirmed-message": "Dėkojame už el. pašto patvirtinimą. Jūsų paskyra pilnai aktyvuota.",

public/language/ms/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Ada pemberitahuan yang belum dibaca",
     "new_message_from": "Pesanan baru daripada  <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> telah mengundi naik kiriman and di <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> telah memindahkan kiriman anda ke <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> telah memindahkan <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> menggemari kiriman and di <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> menanda kiriman anda di <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> telah membalas kiriman kepada: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> membuka topik baru : <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> mula mengikut anda.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> menghantar jemputan pendaftaran.",
     "email-confirmed": "Emel Disahkan",
     "email-confirmed-message": "Terima kasih kerana mengesahkan emel anda. Akaun anda telah diaktifkan sepenuhnya.",

public/language/nb/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Du har uleste varsler.",
     "new_message_from": "Ny melding fra <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> har stemt opp innlegget ditt i <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> har favorittmerket innlegget ditt i <strong>%2</strong>",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> har flagget et innlegg i <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> har skrevet et svar til: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> har skrevet et nytt emne: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> begynte å følge deg.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sendte en forespørsel om registrering",
     "email-confirmed": "E-post bekreftet",
     "email-confirmed-message": "Takk for at du har validert din e-post. Kontoen din er nå fullstendig aktivert.",

public/language/nl/notifications.json

@@ -9,19 +9,29 @@
     "continue_to": "Door naar %1",
     "return_to": "Terug naar %1",
     "new_notification": "Nieuwe melding",
-    "you_have_unread_notifications": "Ongelezen berichten",
+    "you_have_unread_notifications": "Je hebt nieuwe notificaties.",
     "new_message_from": "Nieuw bericht van <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> heeft voor een bericht gestemd in <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> en <strong>%2</strong> hebben voor een bericht in gestemd in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> en %2 andere hebben in gestemd in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> heeft je bericht verplaatst naar <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> heeft <strong>%2</strong> verplaatst",
     "favourited_your_post_in": "<strong>%1</strong> heeft een van je berichten in <strong>%2</strong> aan zijn of haar favorieten toegevoegd.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> en <strong>%2</strong> hebben een van je berichten in <strong>%3</strong> aan zijn of haar favorieten toegevoegd.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> en %2 hebben een van je berichten in <strong>3</strong> aan hun favorieten toegevoegd.",
     "user_flagged_post_in": "<strong>%1</strong> rapporteerde een bericht in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> en <strong>%2</strong> rapporteerde een bericht in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> en %2 andere rapporteede een bericht in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> heeft een reactie geplaatst in <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> en <strong>%2</strong> hebben een reactie geplaatst in: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> en %2 hebben een reactie geplaatst in: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> heeft een nieuw onderwerp geplaatst: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> volgt jou nu.",
+    "user_started_following_you_dual": "<strong>%1</strong> en <strong>%2</strong> volgen jou nu.",
+    "user_started_following_you_multiple": "<strong%1>%1</strong> en %2 andere volgen jou nu.",
     "new_register": "<strong>%1</strong> heeft een registratie verzoek aangevraagd.",
     "email-confirmed": "E-mailadres bevestigd",
     "email-confirmed-message": "Bedankt voor het bevestigen van je e-mailadres. Dit account is nu volledig geactiveerd.",
     "email-confirm-error-message": "Er was een probleem met het bevestigen van dit e-mailadres. Misschien is de code niet goed ingevoerd of was de beschikbare tijd inmiddels verstreken.",
-    "email-confirm-sent": "Bevestigingsmail verstuurd"
+    "email-confirm-sent": "Bevestigingsmail verstuurd."
 }

public/language/pl/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Masz nieprzeczytane powiadomienia.",
     "new_message_from": "Nowa wiadomość od <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> zagłosował na Twój post w <strong>%2</strong>",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1<strong> polubił Twój post w <strong>%2<strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1<strong> oflagował Twój post w <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> dodał odpowiedź do <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> wysłał nowy temat: <strong>%2</strong>",
     "user_started_following_you": "<string>%1</strong> zaczął Cię śledzić.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> wysłał żądanie rejestracji.",
     "email-confirmed": "E-mail potwierdzony",
     "email-confirmed-message": "Dziękujemy za potwierdzenie maila. Twoje konto zostało aktywowane.",

public/language/pt_BR/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Você possui notificações não lidas.",
     "new_message_from": "Nova mensagem de <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> deu voto positivo para seu post em <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> moveu seu post para <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> movido <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> adicionou seu tópico aos favoritos em <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> sinalizou um post em <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> postou uma resposta para: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> postou um novo tópico: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> começou a seguir você.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> lhe enviou um pedido de cadastro.",
     "email-confirmed": "Email Confirmado",
     "email-confirmed-message": "Obrigado por validar o seu email. Agora sua conta está plenamente ativada.",

public/language/ro/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Ai notificări necitite.",
     "new_message_from": "Un mesaj nou de la <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> a votat pozitiv mesajul tău în <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> a adăugat mesajul tău la favorite în <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> a semnalizat un mesaj în <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> a postat un răspuns la: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> a început să te urmărească.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Email confirmat",
     "email-confirmed-message": "Îți mulțumim pentru validarea emailului. Contul tău este acuma activat.",

public/language/ru/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "У вас есть непрочитанные уведомления.",
     "new_message_from": "Новое сообщение от <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> проголосовал за Ваше сообщение в <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> добавил в избранное Ваше сообщение в <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> пометил сообщение в <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> ответил на запись: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> открыл новую тему: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> подписался на Вас.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> отправлен запрос на регистрацию.",
     "email-confirmed": "Email подтвержден",
     "email-confirmed-message": "Спасибо за подтверждение Вашего Email-адреса. Ваш аккаунт активирован.",

public/language/rw/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Ufite amatangazo utarasoma. ",
     "new_message_from": " <strong>%1</strong> yakwandikiye",
     "upvoted_your_post_in": "<strong>%1</strong> yagushimye aguha inota kuri <strong>%2</strong> washyizeho.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> yatonesheje <strong>%2</strong> washyizeho.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> yatambikanye ikintu muri <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> yanditse kuri: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> yatangije ikiganiro gishya: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> yatangiye kugukurikira.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> yasabye kwandikwa.",
     "email-confirmed": "Email Yemejwe",
     "email-confirmed-message": "Urakoze kugaragaza ko email yawe ikora. Ubu ngubu konte yawe irakora nta kabuza. ",

public/language/sc/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "You have unread notifications.",
     "new_message_from": "New message from <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Email Confirmed",
     "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",

public/language/sk/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Máte neprečítané notifikácie",
     "new_message_from": "Nova spáva od <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> odpovedal: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Email bol potvrdený",
     "email-confirmed-message": "Ďakujeme za potvrdenie tvojho emailu. Účet je plne aktivovaný.",

public/language/sl/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Imate neprebrana obvestila.",
     "new_message_from": "Novo obvestilo od <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> je glasoval za vašo objavo v <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> je dodal med priljubljene vašo objavo v <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong>je prijavil vašo objavo v <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> je odgovoril na: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> je odprl novo temo: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> te sledi.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> je poslal prošnjo za registracijo.",
     "email-confirmed": "E-mail naslov potrjen",
     "email-confirmed-message": "Hvala ker ste potrdili svoj naslov. Račun je sedaj aktiviran.",

public/language/sr/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Имате непрочитаних обавештења.",
     "new_message_from": "Нова порука од <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> дода глас вашој поруци у <strong>%2</strong>",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> доду вашу поруку из <strong>%2</strong> у омиљене.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> означи поруку у <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> посла нови одговор за: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> постави нову тему:",
     "user_started_following_you": "<strong>%1</strong> поче да вас прати.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Е-пошта је је отврђена.",
     "email-confirmed-message": "Хвала на овери ваше е-поште. Ваш налог је сада у потпуности активан.",

public/language/sv/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Du har olästa notiser.",
     "new_message_from": "Nytt medelande från <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> har röstat upp ditt inlägg i <strong>%2</strong>",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> har favoriserat ditt inlägg i <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flaggade ett inlägg i <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> har skrivit ett svar på: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> har skapat ett nytt ämne: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> började följa dig.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> skickade en registreringsförfrågan.",
     "email-confirmed": "Epost bekräftad",
     "email-confirmed-message": "Tack för att du bekräftat din epostadress. Ditt konto är nu fullt ut aktiverat.",

public/language/th/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "คุณมีคำเตือนที่ยังไม่ได้อ่าน",
     "new_message_from": "New message from <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Email ได้รับการยืนยันแล้ว",
     "email-confirmed-message": "ขอบคุณที่ยืนยัน Email ของคุณ บัญชีของคุณสามารถใช้งานได้แล้ว",

public/language/tr/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Okunmamış bildirimleriniz var.",
     "new_message_from": "<strong>%1</strong> size bir mesaj gönderdi",
     "upvoted_your_post_in": "<strong>%1</strong> iletinizi beğendi. <strong>%2</strong>",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> senin iletin <strong>%2</strong> taşındı",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> iletinizi favorilerine ekledi. <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> bir iletiyi bayrakladı. <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> <strong>%2</strong> başlığına bir ileti gönderdi.",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> yeni bir konu yarattı: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> sizi takip etmeye başladı.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> kayıt olma isteği gönderdi.",
     "email-confirmed": "E-posta onaylandı",
     "email-confirmed-message": "E-postanızı onaylandığınız için teşekkürler. Hesabınız tamamen aktive edildi.",

public/language/vi/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "Bạn có thông báo chưa đọc",
     "new_message_from": "Tin nhắn mới từ <strong>%1</strong>",
     "upvoted_your_post_in": "<strong>%1</strong> đã bình chọn bài của bạn trong <strong>%2</strong>.",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> đã thích bài của bạn trong <strong>%2</strong>.",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> gắn cờ 1 bài trong <strong>%2</strong>",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> đã trả lời <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> đã gởi chủ đề mới ở <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> đã theo dõi bạn.",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "Đã xác nhận email",
     "email-confirmed-message": "Cảm ơn bạn đã xác nhận địa chỉ email của bạn. Tài khoản của bạn đã được kích hoạt đầy đủ.",

public/language/zh_CN/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "您有未读的通知。",
     "new_message_from": "来自 <strong>%1</strong> 的新消息",
     "upvoted_your_post_in": "<strong>%1</strong> 在 <strong>%2</strong> 点赞了您的帖子。",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "您的帖子已被 <strong>%1</strong> 移动到了 <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> 移动到了 <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> 在 <strong>%2</strong> 收藏了您的帖子。",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> 在 <strong>%2</strong> 标记了一个帖子",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> 回复了：<strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> 发表了新主题：<strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong>关注了您。",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> 发出了注册请求",
     "email-confirmed": "电子邮箱已确认",
     "email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已全面激活。",

public/language/zh_TW/notifications.json

@@ -12,13 +12,23 @@
     "you_have_unread_notifications": "您有未讀的訊息！",
     "new_message_from": "來自 <strong>%1</strong> 的新訊息",
     "upvoted_your_post_in": "<strong>%1</strong> upvote了您在 <strong>%2</strong>的post。",
+    "upvoted_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have upvoted your post in <strong>%3</strong>.",
+    "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
     "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
     "favourited_your_post_in": "<strong>%1</strong> 收藏了你在 <strong>%2</strong>的post。",
+    "favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have favourited your post in <strong>%3</strong>.",
+    "favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have favourited your post in <strong>%3</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> 舉報了 <strong>%2</strong>裡的一個post。",
+    "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
+    "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
     "user_posted_to": "<strong>%1</strong> 發布一個回覆給: <strong>%2</strong>",
+    "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
+    "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> 發布了一個新的主題： <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> 開始關注你。",
+    "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
+    "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
     "new_register": "<strong>%1</strong> sent a registration request.",
     "email-confirmed": "已確認電郵",
     "email-confirmed-message": "感謝您驗證您的電郵。您的帳戶現已全面啟用。",

public/less/admin/bootstrap/alerts.less

@@ -18,6 +18,7 @@
     // Specified for the h4 to prevent conflicts of changing @headings-color
     color: inherit;
   }
+
   // Provide class for links that match alerts
   .alert-link {
     font-weight: @alert-link-font-weight;
@@ -28,6 +29,7 @@
   > ul {
     margin-bottom: 0;
   }
+
   > p + p {
     margin-top: 5px;
   }
@@ -57,12 +59,15 @@
 .alert-success {
   .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text);
 }
+
 .alert-info {
   .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text);
 }
+
 .alert-warning {
   .alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text);
 }
+
 .alert-danger {
   .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);
 }

public/less/admin/bootstrap/badges.less

@@ -12,7 +12,7 @@
   font-weight: @badge-font-weight;
   color: @badge-color;
   line-height: @badge-line-height;
-  vertical-align: baseline;
+  vertical-align: middle;
   white-space: nowrap;
   text-align: center;
   background-color: @badge-bg;
@@ -28,7 +28,9 @@
     position: relative;
     top: -1px;
   }
-  .btn-xs & {
+
+  .btn-xs &,
+  .btn-group-xs > .btn & {
     top: 0;
     padding: 1px 5px;
   }
@@ -49,12 +51,15 @@
     color: @badge-active-color;
     background-color: @badge-active-bg;
   }
+
   .list-group-item > & {
     float: right;
   }
+
   .list-group-item > & + & {
     margin-right: 5px;
   }
+
   .nav-pills > li > a > & {
     margin-left: 3px;
   }

public/less/admin/bootstrap/bootstrap.less

@@ -1,3 +1,9 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
 // Core variables and mixins
 @import "variables.less";
 @import "mixins.less";

public/less/admin/bootstrap/button-groups.less

@@ -36,6 +36,7 @@
   margin-left: -5px; // Offset the first child's margin
   &:extend(.clearfix all);
 
+  .btn,
   .btn-group,
   .input-group {
     float: left;
@@ -71,13 +72,13 @@
 .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group > .btn-group:first-child {
+.btn-group > .btn-group:first-child:not(:last-child) {
   > .btn:last-child,
   > .dropdown-toggle {
     .border-right-radius(0);
   }
 }
-.btn-group > .btn-group:last-child > .btn:first-child {
+.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
   .border-left-radius(0);
 }
 
@@ -172,12 +173,12 @@
     border-radius: 0;
   }
   &:first-child:not(:last-child) {
-    border-top-right-radius: @border-radius-base;
+    .border-top-radius(@btn-border-radius-base);
     .border-bottom-radius(0);
   }
   &:last-child:not(:first-child) {
-    border-bottom-left-radius: @border-radius-base;
     .border-top-radius(0);
+    .border-bottom-radius(@btn-border-radius-base);
   }
 }
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {

public/less/admin/bootstrap/buttons.less

@@ -17,7 +17,7 @@
   background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid transparent;
   white-space: nowrap;
-  .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);
+  .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @btn-border-radius-base);
   .user-select(none);
 
   &,
@@ -47,10 +47,16 @@
   &[disabled],
   fieldset[disabled] & {
     cursor: @cursor-disabled;
-    pointer-events: none; // Future-proof disabling of clicks
     .opacity(.65);
     .box-shadow(none);
   }
+
+  a& {
+    &.disabled,
+    fieldset[disabled] & {
+      pointer-events: none; // Future-proof disabling of clicks on `<a>` elements
+    }
+  }
 }
 
 
@@ -107,7 +113,7 @@
   &:hover,
   &:focus {
     color: @link-hover-color;
-    text-decoration: underline;
+    text-decoration: @link-hover-decoration;
     background-color: transparent;
   }
   &[disabled],
@@ -126,14 +132,14 @@
 
 .btn-lg {
   // line-height: ensure even-numbered height of button next to large input
-  .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
+  .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @btn-border-radius-large);
 }
 .btn-sm {
   // line-height: ensure proper height of button next to small input
-  .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
+  .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small);
 }
 .btn-xs {
-  .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);
+  .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small);
 }
 
 

public/less/admin/bootstrap/carousel.less

@@ -27,24 +27,24 @@
 
     // WebKit CSS3 transforms for supported devices
     @media all and (transform-3d), (-webkit-transform-3d) {
-      transition: transform .6s ease-in-out;
+      .transition-transform(~'0.6s ease-in-out');
-      backface-visibility: hidden;
+      .backface-visibility(~'hidden');
-      perspective: 1000;
+      .perspective(1000px);
 
       &.next,
       &.active.right {
-        transform: translate3d(100%, 0, 0);
+        .translate3d(100%, 0, 0);
         left: 0;
       }
       &.prev,
       &.active.left {
-        transform: translate3d(-100%, 0, 0);
+        .translate3d(-100%, 0, 0);
         left: 0;
       }
       &.next.left,
       &.prev.right,
       &.active {
-        transform: translate3d(0, 0, 0);
+        .translate3d(0, 0, 0);
         left: 0;
       }
     }
@@ -101,6 +101,7 @@
   color: @carousel-control-color;
   text-align: center;
   text-shadow: @carousel-text-shadow;
+  background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug
   // We can't have this transition here because WebKit cancels the carousel
   // animation if you trip this while in the middle of another animation.
 
@@ -130,6 +131,7 @@
   .glyphicon-chevron-right {
     position: absolute;
     top: 50%;
+    margin-top: -10px;
     z-index: 5;
     display: inline-block;
   }
@@ -147,7 +149,7 @@
   .icon-next {
     width:  20px;
     height: 20px;
-    margin-top: -10px;
+    line-height: 1;
     font-family: serif;
   }
 
@@ -195,6 +197,7 @@
     // Internet Explorer 8-9 does not support clicks on elements without a set
     // `background-color`. We cannot use `filter` since that's not viewed as a
     // background color by the browser. Thus, a hack is needed.
+    // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Internet_Explorer
     //
     // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
     // set alpha transparency for the best results possible.
@@ -238,18 +241,18 @@
     .glyphicon-chevron-right,
     .icon-prev,
     .icon-next {
-      width: 30px;
+      width: (@carousel-control-font-size * 1.5);
-      height: 30px;
+      height: (@carousel-control-font-size * 1.5);
-      margin-top: -15px;
+      margin-top: (@carousel-control-font-size / -2);
-      font-size: 30px;
+      font-size: (@carousel-control-font-size * 1.5);
     }
     .glyphicon-chevron-left,
     .icon-prev {
-      margin-left: -15px;
+      margin-left: (@carousel-control-font-size / -2);
     }
     .glyphicon-chevron-right,
     .icon-next {
-      margin-right: -15px;
+      margin-right: (@carousel-control-font-size / -2);
     }
   }
 

public/less/admin/bootstrap/close.less

@@ -23,6 +23,7 @@
   // Additional properties for button version
   // iOS requires the button element instead of an anchor tag.
   // If you want the anchor version, it requires `href="#"`.
+  // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
   button& {
     padding: 0;
     cursor: pointer;

public/less/admin/bootstrap/component-animations.less

@@ -17,9 +17,8 @@
 
 .collapse {
   display: none;
-  visibility: hidden;
 
-  &.in      { display: block; visibility: visible; }
+  &.in      { display: block; }
   tr&.in    { display: table-row; }
   tbody&.in { display: table-row-group; }
 }

public/less/admin/bootstrap/dropdowns.less

@@ -10,12 +10,14 @@
   height: 0;
   margin-left: 2px;
   vertical-align: middle;
-  border-top:   @caret-width-base solid;
+  border-top:   @caret-width-base dashed;
+  border-top:   @caret-width-base solid ~"\9"; // IE8
   border-right: @caret-width-base solid transparent;
   border-left:  @caret-width-base solid transparent;
 }
 
 // The dropdown wrapper (div)
+.dropup,
 .dropdown {
   position: relative;
 }
@@ -183,14 +185,15 @@
   // Reverse the caret
   .caret {
     border-top: 0;
-    border-bottom: @caret-width-base solid;
+    border-bottom: @caret-width-base dashed;
+    border-bottom: @caret-width-base solid ~"\9"; // IE8
     content: "";
   }
   // Different positioning for bottom up menu
   .dropdown-menu {
     top: auto;
     bottom: 100%;
-    margin-bottom: 1px;
+    margin-bottom: 2px;
   }
 }
 

public/less/admin/bootstrap/forms.less

@@ -56,7 +56,6 @@ input[type="checkbox"] {
   line-height: normal;
 }
 
-// Set the height of file controls to match text inputs
 input[type="file"] {
   display: block;
 }
@@ -123,7 +122,7 @@ output {
   background-color: @input-bg;
   background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid @input-border;
-  border-radius: @input-border-radius;
+  border-radius: @input-border-radius; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
   .transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s");
 
@@ -133,6 +132,12 @@ output {
   // Placeholder
   .placeholder();
 
+  // Unstyle the caret on `<select>`s in IE10+.
+  &::-ms-expand {
+    border: 0;
+    background-color: transparent;
+  }
+
   // Disabled and read-only inputs
   //
   // HTML5 says that controls under a fieldset > legend:first-child won't be
@@ -141,9 +146,13 @@ output {
   &[disabled],
   &[readonly],
   fieldset[disabled] & {
-    cursor: @cursor-disabled;
     background-color: @input-bg-disabled;
-    opacity: 1; // iOS fix for unreadable disabled content
+    opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
+  }
+
+  &[disabled],
+  fieldset[disabled] & {
+    cursor: @cursor-disabled;
   }
 
   // Reset height for `textarea`s
@@ -170,26 +179,28 @@ input[type="search"] {
 // In Mobile Safari, setting `display: block` on temporal inputs causes the
 // text within the input to become vertically misaligned. As a workaround, we
 // set a pixel line-height that matches the given height of the input, but only
-// for Safari.
+// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
+//
+// Note that as of 8.3, iOS doesn't support `datetime` or `week`.
 
 @media screen and (-webkit-min-device-pixel-ratio: 0) {
   input[type="date"],
   input[type="time"],
   input[type="datetime-local"],
   input[type="month"] {
-    line-height: @input-height-base;
+    &.form-control {
-  }
+      line-height: @input-height-base;
-  input[type="date"].input-sm,
+    }
-  input[type="time"].input-sm,
+
-  input[type="datetime-local"].input-sm,
+    &.input-sm,
-  input[type="month"].input-sm {
+    .input-group-sm & {
-    line-height: @input-height-small;
+      line-height: @input-height-small;
-  }
+    }
-  input[type="date"].input-lg,
+
-  input[type="time"].input-lg,
+    &.input-lg,
-  input[type="datetime-local"].input-lg,
+    .input-group-lg & {
-  input[type="month"].input-lg {
+      line-height: @input-height-large;
-    line-height: @input-height-large;
+    }
   }
 }
 
@@ -200,7 +211,7 @@ input[type="search"] {
 // horizontal forms, use the predefined grid classes.
 
 .form-group {
-  margin-bottom: 15px;
+  margin-bottom: @form-group-margin-bottom;
 }
 
 
@@ -240,6 +251,7 @@ input[type="search"] {
 // Radios and checkboxes on same line
 .radio-inline,
 .checkbox-inline {
+  position: relative;
   display: inline-block;
   padding-left: 20px;
   margin-bottom: 0;
@@ -296,6 +308,7 @@ input[type="checkbox"] {
   padding-bottom: (@padding-base-vertical + 1);
   // Remove default margin from `p`
   margin-bottom: 0;
+  min-height: (@line-height-computed + @font-size-base);
 
   &.input-lg,
   &.input-sm {
@@ -309,16 +322,65 @@ input[type="checkbox"] {
 //
 // Build on `.form-control` with modifier classes to decrease or increase the
 // height and font-size of form controls.
+//
+// The `.form-group-* form-control` variations are sadly duplicated to avoid the
+// issue documented in https://github.com/twbs/bootstrap/issues/15074.
 
-.input-sm,
+.input-sm {
-.form-group-sm .form-control {
   .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
 }
+.form-group-sm {
+  .form-control {
+    height: @input-height-small;
+    padding: @padding-small-vertical @padding-small-horizontal;
+    font-size: @font-size-small;
+    line-height: @line-height-small;
+    border-radius: @input-border-radius-small;
+  }
+  select.form-control {
+    height: @input-height-small;
+    line-height: @input-height-small;
+  }
+  textarea.form-control,
+  select[multiple].form-control {
+    height: auto;
+  }
+  .form-control-static {
+    height: @input-height-small;
+    min-height: (@line-height-computed + @font-size-small);
+    padding: (@padding-small-vertical + 1) @padding-small-horizontal;
+    font-size: @font-size-small;
+    line-height: @line-height-small;
+  }
+}
 
-.input-lg,
+.input-lg {
-.form-group-lg .form-control {
   .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
 }
+.form-group-lg {
+  .form-control {
+    height: @input-height-large;
+    padding: @padding-large-vertical @padding-large-horizontal;
+    font-size: @font-size-large;
+    line-height: @line-height-large;
+    border-radius: @input-border-radius-large;
+  }
+  select.form-control {
+    height: @input-height-large;
+    line-height: @input-height-large;
+  }
+  textarea.form-control,
+  select[multiple].form-control {
+    height: auto;
+  }
+  .form-control-static {
+    height: @input-height-large;
+    min-height: (@line-height-computed + @font-size-large);
+    padding: (@padding-large-vertical + 1) @padding-large-horizontal;
+    font-size: @font-size-large;
+    line-height: @line-height-large;
+  }
+}
 
 
 // Form control feedback states
@@ -347,12 +409,16 @@ input[type="checkbox"] {
   text-align: center;
   pointer-events: none;
 }
-.input-lg + .form-control-feedback {
+.input-lg + .form-control-feedback,
+.input-group-lg + .form-control-feedback,
+.form-group-lg .form-control + .form-control-feedback {
   width: @input-height-large;
   height: @input-height-large;
   line-height: @input-height-large;
 }
-.input-sm + .form-control-feedback {
+.input-sm + .form-control-feedback,
+.input-group-sm + .form-control-feedback,
+.form-group-sm .form-control + .form-control-feedback {
   width: @input-height-small;
   height: @input-height-small;
   line-height: @input-height-small;
@@ -373,10 +439,10 @@ input[type="checkbox"] {
 .has-feedback label {
 
   & ~ .form-control-feedback {
-     top: (@line-height-computed + 5); // Height of the `label` and its margin
+    top: (@line-height-computed + 5); // Height of the `label` and its margin
   }
   &.sr-only ~ .form-control-feedback {
-     top: 0;
+    top: 0;
   }
 }
 
@@ -450,8 +516,7 @@ input[type="checkbox"] {
     }
 
     // Remove default margin on radios/checkboxes that were used for stacking, and
-    // then undo the floating of radios and checkboxes to match (which also avoids
+    // then undo the floating of radios and checkboxes to match.
-    // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
     .radio,
     .checkbox {
       display: inline-block;
@@ -522,7 +587,7 @@ input[type="checkbox"] {
   // Reposition the icon because it's now within a grid column and columns have
   // `position: relative;` on them. Also accounts for the grid gutter padding.
   .has-feedback .form-control-feedback {
-    right: (@grid-gutter-width / 2);
+    right: floor((@grid-gutter-width / 2));
   }
 
   // Form group sizes
@@ -532,7 +597,8 @@ input[type="checkbox"] {
   .form-group-lg {
     @media (min-width: @screen-sm-min) {
       .control-label {
-        padding-top: ((@padding-large-vertical * @line-height-large) + 1);
+        padding-top: (@padding-large-vertical + 1);
+        font-size: @font-size-large;
       }
     }
   }
@@ -540,6 +606,7 @@ input[type="checkbox"] {
     @media (min-width: @screen-sm-min) {
       .control-label {
         padding-top: (@padding-small-vertical + 1);
+        font-size: @font-size-small;
       }
     }
   }

public/less/admin/bootstrap/glyphicons.less

@@ -12,6 +12,7 @@
   font-family: 'Glyphicons Halflings';
   src: url('@{icon-font-path}@{icon-font-name}.eot');
   src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'),
+       url('@{icon-font-path}@{icon-font-name}.woff2') format('woff2'),
        url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),
        url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),
        url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg');
@@ -31,8 +32,8 @@
 }
 
 // Individual icons
-.glyphicon-asterisk               { &:before { content: "\2a"; } }
+.glyphicon-asterisk               { &:before { content: "\002a"; } }
-.glyphicon-plus                   { &:before { content: "\2b"; } }
+.glyphicon-plus                   { &:before { content: "\002b"; } }
 .glyphicon-euro,
 .glyphicon-eur                    { &:before { content: "\20ac"; } }
 .glyphicon-minus                  { &:before { content: "\2212"; } }
@@ -232,3 +233,73 @@
 .glyphicon-cloud-upload           { &:before { content: "\e198"; } }
 .glyphicon-tree-conifer           { &:before { content: "\e199"; } }
 .glyphicon-tree-deciduous         { &:before { content: "\e200"; } }
+.glyphicon-cd                     { &:before { content: "\e201"; } }
+.glyphicon-save-file              { &:before { content: "\e202"; } }
+.glyphicon-open-file              { &:before { content: "\e203"; } }
+.glyphicon-level-up               { &:before { content: "\e204"; } }
+.glyphicon-copy                   { &:before { content: "\e205"; } }
+.glyphicon-paste                  { &:before { content: "\e206"; } }
+// The following 2 Glyphicons are omitted for the time being because
+// they currently use Unicode codepoints that are outside the
+// Basic Multilingual Plane (BMP). Older buggy versions of WebKit can't handle
+// non-BMP codepoints in CSS string escapes, and thus can't display these two icons.
+// Notably, the bug affects some older versions of the Android Browser.
+// More info: https://github.com/twbs/bootstrap/issues/10106
+// .glyphicon-door                   { &:before { content: "\1f6aa"; } }
+// .glyphicon-key                    { &:before { content: "\1f511"; } }
+.glyphicon-alert                  { &:before { content: "\e209"; } }
+.glyphicon-equalizer              { &:before { content: "\e210"; } }
+.glyphicon-king                   { &:before { content: "\e211"; } }
+.glyphicon-queen                  { &:before { content: "\e212"; } }
+.glyphicon-pawn                   { &:before { content: "\e213"; } }
+.glyphicon-bishop                 { &:before { content: "\e214"; } }
+.glyphicon-knight                 { &:before { content: "\e215"; } }
+.glyphicon-baby-formula           { &:before { content: "\e216"; } }
+.glyphicon-tent                   { &:before { content: "\26fa"; } }
+.glyphicon-blackboard             { &:before { content: "\e218"; } }
+.glyphicon-bed                    { &:before { content: "\e219"; } }
+.glyphicon-apple                  { &:before { content: "\f8ff"; } }
+.glyphicon-erase                  { &:before { content: "\e221"; } }
+.glyphicon-hourglass              { &:before { content: "\231b"; } }
+.glyphicon-lamp                   { &:before { content: "\e223"; } }
+.glyphicon-duplicate              { &:before { content: "\e224"; } }
+.glyphicon-piggy-bank             { &:before { content: "\e225"; } }
+.glyphicon-scissors               { &:before { content: "\e226"; } }
+.glyphicon-bitcoin                { &:before { content: "\e227"; } }
+.glyphicon-btc                    { &:before { content: "\e227"; } }
+.glyphicon-xbt                    { &:before { content: "\e227"; } }
+.glyphicon-yen                    { &:before { content: "\00a5"; } }
+.glyphicon-jpy                    { &:before { content: "\00a5"; } }
+.glyphicon-ruble                  { &:before { content: "\20bd"; } }
+.glyphicon-rub                    { &:before { content: "\20bd"; } }
+.glyphicon-scale                  { &:before { content: "\e230"; } }
+.glyphicon-ice-lolly              { &:before { content: "\e231"; } }
+.glyphicon-ice-lolly-tasted       { &:before { content: "\e232"; } }
+.glyphicon-education              { &:before { content: "\e233"; } }
+.glyphicon-option-horizontal      { &:before { content: "\e234"; } }
+.glyphicon-option-vertical        { &:before { content: "\e235"; } }
+.glyphicon-menu-hamburger         { &:before { content: "\e236"; } }
+.glyphicon-modal-window           { &:before { content: "\e237"; } }
+.glyphicon-oil                    { &:before { content: "\e238"; } }
+.glyphicon-grain                  { &:before { content: "\e239"; } }
+.glyphicon-sunglasses             { &:before { content: "\e240"; } }
+.glyphicon-text-size              { &:before { content: "\e241"; } }
+.glyphicon-text-color             { &:before { content: "\e242"; } }
+.glyphicon-text-background        { &:before { content: "\e243"; } }
+.glyphicon-object-align-top       { &:before { content: "\e244"; } }
+.glyphicon-object-align-bottom    { &:before { content: "\e245"; } }
+.glyphicon-object-align-horizontal{ &:before { content: "\e246"; } }
+.glyphicon-object-align-left      { &:before { content: "\e247"; } }
+.glyphicon-object-align-vertical  { &:before { content: "\e248"; } }
+.glyphicon-object-align-right     { &:before { content: "\e249"; } }
+.glyphicon-triangle-right         { &:before { content: "\e250"; } }
+.glyphicon-triangle-left          { &:before { content: "\e251"; } }
+.glyphicon-triangle-bottom        { &:before { content: "\e252"; } }
+.glyphicon-triangle-top           { &:before { content: "\e253"; } }
+.glyphicon-console                { &:before { content: "\e254"; } }
+.glyphicon-superscript            { &:before { content: "\e255"; } }
+.glyphicon-subscript              { &:before { content: "\e256"; } }
+.glyphicon-menu-left              { &:before { content: "\e257"; } }
+.glyphicon-menu-right             { &:before { content: "\e258"; } }
+.glyphicon-menu-down              { &:before { content: "\e259"; } }
+.glyphicon-menu-up                { &:before { content: "\e260"; } }

public/less/admin/bootstrap/input-groups.less

@@ -29,6 +29,10 @@
 
     width: 100%;
     margin-bottom: 0;
+    
+    &:focus {
+      z-index: 3;
+    }
   }
 }
 
@@ -79,18 +83,18 @@
   text-align: center;
   background-color: @input-group-addon-bg;
   border: 1px solid @input-group-addon-border-color;
-  border-radius: @border-radius-base;
+  border-radius: @input-border-radius;
 
   // Sizing
   &.input-sm {
     padding: @padding-small-vertical @padding-small-horizontal;
     font-size: @font-size-small;
-    border-radius: @border-radius-small;
+    border-radius: @input-border-radius-small;
   }
   &.input-lg {
     padding: @padding-large-vertical @padding-large-horizontal;
     font-size: @font-size-large;
-    border-radius: @border-radius-large;
+    border-radius: @input-border-radius-large;
   }
 
   // Nuke default margins from checkboxes and radios to vertically center within.
@@ -160,6 +164,7 @@
   &:last-child {
     > .btn,
     > .btn-group {
+      z-index: 2;
       margin-left: -1px;
     }
   }

public/less/admin/bootstrap/jumbotron.less

@@ -4,7 +4,8 @@
 
 
 .jumbotron {
-  padding: @jumbotron-padding (@jumbotron-padding / 2);
+  padding-top:    @jumbotron-padding;
+  padding-bottom: @jumbotron-padding;
   margin-bottom: @jumbotron-padding;
   color: @jumbotron-color;
   background-color: @jumbotron-bg;
@@ -13,6 +14,7 @@
   .h1 {
     color: @jumbotron-heading-color;
   }
+
   p {
     margin-bottom: (@jumbotron-padding / 2);
     font-size: @jumbotron-font-size;
@@ -26,6 +28,8 @@
   .container &,
   .container-fluid & {
     border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
+    padding-left:  (@grid-gutter-width / 2);
+    padding-right: (@grid-gutter-width / 2);
   }
 
   .container {
@@ -33,7 +37,8 @@
   }
 
   @media screen and (min-width: @screen-sm-min) {
-    padding: (@jumbotron-padding * 1.6) 0;
+    padding-top:    (@jumbotron-padding * 1.6);
+    padding-bottom: (@jumbotron-padding * 1.6);
 
     .container &,
     .container-fluid & {
@@ -43,7 +48,7 @@
 
     h1,
     .h1 {
-      font-size: (@font-size-base * 4.5);
+      font-size: @jumbotron-heading-font-size;
     }
   }
 }

public/less/admin/bootstrap/list-group.less

@@ -38,12 +38,13 @@
 }
 
 
-// Linked list items
+// Interactive list items
 //
-// Use anchor elements instead of `li`s or `div`s to create linked list items.
+// Use anchor or button elements instead of `li`s or `div`s to create interactive items.
 // Includes an extra `.active` modifier class for showing selected items.
 
-a.list-group-item {
+a.list-group-item,
+button.list-group-item {
   color: @list-group-link-color;
 
   .list-group-item-heading {
@@ -59,6 +60,11 @@ a.list-group-item {
   }
 }
 
+button.list-group-item {
+  width: 100%;
+  text-align: left;
+}
+
 .list-group-item {
   // Disabled state
   &.disabled,

public/less/admin/bootstrap/media.less

@@ -7,6 +7,25 @@
   }
 }
 
+.media,
+.media-body {
+  zoom: 1;
+  overflow: hidden;
+}
+
+.media-body {
+  width: 10000px;
+}
+
+.media-object {
+  display: block;
+
+  // Fix collapse in webkit from max-width: 100% and display: table-cell.
+  &.img-thumbnail {
+    max-width: none;
+  }
+}
+
 .media-right,
 .media > .pull-right {
   padding-left: 10px;

public/less/admin/bootstrap/mixins.less

@@ -11,6 +11,7 @@
 @import "mixins/responsive-visibility.less";
 @import "mixins/size.less";
 @import "mixins/tab-focus.less";
+@import "mixins/reset-text.less";
 @import "mixins/text-emphasis.less";
 @import "mixins/text-overflow.less";
 @import "mixins/vendor-prefixes.less";

public/less/admin/bootstrap/mixins/background-variant.less

@@ -2,7 +2,8 @@
 
 .bg-variant(@color) {
   background-color: @color;
-  a&:hover {
+  a&:hover,
+  a&:focus {
     background-color: darken(@color, 10%);
   }
 }

public/less/admin/bootstrap/mixins/buttons.less

@@ -8,15 +8,31 @@
   background-color: @background;
   border-color: @border;
 
-  &:hover,
   &:focus,
-  &.focus,
+  &.focus {
+    color: @color;
+    background-color: darken(@background, 10%);
+        border-color: darken(@border, 25%);
+  }
+  &:hover {
+    color: @color;
+    background-color: darken(@background, 10%);
+        border-color: darken(@border, 12%);
+  }
   &:active,
   &.active,
   .open > .dropdown-toggle& {
     color: @color;
     background-color: darken(@background, 10%);
         border-color: darken(@border, 12%);
+
+    &:hover,
+    &:focus,
+    &.focus {
+      color: @color;
+      background-color: darken(@background, 17%);
+          border-color: darken(@border, 25%);
+    }
   }
   &:active,
   &.active,
@@ -26,12 +42,9 @@
   &.disabled,
   &[disabled],
   fieldset[disabled] & {
-    &,
     &:hover,
     &:focus,
-    &.focus,
+    &.focus {
-    &:active,
-    &.active {
       background-color: @background;
           border-color: @border;
     }

public/less/admin/bootstrap/mixins/grid-framework.less

@@ -19,8 +19,8 @@
       // Prevent columns from collapsing when empty
       min-height: 1px;
       // Inner gutter via padding
-      padding-left:  (@grid-gutter-width / 2);
+      padding-left:  ceil((@grid-gutter-width / 2));
-      padding-right: (@grid-gutter-width / 2);
+      padding-right: floor((@grid-gutter-width / 2));
     }
   }
   .col(1); // kickstart it

public/less/admin/bootstrap/mixins/grid.less

@@ -6,15 +6,15 @@
 .container-fixed(@gutter: @grid-gutter-width) {
   margin-right: auto;
   margin-left: auto;
-  padding-left:  (@gutter / 2);
+  padding-left:  floor((@gutter / 2));
-  padding-right: (@gutter / 2);
+  padding-right: ceil((@gutter / 2));
   &:extend(.clearfix all);
 }
 
 // Creates a wrapper for a series of columns
 .make-row(@gutter: @grid-gutter-width) {
-  margin-left:  (@gutter / -2);
+  margin-left:  ceil((@gutter / -2));
-  margin-right: (@gutter / -2);
+  margin-right: floor((@gutter / -2));
   &:extend(.clearfix all);
 }
 

public/less/admin/bootstrap/mixins/hide-text.less

@@ -1,12 +1,12 @@
 // CSS image replacement
 //
-// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
+// Heads up! v3 launched with only `.hide-text()`, but per our pattern for
 // mixins being reused as classes with the same name, this doesn't hold up. As
 // of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
 //
 // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
 
-// Deprecated as of v3.0.1 (will be removed in v4)
+// Deprecated as of v3.0.1 (has been removed in v4)
 .hide-text() {
   font: ~"0/0" a;
   color: transparent;

public/less/admin/bootstrap/mixins/list-group.less

@@ -5,7 +5,8 @@
     color: @color;
     background-color: @background;
 
-    a& {
+    a&,
+    button& {
       color: @color;
 
       .list-group-item-heading {

public/less/admin/bootstrap/mixins/pagination.less

@@ -1,11 +1,12 @@
 // Pagination
 
-.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {
+.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {
   > li {
     > a,
     > span {
       padding: @padding-vertical @padding-horizontal;
       font-size: @font-size;
+      line-height: @line-height;
     }
     &:first-child {
       > a,

public/less/admin/bootstrap/mixins/reset-text.less

@@ -0,0 +1,18 @@
+.reset-text() {
+  font-family: @font-family-base;
+  // We deliberately do NOT reset font-size.
+  font-style: normal;
+  font-weight: normal;
+  letter-spacing: normal;
+  line-break: auto;
+  line-height: @line-height-base;
+  text-align: left; // Fallback for where `start` is not supported
+  text-align: start;
+  text-decoration: none;
+  text-shadow: none;
+  text-transform: none;
+  white-space: normal;
+  word-break: normal;
+  word-spacing: normal;
+  word-wrap: normal;
+}

public/less/admin/bootstrap/mixins/responsive-visibility.less

@@ -4,7 +4,7 @@
 // More easily include all the states for responsive-utilities.less.
 .responsive-visibility() {
   display: block !important;
-  table&  { display: table; }
+  table&  { display: table !important; }
   tr&     { display: table-row !important; }
   th&,
   td&     { display: table-cell !important; }

public/less/admin/bootstrap/mixins/text-emphasis.less

@@ -2,7 +2,8 @@
 
 .text-emphasis-variant(@color) {
   color: @color;
-  a&:hover {
+  a&:hover,
+  a&:focus {
     color: darken(@color, 10%);
   }
 }

public/less/admin/bootstrap/mixins/vendor-prefixes.less

@@ -1,7 +1,7 @@
 // Vendor Prefixes
 //
 // All vendor mixins are deprecated as of v3.2.0 due to the introduction of
-// Autoprefixer in our Gruntfile. They will be removed in v4.
+// Autoprefixer in our Gruntfile. They have been removed in v4.
 
 // - Animations
 // - Backface visibility
@@ -54,7 +54,7 @@
 // Prevent browsers from flickering when using CSS 3D transforms.
 // Default value is `visible`, but can be changed to `hidden`
 
-.backface-visibility(@visibility){
+.backface-visibility(@visibility) {
   -webkit-backface-visibility: @visibility;
      -moz-backface-visibility: @visibility;
           backface-visibility: @visibility;
@@ -102,7 +102,7 @@
   // Firefox
   &::-moz-placeholder {
     color: @color;
-    opacity: 1; // See https://github.com/twbs/bootstrap/pull/11526
+    opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
   }
   &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+
   &::-webkit-input-placeholder  { color: @color; } // Safari and Chrome

public/less/admin/bootstrap/modals.less

@@ -62,10 +62,12 @@
 
 // Modal background
 .modal-backdrop {
-  position: absolute;
+  position: fixed;
   top: 0;
   right: 0;
+  bottom: 0;
   left: 0;
+  z-index: @zindex-modal-background;
   background-color: @modal-backdrop-bg;
   // Fade for backdrop
   &.fade { .opacity(0); }
@@ -77,7 +79,7 @@
 .modal-header {
   padding: @modal-title-padding;
   border-bottom: 1px solid @modal-header-border-color;
-  min-height: (@modal-title-padding + @modal-title-line-height);
+  &:extend(.clearfix all);
 }
 // Close icon
 .modal-header .close {

public/less/admin/bootstrap/navbar.less

@@ -67,7 +67,6 @@
 
     &.collapse {
       display: block !important;
-      visibility: visible !important;
       height: auto !important;
       padding-bottom: 0; // Override default setting
       overflow: visible !important;
@@ -331,6 +330,7 @@
 }
 // Menu position and menu caret support for dropups via extra dropup class
 .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+  margin-bottom: 0;
   .border-top-radius(@navbar-border-radius);
   .border-bottom-radius(0);
 }

public/less/admin/bootstrap/navs.less

@@ -223,11 +223,9 @@
 .tab-content {
   > .tab-pane {
     display: none;
-    visibility: hidden;
   }
   > .active {
     display: block;
-    visibility: visible;
   }
 }
 

public/less/admin/bootstrap/normalize.less

@@ -1,9 +1,9 @@
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
 
 //
 // 1. Set default font family to sans-serif.
-// 2. Prevent iOS text size adjust after orientation change, without disabling
+// 2. Prevent iOS and IE text size adjust after device orientation change,
-//    user zoom.
+//    without disabling user zoom.
 //
 
 html {
@@ -71,7 +71,7 @@ audio:not([controls]) {
 
 //
 // Address `[hidden]` styling not present in IE 8/9/10.
-// Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+// Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
 //
 
 [hidden],
@@ -91,7 +91,8 @@ a {
 }
 
 //
-// Improve readability when focused and also mouse hovered in all browsers.
+// Improve readability of focused elements when they are also in an
+// active/hover state.
 //
 
 a:active,
@@ -209,7 +210,6 @@ figure {
 //
 
 hr {
-  -moz-box-sizing: content-box;
   box-sizing: content-box;
   height: 0;
 }
@@ -350,15 +350,12 @@ input[type="number"]::-webkit-outer-spin-button {
 
 //
 // 1. Address `appearance` set to `searchfield` in Safari and Chrome.
-// 2. Address `box-sizing` set to `border-box` in Safari and Chrome
+// 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
-//    (include `-moz` to future-proof).
 //
 
 input[type="search"] {
   -webkit-appearance: textfield; // 1
-  -moz-box-sizing: content-box;
+  box-sizing: content-box; //2
-  -webkit-box-sizing: content-box; // 2
-  box-sizing: content-box;
 }
 
 //

public/less/admin/bootstrap/pagination.less

@@ -40,6 +40,7 @@
   > li > span {
     &:hover,
     &:focus {
+      z-index: 2;
       color: @pagination-hover-color;
       background-color: @pagination-hover-bg;
       border-color: @pagination-hover-border;
@@ -51,7 +52,7 @@
     &,
     &:hover,
     &:focus {
-      z-index: 2;
+      z-index: 3;
       color: @pagination-active-color;
       background-color: @pagination-active-bg;
       border-color: @pagination-active-border;
@@ -79,10 +80,10 @@
 
 // Large
 .pagination-lg {
-  .pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @border-radius-large);
+  .pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
 }
 
 // Small
 .pagination-sm {
-  .pagination-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @border-radius-small);
+  .pagination-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
 }

public/less/admin/bootstrap/panels.less

@@ -36,7 +36,11 @@
   font-size: ceil((@font-size-base * 1.125));
   color: inherit;
 
-  > a {
+  > a,
+  > small,
+  > .small,
+  > small > a,
+  > .small > a {
     color: inherit;
   }
 }
@@ -72,6 +76,7 @@
         .border-top-radius((@panel-border-radius - 1));
       }
     }
+
     // Add border bottom radius for last one
     &:last-child {
       .list-group-item:last-child {
@@ -80,6 +85,11 @@
       }
     }
   }
+  > .panel-heading + .panel-collapse > .list-group {
+    .list-group-item:first-child {
+      .border-top-radius(0);
+    }
+  }
 }
 // Collapse space between when there's no additional content.
 .panel-heading + .list-group {

public/less/admin/bootstrap/popovers.less

@@ -11,12 +11,11 @@
   display: none;
   max-width: @popover-max-width;
   padding: 1px;
-  // Reset font and text propertes given new insertion method
+  // Our parent element can be arbitrary since popovers are by default inserted as a sibling of their target element.
-  font-family: @font-family-base;
+  // So reset our font and text properties to avoid inheriting weird values.
+  .reset-text();
   font-size: @font-size-base;
-  font-weight: normal;
+
-  line-height: @line-height-base;
-  text-align: left;
   background-color: @popover-bg;
   background-clip: padding-box;
   border: 1px solid @popover-fallback-border-color;
@@ -24,9 +23,6 @@
   border-radius: @border-radius-large;
   .box-shadow(0 5px 10px rgba(0,0,0,.2));
 
-  // Overrides for proper insertion
-  white-space: normal;
-
   // Offset the popover to account for the popover arrow
   &.top     { margin-top: -@popover-arrow-width; }
   &.right   { margin-left: @popover-arrow-width; }

public/less/admin/bootstrap/print.less

@@ -67,12 +67,6 @@
     }
 
     // Bootstrap specific changes start
-    //
-    // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
-    // Once fixed, we can just straight up remove this.
-    select {
-        background: #fff !important;
-    }
 
     // Bootstrap components
     .navbar {

public/less/admin/bootstrap/responsive-embed.less

@@ -22,14 +22,14 @@
     width: 100%;
     border: 0;
   }
-
+}
-  // Modifier class for 16:9 aspect ratio
+
-  &.embed-responsive-16by9 {
+// Modifier class for 16:9 aspect ratio
-    padding-bottom: 56.25%;
+.embed-responsive-16by9 {
-  }
+  padding-bottom: 56.25%;
-
+}
-  // Modifier class for 4:3 aspect ratio
+
-  &.embed-responsive-4by3 {
+// Modifier class for 4:3 aspect ratio
-    padding-bottom: 75%;
+.embed-responsive-4by3 {
-  }
+  padding-bottom: 75%;
 }

public/less/admin/bootstrap/scaffolding.less

@@ -148,3 +148,14 @@ hr {
     clip: auto;
   }
 }
+
+
+// iOS "clickable elements" fix for role="button"
+//
+// Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
+// for traditionally non-focusable elements with role="button"
+// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
+
+[role="button"] {
+  cursor: pointer;
+}

public/less/admin/bootstrap/tables.less

@@ -111,7 +111,7 @@ th {
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 
 .table-striped {
-  > tbody > tr:nth-child(odd) {
+  > tbody > tr:nth-of-type(odd) {
     background-color: @table-bg-accent;
   }
 }
@@ -133,7 +133,7 @@ th {
 // Reset default table behavior
 
 table col[class*="col-"] {
-  position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
+  position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
   float: none;
   display: table-column;
 }
@@ -141,7 +141,7 @@ table {
   td,
   th {
     &[class*="col-"] {
-      position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
+      position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
       float: none;
       display: table-cell;
     }

public/less/admin/bootstrap/theme.less

@@ -1,3 +1,8 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
 
 //
 // Load core variables and mixins
@@ -28,6 +33,12 @@
     .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
   }
 
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    .box-shadow(none);
+  }
+
   .badge {
     text-shadow: none;
   }
@@ -36,7 +47,7 @@
 // Mixin for generating new styles
 .btn-styles(@btn-color: #555) {
   #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%));
-  .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
+  .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners; see https://github.com/twbs/bootstrap/issues/10620
   background-repeat: repeat-x;
   border-color: darken(@btn-color, 14%);
 
@@ -52,10 +63,18 @@
     border-color: darken(@btn-color, 14%);
   }
 
-  &:disabled,
+  &.disabled,
-  &[disabled] {
+  &[disabled],
-    background-color: darken(@btn-color, 12%);
+  fieldset[disabled] & {
-    background-image: none;
+    &,
+    &:hover,
+    &:focus,
+    &.focus,
+    &:active,
+    &.active {
+      background-color: darken(@btn-color, 12%);
+      background-image: none;
+    }
   }
 }
 
@@ -130,8 +149,8 @@
 // Inverted navbar
 .navbar-inverse {
   #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg);
-  .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
+  .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257
-
+  border-radius: @navbar-border-radius;
   .navbar-nav > .open > a,
   .navbar-nav > .active > a {
     #gradient > .vertical(@start-color: @navbar-inverse-link-active-bg; @end-color: lighten(@navbar-inverse-link-active-bg, 2.5%));

public/less/admin/bootstrap/tooltip.less

@@ -8,12 +8,11 @@
   position: absolute;
   z-index: @zindex-tooltip;
   display: block;
-  visibility: visible;
+  // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
-  // Reset font and text propertes given new insertion method
+  // So reset our font and text properties to avoid inheriting weird values.
-  font-family: @font-family-base;
+  .reset-text();
   font-size: @font-size-small;
-  font-weight: normal;
+
-  line-height: 1.4;
   .opacity(0);
 
   &.in     { .opacity(@tooltip-opacity); }
@@ -29,7 +28,6 @@
   padding: 3px 8px;
   color: @tooltip-color;
   text-align: center;
-  text-decoration: none;
   background-color: @tooltip-bg;
   border-radius: @border-radius-base;
 }

public/less/admin/bootstrap/type.less

@@ -211,7 +211,7 @@ dd {
     &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present
   }
 
-  @media (min-width: @grid-float-breakpoint) {
+  @media (min-width: @dl-horizontal-breakpoint) {
     dt {
       float: left;
       width: (@dl-horizontal-offset - 20);
@@ -238,7 +238,7 @@ abbr[data-original-title] {
 }
 .initialism {
   font-size: 90%;
-  text-transform: uppercase;
+  .text-uppercase();
 }
 
 // Blockquotes

public/less/admin/bootstrap/utilities.less

@@ -44,7 +44,6 @@
 
 .hidden {
   display: none !important;
-  visibility: hidden !important;
 }
 
 

public/less/admin/bootstrap/variables.less

@@ -863,5 +863,7 @@
 @page-header-border-color:    @gray-lighter;
 //** Width of horizontal description list titles
 @dl-horizontal-offset:        @component-offset-horizontal;
+//** Point at which .dl-horizontal becomes horizontal
+@dl-horizontal-breakpoint:    @grid-float-breakpoint;
 //** Horizontal line color.
 @hr-border:                   @gray-lighter;

public/less/mixins.less

@@ -69,6 +69,10 @@
 
 		margin-bottom: 10px;
 	}
+
+	ol {
+		margin-bottom: 10px;
+	}
 }
 
 .user-icon-style(@size: 32px, @font-size: 1.5rem, @border-radius: inherit) {

public/src/modules/translator.js

@@ -265,6 +265,7 @@
 			path = require('path'),
 			winston = require('winston'),
 			file = require('../../../src/file'),
+			plugins = require('../../../src/plugins'),
 			meta = require('../../../src/meta');
 
 		language = language || meta.config.defaultLang || 'en_GB';
@@ -275,18 +276,35 @@
 		}
 
 		fs.readFile(path.join(__dirname, '../../language', language, filename + '.json'), function(err, data) {
-			if (err) {
+			var onData = function(data) {
-				winston.error('Could not load `' + filename + '`: ' + err.message + '. Skipping...');
+				try {
-				return callback({});
+					data = JSON.parse(data.toString());
+				} catch (e) {
+					winston.error('Could not parse `' + filename + '.json`, syntax error? Skipping...');
+					data = {};
+				}
+				callback(data);
 			}
 
-			try {
+			if (err) {
-				data = JSON.parse(data.toString());
+				if (err.code === 'ENOENT' && plugins.customLanguageFallbacks.hasOwnProperty(filename)) {
-			} catch (e) {
+					// Resource non-existant but fallback exists
-				winston.error('Could not parse `' + filename + '.json`, syntax error? Skipping...');
+					return fs.readFile(plugins.customLanguageFallbacks[filename], {
-				data = {};
+						encoding: 'utf-8'
+					}, function(err, data) {
+						if (err) {
+							return winston.error('[translator] Could not load fallback language file for resource ' + filename);
+						}
+
+						onData(data);
+					})
+				} else {
+					winston.error('[translator] Could not load `' + filename + '`: ' + err.message + '. Skipping...');
+					return callback({});
+				}
 			}
-			callback(data);
+
+			onData(data);
 		});
 	}
 

src/groups/update.js

@@ -45,6 +45,7 @@ module.exports = function(Groups) {
 			}
 
 			async.series([
+				async.apply(checkNameChange, groupName, values.name),
 				async.apply(updatePrivacy, groupName, values.private),
 				function(next) {
 					if (values.hasOwnProperty('hidden')) {
@@ -217,6 +218,23 @@ module.exports = function(Groups) {
 		});
 	}
 
+	function checkNameChange(currentName, newName, callback) {
+		if (currentName === newName) {
+			return callback();
+		}
+		var currentSlug = utils.slugify(currentName);
+		var newSlug = utils.slugify(newName);
+		if (currentSlug === newSlug) {
+			return callback();
+		}
+		Groups.existsBySlug(newSlug, function(err, exists) {
+			if (err || exists) {
+				return callback(err || new Error('[[error:group-already-exists]]'));
+			}
+			callback();
+		});
+	}
+
 	function renameGroup(oldName, newName, callback) {
 		if (oldName === newName || !newName || newName.length === 0) {
 			return callback();

src/notifications.js

@@ -331,5 +331,66 @@ var async = require('async'),
 		});
 	};
 
+	Notifications.merge = function(notifications, callback) {
+		// When passed a set of notification objects, merge any that can be merged
+		var mergeIds = [
+				'notifications:favourited_your_post_in',
+				'notifications:upvoted_your_post_in',
+				'notifications:user_started_following_you',
+				'notifications:user_posted_to',
+				'notifications:user_flagged_post_in'
+			],
+			isolated, differentiator, modifyIndex;
+
+		notifications = mergeIds.reduce(function(notifications, mergeId) {
+			isolated = notifications.filter(function(notifObj) {
+				if (!notifObj.hasOwnProperty('mergeId')) {
+					return false;
+				}
+
+				return notifObj.mergeId.split('|')[0] === mergeId;
+			});
+
+			if (isolated.length <= 1) {
+				return notifications;	// Nothing to merge
+			}
+
+			differentiator = isolated[0].mergeId.split('|')[1];
+
+			modifyIndex = notifications.indexOf(isolated[0]);
+
+			switch(mergeId) {
+				case 'notifications:favourited_your_post_in':	// intentional fall-through
+				case 'notifications:upvoted_your_post_in':
+				case 'notifications:user_started_following_you':
+				case 'notifications:user_posted_to':
+				case 'notifications:user_flagged_post_in':
+					var usernames = isolated.map(function(notifObj) {
+						return notifObj.user.username;
+					});
+					var numUsers = usernames.length;
+
+					// Update bodyShort
+					if (numUsers === 2) {
+						isolated[0].bodyShort = '[[' + mergeId + '_dual, ' + usernames.join(', ') + ', ' + isolated[0].topicTitle + ']]'
+					} else {
+						isolated[0].bodyShort = '[[' + mergeId + '_multiple, ' + usernames[0] + ', ' + (numUsers-1) + ', ' + isolated[0].topicTitle + ']]'
+					}
+					break;
+			}
+
+			// Filter out duplicates
+			return notifications.filter(function(notifObj, idx) {
+				return notifObj.mergeId !== mergeId + '|' + differentiator || idx === modifyIndex;
+			});
+		}, notifications);
+
+		plugins.fireHook('filter:notifications.merge', {
+			notifications: notifications
+		}, function(err, data) {
+			callback(err, data.notifications);
+		});
+	};
+
 }(exports));
 

src/reset.js

@@ -123,7 +123,7 @@ function resetPlugins(callback) {
 }
 
 function resetWidgets(callback) {
-	require('./src/widgets').reset(function(err) {
+	require('./widgets').reset(function(err) {
 		winston.info('[reset] All Widgets moved to Draft Zone');
 		if (typeof callback === 'function') {
 			callback(err);

src/socket.io/helpers.js

@@ -69,7 +69,9 @@ SocketHelpers.sendNotificationToPostOwner = function(pid, fromuid, notification)
 				bodyLong: results.postObj.content,
 				pid: pid,
 				nid: 'post:' + pid + ':uid:' + fromuid,
-				from: fromuid
+				from: fromuid,
+				mergeId: notification + '|' + postData.tid,
+				topicTitle: results.topicTitle
 			}, function(err, notification) {
 				if (!err && notification) {
 					notifications.push(notification, [postData.uid]);

src/socket.io/posts/flag.js

@@ -84,7 +84,9 @@ module.exports = function(SocketPosts) {
 					bodyLong: post.content,
 					pid: data.pid,
 					nid: 'post_flag:' + data.pid + ':uid:' + socket.uid,
-					from: socket.uid
+					from: socket.uid,
+					mergeId: 'notifications:user_flagged_post_in|' + data.pid,
+					topicTitle: post.topic.title
 				}, function(err, notification) {
 					if (err || !notification) {
 						return next(err);

src/socket.io/user.js

@@ -142,7 +142,8 @@ SocketUser.follow = function(socket, data, callback) {
 				bodyShort: '[[notifications:user_started_following_you, ' + userData.username + ']]',
 				nid: 'follow:' + data.uid + ':uid:' + socket.uid,
 				from: socket.uid,
-				path: '/user/' + userData.userslug
+				path: '/user/' + userData.userslug,
+				mergeId: 'notifications:user_started_following_you'
 			}, next);
 		},
 		function(notification, next) {

src/topics.js

@@ -192,12 +192,19 @@ var async = require('async'),
 				}, next);
 			},
 			function(results, next) {
+				if (plugins.hasListeners('filter:topic.getRelatedTopics')) {
+					plugins.fireHook('filter:topic.getRelatedTopics', results, next);
+				} else {
+					Topics.getRelatedTopics(results, next);
+				}
+			}, function(results, next) {
 				topicData.posts = results.posts;
 				topicData.category = results.category;
 				topicData.thread_tools = results.threadTools.tools;
 				topicData.tags = results.tags;
 				topicData.isFollowing = results.isFollowing[0];
 				topicData.bookmark = results.bookmark;
+				topicData.related = results.related || [];
 
 				topicData.unreplied = parseInt(topicData.postcount, 10) === 1;
 				topicData.deleted = parseInt(topicData.deleted, 10) === 1;

src/topics/follow.js

@@ -137,7 +137,9 @@ module.exports = function(Topics) {
 					pid: postData.pid,
 					nid: 'new_post:tid:' + postData.topic.tid + ':pid:' + postData.pid + ':uid:' + exceptUid,
 					tid: postData.topic.tid,
-					from: exceptUid
+					from: exceptUid,
+					mergeId: 'notifications:user_posted_to|' + postData.topic.tid,
+					topicTitle: title
 				}, function(err, notification) {
 					if (err) {
 						return next(err);

src/topics/tags.js

@@ -5,6 +5,7 @@ var async = require('async'),
 
 	db = require('../database'),
 	meta = require('../meta'),
+	user = require('../user'),
 	_ = require('underscore'),
 	plugins = require('../plugins');
 
@@ -322,4 +323,43 @@ module.exports = function(Topics) {
 		});
 	};
 
+	Topics.getRelatedTopics = function(topicData, callback) {
+		var maximumTopics = typeof meta.config.maximumRelatedTopics !== 'undefined' ? parseInt(meta.config.maximumRelatedTopics, 10) : 5;
+
+		if (!topicData.tags.length || maximumTopics === 0) {
+			return callback(null, topicData);
+		}
+
+		var related = [];
+
+		user.isAdministrator(topicData.threadTools.uid, function(err, isAdministrator) {
+			async.each(topicData.tags, function(tag, next) {
+				tag = tag.value;
+
+				Topics.getTagTids(tag, 0, 5, function(err, tids) {
+					Topics.getTopics(tids, topicData.threadTools.uid, function(err, topics) {
+						related = related.concat(topics.filter(function(topic) {
+							var doesntOwnTopic = parseInt(topic.uid, 10) !== parseInt(topicData.threadTools.uid, 10);
+							var isntSameTopic = parseInt(topic.tid, 10) !== parseInt(topicData.threadTools.topic.tid, 10);
+
+							return doesntOwnTopic && isntSameTopic;
+						}));
+
+						next(err);
+					});
+				});
+			}, function(err) {
+				if (!isAdministrator) {
+					related = related.filter(function(topic) {
+						return topic && !topic.deleted;
+					});
+				}
+
+				related = _.shuffle(related).slice(0, maximumTopics);
+
+				topicData.related = related;
+				callback(err, topicData);
+			});
+		});
+	};
 };

src/user/notifications.js

@@ -64,29 +64,22 @@ var async = require('async'),
 	}
 
 	function getNotificationsFromSet(set, read, uid, start, stop, callback) {
-		db.getSortedSetRevRange(set, start, stop, function(err, nids) {
+		async.waterfall([
-			if (err) {
+			async.apply(db.getSortedSetRevRange, set, start, stop),
-				return callback(err);
+			function(nids, next) {
-			}
+				if(!Array.isArray(nids) || !nids.length) {
-
+					return callback(null, []);
-			if(!Array.isArray(nids) || !nids.length) {
-				return callback(null, []);
-			}
-
-			UserNotifications.getNotifications(nids, uid, function(err, notifications) {
-				if (err) {
-					return callback(err);
 				}
 
+				UserNotifications.getNotifications(nids, uid, next);
+			},
+			function(notifs, next) {
 				var deletedNids = [];
 
-				notifications.forEach(function(notification, index) {
+				notifs.forEach(function(notification, index) {
 					if (!notification) {
-						if (process.env.NODE_ENV === 'development') {
+						winston.verbose('[notifications.get] nid ' + notification.nid + ' not found. Removing.');
-							winston.info('[notifications.get] nid ' + nids[index] + ' not found. Removing.');
+						deletedNids.push(notification.nid);
-						}
-
-						deletedNids.push(nids[index]);
 					} else {
 						notification.read = read;
 						notification.readClass = !notification.read ? 'unread' : '';
@@ -97,9 +90,9 @@ var async = require('async'),
 					db.sortedSetRemove(set, deletedNids);
 				}
 
-				callback(null, notifications);
+				notifications.merge(notifs, next);
-			});
+			}
-		});
+		], callback);
 	}
 
 	UserNotifications.getNotifications = function(nids, uid, callback) {

src/views/admin/settings/tags.tpl

@@ -4,12 +4,6 @@
 	<div class="col-sm-2 col-xs-12 settings-header">Tag Settings</div>
 	<div class="col-sm-10 col-xs-12">
 		<form>
-			<div class="checkbox">
-				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
-					<input class="mdl-switch__input" type="checkbox" data-field="privateTagListing">
-					<span class="mdl-switch__label">Make the tags list private</span>
-				</label>
-			</div>
 			<div class="form-group">
 				<label for="minimumTagsPerTopics">Minimum Tags per Topic</label>
 				<input id="minimumTagsPerTopics" type="text" class="form-control" value="0" data-field="minimumTagsPerTopic">
@@ -31,4 +25,31 @@
 	</div>
 </div>
 
+
+<div class="row">
+	<div class="col-sm-2 col-xs-12 settings-header">Privacy</div>
+	<div class="col-sm-10 col-xs-12">
+		<form>
+			<div class="checkbox">
+				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
+					<input class="mdl-switch__input" type="checkbox" data-field="privateTagListing">
+					<span class="mdl-switch__label">Make the tags list private</span>
+				</label>
+			</div>
+		</form>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-sm-2 col-xs-12 settings-header">Related Topics</div>
+	<div class="col-sm-10 col-xs-12">
+		<form>
+			<div class="form-group">
+				<label for="maximumRelatedTopics">Maximum related topics to display (if supported by theme)</label>
+				<input id="maximumRelatedTopics" type="text" class="form-control" value="5" data-field="maximumRelatedTopics">
+			</div>
+		</form>
+	</div>
+</div>
+
 <!-- IMPORT admin/settings/footer.tpl -->