Merge branch 'master' of https://github.com/NodeBB/NodeBB

package.json

@@ -47,7 +47,7 @@
     "morgan": "^1.3.2",
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "4.1.1",
+    "nodebb-plugin-composer-default": "4.1.3",
     "nodebb-plugin-dbsearch": "1.0.2",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.1.5",
@@ -57,8 +57,8 @@
     "nodebb-plugin-spam-be-gone": "0.4.9",
     "nodebb-rewards-essentials": "0.0.9",
     "nodebb-theme-lavender": "3.0.13",
-    "nodebb-theme-persona": "4.1.15",
+    "nodebb-theme-persona": "4.1.17",
-    "nodebb-theme-vanilla": "5.1.6",
+    "nodebb-theme-vanilla": "5.1.8",
     "nodebb-widget-essentials": "2.0.10",
     "nodemailer": "2.0.0",
     "nodemailer-sendmail-transport": "1.0.0",

public/language/ar/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "تسجيلات الدخول البديلة",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "قمت بتسجيل الدخول بنجاح!",
-    "dont_have_account": "لا تملك حساب؟"
+    "dont_have_account": "لا تملك حساب؟",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/ar/topic.json

@@ -26,6 +26,8 @@
     "tools": "أدوات",
     "flag": "تبليغ",
     "locked": "مقفل",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "إشعار بمشاركة مخلة.",
     "flag_success": "تم الإشعار بهذه المشاركة على أنها مخلة",

public/language/bg/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Други начини за влизане",
     "failed_login_attempt": "Влизането беше неуспешно",
     "login_successful": "Вие влязохте успешно!",
-    "dont_have_account": "Нямате акаунт?"
+    "dont_have_account": "Нямате акаунт?",
+    "logged-out-due-to-inactivity": "Излязохте автоматично поради бездействие"
 }

public/language/bg/topic.json

@@ -26,6 +26,8 @@
     "tools": "Инструменти",
     "flag": "Докладване",
     "locked": "Заключена",
+    "pinned": "Закачена",
+    "moved": "Преместена",
     "bookmark_instructions": "Щракнете тук, за да се върнете към последно прочетената публикация в тази тема.",
     "flag_title": "Докладване на тази публикация до модератор",
     "flag_success": "Тази публикация е била докладвана до модератор.",

public/language/bn/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "বিকল্প প্রবেশ",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "আপনি সফলভাবে প্রবেশ করেছেন!",
-    "dont_have_account": "কোন একাউন্ট নেই?"
+    "dont_have_account": "কোন একাউন্ট নেই?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/bn/topic.json

@@ -26,6 +26,8 @@
     "tools": "টুলস",
     "flag": "ফ্ল্যাগ",
     "locked": "বন্ধ",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "মডারেশনের জন্য এই পোস্টটি ফ্ল্যাগ করুন",
     "flag_success": "এই পোস্টটি মডারেশনের জন্য ফ্ল্যাগ করা হয়েছে।",

public/language/cs/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Další způsoby přihlášení",
     "failed_login_attempt": "Přihlášení neúspěšné",
     "login_successful": "Přihlášení proběhlo úspěšně!",
-    "dont_have_account": "Nemáte účet?"
+    "dont_have_account": "Nemáte účet?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/cs/topic.json

@@ -26,6 +26,8 @@
     "tools": "Nástroje",
     "flag": "Flag",
     "locked": "Uzamčeno",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "flag_success": "This post has been flagged for moderation.",

public/language/da/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "alternative logins",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Du har successfuldt logged in!",
-    "dont_have_account": "Har du ikke en konto?"
+    "dont_have_account": "Har du ikke en konto?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/da/topic.json

@@ -26,6 +26,8 @@
     "tools": "Værktøjer",
     "flag": "Marker",
     "locked": "Låst",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Meld dette indlæg til moderation",
     "flag_success": "Dette indlæg er blevet meldt til moderation.",

public/language/de/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Alternative Logins",
     "failed_login_attempt": "Login fehlgeschlagen",
     "login_successful": "Du hast dich erfolgreich eingeloggt!",
-    "dont_have_account": "Du hast noch kein Konto?"
+    "dont_have_account": "Du hast noch kein Konto?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/de/topic.json

@@ -26,6 +26,8 @@
     "tools": "Werkzeuge",
     "flag": "Markieren",
     "locked": "Gesperrt",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Klicke hier, um zum letzten gelesenen Beitrag des Themas zurückzukehren.",
     "flag_title": "Diesen Beitrag zur Moderation markieren",
     "flag_success": "Dieser Beitrag wurde erfolgreich für die Moderation markiert.",

