Latest translations and fallbacks

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

@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Custom Header",
-	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",
 
 	"custom-css.livereload": "Enable Live Reload",

public/language/ar/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",

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

@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",

public/language/ar/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "تم إرسال هذا الإشعار بوجودة محادثة جديدة وفقا لخيارات تسجيلك.",
     "notif.post.cta": "انقر هنا لقراءة الموضوع بأكمله",
     "notif.post.unsub.info": "تم إشعارك بهذه المشاركة بناءً على الخيارات التي سبق وأن حددتها.",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "هذه رسالة تجريبية للتأكد من صحة إعدادت الرسائل الإلكترونية في منتدى NodeBB خاصتك.",
     "unsub.cta": "انقر هنا لتغيير تلك الإعدادات",
     "banned.subject": "You have been banned from %1",

public/language/ar/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "استمر إلى %1",
     "return_to": "عودة إى %1",
     "new_notification": "تنبيه جديد",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "لديك تنبيهات غير مقروءة.",
     "all": "All",
     "topics": "Topics",
@@ -45,5 +46,19 @@
     "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
     "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
     "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",
-    "email-confirm-sent": "تم إرسال بريد التفعيل."
+    "email-confirm-sent": "تم إرسال بريد التفعيل.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

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

@@ -3,8 +3,12 @@
 	"custom-css.description": "Въведете своите собствени декларации за стилове, те ще бъдат приложени след всички останали стилове.",
 	"custom-css.enable": "Включване на персонализиран CSS",
 
+	"custom-js": "Персонализиран код на Javascript",
+	"custom-js.description": "Въведете свой собствен код на javascript тук. Той ще бъде изпълнен след като страницата се зареди напълно.",
+	"custom-js.enable": "Включване на персонализирания код на Javascript",
+
 	"custom-header": "Персонализирана заглавна част",
-	"custom-header.description": "Въведете своя персонализиран код HTML тук (напр. JavaScript, елементи „meta“ и т.н.), те ще бъдат добавени към секцията <code>&lt;head&gt;</code> в кода на Вашия форум.",
+	"custom-header.description": "Въведете своя персонализиран код HTML тук (напр. елементи „meta“ и т.н.), те ще бъдат добавени към секцията <code>&lt;head&gt;</code> в кода на Вашия форум. Ползването на елементи „script“ е позволено, но непрепоръчително, тъй като за това можете да ползвате раздела <a href=\"#custom-header\" data-toggle=\"tab\">Персонализиран код на Javascript</a>.",
 	"custom-header.enable": "Включване на персонализирана заглавна част",
 
 	"custom-css.livereload": "Включване на моменталното презареждане",

public/language/bg/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Външен вид",
 	"appearance/themes": "Теми",
 	"appearance/skins": "Облици",
-	"appearance/customise": "Персонализиран HTML и CSS",
+	"appearance/customise": "Персонализирано съдържание (HTML/JS/CSS)",
 
 	"section-extend": "Разширяване",
 	"extend/plugins": "Добавки",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Известия",
 	"welcome-notification": "Приветствено известие",
-	"welcome-notification-link": "Връзка за приветственото известие"
+	"welcome-notification-link": "Връзка за приветственото известие",
+	"welcome-notification-uid": "Потр. ид. за приветственото известие"
 }

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

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Първо най-старите",
 	"sorting.newest-to-oldest": "Първо най-новите",
 	"sorting.most-votes": "Първо тези с най-много гласове",
+	"sorting.most-posts": "Първо тези с най-много публикации",
 	"sorting.topic-default": "Подредба по подразбиране на темите",
 	"restrictions": "Ограничения за публикуването",
 	"restrictions.post-queue": "Включване на опашката за публикации",

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

@@ -19,6 +19,8 @@
 	"themes": "Теми",
 	"disable-user-skins": "Потребителите да не могат да избират собствен облик",
 	"account-protection": "Защита на акаунта",
+	"admin-relogin-duration": "Повторно вписване на администратора (в минути)",
+	"admin-relogin-duration-help": "След определено време достъпът до административния раздел ще изисква повторно вписване. Задайте 0, за да изключите това.",
 	"login-attempts": "Брой опити за вписване на час",
 	"login-attempts-help": "Ако опитите за вписване на потребител минат тази граница, акаунтът ще бъде заключен за определено време.",
 	"lockout-duration": "Продължителност на заключването на акаунта (в минути)",

public/language/bg/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "Това известие за разговор беше изпратено до Вас поради настройките Ви за абонаментите.",
     "notif.post.cta": "Натиснете тук, за да прочетете цялата тема",
     "notif.post.unsub.info": "Това известие за публикация беше изпратено до Вас поради настройките Ви за абонаментите.",
