From f060c7a3786b8d38596862d6e216716b75d32465 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 4 Aug 2016 15:47:54 -0400 Subject: [PATCH 1/7] not using relative reference for tjs value --- src/views/admin/extend/plugins.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl index 58a8b90651..1e240b7fd6 100644 --- a/src/views/admin/extend/plugins.tpl +++ b/src/views/admin/extend/plugins.tpl @@ -3,7 +3,7 @@
  • Active
  • Out of Date - {../upgradeCount} + {upgradeCount}
  • Find Plugins
    • From f593d925ae2323a12c67f65ac25cf09f02f04f85 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 4 Aug 2016 16:17:51 -0400 Subject: [PATCH 2/7] closes #4826, modifying ajaxify so it does not override links with target set explicitly --- package.json | 4 ++-- public/src/ajaxify.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 22da7f7443..7c87d1731e 100644 --- a/package.json +++ b/package.json @@ -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.14", - "nodebb-theme-vanilla": "5.1.5", + "nodebb-theme-persona": "4.1.15", + "nodebb-theme-vanilla": "5.1.6", "nodebb-widget-essentials": "2.0.10", "nodemailer": "2.0.0", "nodemailer-sendmail-transport": "1.0.0", diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 7280de01ed..17ac97c794 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -307,7 +307,7 @@ $(document).ready(function() { e.preventDefault(); } } - } else if (window.location.pathname !== '/outgoing') { + } else if (!this.target && window.location.pathname !== '/outgoing') { if (config.openOutgoingLinksInNewTab) { window.open(this.href, '_blank'); e.preventDefault(); From e03922fffa8b19abb6d189af92e571e2f026db1c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 4 Aug 2016 16:34:31 -0400 Subject: [PATCH 3/7] minor language change, since not actually logged out --- public/language/en_GB/login.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/en_GB/login.json b/public/language/en_GB/login.json index 97c6dedb37..b03ee269cf 100644 --- a/public/language/en_GB/login.json +++ b/public/language/en_GB/login.json @@ -8,5 +8,5 @@ "failed_login_attempt": "Login Unsuccessful", "login_successful": "You have successfully logged in!", "dont_have_account": "Don't have an account?", - "logged-out-due-to-inactivity": "You have been logged out due to inactivity" + "logged-out-due-to-inactivity": "You have been logged out of the Admin Control Panel due to inactivity" } From 9d25d4bd44f974540e7e60cdb15218d15e58c5a1 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 4 Aug 2016 17:32:03 -0400 Subject: [PATCH 4/7] revert last change to ajaxify.js --- public/src/ajaxify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 17ac97c794..7280de01ed 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -307,7 +307,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(); From dbb2ad29cb2a866a7ea92b78e528e933ac87912f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 4 Aug 2016 17:35:33 -0400 Subject: [PATCH 5/7] revert re: #4826 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7c87d1731e..4ad0c85107 100644 --- a/package.json +++ b/package.json @@ -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-vanilla": "5.1.6", + "nodebb-theme-persona": "4.1.16", + "nodebb-theme-vanilla": "5.1.7", "nodebb-widget-essentials": "2.0.10", "nodemailer": "2.0.0", "nodemailer-sendmail-transport": "1.0.0", From c3f58104f6621f5b4310ec1abdd3c422b123ca87 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 4 Aug 2016 17:56:59 -0400 Subject: [PATCH 6/7] up composer version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ad0c85107..46c48faaf7 100644 --- a/package.json +++ b/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.2", "nodebb-plugin-dbsearch": "1.0.2", "nodebb-plugin-emoji-extended": "1.1.1", "nodebb-plugin-emoji-one": "1.1.5", From d400b1a37fc15c598fe549046a8ad6e8ef121a56 Mon Sep 17 00:00:00 2001 From: NodeBB Misty Date: Fri, 5 Aug 2016 09:02:29 -0400 Subject: [PATCH 7/7] Latest translations and fallbacks --- public/language/ar/login.json | 3 ++- public/language/ar/topic.json | 2 ++ public/language/bg/login.json | 3 ++- public/language/bg/topic.json | 2 ++ public/language/bn/login.json | 3 ++- public/language/bn/topic.json | 2 ++ public/language/cs/login.json | 3 ++- public/language/cs/topic.json | 2 ++ public/language/da/login.json | 3 ++- public/language/da/topic.json | 2 ++ public/language/de/login.json | 3 ++- public/language/de/topic.json | 2 ++ public/language/el/login.json | 3 ++- public/language/el/topic.json | 2 ++ public/language/en@pirate/login.json | 3 ++- public/language/en@pirate/topic.json | 2 ++ public/language/en_US/login.json | 3 ++- public/language/en_US/topic.json | 2 ++ public/language/es/login.json | 3 ++- public/language/es/topic.json | 2 ++ public/language/et/login.json | 3 ++- public/language/et/topic.json | 2 ++ public/language/fa_IR/login.json | 3 ++- public/language/fa_IR/topic.json | 2 ++ public/language/fi/login.json | 3 ++- public/language/fi/topic.json | 2 ++ public/language/fr/login.json | 3 ++- public/language/fr/topic.json | 2 ++ public/language/gl/login.json | 3 ++- public/language/gl/topic.json | 2 ++ public/language/he/login.json | 3 ++- public/language/he/topic.json | 2 ++ public/language/hu/login.json | 3 ++- public/language/hu/topic.json | 2 ++ public/language/id/login.json | 3 ++- public/language/id/topic.json | 2 ++ public/language/it/login.json | 3 ++- public/language/it/topic.json | 2 ++ public/language/ja/login.json | 3 ++- public/language/ja/topic.json | 2 ++ public/language/ko/login.json | 3 ++- public/language/ko/topic.json | 2 ++ public/language/lt/login.json | 3 ++- public/language/lt/topic.json | 2 ++ public/language/ms/login.json | 3 ++- public/language/ms/topic.json | 2 ++ public/language/nb/login.json | 3 ++- public/language/nb/topic.json | 2 ++ public/language/nl/login.json | 3 ++- public/language/nl/topic.json | 2 ++ public/language/pl/login.json | 3 ++- public/language/pl/topic.json | 2 ++ public/language/pt_BR/login.json | 3 ++- public/language/pt_BR/topic.json | 2 ++ public/language/ro/login.json | 3 ++- public/language/ro/topic.json | 2 ++ public/language/ru/login.json | 3 ++- public/language/ru/topic.json | 2 ++ public/language/rw/login.json | 3 ++- public/language/rw/topic.json | 2 ++ public/language/sc/login.json | 3 ++- public/language/sc/topic.json | 2 ++ public/language/sk/login.json | 3 ++- public/language/sk/topic.json | 2 ++ public/language/sl/login.json | 3 ++- public/language/sl/topic.json | 2 ++ public/language/sr/login.json | 3 ++- public/language/sr/topic.json | 2 ++ public/language/sv/login.json | 3 ++- public/language/sv/topic.json | 2 ++ public/language/th/login.json | 3 ++- public/language/th/topic.json | 2 ++ public/language/tr/login.json | 3 ++- public/language/tr/topic.json | 2 ++ public/language/vi/login.json | 3 ++- public/language/vi/topic.json | 2 ++ public/language/zh_CN/login.json | 3 ++- public/language/zh_CN/topic.json | 2 ++ public/language/zh_TW/login.json | 3 ++- public/language/zh_TW/topic.json | 2 ++ 80 files changed, 160 insertions(+), 40 deletions(-) diff --git a/public/language/ar/login.json b/public/language/ar/login.json index c6007a15ff..d7b4923aa2 100644 --- a/public/language/ar/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index e0dacb7e32..9810d07d64 100644 --- a/public/language/ar/topic.json +++ b/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": "تم الإشعار بهذه المشاركة على أنها مخلة", diff --git a/public/language/bg/login.json b/public/language/bg/login.json index 4091422daa..83ada9127b 100644 --- a/public/language/bg/login.json +++ b/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": "Излязохте автоматично поради бездействие" } \ No newline at end of file diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index 041facf810..46f4a70313 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -26,6 +26,8 @@ "tools": "Инструменти", "flag": "Докладване", "locked": "Заключена", + "pinned": "Закачена", + "moved": "Преместена", "bookmark_instructions": "Щракнете тук, за да се върнете към последно прочетената публикация в тази тема.", "flag_title": "Докладване на тази публикация до модератор", "flag_success": "Тази публикация е била докладвана до модератор.", diff --git a/public/language/bn/login.json b/public/language/bn/login.json index 0fea8218ba..4f3fb421b5 100644 --- a/public/language/bn/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index 4a099bf546..51e88fd6e3 100644 --- a/public/language/bn/topic.json +++ b/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": "এই পোস্টটি মডারেশনের জন্য ফ্ল্যাগ করা হয়েছে।", diff --git a/public/language/cs/login.json b/public/language/cs/login.json index 746c3364a9..d96d2d9d00 100644 --- a/public/language/cs/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index 104b9aa379..b528de0a8c 100644 --- a/public/language/cs/topic.json +++ b/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.", diff --git a/public/language/da/login.json b/public/language/da/login.json index 2196a937ee..c6d4b8f346 100644 --- a/public/language/da/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/da/topic.json b/public/language/da/topic.json index 2a3653db8c..22ca530310 100644 --- a/public/language/da/topic.json +++ b/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.", diff --git a/public/language/de/login.json b/public/language/de/login.json index efa95cac28..f36f625590 100644 --- a/public/language/de/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/de/topic.json b/public/language/de/topic.json index bb94283e65..7d4cd8fc97 100644 --- a/public/language/de/topic.json +++ b/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.", diff --git a/public/language/el/login.json b/public/language/el/login.json index c46d2220f5..1b5d010d63 100644 --- a/public/language/el/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/el/topic.json b/public/language/el/topic.json index 965c3e70ad..7625226e7d 100644 --- a/public/language/el/topic.json +++ b/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": "Αυτή η δημοσίευση έχει επισημανθεί για συντονισμό.", diff --git a/public/language/en@pirate/login.json b/public/language/en@pirate/login.json index a27ed4d761..f7d9dee4ed 100644 --- a/public/language/en@pirate/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/en@pirate/topic.json b/public/language/en@pirate/topic.json index 613efb2d0a..edcc8a8435 100644 --- a/public/language/en@pirate/topic.json +++ b/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.", diff --git a/public/language/en_US/login.json b/public/language/en_US/login.json index 17c53b6628..a06b175547 100644 --- a/public/language/en_US/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/en_US/topic.json b/public/language/en_US/topic.json index 613efb2d0a..edcc8a8435 100644 --- a/public/language/en_US/topic.json +++ b/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.", diff --git a/public/language/es/login.json b/public/language/es/login.json index d6e357016e..34c3995a02 100644 --- a/public/language/es/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/es/topic.json b/public/language/es/topic.json index 9c7ad4fc9a..edec01a829 100644 --- a/public/language/es/topic.json +++ b/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.", diff --git a/public/language/et/login.json b/public/language/et/login.json index 1ee4c2d703..c038d9aef0 100644 --- a/public/language/et/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/et/topic.json b/public/language/et/topic.json index ecd8e893b3..622c2b6982 100644 --- a/public/language/et/topic.json +++ b/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.", diff --git a/public/language/fa_IR/login.json b/public/language/fa_IR/login.json index a6c3e72fa8..22283dbaeb 100644 --- a/public/language/fa_IR/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json index 7856198d12..5fabf8c7fe 100644 --- a/public/language/fa_IR/topic.json +++ b/public/language/fa_IR/topic.json @@ -26,6 +26,8 @@ "tools": "ابزارها", "flag": "پرچم", "locked": "قفل شده است", + "pinned": "Pinned", + "moved": "Moved", "bookmark_instructions": "برای بازگشت به آخرین پست در این موضوع اینجا را کلیک کنید.", "flag_title": "پرچم‌گذاری این موضوع برای بررسی ناظران", "flag_success": "این موضوع برای بررسی ناظران پرچم گذاشته شد.", diff --git a/public/language/fi/login.json b/public/language/fi/login.json index a9c69851b2..9015ad3c1b 100644 --- a/public/language/fi/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index 016faa3d38..b2d5e9d127 100644 --- a/public/language/fi/topic.json +++ b/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.", diff --git a/public/language/fr/login.json b/public/language/fr/login.json index 41150728c6..28cd345558 100644 --- a/public/language/fr/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index 72ba13cdd7..dc8bb65354 100644 --- a/public/language/fr/topic.json +++ b/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.", diff --git a/public/language/gl/login.json b/public/language/gl/login.json index d2fc82f95b..2e70bb930c 100644 --- a/public/language/gl/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json index f5a27bf8d2..96c8da628e 100644 --- a/public/language/gl/topic.json +++ b/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.", diff --git a/public/language/he/login.json b/public/language/he/login.json index c0c679e0cd..79f006e37b 100644 --- a/public/language/he/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/he/topic.json b/public/language/he/topic.json index 778d419d16..8bf3fe2cda 100644 --- a/public/language/he/topic.json +++ b/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": "התקבל דיווח על פוסט זה.", diff --git a/public/language/hu/login.json b/public/language/hu/login.json index 4323321c44..e697bf1cd4 100644 --- a/public/language/hu/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index c9b31ccec1..ef9dcb52b3 100644 --- a/public/language/hu/topic.json +++ b/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.", diff --git a/public/language/id/login.json b/public/language/id/login.json index 48aa87589d..cbee239e66 100644 --- a/public/language/id/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/id/topic.json b/public/language/id/topic.json index 799c6b7c67..757bc1b54f 100644 --- a/public/language/id/topic.json +++ b/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", diff --git a/public/language/it/login.json b/public/language/it/login.json index cdfa00c223..c40417dfc9 100644 --- a/public/language/it/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 0d71337cca..ccfdcec340 100644 --- a/public/language/it/topic.json +++ b/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.", diff --git a/public/language/ja/login.json b/public/language/ja/login.json index 59c72797e6..fb0a23b10d 100644 --- a/public/language/ja/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 2da568248e..4fc666f07a 100644 --- a/public/language/ja/topic.json +++ b/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": "このポストをリポートしました。", diff --git a/public/language/ko/login.json b/public/language/ko/login.json index d71e824596..da5c74385f 100644 --- a/public/language/ko/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index 3b09e7efb7..122525bb38 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -26,6 +26,8 @@ "tools": "도구", "flag": "신고", "locked": "잠김", + "pinned": "Pinned", + "moved": "Moved", "bookmark_instructions": "이 스레드에서 읽은 마지막 게시글로 이동하시려면 여기를 클릭하세요.", "flag_title": "이 게시물을 신고", "flag_success": "이 게시물은 신고되었습니다.", diff --git a/public/language/lt/login.json b/public/language/lt/login.json index 09d9b42d62..d236f566bc 100644 --- a/public/language/lt/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index e30d9b0f65..4c8e07fc98 100644 --- a/public/language/lt/topic.json +++ b/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.", diff --git a/public/language/ms/login.json b/public/language/ms/login.json index 3c3a1fd1d1..fcc401a5dc 100644 --- a/public/language/ms/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index 691530a81e..04b30e193d 100644 --- a/public/language/ms/topic.json +++ b/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", diff --git a/public/language/nb/login.json b/public/language/nb/login.json index cdf5766265..ab6587ca4a 100644 --- a/public/language/nb/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index c6233247c4..fe18a3d9f9 100644 --- a/public/language/nb/topic.json +++ b/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.", diff --git a/public/language/nl/login.json b/public/language/nl/login.json index 88ffdf3196..433d624759 100644 --- a/public/language/nl/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index d011e95667..d938fb6c50 100644 --- a/public/language/nl/topic.json +++ b/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.", diff --git a/public/language/pl/login.json b/public/language/pl/login.json index 1133f6afba..0ca66d5490 100644 --- a/public/language/pl/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index 92e2ef9459..2c5cd28d2a 100644 --- a/public/language/pl/topic.json +++ b/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.", diff --git a/public/language/pt_BR/login.json b/public/language/pt_BR/login.json index eaccc74fac..bc7b2ed432 100644 --- a/public/language/pt_BR/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json index f4a9305d1b..760fe42a3f 100644 --- a/public/language/pt_BR/topic.json +++ b/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.", diff --git a/public/language/ro/login.json b/public/language/ro/login.json index c79bb9e0f9..270c9263b4 100644 --- a/public/language/ro/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index 4c94d218ef..0daf15f7ec 100644 --- a/public/language/ro/topic.json +++ b/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.", diff --git a/public/language/ru/login.json b/public/language/ru/login.json index 62a4e64f8a..85bcedcf9a 100644 --- a/public/language/ru/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index a484e415dd..9ccfff5668 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -26,6 +26,8 @@ "tools": "Опции", "flag": "Отметить", "locked": "Закрыт", + "pinned": "Pinned", + "moved": "Moved", "bookmark_instructions": "Нажмите здесь, чтобы вернуться к последнему прочитанному сообщению в этой теме.", "flag_title": "Отметить сообщение для модерирования", "flag_success": "Это сообщение было помечено для модерации", diff --git a/public/language/rw/login.json b/public/language/rw/login.json index 5bdb99dc21..0bdba3cd0d 100644 --- a/public/language/rw/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json index 3539e02af9..bd05fdfc3a 100644 --- a/public/language/rw/topic.json +++ b/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. ", diff --git a/public/language/sc/login.json b/public/language/sc/login.json index ee7f253df5..0a1b280269 100644 --- a/public/language/sc/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index 5f03e99223..97fb268bc0 100644 --- a/public/language/sc/topic.json +++ b/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.", diff --git a/public/language/sk/login.json b/public/language/sk/login.json index 0736ab4faa..8bcaaa6337 100644 --- a/public/language/sk/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index d14a0a3d81..78c8473ae0 100644 --- a/public/language/sk/topic.json +++ b/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. ", diff --git a/public/language/sl/login.json b/public/language/sl/login.json index 7f3d80e3cb..6a5153670c 100644 --- a/public/language/sl/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json index 9593d6d0cf..225d18110b 100644 --- a/public/language/sl/topic.json +++ b/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.", diff --git a/public/language/sr/login.json b/public/language/sr/login.json index abcf584db7..ff74964c50 100644 --- a/public/language/sr/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json index 1e6b5a8cca..42b56929a3 100644 --- a/public/language/sr/topic.json +++ b/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.", diff --git a/public/language/sv/login.json b/public/language/sv/login.json index 4b08e7209e..341f4dd860 100644 --- a/public/language/sv/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index 49e1088f7b..734afb5719 100644 --- a/public/language/sv/topic.json +++ b/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.", diff --git a/public/language/th/login.json b/public/language/th/login.json index c9e8a589eb..60ea8e61db 100644 --- a/public/language/th/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/th/topic.json b/public/language/th/topic.json index 3fdc2aa0ce..532af2a8a8 100644 --- a/public/language/th/topic.json +++ b/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.", diff --git a/public/language/tr/login.json b/public/language/tr/login.json index e28dda2797..8212bca885 100644 --- a/public/language/tr/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index 9c37c91f52..f717ff5986 100644 --- a/public/language/tr/topic.json +++ b/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.", diff --git a/public/language/vi/login.json b/public/language/vi/login.json index 525f84e455..1823d7d586 100644 --- a/public/language/vi/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index 830773342b..8c7085fcbf 100644 --- a/public/language/vi/topic.json +++ b/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", diff --git a/public/language/zh_CN/login.json b/public/language/zh_CN/login.json index 6086ef9b0e..d0a99d91c9 100644 --- a/public/language/zh_CN/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json index 988e5d9205..63ebe02f77 100644 --- a/public/language/zh_CN/topic.json +++ b/public/language/zh_CN/topic.json @@ -26,6 +26,8 @@ "tools": "工具", "flag": "举报", "locked": "已锁定", + "pinned": "Pinned", + "moved": "Moved", "bookmark_instructions": "点击阅读本主题帖中的最新回复", "flag_title": "举报此帖", "flag_success": "已举报此回帖。", diff --git a/public/language/zh_TW/login.json b/public/language/zh_TW/login.json index de5b637a5e..ef0936ff15 100644 --- a/public/language/zh_TW/login.json +++ b/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" } \ No newline at end of file diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json index 6bb424475a..87bb2d8e08 100644 --- a/public/language/zh_TW/topic.json +++ b/public/language/zh_TW/topic.json @@ -26,6 +26,8 @@ "tools": "工具", "flag": "檢舉", "locked": "已鎖定", + "pinned": "Pinned", + "moved": "Moved", "bookmark_instructions": "點擊這裡返回到這個討論串的最後一篇張貼文", "flag_title": "檢舉這篇文章, 交給仲裁者來審閱.", "flag_success": "這文章已經被檢舉要求仲裁.",