public/language/el/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Εναλλακτικά Login",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Συνδέθηκες επιτυχώς!",
-    "dont_have_account": "Δεν έχεις λογαριασμό;"
+    "dont_have_account": "Δεν έχεις λογαριασμό;",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/el/topic.json

@@ -26,6 +26,8 @@
     "tools": "Εργαλεία",
     "flag": "Σημαία",
     "locked": "Κλειδωμένο",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Επισήμανση αυτής της δημοσίευσης για συντονισμό",
     "flag_success": "Αυτή η δημοσίευση έχει επισημανθεί για συντονισμό.",

public/language/en@pirate/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Oth'r gangplanks",
     "failed_login_attempt": "Ye be refused boardin'",
     "login_successful": "Welcome on board, matey!",
-    "dont_have_account": "Don't have an account?"
+    "dont_have_account": "Don't have an account?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/en@pirate/topic.json

@@ -26,6 +26,8 @@
     "tools": "Tools",
     "flag": "Flag",
     "locked": "Locked",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "flag_success": "This post has been flagged for moderation.",

public/language/en_US/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Alternative Logins",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "You have successfully logged in!",
-    "dont_have_account": "Don't have an account?"
+    "dont_have_account": "Don't have an account?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/en_US/topic.json

@@ -26,6 +26,8 @@
     "tools": "Tools",
     "flag": "Flag",
     "locked": "Locked",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "flag_success": "This post has been flagged for moderation.",

public/language/es/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Accesos alternativos",
     "failed_login_attempt": "Error al iniciar sesión",
     "login_successful": "¡Identificado satisfactoriamente!",
-    "dont_have_account": "¿Aún no tienes cuenta?"
+    "dont_have_account": "¿Aún no tienes cuenta?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/es/topic.json

@@ -26,6 +26,8 @@
     "tools": "Herramientas",
     "flag": "Reportar",
     "locked": "Cerrado",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Haz click aquí para volver a tu último mensaje leído en este tema",
     "flag_title": "Reportar este mensaje",
     "flag_success": "Este mensaje ha sido reportado para moderación.",

public/language/et/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Alternatiivsed sisse logimise võimalused",
     "failed_login_attempt": "Sisselogimine ebaõnnestus",
     "login_successful": "Edukalt sisse logitud!",
-    "dont_have_account": "Pole veel kasutajat?"
+    "dont_have_account": "Pole veel kasutajat?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/et/topic.json

@@ -26,6 +26,8 @@
     "tools": "Tööriistad",
     "flag": "Märgista",
     "locked": "Lukustatud",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Vajuta siia, et tagasi minna viimati loetud postituse juurde siin teemas.",
     "flag_title": "Märgista see postitus modereerimiseks",
     "flag_success": "See postitus on nüüd märgistatud modereerimiseks.",

public/language/fa_IR/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "روش‌های درون آمدن جایگزین",
     "failed_login_attempt": "ورود ناموفق",
     "login_successful": "شما با موفقیت به درون آمده‌اید!",
-    "dont_have_account": "حساب کاربری ندارید؟"
+    "dont_have_account": "حساب کاربری ندارید؟",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/fa_IR/topic.json

@@ -26,6 +26,8 @@
     "tools": "ابزارها",
     "flag": "پرچم",
     "locked": "قفل شده است",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "برای بازگشت به آخرین پست در این موضوع اینجا را کلیک کنید.",
     "flag_title": "پرچم‌گذاری این موضوع برای بررسی ناظران",
     "flag_success": "این موضوع برای بررسی ناظران پرچم گذاشته شد.",

public/language/fi/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Vaihtoehtoiset kirjautumistavat",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Olet onnistuneesti kirjautunut sisään!",
-    "dont_have_account": "Ei käyttäjätunnusta?"
+    "dont_have_account": "Ei käyttäjätunnusta?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/fi/topic.json

@@ -26,6 +26,8 @@
     "tools": "Työkalut",
     "flag": "Ilmianna",
     "locked": "Lukittu",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Ilmianna tämä viesti moderaattoreille",
     "flag_success": "Tämä viesti ilmiannettiin moderaattoreille.",

public/language/fr/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Autres méthodes de connexion",
     "failed_login_attempt": "Identification échouée",
     "login_successful": "Vous êtes maintenant connecté !",