+    "notif.cta": "Натиснете тук, за да преминете към форума",
     "test.text1": "Това е пробно е-писмо, за да потвърдим, че изпращачът на е-поща е правилно настроен за Вашия NodeBB.",
     "unsub.cta": "Натиснете тук, за да промените тези настройки",
     "banned.subject": "Вие бяхте блокиран(а) от %1",

public/language/bg/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "Продължаване към %1",
     "return_to": "Връщане към %1",
     "new_notification": "Ново известие",
+    "new_notification_from": "Имате ново известие от %1",
     "you_have_unread_notifications": "Имате непрочетени известия",
     "all": "Всички",
     "topics": "Теми",
@@ -45,5 +46,19 @@
     "email-confirmed": "Е-пощата беше потвърдена",
     "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.",
     "email-confirm-error-message": "Възникна проблем при потвърждаването на е-пощата Ви. Може кодът да е грешен или давността му да е изтекла.",
-    "email-confirm-sent": "Изпратено е е-писмо за потвърждение."
+    "email-confirm-sent": "Изпратено е е-писмо за потвърждение.",
+    "none": "Нищо",
+    "notification_only": "Само известие",
+    "email_only": "Само е-писмо",
+    "notification_and_email": "Известие и е-писмо",
+    "notificationType_upvote": "Когато някой гласува положително за Ваша публикация",
+    "notificationType_new-topic": "Когато някой, когото следвате, публикува тема",
+    "notificationType_new-reply": "Когато бъде публикуван нов отговор в тема, която следвате",
+    "notificationType_follow": "Когато някой започне да Ви следва",
+    "notificationType_new-chat": "Когато получите съобщение в разговор",
+    "notificationType_group-invite": "Когато получите покана за група",
+    "notificationType_new-register": "Когато някой бъде добавен в опашката за регистрация",
+    "notificationType_post-queue": "Когато бъде добавена нова публикация в опашката",
+    "notificationType_new-post-flag": "Когато публикация бъде докладвана",
+    "notificationType_new-user-flag": "Когато потребител бъде докладван"
 }

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

@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Custom Header",
-	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",
 
 	"custom-css.livereload": "Enable Live Reload",

public/language/bn/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",

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

@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",

public/language/bn/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "আপনার সাবস্ক্রীপশন সেটিংসের কারনে আপনার এই নোটিফিকেশন পাঠানো হয়েছে",
     "notif.post.cta": "পুরো বিষয়টি পড়তে এখানে ক্লিক করুন",
     "notif.post.unsub.info": "আপনার সাবস্ক্রিপশন সেটিংসের কারনে আপনার এই বার্তাটি পাঠানো হয়েছে",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "আপনি সঠিকভাবে নোডবিবির জন্য মেইলার সেটাপ করেছেন কিনা নিশ্চিত করার জন্য এই টেষ্ট ইমেইল পাঠানো হয়েছে",
     "unsub.cta": "সেটিংসগুলো পরিবর্তন করতে এখানে ক্লিক করুন",
     "banned.subject": "You have been banned from %1",

public/language/bn/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "%1 তে আগান",
     "return_to": "%1 এ ফেরত যান",
     "new_notification": "নতুন বিজ্ঞপ্তি",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "আপনার অপঠিত বিজ্ঞপ্তি আছে।",
     "all": "All",
     "topics": "Topics",
@@ -45,5 +46,19 @@
     "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে",
     "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।",
     "email-confirm-error-message": "আপনার ইমেল ঠিকানার বৈধতা যাচাইয়ে একটি সমস্যা হয়েছে। সম্ভবত কোডটি ভুল ছিল অথবা কোডের মেয়াদ শেষ হয়ে গিয়েছে।",
-    "email-confirm-sent": "নিশ্চিতকরণ ইমেইল পাঠানো হয়েছে।"
+    "email-confirm-sent": "নিশ্চিতকরণ ইমেইল পাঠানো হয়েছে।",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

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

@@ -3,8 +3,12 @@
 	"custom-css.description": "Zadejte vlastní deklarace CSS, které budou použity na všechny ostatních styly.",
 	"custom-css.enable": "Povolit uživatelské CSS",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Uživatelská hlavička",
-	"custom-header.description": "Zadejte zde uživatelské HTML (např.: javascript, meta značky, atp.), které bude přiřazeno k <code>&lt;head&gt;</code>  části značek vašeho fóra.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Povolit uživatelskou hlavičku",
 
 	"custom-css.livereload": "Povolit aktuální znovu načtení",

public/language/cs/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Vzhled",
 	"appearance/themes": "Motivy",
 	"appearance/skins": "Vzhledy",
-	"appearance/customise": "Uživatelské HTML a CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Rozšířit",
 	"extend/plugins": "Rozšíření",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Oznámení",
 	"welcome-notification": "Uvítání",
-	"welcome-notification-link": "Odkaz na uvítání"
+	"welcome-notification-link": "Odkaz na uvítání",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Od nejstarších po nejnovější",
 	"sorting.newest-to-oldest": "Od nejnovějších po nejstarší",
 	"sorting.most-votes": "Dle hlasování",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Výchozí třídění tématu",
 	"restrictions": "Omezení příspěvků",
 	"restrictions.post-queue": "Povolit frontu pro příspěvky",

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

@@ -19,6 +19,8 @@
 	"themes": "Motivy",
 	"disable-user-skins": "Zabránit uživateli ve výběru vlastního vzhledu",
 	"account-protection": "Ochrana účtu",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Počet pokusů o přihlášení za hodinu",
 	"login-attempts-help": "Překročí-li pokusy o přihlášení uživatele/ů  tuto hranici, účet bude uzamknut na určený čas",
 	"lockout-duration": "Délka blokování účtu (v minutách)",

public/language/cs/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "Toto upozornění na chat vám bylo odesláno na základě vašeho nastavení odběru.",
     "notif.post.cta": "Klikněte zde pro přečtené celého tématu",
     "notif.post.unsub.info": "Toto upozornění na příspěvek vám bylo odesláno na základě vašeho nastavení odběru.",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "Tento testovací e-mail slouží k ověření, že je e-mailer správně nastaven pro práci s NodeBB.",
     "unsub.cta": "Chcete-li změnit tyto nastavení, klikněte zde.",
     "banned.subject": "Byl jste zablokován od %1",

public/language/cs/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "Pokračovat na %1",
     "return_to": "Vrátit se na %1",
     "new_notification": "Nové upozornění",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "Máte nepřečtená upozornění.",
     "all": "Vše",
     "topics": "Témata",
@@ -45,5 +46,19 @@
     "email-confirmed": "E-mail potvrzen",
     "email-confirmed-message": "Děkujeme za ověření vaší e-mailové adresy. Váš účet je nyní aktivní.",
     "email-confirm-error-message": "Nastal problém s ověřením vaší e-mailové adresy. Kód je pravděpodobně neplatný nebo jeho platnost vypršela.",
-    "email-confirm-sent": "Ověřovací e-mail odeslán."
+    "email-confirm-sent": "Ověřovací e-mail odeslán.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

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

@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Custom Header",
-	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",
 
 	"custom-css.livereload": "Enable Live Reload",

public/language/da/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",

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

@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",

public/language/da/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "Denne chat notifikation blev sendt til dig pga. indstillingerne i dit abonnement.",
     "notif.post.cta": "Klik her for a læse hele emnet",
     "notif.post.unsub.info": "Denne indlægs notifikation var sendt pga. dine abonnering indstillinger.",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "Dette er en test email for at kontrollere, at den udgående email server er opsat korrekt i forhold til din NodeBB installation.",
     "unsub.cta": "Klik her for at ændre disse indstillinger",
     "banned.subject": "You have been banned from %1",

public/language/da/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "Fortsæt til %1",
     "return_to": "Returnere til %t",
     "new_notification": "Ny notifikation",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "Du har ulæste notifikationer.",
     "all": "All",
     "topics": "Topics",
@@ -45,5 +46,19 @@
     "email-confirmed": "Email bekræftet",
     "email-confirmed-message": "Tak fordi du validerede din email. Din konto er nu fuldt ud aktiveret.",
     "email-confirm-error-message": "Der var et problem med valideringen af din emailadresse. Bekræftelses koden var muligvis forkert eller udløbet.",
-    "email-confirm-sent": "Bekræftelses email afsendt."
+    "email-confirm-sent": "Bekræftelses email afsendt.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

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

@@ -3,8 +3,12 @@
 	"custom-css.description": "Füge hier deine eigenen CSS-Eigenschaften ein, sie werden als letztes angewendet.",
 	"custom-css.enable": "Benutzerdefiniertes CSS aktivieren",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Benutzerdefinierter Header",
-	"custom-header.description": "Füge hier dein benutzerdefiniertes HTML (z.B. Javascript, Meta Tags, usw.) ein, welches in den <code>&lt;head&gt;</code> Tag eingefügt werden soll.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Benutzerdefinierten Header aktivieren",
 
 	"custom-css.livereload": "Live-Aktualisierung aktivieren",

public/language/de/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Aussehen",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Benutzerdefiniertes HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Erweitert",
 	"extend/plugins": "Plugins",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Benachrichtigungen",
 	"welcome-notification": "Wilkommensnachricht",
-	"welcome-notification-link": "Wilkommensnachricht-Link"
+	"welcome-notification-link": "Wilkommensnachricht-Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Von Alt bis Neu",
 	"sorting.newest-to-oldest": "Von Neu zu Alt",
 	"sorting.most-votes": "Meiste Bewertungen",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Standardmäßige Themensortierung",
 	"restrictions": "Posting beschränkungen",
 	"restrictions.post-queue": "Beitragswarteschlange verwenden",

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