-    "dont_have_account": "Vous n'avez pas de compte ?"
+    "dont_have_account": "Vous n'avez pas de compte ?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/fr/topic.json

@@ -26,6 +26,8 @@
     "tools": "Outils",
     "flag": "Signaler",
     "locked": "Verrouillé",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Cliquez ici pour retourner au dernier message lu de ce fil.",
     "flag_title": "Signaler ce message à la modération",
     "flag_success": "Ce message a bien été signalé aux modérateurs.",

public/language/gl/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Métodos alternativos",
     "failed_login_attempt": "Erro ao iniciar sesión",
     "login_successful": "Sesión iniciada con éxito!",
-    "dont_have_account": "Aínda non tes conta?"
+    "dont_have_account": "Aínda non tes conta?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/gl/topic.json

@@ -26,6 +26,8 @@
     "tools": "Ferramentas",
     "flag": "Reportar",
     "locked": "Pechado",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Pica aquí para volver á última mensaxe lida neste tema ",
     "flag_title": "Reportar esta mensaxe",
     "flag_success": "Esta mensaxe foi reportada para moderación.",

public/language/he/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "התחבר באמצעות...",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "התחברת בהצלחה!",
-    "dont_have_account": "אין לך חשבון עדיין?"
+    "dont_have_account": "אין לך חשבון עדיין?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/he/topic.json

@@ -26,6 +26,8 @@
     "tools": "כלים",
     "flag": "דווח",
     "locked": "נעול",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "דווח על פוסט זה למנהל",
     "flag_success": "התקבל דיווח על פוסט זה.",

public/language/hu/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Alternatív belépés",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Sikeres belépés",
-    "dont_have_account": "Nincs még fiók?"
+    "dont_have_account": "Nincs még fiók?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/hu/topic.json

@@ -26,6 +26,8 @@
     "tools": "Eszközök",
     "flag": "Jelentés",
     "locked": "Locked",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "A hozzászólás jelentése a moderátoroknál",
     "flag_success": "This post has been flagged for moderation.",

public/language/id/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Login Alternatif",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Kamu telah berhasil login!",
-    "dont_have_account": "Belum memiliki akun?"
+    "dont_have_account": "Belum memiliki akun?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/id/topic.json

@@ -26,6 +26,8 @@
     "tools": "Perangkat",
     "flag": "Tandai",
     "locked": "Terkunci",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Tandai posting ini untuk moderasi",
     "flag_success": "Posting ini telah ditandai untuk moderasi",

public/language/it/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Accessi Alternativi",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Sei entrato con successo!",
-    "dont_have_account": "Non hai un account?"
+    "dont_have_account": "Non hai un account?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/it/topic.json

@@ -26,6 +26,8 @@
     "tools": "Strumenti",
     "flag": "Segnala",
     "locked": "Bloccato",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Segnala questo post per la moderazione",
     "flag_success": "Questo post è stato contrassegnato per la moderazione.",

public/language/ja/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "ほかのログイン方法",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "ログインしました！",
-    "dont_have_account": "アカウントをもっていませんか?"
+    "dont_have_account": "アカウントをもっていませんか?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/ja/topic.json

@@ -26,6 +26,8 @@
     "tools": "ツール",
     "flag": "フラグ",
     "locked": "ロック",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "リポートする",
     "flag_success": "このポストをリポートしました。",

public/language/ko/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "다른 방법으로 로그인",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "성공적으로 로그인했습니다.",
-    "dont_have_account": "계정이 없으신가요?"
+    "dont_have_account": "계정이 없으신가요?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/ko/topic.json

@@ -26,6 +26,8 @@
     "tools": "도구",
     "flag": "신고",
     "locked": "잠김",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "이 스레드에서 읽은 마지막 게시글로 이동하시려면 여기를 클릭하세요.",
     "flag_title": "이 게시물을 신고",
     "flag_success": "이 게시물은 신고되었습니다.",

public/language/lt/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Alternatyvūs prisijungimo būdai",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Jūs sėkmingai prisijungėte!",
-    "dont_have_account": "Neturite paskyros?"
+    "dont_have_account": "Neturite paskyros?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/lt/topic.json

@@ -26,6 +26,8 @@
     "tools": "Įrankiai",
     "flag": "Pažymėti",
     "locked": "Užrakinta",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Pažymėti ši pranešimą moderatoriams",
     "flag_success": "Šis pranešimas buvo pažymėtas moderatorių patikrinimui.",