@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Verhindere das Benutzer eigene Skins verwenden",
 	"account-protection": "Kontosicherheit",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login-Versuche pro Stunde",
 	"login-attempts-help": "Wenn die loginversuche zu einem Account diese Schwelle überschreiten, wird dieser Account für eine festgelegte Zeit gesperrt",
 	"lockout-duration": "Account Aussperrzeitraum (Minuten)",

public/language/de/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "Diese Chat-Benachrichtigung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
     "notif.post.cta": "Hier klicken, um das gesamte Thema zu lesen",
     "notif.post.unsub.info": "Diese Mitteilung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "Dies ist eine Test-E-Mail, um zu überprüfen, ob der E-Mailer deines NodeBB korrekt eingestellt wurde.",
     "unsub.cta": "Klicke hier, um diese Einstellungen zu ändern",
     "banned.subject": "Du wurdest von %1 gebannt.",

public/language/de/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "Fortfahren zu %1",
     "return_to": "Kehre zurück zu %1",
     "new_notification": "Neue Benachrichtigung",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.",
     "all": "Alle",
     "topics": "Themen",
@@ -45,5 +46,19 @@
     "email-confirmed": "E-Mail bestätigt",
     "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.",
     "email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.",
-    "email-confirm-sent": "Bestätigungs-E-Mail gesendet."
+    "email-confirm-sent": "Bestätigungs-E-Mail gesendet.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

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

@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Custom Header",
-	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",
 
 	"custom-css.livereload": "Enable Live Reload",

public/language/el/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",

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

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

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

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",

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

@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",

public/language/el/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "Αυτή η ειδοποίηση για συνομιλία σου στάλθηκε λόγω των ρυθμίσεών σου. ",
     "notif.post.cta": "Click here to read the full topic",
     "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "Αυτό είναι ένα δοκιμαστικό email για να επιβεβαιώσουμε ότι ο emailer έχει στηθεί σωστά για το NodeBB.",
     "unsub.cta": "Κάνε κλικ εδώ για να αλλάξεις αυτές τις ρυθμίσεις",
     "banned.subject": "You have been banned from %1",

public/language/el/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "Continue to %1",
     "return_to": "Return to %1",
     "new_notification": "New Notification",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "You have unread notifications.",
     "all": "All",
     "topics": "Topics",
@@ -45,5 +46,19 @@
     "email-confirmed": "Email Confirmed",
     "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
     "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.",
-    "email-confirm-sent": "Στάλθηκε email επιβεβαίωσης."
+    "email-confirm-sent": "Στάλθηκε email επιβεβαίωσης.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

public/language/en-US/admin/appearance/customise.json

@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Custom Header",
-	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",
 
 	"custom-css.livereload": "Enable Live Reload",

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

@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",

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

@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",

public/language/en-US/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
     "notif.post.cta": "Click here to read the full topic",
     "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
     "unsub.cta": "Click here to alter those settings",
     "banned.subject": "You have been banned from %1",

public/language/en-US/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "Continue to %1",
     "return_to": "Return to %1",
     "new_notification": "New Notification",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "You have unread notifications.",
     "all": "All",
     "topics": "Topics",
@@ -45,5 +46,19 @@
     "email-confirmed": "Email Confirmed",
     "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
     "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.",
-    "email-confirm-sent": "Confirmation email sent."
+    "email-confirm-sent": "Confirmation email sent.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

public/language/en-x-pirate/admin/appearance/customise.json

@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Custom Header",
-	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",
 
 	"custom-css.livereload": "Enable Live Reload",

public/language/en-x-pirate/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",

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

@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",

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

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
     "notif.post.cta": "Click here to read the full topic",
     "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
     "unsub.cta": "Click here to alter those settings",
     "banned.subject": "You have been banned from %1",

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

@@ -9,6 +9,7 @@
     "continue_to": "Continue to %1",
     "return_to": "Return to %1",
     "new_notification": "New Notification",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "You have unread notifications.",
     "all": "All",
     "topics": "Topics",
@@ -45,5 +46,19 @@
     "email-confirmed": "Email Confirmed",
     "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
     "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.",
-    "email-confirm-sent": "Confirmation email sent."
+    "email-confirm-sent": "Confirmation email sent.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

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

@@ -3,8 +3,12 @@
 	"custom-css.description": "Introduce tus propias declaraciones CSS aquí, las cuales serán aplicadas después de otros estilos.",
 	"custom-css.enable": "Activar CSS personalizado",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Cabezera personalizada",
-	"custom-header.description": "Introduce HTML personalizado aquí (ej. JavaScript, Meta Etiquetas, etc.), el cual se adjuntará a la sección <code>&lt;head&gt;</code> del código de su foro.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Activar cabecera personalizada",
 
 	"custom-css.livereload": "Activar Recargar en Vivo",

public/language/es/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Apariencia",
 	"appearance/themes": "Temas",
 	"appearance/skins": "Pieles",
-	"appearance/customise": "HTML & CSS personalizado",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Extender",
 	"extend/plugins": "Extensiones",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Notificaciones",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",

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

@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",

public/language/es/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "Esta notificación de chat se te envió debido a tus ajustes de suscripción.",
     "notif.post.cta": "Cliquea aquí para leer la publicación completa",
     "notif.post.unsub.info": "La notificación de este mensaje se te ha enviado debido a tus ajustes de subscripción.",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "Este es un email de prueba para verificar que el envío de email está ajustado correctamente para tu NodeBB",
     "unsub.cta": "Haz click aquí para modificar los ajustes.",
     "banned.subject": "Has sido baneado de %1",

public/language/es/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "Continuar a %1",
     "return_to": "Regresar a %1",
     "new_notification": "Nueva notificación",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "Tienes notificaciones sin leer.",
     "all": "Todo",
     "topics": "Temas",
@@ -45,5 +46,19 @@
     "email-confirmed": "Correo electrónico confirmado",
     "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.",
     "email-confirm-error-message": "Hubo un problema al validar tu cuenta de correo electrónico. Quizá el código era erróneo o expiró...",
-    "email-confirm-sent": "Correo de confirmación enviado."
+    "email-confirm-sent": "Correo de confirmación enviado.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

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

@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Custom Header",
-	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",
 
 	"custom-css.livereload": "Enable Live Reload",

public/language/et/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

public/language/et/admin/settings/post.json

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",

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

@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",

public/language/et/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "See chat teavitus on saadetud teile tellimuse seadistuse tõttu.",
     "notif.post.cta": "Vajuta siia, et lugeda teemat täies mahus",
     "notif.post.unsub.info": "See postituse teavitus on saadetud teile tellimuse seadistuse tõttu.",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "See on test e-mail kinnitamaks, et emailer on korrektselt seadistatud sinu NodeBB jaoks.",
     "unsub.cta": "Vajuta siia, et muuta neid seadeid",
     "banned.subject": "You have been banned from %1",

public/language/et/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "Jätka %1",
     "return_to": "Pöördu tagasi %1",
     "new_notification": "Uus teade",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "Sul ei ole lugemata teateid.",
     "all": "All",
     "topics": "Topics",
@@ -45,5 +46,19 @@
     "email-confirmed": "Emaili aadress kinnitatud",
     "email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja on nüüd täielikult aktiveeritud.",
     "email-confirm-error-message": "Emaili aadressi kinnitamisel tekkis viga. Võibolla kinnituskood oli vale või aegunud.",
-    "email-confirm-sent": "Kinnituskiri on saadetud."
+    "email-confirm-sent": "Kinnituskiri on saadetud.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

public/language/fa-IR/admin/appearance/customise.json

@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Custom Header",
-	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",
 
 	"custom-css.livereload": "Enable Live Reload",

public/language/fa-IR/admin/extend/plugins.json