public/language/ms/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Log Masuk Alternatif",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Anda berjaya log masuk!",
-    "dont_have_account": "Tiada akaun?"
+    "dont_have_account": "Tiada akaun?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/ms/topic.json

@@ -26,6 +26,8 @@
     "tools": "Perkakas",
     "flag": "Tanda",
     "locked": "Kunci",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Tanda kiriman ini untuk diselia",
     "flag_success": "Kiriman ini telah ditandakan untuk diselia",

public/language/nb/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Alternativ innlogging",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Du har blitt logget inn!",
-    "dont_have_account": "Har du ikke en konto?"
+    "dont_have_account": "Har du ikke en konto?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/nb/topic.json

@@ -26,6 +26,8 @@
     "tools": "Verktøy",
     "flag": "Rapporter",
     "locked": "Låst",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Rapporter dette innlegget for granskning",
     "flag_success": "Dette innlegget har blitt rapportert.",

public/language/nl/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Andere manieren van aanmelden",
     "failed_login_attempt": "Aanmelden mislukt",
     "login_successful": "Je bent succesvol ingelogd!",
-    "dont_have_account": "Geen gebruikersaccount?"
+    "dont_have_account": "Geen gebruikersaccount?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/nl/topic.json

@@ -26,6 +26,8 @@
     "tools": "Extra",
     "flag": "Markeren",
     "locked": "Gesloten",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Klik hier om terug te keren naar de laatst gelezen post in deze thread.",
     "flag_title": "Bericht aan beheerders melden",
     "flag_success": "Dit bericht is gerapporteerd aan de beheerder.",

public/language/pl/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Alternatywne logowanie",
     "failed_login_attempt": "Nie udało się zalogować. Spróbuj ponownie.",
     "login_successful": "Zostałeś pomyślnie zalogowany.",
-    "dont_have_account": "Nie masz konta?"
+    "dont_have_account": "Nie masz konta?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/pl/topic.json

@@ -26,6 +26,8 @@
     "tools": "Narzędzia",
     "flag": "Zgłoś",
     "locked": "Zablokowany",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Zgłoś post do moderacji",
     "flag_success": "Ten post został oznaczony do moderacji.",

public/language/pt_BR/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Logins Alternativos",
     "failed_login_attempt": "Falha no Login",
     "login_successful": "Você logou com sucesso!",
-    "dont_have_account": "Não tem uma conta?"
+    "dont_have_account": "Não tem uma conta?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/pt_BR/topic.json

@@ -26,6 +26,8 @@
     "tools": "Ferramentas",
     "flag": "Sinalizar",
     "locked": "Trancado",
+    "pinned": "Afixado",
+    "moved": "Movido",
     "bookmark_instructions": "Clique aqui para retornar ao último post lido neste tópico.",
     "flag_title": "Sinalizar este post para moderação",
     "flag_success": "Este post foi sinalizado para ser moderado.",

public/language/ro/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Autentificare Alternativă",
     "failed_login_attempt": "Login nereușit",
     "login_successful": "Te-ai autentificat cu succes!",
-    "dont_have_account": "Nu ai un cont?"
+    "dont_have_account": "Nu ai un cont?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/ro/topic.json

@@ -26,6 +26,8 @@
     "tools": "Unelte",
     "flag": "Semnalizează",
     "locked": "Închis",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Semnalizează acest mesaj pentru moderare",
     "flag_success": "Acest mesaj a fost semnalizat pentru moderare.",

public/language/ru/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Войти через",
     "failed_login_attempt": "Некорректный логин",
     "login_successful": "Вы успешно вошли!",
-    "dont_have_account": "Нет акканута?"
+    "dont_have_account": "Нет акканута?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/ru/topic.json

@@ -26,6 +26,8 @@
     "tools": "Опции",
     "flag": "Отметить",
     "locked": "Закрыт",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Нажмите здесь, чтобы вернуться к последнему прочитанному сообщению в этой теме.",
     "flag_title": "Отметить сообщение для модерирования",
     "flag_success": "Это сообщение было помечено для модерации",

public/language/rw/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Ukundi Wakwinjiramo",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Winjiyemo nta ngorane!",
-    "dont_have_account": "Nta konte ufite?"
+    "dont_have_account": "Nta konte ufite?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/rw/topic.json