@@ -1,14 +1,14 @@
 {
-	"installed": "نصب شده",
+	"installed": "Installed",
-	"active": "فعال",
+	"active": "Active",
-	"inactive": "غیرفعال",
+	"inactive": "Inactive",
 	"out-of-date": "Out of Date",
-	"none-found": "هیچ پلاگینی یافت نشد.",
+	"none-found": "No plugins found.",
 	"none-active": "No Active Plugins",
-	"find-plugins": "پیدا کردن پلاگین ها",
+	"find-plugins": "Find Plugins",
 
-	"plugin-search": "جستجوی پلاگین",
+	"plugin-search": "Plugin Search",
-	"plugin-search-placeholder": "جستجو برای پلاگین",
+	"plugin-search-placeholder": "Search for plugin...",
 	"reorder-plugins": "Re-order Plugins",
 	"order-active": "Order Active Plugins",
 	"dev-interested": "Interested in writing plugins for NodeBB?",
@@ -17,35 +17,35 @@
 	"order.description": "Certain plugins work ideally when they are initialised before/after other plugins.",
 	"order.explanation": "Plugins load in the order specified here, from top to bottom",
 
-	"plugin-item.themes": "پوسته",
+	"plugin-item.themes": "Themes",
-	"plugin-item.deactivate": "غیر فعال کردن",
+	"plugin-item.deactivate": "Deactivate",
-	"plugin-item.activate": "فعال کردن",
+	"plugin-item.activate": "Activate",
-	"plugin-item.install": "نصب کردن",
+	"plugin-item.install": "Install",
-	"plugin-item.uninstall": "حذف کردن",
+	"plugin-item.uninstall": "Uninstall",
-	"plugin-item.settings": "تنظیمات",
+	"plugin-item.settings": "Settings",
-	"plugin-item.installed": "نصب شده",
+	"plugin-item.installed": "Installed",
-	"plugin-item.latest": "آخرین",
+	"plugin-item.latest": "Latest",
-	"plugin-item.upgrade": "ارتقاء",
+	"plugin-item.upgrade": "Upgrade",
-	"plugin-item.more-info": "برای اطلاعات بیشتر:",
+	"plugin-item.more-info": "For more information:",
-	"plugin-item.unknown": "ناشناخته",
+	"plugin-item.unknown": "Unknown",
 	"plugin-item.unknown-explanation": "The state of this plugin could not be determined, possibly due to a misconfiguration error.",
 
-	"alert.enabled": "پلاگین فعال شد",
+	"alert.enabled": "Plugin Enabled",
-	"alert.disabled": "پلاگین غیرفعال شد",
+	"alert.disabled": "Plugin Disabled",
-	"alert.upgraded": "پلاگین ارتقاء یافت",
+	"alert.upgraded": "Plugin Upgraded",
-	"alert.installed": "پلاگین نصب شد",
+	"alert.installed": "Plugin Installed",
-	"alert.uninstalled": "پلاگین حذف شد",
+	"alert.uninstalled": "Plugin Uninstalled",
 	"alert.activate-success": "Please restart your NodeBB to fully activate this plugin",
-	"alert.deactivate-success": "پلاگین با موفقیت غیر فعال شد",
+	"alert.deactivate-success": "Plugin successfully deactivated",
 	"alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin",
-	"alert.install-success": "پلاگین با موفقیت نصب شد، لطفا پلاگین را فعال کنید",
+	"alert.install-success": "Plugin successfully installed, please activate the plugin.",
-	"alert.uninstall-success": "پلاگین با موفقیت غیرفعال و حذف شده است",
+	"alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.",
 	"alert.suggest-error": "<p>NodeBB could not reach the package manager, proceed with installation of latest version?</p><div class=\"alert alert-danger\"><strong>Server returned (%1)</strong>: %2</div>",
 	"alert.package-manager-unreachable": "<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>",
 	"alert.incompatible": "<p>Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>No Compatibility Information Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div><p>In the event that NodeBB cannot boot properly:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Continue installation of latest version of this plugin?</p>",
 
-	"license.title": "اطلاعات مجوز پلاگین ",
+	"license.title": "Plugin License Information",
 	"license.intro": "The plugin <strong>%1</strong> is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",
-	"license.cta": "آیا می خواهید پلاگین را فعال کنید؟"
+	"license.cta": "Do you wish to continue with activating this plugin?"
 }

public/language/fa-IR/admin/general/languages.json

@@ -1,6 +1,6 @@
 {
-	"language-settings": "تنظیمات زبان",
+	"language-settings": "Language Settings",
 	"description": "The default language determines the language settings for all users who are visiting your forum. <br />Individual users can override the default language on their account settings page.",
-	"default-language": "زبان پیش فرض",
+	"default-language": "Default Language",
-	"auto-detect": "شناسایی خودکار تنظیمات زبان برای مهمانان"
+	"auto-detect": "Auto Detect Language Setting for Guests"
 }

public/language/fa-IR/admin/menu.json