@@ -26,6 +26,8 @@
     "tools": "Ibikoresho",
     "flag": "Tambikana",
     "locked": "Birafungiranye",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Bimenyeshe ubuyobozi",
     "flag_success": "Bimaze kumenyeshwa ubuyobozi ngo bikurikiranwe. ",

public/language/sc/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Intradas Alternativas",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Ses intradu!",
-    "dont_have_account": "Don't have an account?"
+    "dont_have_account": "Don't have an account?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/sc/topic.json

@@ -26,6 +26,8 @@
     "tools": "Ainas",
     "flag": "Signala",
     "locked": "Locked",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Signala custu arresonu pro sa moderatzione",
     "flag_success": "This post has been flagged for moderation.",

public/language/sk/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Ďalšie spôsoby prihlásenia",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Prihlásenie prebehlo úspešne!",
-    "dont_have_account": "Nemáš účet?"
+    "dont_have_account": "Nemáš účet?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/sk/topic.json

@@ -26,6 +26,8 @@
     "tools": "Nástroje",
     "flag": "Označiť",
     "locked": "Locked",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Označiť príspevok pre moderáciu",
     "flag_success": "Tento príspevok bol označený na úpravu. ",

public/language/sl/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Prijava z drugim računom",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Prijava je uspešna.",
-    "dont_have_account": "Ali še nimaš uporabniškega računa?"
+    "dont_have_account": "Ali še nimaš uporabniškega računa?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/sl/topic.json

@@ -26,6 +26,8 @@
     "tools": "Orodja",
     "flag": "Prijavi",
     "locked": "Zaklenjeno",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Prijavi to objavo v pregled administratorju",
     "flag_success": "Ta objava je bila prijavljena v pregled administratorju.",

public/language/sr/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Алтернативно пријављивање",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "Успешно сте се пријавили!",
-    "dont_have_account": "Немате налог?"
+    "dont_have_account": "Немате налог?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/sr/topic.json

@@ -26,6 +26,8 @@
     "tools": "Алатке",
     "flag": "Означи",
     "locked": "Закључан",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "flag_success": "This post has been flagged for moderation.",

public/language/sv/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Alternativa inloggningssätt",
     "failed_login_attempt": "Misslyckad inloggning",
     "login_successful": "Du är nu inloggad!",
-    "dont_have_account": "Har du inget konto?"
+    "dont_have_account": "Har du inget konto?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/sv/topic.json

@@ -26,6 +26,8 @@
     "tools": "Verktyg",
     "flag": "Rapportera",
     "locked": "Låst",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Klicka här för att återgå till senast lästa inlägg i detta ämne.",
     "flag_title": "Rapportera detta inlägg för granskning",
     "flag_success": "Det här inlägget har flaggats för moderering.",

public/language/th/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "เข้าสู่ระบบโดยทางอื่น",
     "failed_login_attempt": "Login Unsuccessful",
     "login_successful": "คุณเข้าสู่ระบบเรียบร้อยแล้ว",
-    "dont_have_account": "คุณยังไม่มีบัญชีเข้าระบบ?"
+    "dont_have_account": "คุณยังไม่มีบัญชีเข้าระบบ?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/th/topic.json

@@ -26,6 +26,8 @@
     "tools": "เครื่องมือ",
     "flag": "ปักธง",
     "locked": "Locked",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "ปักธงโพสต์นี้เพื่อดำเนินการ",
     "flag_success": "This post has been flagged for moderation.",

public/language/tr/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Alternatif Girişler",
     "failed_login_attempt": "Giriş Başarısız",
     "login_successful": "Başarıyla giriş yaptınız!",
-    "dont_have_account": "Hesabınız yok mu?"
+    "dont_have_account": "Hesabınız yok mu?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/tr/topic.json

@@ -26,6 +26,8 @@
     "tools": "Araçlar",
     "flag": "Bayrak",
     "locked": "Kilitli",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Bu başlıkta en son kaldığın yere dönmek için tıklayın.",
     "flag_title": "Bu iletiyi moderatöre haber et",
     "flag_success": "Bu ileti yöneticilere bildirildi.",

public/language/vi/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "Đăng nhập bằng tài khoản khác",
     "failed_login_attempt": "Đăng nhập không thành công",
     "login_successful": "Bạn đã đăng nhập thành công!",
-    "dont_have_account": "Chưa có tài khoản?"
+    "dont_have_account": "Chưa có tài khoản?",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/vi/topic.json