@@ -1,10 +1,10 @@
 {
 	"section-general": "General",
-	"general/dashboard": "داشبورد",
+	"general/dashboard": "Dashboard",
 	"general/homepage": "Home Page",
 	"general/navigation": "Navigation",
-	"general/languages": "زبان ها",
+	"general/languages": "Languages",
-	"general/sounds": "صداها",
+	"general/sounds": "Sounds",
 	"general/social": "Social",
 
 	"section-manage": "Manage",
@@ -13,12 +13,12 @@
 	"manage/users": "Users",
 	"manage/registration": "Registration Queue",
 	"manage/post-queue": "Post Queue",
-	"manage/groups": "گروه ها",
+	"manage/groups": "Groups",
-	"manage/ip-blacklist": "لیست سیاه IP",
+	"manage/ip-blacklist": "IP Blacklist",
 
-	"section-settings": "تنظیمات",
+	"section-settings": "Settings",
 	"settings/general": "General",
-	"settings/reputation": "اعتبار",
+	"settings/reputation": "Reputation",
 	"settings/email": "Email",
 	"settings/user": "User",
 	"settings/group": "Group",
@@ -36,34 +36,34 @@
 
 	"settings.page-title": "%1 Settings",
 
-	"section-appearance": "ظاهر",
+	"section-appearance": "Appearance",
-	"appearance/themes": "پوسته ها",
+	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Extend",
-	"extend/plugins": "پلاگین ها",
+	"extend/plugins": "Plugins",
-	"extend/widgets": "ویجت ها",
+	"extend/widgets": "Widgets",
-	"extend/rewards": "پاداش ها",
+	"extend/rewards": "Rewards",
 
 	"section-social-auth": "Social Authentication",
 
-	"section-plugins": "پلاگین ها",
+	"section-plugins": "Plugins\n",
 	"extend/plugins.install": "Install Plugins",
 
 	"section-advanced": "Advanced",
 	"advanced/database": "Database",
 	"advanced/events": "Events",
 	"advanced/logs": "Logs",
-	"advanced/errors": "خطاها",
+	"advanced/errors": "Errors",
 	"advanced/cache": "Cache",
 	"development/logger": "Logger",
 	"development/info": "Info",
 
 	"reload-forum": "Reload Forum",
-	"restart-forum": "راه اندازی مجدد انجمن",
+	"restart-forum": "Restart Forum",
-	"logout": "خروج",
+	"logout": "Log out",
-	"view-forum": "مشاهده انجمن",
+	"view-forum": "View Forum",
 
 	"search.placeholder": "Search for settings",
 	"search.no-results": "No results...",

public/language/fa-IR/admin/settings/chat.json

@@ -1,7 +1,7 @@
 {
-	"chat-settings": "تنظیمات گفتگو ها",
+	"chat-settings": "Chat Settings",
-	"disable": "غیرفعال کردن چت",
+	"disable": "Disable chat",
-	"disable-editing": "غیرفعال کردن ویرایش کردن / پاک کردن پیام های چت",
+	"disable-editing": "Disable chat message editing/deletion",
 	"disable-editing-help": "Administrators and global moderators are exempt from this restriction",
 	"max-length": "Maximum length of chat messages",
 	"max-room-size": "Maximum number of users in chat rooms",

public/language/fa-IR/admin/settings/notifications.json

@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

public/language/fa-IR/admin/settings/post.json

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",

public/language/fa-IR/admin/settings/uploads.json

@@ -1,6 +1,6 @@
 {
 	"posts": "پست‌ها",
-	"allow-files": "اجازه بارگذاری فایل های معمولی به کاربران",
+	"allow-files": "Allow users to upload regular files",
 	"private": "Make uploaded files private",
 	"max-image-width": "Resize images down to specified width (in pixels)",
 	"max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
@@ -14,15 +14,15 @@
 	"allow-profile-image-uploads": "Allow users to upload profile images",
 	"convert-profile-image-png": "Convert profile image uploads to PNG",
 	"default-avatar": "Custom Default Avatar",
-	"upload": "بارگذاری",
+	"upload": "Upload",
 	"profile-image-dimension": "Profile Image Dimension",
 	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
 	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(برحسب kibibytes، پیش فرض : 256 KiB)",
+	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
 	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(برحسب kibibytes، پیش فرض : 2,048 KiB)",
+	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
 	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
-	"profile-covers": "کاور های پروفایل",
+	"profile-covers": "Profile Covers",
-	"default-covers": "عکس های کاور پیش فرض",
+	"default-covers": "Default Cover Images",
 	"default-covers-help": "Add comma-separated default cover images for accounts that don't have an uploaded cover image"
 }

public/language/fa-IR/admin/settings/user.json

@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",

public/language/fa-IR/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "این اطلاعیه ی چتیی که برای شما فرستاده شده به علت تنظیمات اشترک شماست.",
     "notif.post.cta": "برای مشاهده کامل موضوع اینجا کلیک کنید",
     "notif.post.unsub.info": "این اطلاعیه ی پستی که برای شما فرستاده شده به علت تنظیمات اشترک شماست.",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "این یک ایمیل امتحانی جهت تایید اینکه فرستنده ایمیل برای انجمن NodeBB شما به درستی تنظیم و نصب شده است",
     "unsub.cta": "برای ویرایش آن تنظیمات اینجا کلیک کنید",
     "banned.subject": "You have been banned from %1",

public/language/fa-IR/error.json

@@ -109,7 +109,7 @@
     "chat-disabled": "سیستم گفتمان غیرفعال شده است",
     "too-many-messages": "شما پیامهای خیلی زیادی فرستاده اید، لطفا مدتی صبر نمایید",
     "invalid-chat-message": "پیام نامعتبر",
-    "chat-message-too-long": "پیام های چت نمی توانند بیشتر از 1% کاراکتر باشند.",
+    "chat-message-too-long": "پیام های چت نمی توانند بیشتر از %1 کاراکتر باشند.",
     "cant-edit-chat-message": "شما اجازه ی ویرایش این پیام را ندارید",
     "cant-remove-last-user": "شما نمی توانید آخرین کاربر را حذف کنید",
     "cant-delete-chat-message": "شما اجازه حذف این پیام را ندارید.",

public/language/fa-IR/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "ادامه به %1",
     "return_to": "بازگشت به %1",
     "new_notification": "آگاه‌سازی‌ تازه",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "شما آگاه‌سازی‌‌های نخوانده دارید.",
     "all": "همه",
     "topics": "موضوع ها",
@@ -45,5 +46,19 @@
     "email-confirmed": "ایمیل تایید شد",
     "email-confirmed-message": "بابت تایید ایمیلتان سپاس‌گزاریم. حساب کاربری شما اکنون به صورت کامل فعال شده است.",
     "email-confirm-error-message": "خطایی در تایید آدرس ایمیل شما پیش آمده است. ممکن است کد نا‌معتبر و یا منقضی شده باشد.",
-    "email-confirm-sent": "ایمیل تایید ارسال شد."
+    "email-confirm-sent": "ایمیل تایید ارسال شد.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

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

@@ -3,8 +3,12 @@
 	"custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.",
 	"custom-css.enable": "Enable Custom CSS",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "Custom Header",
-	"custom-header.description": "Enter custom HTML here (ex. JavaScript, Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Enable Custom Header",
 
 	"custom-css.livereload": "Enable Live Reload",

public/language/fi/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Appearance",
 	"appearance/themes": "Themes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Extend",
 	"extend/plugins": "Plugins",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

public/language/fi/admin/settings/post.json

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Oldest to Newest",
 	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",
 	"restrictions.post-queue": "Enable post queue",

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

@@ -19,6 +19,8 @@
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
+	"admin-relogin-duration": "Admin relogin duration (minutes)",
+	"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
 	"login-attempts": "Login attempts per hour",
 	"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
 	"lockout-duration": "Account Lockout Duration (minutes)",

public/language/fi/email.json

@@ -30,6 +30,7 @@
     "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
     "notif.post.cta": "Click here to read the full topic",
     "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+    "notif.cta": "Click here to go to forum",
     "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
     "unsub.cta": "Click here to alter those settings",
     "banned.subject": "You have been banned from %1",

public/language/fi/notifications.json

@@ -9,6 +9,7 @@
     "continue_to": "Continue to %1",
     "return_to": "Return to %1",
     "new_notification": "Uusi ilmoitus",
+    "new_notification_from": "You have a new Notification from %1",
     "you_have_unread_notifications": "Sinulla on lukemattomia ilmoituksia.",
     "all": "All",
     "topics": "Topics",
@@ -45,5 +46,19 @@
     "email-confirmed": "Sähköpostiosoite vahvistettu",
     "email-confirmed-message": "Kiitos sähköpostiosoitteesi vahvistamisesta. Käyttäjätilisi on nyt täysin aktivoitu.",
     "email-confirm-error-message": "Ongelma sähköpostiosoitteen vahvistamisessa. Ehkäpä koodi oli virheellinen tai vanhentunut.",
-    "email-confirm-sent": "Vahvistussähköposti lähetetty."
+    "email-confirm-sent": "Vahvistussähköposti lähetetty.",
+    "none": "None",
+    "notification_only": "Notification Only",
+    "email_only": "Email Only",
+    "notification_and_email": "Notification & Email",
+    "notificationType_upvote": "When someone upvotes your post",
+    "notificationType_new-topic": "When someone you follow posts a topic",
+    "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
+    "notificationType_follow": "When someone starts following you",
+    "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_new-register": "When someone gets added to registration queue",
+    "notificationType_post-queue": "When a new post is queued",
+    "notificationType_new-post-flag": "When a post is flagged",
+    "notificationType_new-user-flag": "When a user is flagged"
 }

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

@@ -3,8 +3,12 @@
 	"custom-css.description": "Entrez vos propres déclarations de CSS ici, elles seront appliquées après tous les autres styles.",
 	"custom-css.enable": "Activer les CSS personnalisés",
 
+	"custom-js": "Custom Javascript",
+	"custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.",
+	"custom-js.enable": "Enable Custom Javascript",
+
 	"custom-header": "En-tête personnalisé",
-	"custom-header.description": "Entrez votre code HTML ici (ex. Javascripts, Méta tags, etc…), qui seront ajoutés à la section <code>&lt;head&gt;</code> du code de votre forum.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-header\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Activer les en-têtes personnalisés",
 
 	"custom-css.livereload": "Activer le rechargement en direct",

public/language/fr/admin/menu.json

@@ -39,7 +39,7 @@
 	"section-appearance": "Apparence",
 	"appearance/themes": "Thèmes",
 	"appearance/skins": "Skins",
-	"appearance/customise": "HTML et CSS personnalisés",
+	"appearance/customise": "Custom Content (HTML/JS/CSS)",
 
 	"section-extend": "Extensions",
 	"extend/plugins": "Plugins",

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

@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Notification de bienvenue",
-	"welcome-notification-link": "Lien de notification de bienvenue"
+	"welcome-notification-link": "Lien de notification de bienvenue",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

public/language/fr/admin/settings/post.json

@@ -4,6 +4,7 @@
 	"sorting.oldest-to-newest": "Du plus ancien au plus récent",
 	"sorting.newest-to-oldest": "Du plus récent au plus ancien",
 	"sorting.most-votes": "Avec le plus de votes",
+	"sorting.most-posts": "Most Posts",
 	"sorting.topic-default": "Tri des sujets par défaut",
 	"restrictions": "Restrictions d'envoi",
 	"restrictions.post-queue": "Activer la file d'attente des messages",