@@ -26,6 +26,8 @@
     "tools": "Công cụ",
     "flag": "Gắn cờ",
     "locked": "Khóa",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "Bấm vào đây để quay về đọc bài viết mới nhất trong chủ đề này.",
     "flag_title": "Flag bài viết này để chỉnh sửa",
     "flag_success": "Chủ đề này đã được flag để chỉnh sửa",

public/language/zh_CN/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "使用合作网站帐号登录",
     "failed_login_attempt": "登录失败",
     "login_successful": "您已经成功登录！",
-    "dont_have_account": "没有帐号？"
+    "dont_have_account": "没有帐号？",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/zh_CN/topic.json

@@ -26,6 +26,8 @@
     "tools": "工具",
     "flag": "举报",
     "locked": "已锁定",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "点击阅读本主题帖中的最新回复",
     "flag_title": "举报此帖",
     "flag_success": "已举报此回帖。",

public/language/zh_TW/login.json

@@ -7,5 +7,6 @@
     "alternative_logins": "其他登入方式",
     "failed_login_attempt": "登入失敗",
     "login_successful": "你已成功登入！",
-    "dont_have_account": "還沒有帳號？"
+    "dont_have_account": "還沒有帳號？",
+    "logged-out-due-to-inactivity": "You have been logged out due to inactivity"
 }

public/language/zh_TW/topic.json

@@ -26,6 +26,8 @@
     "tools": "工具",
     "flag": "檢舉",
     "locked": "已鎖定",
+    "pinned": "Pinned",
+    "moved": "Moved",
     "bookmark_instructions": "點擊這裡返回到這個討論串的最後一篇張貼文",
     "flag_title": "檢舉這篇文章, 交給仲裁者來審閱.",
     "flag_success": "這文章已經被檢舉要求仲裁.",

public/src/ajaxify.js

@@ -10,6 +10,7 @@ $(document).ready(function() {
 
 	var translator;
 	var retry = true;
+	var previousBodyClass = '';
 
 	// Dumb hack to fool ajaxify into thinking translator is still a global
 	// When ajaxify is migrated to a require.js module, then this can be merged into the "define" call
@@ -65,7 +66,7 @@ $(document).ready(function() {
 
 		url = ajaxify.start(url);
 
-		$('body').removeClass(ajaxify.data.bodyClass);
+		previousBodyClass = ajaxify.data.bodyClass;
 		$('#footer, #content').removeClass('hide').addClass('ajaxifying');
 
 		ajaxify.loadData(url, function(err, data) {
@@ -163,7 +164,7 @@ $(document).ready(function() {
 		templates.parse(tpl_url, data, function(template) {
 			translator.translate(template, function(translatedTemplate) {
 				translatedTemplate = translator.unescape(translatedTemplate);
-				$('body').addClass(data.bodyClass);
+				$('body').removeClass(previousBodyClass).addClass(data.bodyClass);
 				$('#content').html(translatedTemplate);
 
 				ajaxify.end(url, tpl_url);
@@ -307,7 +308,7 @@ $(document).ready(function() {
 								e.preventDefault();
 							}
 						}
-					} else if (!this.target && window.location.pathname !== '/outgoing') {
+					} else if (window.location.pathname !== '/outgoing') {
 						if (config.openOutgoingLinksInNewTab) {
 							window.open(this.href, '_blank');
 							e.preventDefault();

src/middleware/middleware.js

@@ -206,7 +206,11 @@ middleware.isAdmin = function(req, res, next) {
 
 				var loginTime = req.session.meta ? req.session.meta.datetime : 0;
 				if (loginTime && parseInt(loginTime, 10) > Date.now() - 3600000) {
-					req.session.meta.datetime += 300000;
+					var timeLeft = parseInt(loginTime, 10) - (Date.now() - 3600000);
+					if (timeLeft < 300000) {
+						req.session.meta.datetime += 300000;
+					}
+
 					return next();
 				}
 

src/user/settings.js

@@ -123,7 +123,7 @@ module.exports = function(User) {
 			topicSearchEnabled: data.topicSearchEnabled,
 			delayImageLoading: data.delayImageLoading,
 			groupTitle: data.groupTitle,
-			homePageRoute: (data.homePageCustom || (data.homePageRoute !== 'custom' ? data.homePageRoute : '') || '').replace(/^\//, ''),
+			homePageRoute : ((data.homePageRoute === 'custom' ? data.homePageCustom : data.homePageRoute) || '').replace(/^\//, ''),
 			scrollToMyPost: data.scrollToMyPost
 		};