diff --git a/package.json b/package.json index 1b269ab14c..f55d5c6eff 100644 --- a/package.json +++ b/package.json @@ -48,10 +48,10 @@ "nodebb-plugin-soundpack-default": "0.1.4", "nodebb-plugin-spam-be-gone": "0.4.1", "nodebb-rewards-essentials": "0.0.5", - "nodebb-theme-lavender": "1.0.52", - "nodebb-theme-persona": "2.1.8", - "nodebb-theme-vanilla": "3.1.3", - "nodebb-widget-essentials": "1.0.6", + "nodebb-theme-lavender": "1.0.54", + "nodebb-theme-persona": "2.1.25", + "nodebb-theme-vanilla": "3.1.7", + "nodebb-widget-essentials": "2.0.0", "npm": "^2.1.4", "passport": "^0.3.0", "passport-local": "1.0.0", @@ -69,7 +69,7 @@ "string": "^3.0.0", "templates.js": "0.2.10", "touch": "1.0.0", - "uglify-js": "^2.4.23", + "uglify-js": "^2.4.24", "underscore": "~1.8.3", "underscore.deep": "^0.5.1", "validator": "^4.0.5", diff --git a/public/language/ar/global.json b/public/language/ar/global.json index 50b3877256..ca12d56fe4 100644 --- a/public/language/ar/global.json +++ b/public/language/ar/global.json @@ -33,6 +33,7 @@ "header.notifications": "التنبيهات", "header.search": "بحث", "header.profile": "ملف", + "header.navigation": "Navigation", "notifications.loading": "تحميل التبليغات", "chats.loading": "تحميل الدردشات", "motd.welcome": "مرحبا بكم NodeBB، منصة مناقشة المستقبل", @@ -67,7 +68,7 @@ "recentposts": "آخر المشاركات", "recentips": "آخر عناوين ال IP التي سجلت الدخول", "away": "غير متواجد", - "dnd": "المرجو عدم الإزعاج", + "dnd": "Do not disturb", "invisible": "مخفي", "offline": "غير متصل", "email": "عنوان البريد الإلكتروني", diff --git a/public/language/ar/modules.json b/public/language/ar/modules.json index 56ff907b18..fd57bc4d9b 100644 --- a/public/language/ar/modules.json +++ b/public/language/ar/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "لا يوجد لديك دردشات نشطة.", "chat.user_typing": "%1 يكتب رسالة...", "chat.user_has_messaged_you": "%1 أرسل لك رسالة.", - "chat.see_all": "معاينة كل الدردشات", + "chat.see_all": "See all chats", "chat.no-messages": "المرجو اختيار مرسل إليه لمعاينة تاريخ الدردشات", "chat.recent-chats": "آخر الدردشات", "chat.contacts": "الأصدقاء", @@ -22,5 +22,8 @@ "composer.user_said": "%1 كتب:", "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index 5a26c90719..90841027d2 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -1,7 +1,7 @@ { "title": "التنبيهات", "no_notifs": "ليس لديك أية تنبيهات جديدة", - "see_all": "معاينة كل التنبيهات", + "see_all": "See all notifications", "mark_all_read": "اجعل كل التنبيهات مقروءة", "back_to_home": "عودة إلى %1", "outgoing_link": "رابط خارجي", diff --git a/public/language/ar/pages.json b/public/language/ar/pages.json index cf230fc28a..a03dbb6169 100644 --- a/public/language/ar/pages.json +++ b/public/language/ar/pages.json @@ -1,21 +1,37 @@ { "home": "الصفحة الرئيسية", "unread": "المواضيع الغير مقروءة", - "popular": "المواضيع الأكثر شهرة", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "المواضيع الحديثة", - "users": "اﻷعضاء المسجلون", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "التنبيهات", "tags": "الكلمات الدلالية", "tag": "Topics tagged under \"%1\"", - "user.edit": "تعديل \"%1\"", - "user.following": "المستخدمون الذين يتبعهم %1", - "user.followers": "المستخدمون الذين يتبعون %1", - "user.posts": "ردود %1", - "user.topics": "مواضيع %1", - "user.groups": "مجموعات %1", - "user.favourites": "مفضلات %1", - "user.settings": "خيارات المستخدم", - "user.watched": "المواضيع المتابعة من قبل %1 ", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.", "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:" } \ No newline at end of file diff --git a/public/language/ar/user.json b/public/language/ar/user.json index 80336505fa..7b6a26fcb1 100644 --- a/public/language/ar/user.json +++ b/public/language/ar/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد فيها", "follow_topics_you_create": "متابعة المواضيع التي تنشئها", "grouptitle": "حدد عنوان المجموعة الذي تريد عرضه", - "no-group-title": "لا يوجد عنوان للمجموعة" + "no-group-title": "لا يوجد عنوان للمجموعة", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/bg/email.json b/public/language/bg/email.json index f674ebd3f6..ab47936748 100644 --- a/public/language/bg/email.json +++ b/public/language/bg/email.json @@ -21,9 +21,9 @@ "digest.cta": "Натиснете тук, за да посетите %1", "digest.unsub.info": "Това резюме беше изпратено до Вас поради настройките Ви за абонаментите.", "digest.no_topics": "Не е имало дейност по темите в последните %1", - "notif.chat.subject": "Получено е ново чат съобщение от %1", + "notif.chat.subject": "Получено е ново съобщение от %1", "notif.chat.cta": "Натиснете тук, за да продължите разговора", - "notif.chat.unsub.info": "Това известие за чата беше изпратено до Вас поради настройките Ви за абонаментите.", + "notif.chat.unsub.info": "Това известие за разговор беше изпратено до Вас поради настройките Ви за абонаментите.", "notif.post.cta": "Натиснете тук, за да прочетете цялата тема", "notif.post.unsub.info": "Това известие за публикация беше изпратено до Вас поради настройките Ви за абонаментите.", "test.text1": "Това е пробно е-писмо, за да потвърдим, че изпращачът на е-поща е правилно настроен за Вашия NodeBB.", diff --git a/public/language/bg/error.json b/public/language/bg/error.json index 56ae758261..4a89a5a864 100644 --- a/public/language/bg/error.json +++ b/public/language/bg/error.json @@ -18,7 +18,7 @@ "username-taken": "Потребителското име е заето", "email-taken": "Е-пощата е заета", "email-not-confirmed": "Вашата е-поща все още не е потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.", - "email-not-confirmed-chat": "Няма да можете да пишете в чата, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.", + "email-not-confirmed-chat": "Няма да можете да пишете в разговори, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.", "no-email-to-confirm": "Този форум изисква потвърдена е-поща. Моля, натиснете тук, за да въведете е-поща", "email-confirm-failed": "Не успяхме да потвърдим е-пощата Ви. Моля, опитайте отново по-късно.", "confirm-email-already-sent": "Е-писмото за потвърждение вече е изпратено. Моля, почакайте още %1 минута/и, преди да изпратите ново.", @@ -74,8 +74,8 @@ "uploads-are-disabled": "Качването не е разрешено", "signature-too-long": "Съжаляваме, но подписът Ви трябва да съдържа не повече от %1 символ(а).", "about-me-too-long": "Съжаляваме, но информацията за Вас трябва да съдържа не повече от %1 символ(а).", - "cant-chat-with-yourself": "Не можете да пишете чат съобщение на себе си!", - "chat-restricted": "Този потребител е ограничил чат съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.", + "cant-chat-with-yourself": "Не можете да пишете съобщение на себе си!", + "chat-restricted": "Този потребител е ограничил съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.", "too-many-messages": "Изпратили сте твърде много съобщения. Моля, изчакайте малко.", "reputation-system-disabled": "Системата за репутация е изключена.", "downvoting-disabled": "Отрицателното гласуване е изключено", diff --git a/public/language/bg/global.json b/public/language/bg/global.json index 3d3b9e63a2..d9dd8bf07e 100644 --- a/public/language/bg/global.json +++ b/public/language/bg/global.json @@ -29,12 +29,13 @@ "header.popular": "Популярни", "header.users": "Потребители", "header.groups": "Групи", - "header.chats": "Чатове", + "header.chats": "Разговори", "header.notifications": "Известия", "header.search": "Търсене", "header.profile": "Профил", + "header.navigation": "Навигация", "notifications.loading": "Зареждане на известията", - "chats.loading": "Зареждане на чатовете", + "chats.loading": "Зареждане на разговорите", "motd.welcome": "Добре дошли в NodeBB, системата за дискусии на бъдещето.", "previouspage": "Предишна страница", "nextpage": "Следваща страница", diff --git a/public/language/bg/modules.json b/public/language/bg/modules.json index d151330bad..131ccb77ac 100644 --- a/public/language/bg/modules.json +++ b/public/language/bg/modules.json @@ -1,16 +1,16 @@ { - "chat.chatting_with": "Чат с ", - "chat.placeholder": "Въведете чат съобщението тук и натиснете Ентер за изпращане", + "chat.chatting_with": "Разговор с ", + "chat.placeholder": "Въведете съобщението тук и натиснете Ентер за изпращане", "chat.send": "Изпращане", - "chat.no_active": "Нямате текущи чатове.", + "chat.no_active": "Нямате текущи разговори.", "chat.user_typing": "%1 пише...", "chat.user_has_messaged_you": "%1 Ви написа съобщение.", - "chat.see_all": "Вижте всички чатове", - "chat.no-messages": "Моля, изберете получател, за да видите историята на чат съобщенията", - "chat.recent-chats": "Скорошни чатове", + "chat.see_all": "Вижте всички разговори", + "chat.no-messages": "Моля, изберете получател, за да видите историята на съобщенията", + "chat.recent-chats": "Скорошни разговори", "chat.contacts": "Контакти", "chat.message-history": "История на съобщенията", - "chat.pop-out": "Отделяне на чата в прозорец", + "chat.pop-out": "Отделяне на разговора в прозорец", "chat.maximize": "Уголемяване", "chat.seven_days": "7 дни", "chat.thirty_days": "30 дни", @@ -22,5 +22,8 @@ "composer.user_said": "%1 каза:", "composer.discard": "Сигурни ли сте, че искате да отхвърлите тази публикация?", "composer.submit_and_lock": "Публикуване и заключване", - "composer.toggle_dropdown": "Превключване на падащото меню" + "composer.toggle_dropdown": "Превключване на падащото меню", + "bootbox.ok": "Добре", + "bootbox.cancel": "Отказ", + "bootbox.confirm": "Потвърждаване" } \ No newline at end of file diff --git a/public/language/bg/pages.json b/public/language/bg/pages.json index d0d9c7ec82..e529a8e386 100644 --- a/public/language/bg/pages.json +++ b/public/language/bg/pages.json @@ -1,21 +1,37 @@ { "home": "Начало", "unread": "Непрочетени теми", - "popular": "Популярни теми", + "popular-day": "Популярните теми днес", + "popular-week": "Популярните теми тази седмица", + "popular-month": "Популярните теми този месец", + "popular-alltime": "Популярните теми за всички времена", "recent": "Скорошни теми", - "users": "Регистрирани потребители", + "users/online": "Потребители на линия", + "users/latest": "Последни потребители", + "users/sort-posts": "Потребители с най-много публикации", + "users/sort-reputation": "Потребители с най-висока репутация", + "users/map": "Карта на потребителите", + "users/search": "Търсене на потребители", "notifications": "Известия", "tags": "Етикети", "tag": "Теми, отбелязани като „%1“", - "user.edit": "Редактиране на „%1“", - "user.following": "Хора, които %1 следва", - "user.followers": "Хора, които следват %1", - "user.posts": "Публикации от %1", - "user.topics": "Теми, създадени от %1", - "user.groups": "Групите на %1", - "user.favourites": "Любимите публикации на %1", - "user.settings": "Настройки на потребителя", - "user.watched": "Теми, следени от %1", + "register": "Регистрирайте акаунт", + "login": "Влезте в акаунта си", + "reset": "Подновете паролата за акаунта си", + "categories": "Категории", + "groups": "Групи", + "group": "Група %1", + "chats": "Разговори", + "chat": "Разговаря с %1", + "account/edit": "Редактиране на „%1“", + "account/following": "Хора, които %1 следва", + "account/followers": "Хора, които следват %1", + "account/posts": "Публикации от %1", + "account/topics": "Теми, създадени от %1", + "account/groups": "Групите на %1", + "account/favourites": "Любимите публикации на %1", + "account/settings": "Потребителски настройки", + "account/watched": "Теми, следени от %1", "maintenance.text": "%1 в момента е в профилактика. Моля, върнете се по-късно.", "maintenance.messageIntro": "В допълнение, администраторът е оставил това съобщение:" } \ No newline at end of file diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index 492bf1bccf..8085d3b1b2 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -9,7 +9,7 @@ "profile": "Профил", "posted_by": "Публикувано от %1", "posted_by_guest": "Публикувано от гост", - "chat": "Чат", + "chat": "Разговор", "notify_me": "Получавайте известия за новите отговори в тази тема", "quote": "Цитат", "reply": "Отговор", diff --git a/public/language/bg/user.json b/public/language/bg/user.json index eebc5bdc93..1d19910de4 100644 --- a/public/language/bg/user.json +++ b/public/language/bg/user.json @@ -29,7 +29,7 @@ "signature": "Подпис", "gravatar": "Граватар", "birthday": "Рождена дата", - "chat": "Чат", + "chat": "Разговор", "follow": "Следване", "unfollow": "Спиране на следването", "more": "Още", @@ -49,21 +49,21 @@ "change_password_success": "Паролата ви е обновена!", "confirm_password": "Потвърдете паролата", "password": "Парола", - "username_taken_workaround": "Потребителското име, което искате, е заето и затова ние го променихме леко. Вие ще се наричате %1", + "username_taken_workaround": "Потребителското име, което искате, е заето и затова ние го променихме малко. Вие ще се наричате %1", "upload_picture": "Качване на снимка", "upload_a_picture": "Качване на снимка", "image_spec": "Можете да качвате само PNG, JPG, или GIF файлове", "settings": "Настройки", "show_email": "Да се показва е-пощата ми", "show_fullname": "Да се показва цялото ми име", - "restrict_chats": "Разрешаване на чат съобщенията само от потребители, които следвам", + "restrict_chats": "Разрешаване на съобщенията само от потребители, които следвам", "digest_label": "Абониране за резюмета", "digest_description": "Абониране за новини по е-пощата относно този форум (нови известия и теми) според избрания график", "digest_off": "Изключено", "digest_daily": "Ежедневно", "digest_weekly": "Ежеседмично", "digest_monthly": "Ежемесечно", - "send_chat_notifications": "Изпращане на е-писмо, ако получа ново чат съобщения, а не съм на линия", + "send_chat_notifications": "Изпращане на е-писмо, ако получа ново съобщение в разговор, а не съм на линия", "send_post_notifications": "Изпращане на е-писмо, когато се появи отговор в темите, за които съм абониран/а.", "settings-require-reload": "Някои промени в настройките изискват презареждане. Натиснете тук, за да презаредите страницата.", "has_no_follower": "Този потребител няма последователи :(", @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Следване на темите, на които отговаряте", "follow_topics_you_create": "Следване на темите, които създавате", "grouptitle": "Изберете заглавието на групата, което искате да се показва", - "no-group-title": "Няма заглавие на група" + "no-group-title": "Няма заглавие на група", + "select-skin": "Изберете облик" } \ No newline at end of file diff --git a/public/language/bn/global.json b/public/language/bn/global.json index 31211f44aa..7bad0b05b7 100644 --- a/public/language/bn/global.json +++ b/public/language/bn/global.json @@ -33,6 +33,7 @@ "header.notifications": "বিজ্ঞপ্তি", "header.search": "অনুসন্ধান", "header.profile": "প্রোফাইল", + "header.navigation": "Navigation", "notifications.loading": "বিজ্ঞপ্তিগুলি লোড হচ্ছে", "chats.loading": "কথোপকথনগুলি লোড হচ্ছে ", "motd.welcome": "ভবিষ্যতের আলোচনার প্লাটফর্ম, NodeBB তে স্বাগতম।", @@ -67,7 +68,7 @@ "recentposts": "সাম্প্রতিক পোস্ট", "recentips": "সাম্প্রতিক প্রবেশকৃত আইপি সমুহ", "away": "দূরে", - "dnd": "বিরক্ত করবেন না", + "dnd": "Do not disturb", "invisible": "অদৃশ্য", "offline": "অফলাইন", "email": "ইমেইল", diff --git a/public/language/bn/modules.json b/public/language/bn/modules.json index eca6afb7cb..72e5326965 100644 --- a/public/language/bn/modules.json +++ b/public/language/bn/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "আপনার কোন সচল কথোপকথন নেই", "chat.user_typing": "%1 লিখছেন", "chat.user_has_messaged_you": "%1 আপনাকে বার্তা পাঠিয়েছেন", - "chat.see_all": "সকল কথোপকথন দেখুন", + "chat.see_all": "See all chats", "chat.no-messages": "মেসেজ হিস্টোরী দেখতে প্রাপক নির্বাচন করুন", "chat.recent-chats": "সাম্প্রতিক চ্যাটসমূহ", "chat.contacts": "কন্টাক্টস", @@ -22,5 +22,8 @@ "composer.user_said": "%1 বলেছেনঃ", "composer.discard": "আপনি কি নিশ্চিত যে আপনি এই পোস্ট বাতিল করতে ইচ্ছুক?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json index 78771cb47c..d3038c27ed 100644 --- a/public/language/bn/notifications.json +++ b/public/language/bn/notifications.json @@ -1,7 +1,7 @@ { "title": "বিজ্ঞপ্তিগুলো", "no_notifs": "আপনার নতুন কোন বিজ্ঞপ্তি নেই", - "see_all": "সকল বিজ্ঞপ্তিগুলো দেখুন", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "ফিরুন %1", "outgoing_link": "বহির্গামী লিঙ্ক", diff --git a/public/language/bn/pages.json b/public/language/bn/pages.json index 3226cc5431..47c1f09f0b 100644 --- a/public/language/bn/pages.json +++ b/public/language/bn/pages.json @@ -1,21 +1,37 @@ { "home": "নীড়পাতা", "unread": "অপঠিত টপিক", - "popular": "জনপ্রিয় টপিক", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "সাম্প্রতিক টপিক", - "users": "নিবন্ধিত সদস্যগণ", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "বিজ্ঞপ্তি", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "সম্পাদনা \"%1\"", - "user.following": "%1 যাদের অনুসরণ করেন", - "user.followers": "যারা %1 কে অনুসরণ করেন", - "user.posts": "%1 এর পোস্ট সমুহ", - "user.topics": "%1 এর টপিক সমুহ", - "user.groups": "%1's Groups", - "user.favourites": "%1'র প্রিয় পোস্টগুলো", - "user.settings": "সদস্য সেটিংস", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", "maintenance.messageIntro": "Additionally, the administrator has left this message:" } \ No newline at end of file diff --git a/public/language/bn/user.json b/public/language/bn/user.json index b348b91866..d5c99082d8 100644 --- a/public/language/bn/user.json +++ b/public/language/bn/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/cs/global.json b/public/language/cs/global.json index 2e99c31dd6..8a2107681c 100644 --- a/public/language/cs/global.json +++ b/public/language/cs/global.json @@ -33,6 +33,7 @@ "header.notifications": "Oznámení", "header.search": "Hledat", "header.profile": "Můj profil", + "header.navigation": "Navigation", "notifications.loading": "Načítání upozornění", "chats.loading": "Načítání grafů", "motd.welcome": "Vítejte na NodeBB, diskusní platforma buducnosti.", @@ -67,7 +68,7 @@ "recentposts": "Nedávné příspěvky", "recentips": "Recently Logged In IPs", "away": "Pryč", - "dnd": "Nerušit", + "dnd": "Do not disturb", "invisible": "Neviditelný", "offline": "Offline", "email": "Email", diff --git a/public/language/cs/modules.json b/public/language/cs/modules.json index ebda99d83e..d848c4321a 100644 --- a/public/language/cs/modules.json +++ b/public/language/cs/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Nemáte žádné aktivní konverzace.", "chat.user_typing": "%1 píše ...", "chat.user_has_messaged_you": "%1 has messaged you.", - "chat.see_all": "See all Chats", + "chat.see_all": "See all chats", "chat.no-messages": "Please select a recipient to view chat message history", "chat.recent-chats": "Recent Chats", "chat.contacts": "Kontakty", @@ -22,5 +22,8 @@ "composer.user_said": "%1 said:", "composer.discard": "Are you sure you wish to discard this post?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index 8265bb48da..623eaf1ff3 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -1,7 +1,7 @@ { "title": "Upozornění", "no_notifs": "You have no new notifications", - "see_all": "See all Notifications", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Odkaz mimo fórum", diff --git a/public/language/cs/pages.json b/public/language/cs/pages.json index afe6d74248..ebf02ba2c9 100644 --- a/public/language/cs/pages.json +++ b/public/language/cs/pages.json @@ -1,21 +1,37 @@ { "home": "Home", "unread": "Unread Topics", - "popular": "Popular Topics", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Recent Topics", - "users": "Registered Users", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notifications", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Editing \"%1\"", - "user.following": "People %1 Follows", - "user.followers": "People who Follow %1", - "user.posts": "Posts made by %1", - "user.topics": "Topics created by %1", - "user.groups": "%1's Groups", - "user.favourites": "%1's Favourite Posts", - "user.settings": "User Settings", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", "maintenance.messageIntro": "Additionally, the administrator has left this message:" } \ No newline at end of file diff --git a/public/language/cs/user.json b/public/language/cs/user.json index e61d01b6f3..db573533f7 100644 --- a/public/language/cs/user.json +++ b/public/language/cs/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/da/global.json b/public/language/da/global.json index 4317c2776c..34afe49fbf 100644 --- a/public/language/da/global.json +++ b/public/language/da/global.json @@ -33,6 +33,7 @@ "header.notifications": "Notifikationer", "header.search": "Søg", "header.profile": "Profil", + "header.navigation": "Navigation", "notifications.loading": "Indlæser notifikationer", "chats.loading": "Indlæser chats", "motd.welcome": "Velkommen til NodeBB, fremtidens diskussion platform. ", @@ -67,7 +68,7 @@ "recentposts": "Seneste indlæg", "recentips": "Seneste loggede ind IPer", "away": "Væk", - "dnd": "Vil ikke forstyres", + "dnd": "Do not disturb", "invisible": "Usynlig", "offline": "Offline", "email": "Email", diff --git a/public/language/da/modules.json b/public/language/da/modules.json index 8f178892ee..333a0e2e5f 100644 --- a/public/language/da/modules.json +++ b/public/language/da/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Du har ingen aktive chats.", "chat.user_typing": "%1 skriver ...", "chat.user_has_messaged_you": "1% har skrevet til dig.", - "chat.see_all": "Se alle chats.", + "chat.see_all": "See all chats", "chat.no-messages": "Vælg en modtager for at se beskedhistorikken", "chat.recent-chats": "Seneste chats", "chat.contacts": "Kontakter", @@ -22,5 +22,8 @@ "composer.user_said": "%1 sagde:", "composer.discard": "Er du sikker på at du vil kassere dette indlæg?", "composer.submit_and_lock": "Send og lås", - "composer.toggle_dropdown": "Skift mellem dropdown" + "composer.toggle_dropdown": "Skift mellem dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/da/notifications.json b/public/language/da/notifications.json index a6a810dc87..3475ffbb5a 100644 --- a/public/language/da/notifications.json +++ b/public/language/da/notifications.json @@ -1,7 +1,7 @@ { "title": "Notifikationer", "no_notifs": "Du har ingen nye notifkationer", - "see_all": "Se alle notifikationer", + "see_all": "See all notifications", "mark_all_read": "Marker alle notifikationer læst", "back_to_home": "Tilbage til %1", "outgoing_link": "Udgående link", diff --git a/public/language/da/pages.json b/public/language/da/pages.json index 6843d45062..221da04afb 100644 --- a/public/language/da/pages.json +++ b/public/language/da/pages.json @@ -1,21 +1,37 @@ { "home": "Forside", "unread": "Ulæste tråde", - "popular": "Populære tråde", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Seneste tråde", - "users": "Registrerede brugere", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notifikationer", "tags": "Tags", "tag": "Tråde tagget under \"%1\"", - "user.edit": "Redigere \"%1\"", - "user.following": "Folk som %1 følger", - "user.followers": "Folk der følger %1", - "user.posts": "Indlæg skrevet af %1", - "user.topics": "Tråde oprettet af %1", - "user.groups": "%1s grupper", - "user.favourites": "%1s favorit indlæg", - "user.settings": "Brugerindstillinger", - "user.watched": "Tråde overvåget af %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 er under vedligeholdelse. Kom venligst tilbage senere.", "maintenance.messageIntro": "Administratoren har yderligere vedlagt denne besked:" } \ No newline at end of file diff --git a/public/language/da/user.json b/public/language/da/user.json index 421f00b20e..871933e1d0 100644 --- a/public/language/da/user.json +++ b/public/language/da/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Følg emner du har skrevet indlæg i", "follow_topics_you_create": "Følg emner du opretter", "grouptitle": "Vælg gruppe titlen du gerne vil fremvise", - "no-group-title": "Ingen gruppe titel" + "no-group-title": "Ingen gruppe titel", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/de/global.json b/public/language/de/global.json index a2d6127ba5..8002e59ead 100644 --- a/public/language/de/global.json +++ b/public/language/de/global.json @@ -33,6 +33,7 @@ "header.notifications": "Benachrichtigungen", "header.search": "Suche", "header.profile": "Profil", + "header.navigation": "Navigation", "notifications.loading": "Benachrichtigungen werden geladen", "chats.loading": "Nachrichten werden geladen", "motd.welcome": "Willkommen auf NodeBB, der Diskussionsplattform der Zukunft.", @@ -67,7 +68,7 @@ "recentposts": "Aktuelle Beiträge", "recentips": "Zuletzt eingeloggte IPs", "away": "Abwesend", - "dnd": "Nicht stören", + "dnd": "Do not disturb", "invisible": "Unsichtbar", "offline": "Offline", "email": "E-Mail", diff --git a/public/language/de/modules.json b/public/language/de/modules.json index d0287d790c..c872442e56 100644 --- a/public/language/de/modules.json +++ b/public/language/de/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Du hast keine aktiven Chats.", "chat.user_typing": "%1 tippt gerade ...", "chat.user_has_messaged_you": "%1 hat dir geschrieben.", - "chat.see_all": "Alle Chats anzeigen", + "chat.see_all": "See all chats", "chat.no-messages": "Bitte wähle einen Empfänger, um den jeweiligen Nachrichtenverlauf anzuzeigen.", "chat.recent-chats": "Aktuelle Chats", "chat.contacts": "Kontakte", @@ -22,5 +22,8 @@ "composer.user_said": "%1 sagte:", "composer.discard": "Bist du sicher, dass du diesen Beitrag verwerfen möchtest?", "composer.submit_and_lock": "Einreichen und Sperren", - "composer.toggle_dropdown": "Menu aus-/einblenden" + "composer.toggle_dropdown": "Menu aus-/einblenden", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index 0dcc1b825d..3ba55b59a2 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -1,7 +1,7 @@ { "title": "Benachrichtigungen", "no_notifs": "Du hast keine neuen Benachrichtigungen", - "see_all": "Alle Benachrichtigungen ansehen", + "see_all": "See all notifications", "mark_all_read": "Alle Benachrichtigungen als gelesen markieren", "back_to_home": "Zurück zu %1", "outgoing_link": "Externer Link", diff --git a/public/language/de/pages.json b/public/language/de/pages.json index 781ccb7962..239414954d 100644 --- a/public/language/de/pages.json +++ b/public/language/de/pages.json @@ -1,21 +1,37 @@ { "home": "Home", "unread": "Ungelesene Themen", - "popular": "Beliebte Themen", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Neueste Themen", - "users": "Registrierte User", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Benachrichtigungen", "tags": "Markierungen", "tag": "Themen markiert unter \"%1\"", - "user.edit": "Bearbeite \"%1\"", - "user.following": "Nutzer, die %1 folgt", - "user.followers": "Nutzer, die %1 folgen", - "user.posts": "Beiträge von %1", - "user.topics": "Themen von %1", - "user.groups": "%1's Gruppen", - "user.favourites": "Von %1 favorisierte Beiträge", - "user.settings": "Benutzer-Einstellungen", - "user.watched": "Themen angeschaut von %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komm später wieder.", "maintenance.messageIntro": "Zusätzlich hat der Administrator diese Nachricht hinterlassen:" } \ No newline at end of file diff --git a/public/language/de/user.json b/public/language/de/user.json index 8c96e203d3..7d5ba0bbd4 100644 --- a/public/language/de/user.json +++ b/public/language/de/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Themen folgen, in denen auf dich geantwortet wird", "follow_topics_you_create": "Themen folgen, die du erstellst", "grouptitle": "Wähle den anzuzeigenden Gruppen Titel aus", - "no-group-title": "Kein Gruppentitel" + "no-group-title": "Kein Gruppentitel", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/el/global.json b/public/language/el/global.json index 6dafd72e02..de22b9b106 100644 --- a/public/language/el/global.json +++ b/public/language/el/global.json @@ -33,6 +33,7 @@ "header.notifications": "Ειδοποιήσεις", "header.search": "Αναζήτηση", "header.profile": "Προφίλ", + "header.navigation": "Navigation", "notifications.loading": "Φόρτωση Ειδοποιήσεων", "chats.loading": "Φόρτωση Συνομιλιών", "motd.welcome": "Καλωσόρισες στο NodeBB, την πλατφόρμα συζητήσεων του μέλλοντος.", @@ -67,7 +68,7 @@ "recentposts": "Πρόσφατες Δημοσιεύσεις", "recentips": "Πρόσφατη IP Σύνδεσης", "away": "Απών/ούσα", - "dnd": "Μην ενοχλείτε", + "dnd": "Do not disturb", "invisible": "Αόρατος/η", "offline": "Εκτός Σύνδεσης", "email": "Email", diff --git a/public/language/el/modules.json b/public/language/el/modules.json index 4c82c03d4f..0751fd2fce 100644 --- a/public/language/el/modules.json +++ b/public/language/el/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Δεν έχεις ενεργές συνομιλίες.", "chat.user_typing": "Ο/Η %1 πληκτρολογεί...", "chat.user_has_messaged_you": "Ο/Η %1 σου έστειλε μήνυμα.", - "chat.see_all": "Προβολή όλων των Συνομιλιών", + "chat.see_all": "See all chats", "chat.no-messages": "Παρακαλώ επέλεξε έναν παραλήπτη για να δείς το ιστορικό της συνομιλίας", "chat.recent-chats": "Πρόσφατες Συνομιλίες", "chat.contacts": "Επαφές", @@ -22,5 +22,8 @@ "composer.user_said": "Ο/Η %1 είπε:", "composer.discard": "Είσαι σίγουρος/η πως θέλεις να πετάξεις αυτή την δημοσίευση;", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/el/notifications.json b/public/language/el/notifications.json index 7b21d83f53..92ff9a14c1 100644 --- a/public/language/el/notifications.json +++ b/public/language/el/notifications.json @@ -1,7 +1,7 @@ { "title": "Ειδοποιήσεις", "no_notifs": "Δεν έχεις νέες ειδοποιήσεις;", - "see_all": "Προβολή όλων των ειδοποιήσεων", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Πίσω στο %1", "outgoing_link": "Εξερχόμενος Σύνδεσμος", diff --git a/public/language/el/pages.json b/public/language/el/pages.json index c1fc315a96..f64d9fe5e9 100644 --- a/public/language/el/pages.json +++ b/public/language/el/pages.json @@ -1,21 +1,37 @@ { "home": "Κεντρική", "unread": "Μη αναγνωσμένα Θέματα", - "popular": "Δημοφιλή Θέματα", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Πρόσφατα Θέματα", - "users": "Εγγεγραμμένοι Χρήστες", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Ειδοποιήσεις", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Επεξεργασία του \"%1\"", - "user.following": "Άτομα που ακολουθεί ο/η %1", - "user.followers": "Άτομα που ακολουθούν τον/την %1", - "user.posts": "Δημοσιεύσεις από τον/την %1", - "user.topics": "Θέματα από τον/την %1", - "user.groups": "%1's Groups", - "user.favourites": "Οι αγαπημένες δημοσιεύσεις του/της %1", - "user.settings": "Επιλογές Χρήστη", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "Το %1 αυτή την στιγμή συντηρείται. Παρακαλώ έλα αργότερα.", "maintenance.messageIntro": "Additionally, the administrator has left this message:" } \ No newline at end of file diff --git a/public/language/el/user.json b/public/language/el/user.json index c58b3dfb4a..5639096008 100644 --- a/public/language/el/user.json +++ b/public/language/el/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/en@pirate/global.json b/public/language/en@pirate/global.json index e448cf78e0..19a46c8606 100644 --- a/public/language/en@pirate/global.json +++ b/public/language/en@pirate/global.json @@ -33,6 +33,7 @@ "header.notifications": "Parrot Calls", "header.search": "Finderer", "header.profile": "Bunk", + "header.navigation": "Navigation", "notifications.loading": "Fetching yer Parrot Calls", "chats.loading": "Loading Yik-Yaks", "motd.welcome": "Welcome to NodeBB, th' discussion platform 'o th' future.", @@ -67,7 +68,7 @@ "recentposts": "Recent Messages", "recentips": "Recently Logged In IPs", "away": "Out to sea", - "dnd": "Do not Disturb", + "dnd": "Do not disturb", "invisible": "Magic usin'", "offline": "Dead", "email": "Email", diff --git a/public/language/en@pirate/modules.json b/public/language/en@pirate/modules.json index f8e2e49f0b..eaa0b16713 100644 --- a/public/language/en@pirate/modules.json +++ b/public/language/en@pirate/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Ye be a lonely sailor.", "chat.user_typing": "%1 is typing ...", "chat.user_has_messaged_you": "%1 has messaged you.", - "chat.see_all": "See all Chats", + "chat.see_all": "See all chats", "chat.no-messages": "Please select a recipient to view chat message history", "chat.recent-chats": "Recent Chats", "chat.contacts": "Contacts", @@ -22,5 +22,8 @@ "composer.user_said": "%1 said:", "composer.discard": "Are you sure you wish to discard this post?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/en@pirate/notifications.json b/public/language/en@pirate/notifications.json index fd89bbf6f5..90e5ed5526 100644 --- a/public/language/en@pirate/notifications.json +++ b/public/language/en@pirate/notifications.json @@ -1,7 +1,7 @@ { "title": "Notifications", "no_notifs": "You have no new notifications", - "see_all": "Spy wit' ye eye all ye notifications", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Go offshore", diff --git a/public/language/en@pirate/pages.json b/public/language/en@pirate/pages.json index afe6d74248..ebf02ba2c9 100644 --- a/public/language/en@pirate/pages.json +++ b/public/language/en@pirate/pages.json @@ -1,21 +1,37 @@ { "home": "Home", "unread": "Unread Topics", - "popular": "Popular Topics", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Recent Topics", - "users": "Registered Users", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notifications", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Editing \"%1\"", - "user.following": "People %1 Follows", - "user.followers": "People who Follow %1", - "user.posts": "Posts made by %1", - "user.topics": "Topics created by %1", - "user.groups": "%1's Groups", - "user.favourites": "%1's Favourite Posts", - "user.settings": "User Settings", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", "maintenance.messageIntro": "Additionally, the administrator has left this message:" } \ No newline at end of file diff --git a/public/language/en@pirate/user.json b/public/language/en@pirate/user.json index a35bdf9aaa..65ee32db71 100644 --- a/public/language/en@pirate/user.json +++ b/public/language/en@pirate/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/en_US/global.json b/public/language/en_US/global.json index 3eb3e1db21..51a9b2e83f 100644 --- a/public/language/en_US/global.json +++ b/public/language/en_US/global.json @@ -33,6 +33,7 @@ "header.notifications": "Notifications", "header.search": "Search", "header.profile": "Profile", + "header.navigation": "Navigation", "notifications.loading": "Loading Notifications", "chats.loading": "Loading Chats", "motd.welcome": "Welcome to NodeBB, the discussion platform of the future.", @@ -67,7 +68,7 @@ "recentposts": "Recent Posts", "recentips": "Recently Logged In IPs", "away": "Away", - "dnd": "Do not Disturb", + "dnd": "Do not disturb", "invisible": "Invisible", "offline": "Offline", "email": "Email", diff --git a/public/language/en_US/modules.json b/public/language/en_US/modules.json index e86a8ce480..6d6a3ed41c 100644 --- a/public/language/en_US/modules.json +++ b/public/language/en_US/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "You have no active chats.", "chat.user_typing": "%1 is typing ...", "chat.user_has_messaged_you": "%1 has messaged you.", - "chat.see_all": "See all Chats", + "chat.see_all": "See all chats", "chat.no-messages": "Please select a recipient to view chat message history", "chat.recent-chats": "Recent Chats", "chat.contacts": "Contacts", @@ -22,5 +22,8 @@ "composer.user_said": "%1 said:", "composer.discard": "Are you sure you wish to discard this post?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/en_US/notifications.json b/public/language/en_US/notifications.json index 71c727ebc0..e3f2c6c2e3 100644 --- a/public/language/en_US/notifications.json +++ b/public/language/en_US/notifications.json @@ -1,7 +1,7 @@ { "title": "Notifications", "no_notifs": "You have no new notifications", - "see_all": "See all Notifications", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Outgoing Link", diff --git a/public/language/en_US/pages.json b/public/language/en_US/pages.json index 8f3c442101..ebf02ba2c9 100644 --- a/public/language/en_US/pages.json +++ b/public/language/en_US/pages.json @@ -1,21 +1,37 @@ { "home": "Home", "unread": "Unread Topics", - "popular": "Popular Topics", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Recent Topics", - "users": "Registered Users", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notifications", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Editing \"%1\"", - "user.following": "People %1 Follows", - "user.followers": "People who Follow %1", - "user.posts": "Posts made by %1", - "user.topics": "Topics created by %1", - "user.groups": "%1's Groups", - "user.favourites": "%1's Favorite Posts", - "user.settings": "User Settings", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", "maintenance.messageIntro": "Additionally, the administrator has left this message:" } \ No newline at end of file diff --git a/public/language/en_US/user.json b/public/language/en_US/user.json index be5da7fc6c..e06df9e525 100644 --- a/public/language/en_US/user.json +++ b/public/language/en_US/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/es/global.json b/public/language/es/global.json index 66a7b6fbe7..138161bb35 100644 --- a/public/language/es/global.json +++ b/public/language/es/global.json @@ -33,6 +33,7 @@ "header.notifications": "Notificaciones", "header.search": "Buscar", "header.profile": "Perfil", + "header.navigation": "Navigation", "notifications.loading": "Cargando notificaciones", "chats.loading": "Cargando chats", "motd.welcome": "Bienvenido a NodeBB, la plataforma de debate del el futuro.", @@ -67,7 +68,7 @@ "recentposts": "Publicaciones recientes", "recentips": "IP's conectadas recientemente", "away": "Ausente", - "dnd": "No molestar", + "dnd": "Do not disturb", "invisible": "Invisible", "offline": "Desconectado", "email": "Email", diff --git a/public/language/es/modules.json b/public/language/es/modules.json index 857135bde1..7597bce0c3 100644 --- a/public/language/es/modules.json +++ b/public/language/es/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "No tiene conversaciones activas.", "chat.user_typing": "%1 está escribiendo...", "chat.user_has_messaged_you": "%1 te ha enviado un mensaje.", - "chat.see_all": "Ver todas las conversaciones", + "chat.see_all": "See all chats", "chat.no-messages": "Por favor, selecciona un contacto para ver el historial de mensajes", "chat.recent-chats": "Chats recientes", "chat.contacts": "Contactos", @@ -22,5 +22,8 @@ "composer.user_said": "%1 dijo:", "composer.discard": "¿Estás seguro de que deseas descartar este mensaje?", "composer.submit_and_lock": "Enviar y Bloquear", - "composer.toggle_dropdown": "Alternar desplegable" + "composer.toggle_dropdown": "Alternar desplegable", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index 5258be8a9a..62d03601a7 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -1,7 +1,7 @@ { "title": "Notificaciones", "no_notifs": "No tienes nuevas notificaciones", - "see_all": "Ver todas las notificaciones", + "see_all": "See all notifications", "mark_all_read": "Marcar todas las notificaciones como leídas", "back_to_home": "Volver a %1", "outgoing_link": "Enlace externo", diff --git a/public/language/es/pages.json b/public/language/es/pages.json index 4a2374bc06..2e43b8021b 100644 --- a/public/language/es/pages.json +++ b/public/language/es/pages.json @@ -1,21 +1,37 @@ { "home": "Inicio", "unread": "Temas no leídos", - "popular": "Temas populares", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Temas recientes", - "users": "Usuarios registrados", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notificaciones", "tags": "Etiquetas", "tag": "Temas etiquetados en \"%1\"", - "user.edit": "Editando \"%1\"", - "user.following": "Gente que sigue %1 ", - "user.followers": "Seguidores de %1", - "user.posts": "Mensajes de %1", - "user.topics": "Temas creados por %1", - "user.groups": "%1's Grupos", - "user.favourites": "Publicaciones favoritas de %1 ", - "user.settings": "Preferencias de usuario", - "user.watched": "Temas vistos por 1%", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 está en mantenimiento actualmente. Por favor vuelva en otro momento.", "maintenance.messageIntro": "Adicionalmente, la administración ha dejado este mensaje:" } \ No newline at end of file diff --git a/public/language/es/user.json b/public/language/es/user.json index a78c4eccc9..2a795889e4 100644 --- a/public/language/es/user.json +++ b/public/language/es/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Seguir los temas en los que respondes", "follow_topics_you_create": "Seguir publicaciones que creas", "grouptitle": "Selecciona el título del grupo que deseas visualizar", - "no-group-title": "Sin título de grupo" + "no-group-title": "Sin título de grupo", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/et/global.json b/public/language/et/global.json index ce9d277529..17e6263957 100644 --- a/public/language/et/global.json +++ b/public/language/et/global.json @@ -33,6 +33,7 @@ "header.notifications": "Teated", "header.search": "Otsi", "header.profile": "Profiil", + "header.navigation": "Navigation", "notifications.loading": "Laen teateid", "chats.loading": "Laen vestlusi", "motd.welcome": "Tere tulemast NodeBB foorumisse.", @@ -67,7 +68,7 @@ "recentposts": "Hiljutised postitused", "recentips": "Hiljutised IP'd, millelt sisse logitud", "away": "Eemal", - "dnd": "Hõivatud", + "dnd": "Do not disturb", "invisible": "Nähtamatu", "offline": "Väljas", "email": "Emaili aadress", diff --git a/public/language/et/modules.json b/public/language/et/modules.json index 6fa3be280f..9b4e6624f9 100644 --- a/public/language/et/modules.json +++ b/public/language/et/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Sul ei ole hetkel aktiivseid vestlusi.", "chat.user_typing": "%1 kirjutab sõnumit...", "chat.user_has_messaged_you": "%1 saatis sulle sõnumi.", - "chat.see_all": "Vaata kõiki vestlusi", + "chat.see_all": "See all chats", "chat.no-messages": "Vali sõnumisaaja, et vaadata sõnumite ajalugu.", "chat.recent-chats": "Hiljutised vestlused", "chat.contacts": "Kontaktid", @@ -22,5 +22,8 @@ "composer.user_said": "%1 ütles:", "composer.discard": "Oled kindel, et soovid selle postituse tühistada?", "composer.submit_and_lock": "Kinnita ja Lukusta", - "composer.toggle_dropdown": "Aktiveeri rippmenüü" + "composer.toggle_dropdown": "Aktiveeri rippmenüü", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json index b20db58c6b..9915940f35 100644 --- a/public/language/et/notifications.json +++ b/public/language/et/notifications.json @@ -1,7 +1,7 @@ { "title": "Teated", "no_notifs": "Sul pole uusi teateid", - "see_all": "Vaata kõiki teateid", + "see_all": "See all notifications", "mark_all_read": "Märgi kõik teavitused loetuks", "back_to_home": "Tagasi %1", "outgoing_link": "Väljaminev link", diff --git a/public/language/et/pages.json b/public/language/et/pages.json index 136b1463db..f4b23baff4 100644 --- a/public/language/et/pages.json +++ b/public/language/et/pages.json @@ -1,21 +1,37 @@ { "home": "Avaleht", "unread": "Lugemata teemad", - "popular": "Populaarsed teemad", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Hiljutised teemad", - "users": "Registreeritud kasutajad", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Teated", "tags": "Märksõnad", "tag": "Teemad märksõnadega \"%1\"", - "user.edit": "Muudan \"%1\"", - "user.following": "Kasutaja %1 jälgib", - "user.followers": "Kasutajad, kes jälgivad %1", - "user.posts": "Postitused, mis on tehtud kasutaja %1 poolt", - "user.topics": "Teemad on kirjutanud %1", - "user.groups": "%1's grupid", - "user.favourites": "%1's lemmikud postitused", - "user.settings": "Kasutaja sätted", - "user.watched": "Teemasid jälgib %1 kasutajat", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 foorumil on käimas hooldustööd. Palun külastage meid mõne aja pärast uuesti.", "maintenance.messageIntro": "Administraator on jätnud ka omaltpoolt sõnumi:" } \ No newline at end of file diff --git a/public/language/et/user.json b/public/language/et/user.json index a697fd2437..62297ad120 100644 --- a/public/language/et/user.json +++ b/public/language/et/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Järgi teemasid, millele olete vastanud.", "follow_topics_you_create": "Järgi teemasi, mis on teie loodud.", "grouptitle": "Vali grupile tiitel mida kuvada soovid", - "no-group-title": "Grupi tiitel puudub" + "no-group-title": "Grupi tiitel puudub", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/fa_IR/global.json b/public/language/fa_IR/global.json index 664ac9b73a..d14968f31f 100644 --- a/public/language/fa_IR/global.json +++ b/public/language/fa_IR/global.json @@ -33,6 +33,7 @@ "header.notifications": "آگاه‌سازی‌ها", "header.search": "جستجو", "header.profile": "نمایه", + "header.navigation": "Navigation", "notifications.loading": "بارگذاری آگاه‌سازی‌ها", "chats.loading": "بارگذاری گفتگوها", "motd.welcome": "به NodeBB خوش آمدید، پلتفرم انجمن‌ساز آینده", @@ -67,7 +68,7 @@ "recentposts": "دیدگاه‌های تازه", "recentips": "آخرین IPها", "away": "دور از دسترس", - "dnd": "مشغول", + "dnd": "Do not disturb", "invisible": "مخفی", "offline": "آفلاین", "email": "رایانامه", diff --git a/public/language/fa_IR/modules.json b/public/language/fa_IR/modules.json index 81b4fab4fc..f14bac3a64 100644 --- a/public/language/fa_IR/modules.json +++ b/public/language/fa_IR/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "شما هیچ گفتگوی فعالی ندارید.", "chat.user_typing": "%1 در حال نوشتن است...", "chat.user_has_messaged_you": "%1 به شما پیام داده است.", - "chat.see_all": "نمایش تمامی گفتگوها", + "chat.see_all": "See all chats", "chat.no-messages": "مشخص کنید تاریخچه گفتگوهایتان با چه کاربری را می‌خواهید ببینید", "chat.recent-chats": "گفتگوهای اخیر", "chat.contacts": "تماس‌ها", @@ -22,5 +22,8 @@ "composer.user_said": "%1 گفته است:", "composer.discard": "آیا از دور انداختن این دیدگاه اطمینان دارید؟", "composer.submit_and_lock": "ارسال و قفل", - "composer.toggle_dropdown": "باز و بسته کردن کرکره" + "composer.toggle_dropdown": "باز و بسته کردن کرکره", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/fa_IR/notifications.json b/public/language/fa_IR/notifications.json index 8a5cbf8863..773186c7e1 100644 --- a/public/language/fa_IR/notifications.json +++ b/public/language/fa_IR/notifications.json @@ -1,7 +1,7 @@ { "title": "آگاه‌سازی‌ها", "no_notifs": "هیچ آگاه‌سازی تازه‌ای ندارید", - "see_all": "دیدن همهٔ آگاه‌سازی‌ها", + "see_all": "See all notifications", "mark_all_read": "همه اطلاعیه ها را خوانده شده علامت بزن", "back_to_home": "بازگشت به %1", "outgoing_link": "پیوند برون‌رو", diff --git a/public/language/fa_IR/pages.json b/public/language/fa_IR/pages.json index cf7accc690..113b049e3b 100644 --- a/public/language/fa_IR/pages.json +++ b/public/language/fa_IR/pages.json @@ -1,21 +1,37 @@ { "home": "خانه", "unread": "جستاره‌های نخوانده", - "popular": "جستارهای دوست‌داشتنی", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "جستارهای تازه", - "users": "کاربران نام‌نویسی شده", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "آگاه‌سازی‌ها", "tags": "برچسب‌ها", "tag": "جستارهای داری کلیدواژه \"%1\"", - "user.edit": "ویرایش \"%1\"", - "user.following": "کاربرانی که %1 دنبال می‌کند", - "user.followers": "کاربرانی که %1 را دنبال می‌کنند", - "user.posts": "دیدگاه‌های %1", - "user.topics": "%1 این جستار را ساخت.", - "user.groups": "گروه‌های %1", - "user.favourites": "دیدگاه‌های پسندیدهٔ %1", - "user.settings": "تنظیمات کاربر", - "user.watched": "جستارهای پاییده شده توسط %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "1% در حال حاضر تحت تعمیر و نگهدارییست. لطفا زمان دیگری مراجعه کنید.", "maintenance.messageIntro": "علاوه بر این، مدیر این پیام را گذاشته است:" } \ No newline at end of file diff --git a/public/language/fa_IR/user.json b/public/language/fa_IR/user.json index 819755917f..087ed224f2 100644 --- a/public/language/fa_IR/user.json +++ b/public/language/fa_IR/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "تاپیک هایی که پاسخ داده ای را دنبال کن", "follow_topics_you_create": "جستارهایی که ایجاد کرده ای را دنبال کن", "grouptitle": "عنوان گروهی که میخواهید نشان داده شود را انتخاب کنید.", - "no-group-title": "عنوان گروه ای نیست" + "no-group-title": "عنوان گروه ای نیست", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/fi/global.json b/public/language/fi/global.json index ddf038b849..f0484ef801 100644 --- a/public/language/fi/global.json +++ b/public/language/fi/global.json @@ -33,6 +33,7 @@ "header.notifications": "Ilmoitukset", "header.search": "Hae", "header.profile": "Profiili", + "header.navigation": "Navigation", "notifications.loading": "Ladataan ilmoituksia", "chats.loading": "Ladataan keskusteluja", "motd.welcome": "Tervetuloa NodeBB:hen, tulevaisuuden keskustelualustalle.", @@ -67,7 +68,7 @@ "recentposts": "Viimeisimmät viestit", "recentips": "Äskettäin kirjautuneet IP-osoitteet", "away": "Poissa", - "dnd": "Älä häiritse", + "dnd": "Do not disturb", "invisible": "Näkymätön", "offline": "Offline", "email": "Sähköposti", diff --git a/public/language/fi/modules.json b/public/language/fi/modules.json index a789f8dd91..f4d5700c41 100644 --- a/public/language/fi/modules.json +++ b/public/language/fi/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Sinulla ei ole aktiivisia keskusteluita.", "chat.user_typing": "%1 kirjoittaa ...", "chat.user_has_messaged_you": "%1 lähetti sinulle viestin.", - "chat.see_all": "Näytä kaikki keskustelut", + "chat.see_all": "See all chats", "chat.no-messages": "Valitse vastaanottaja katsellaksesi keskusteluhistoriaa", "chat.recent-chats": "Viimeisimmät keskustelut", "chat.contacts": "Contacts", @@ -22,5 +22,8 @@ "composer.user_said": "%1 sanoi:", "composer.discard": "Oletko varma, että haluat hylätä viestin?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index 6a7b3e01ad..de9dffb863 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -1,7 +1,7 @@ { "title": "Ilmoitukset", "no_notifs": "Sinulla ei ole uusia ilmoituksia", - "see_all": "Katso kaikki ilmoitukset", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Ulkopuolinen linkki", diff --git a/public/language/fi/pages.json b/public/language/fi/pages.json index c47769bd90..f66a483bf4 100644 --- a/public/language/fi/pages.json +++ b/public/language/fi/pages.json @@ -1,21 +1,37 @@ { "home": "Etusivu", "unread": "Lukemattomat aiheet", - "popular": "Suositut aiheet", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Viimeisimmät aiheet", - "users": "Rekisteröityneet käyttäjät", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Ilmoitukset", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Muokataan \"%1\"", - "user.following": "Käyttäjät, joita %1 seuraa", - "user.followers": "Käyttäjät, jotka seuraavat käyttäjää %1", - "user.posts": "Käyttäjän %1 kirjoittamat viestit", - "user.topics": "Käyttäjän %1 aloittamat aiheet", - "user.groups": "%1's Groups", - "user.favourites": "Käyttäjän %1 suosikkiviestit", - "user.settings": "Käyttäjän asetukset", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", "maintenance.messageIntro": "Additionally, the administrator has left this message:" } \ No newline at end of file diff --git a/public/language/fi/user.json b/public/language/fi/user.json index 3ffc13dfe0..30bb4294c3 100644 --- a/public/language/fi/user.json +++ b/public/language/fi/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/fr/category.json b/public/language/fr/category.json index e051891b6a..f0ba60e422 100644 --- a/public/language/fr/category.json +++ b/public/language/fr/category.json @@ -8,8 +8,8 @@ "no_replies": "Personne n'a répondu", "no_new_posts": "Pas de nouveau message", "share_this_category": "Partager cette catégorie", - "watch": "Suivre", - "ignore": "Ne plus suivre", - "watch.message": "Vous suivez désormais les mises à jour de cette catégorie.", - "ignore.message": "Vous ne suivez plus les mises jour de cette catégorie." + "watch": "Surveiller", + "ignore": "Ne plus surveiller", + "watch.message": "Vous surveillez désormais les mises à jour de cette catégorie.", + "ignore.message": "Vous ne surveillez plus les mises jour de cette catégorie." } \ No newline at end of file diff --git a/public/language/fr/global.json b/public/language/fr/global.json index c9a2550c37..709d9287ee 100644 --- a/public/language/fr/global.json +++ b/public/language/fr/global.json @@ -33,6 +33,7 @@ "header.notifications": "Notifications", "header.search": "Recherche", "header.profile": "Profil", + "header.navigation": "Navigation", "notifications.loading": "Chargement des notifications", "chats.loading": "Chargement des chats", "motd.welcome": "Bienvenue sur NodeBB, la plate-forme de discussion du futur.", @@ -77,7 +78,7 @@ "updated.title": "Forum mis à jour", "updated.message": "Ce forum a été mis à jour à la dernière version. Cliquez ici pour recharger la page.", "privacy": "Vie privée", - "follow": "S'abonner", - "unfollow": "Se désabonner", + "follow": "Suivre", + "unfollow": "Ne plus suivre", "delete_all": "Tout supprimer" } \ No newline at end of file diff --git a/public/language/fr/modules.json b/public/language/fr/modules.json index 5c5e9b3fdf..cfb05ef8c2 100644 --- a/public/language/fr/modules.json +++ b/public/language/fr/modules.json @@ -22,5 +22,8 @@ "composer.user_said": "%1 a dit :", "composer.discard": "Êtes-vous sûr de bien vouloir supprimer ce message ?", "composer.submit_and_lock": "Soumettre et Verrouiller", - "composer.toggle_dropdown": "Afficher/masquer le menu" + "composer.toggle_dropdown": "Afficher/masquer le menu", + "bootbox.ok": "OK", + "bootbox.cancel": "Annuler", + "bootbox.confirm": "Confirmer" } \ No newline at end of file diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index 217f84ecc6..0373790bda 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -1,7 +1,7 @@ { "title": "Notifications", "no_notifs": "Vous n'avez aucune notification", - "see_all": "Voir toutes les notifications.", + "see_all": "Voir toutes les notifications", "mark_all_read": "Marquer toutes les notifications comme lues", "back_to_home": "Revenir à %1", "outgoing_link": "Lien sortant", diff --git a/public/language/fr/pages.json b/public/language/fr/pages.json index d78cf504d6..f3dea8cc49 100644 --- a/public/language/fr/pages.json +++ b/public/language/fr/pages.json @@ -1,21 +1,37 @@ { "home": "Accueil", "unread": "Sujets non lus", - "popular": "Sujets populaires", + "popular-day": "Sujets populaires aujourd'hui", + "popular-week": "Sujets populaires cette semaine", + "popular-month": "Sujets populaires ce mois-ci", + "popular-alltime": "Sujets populaires depuis toujours", "recent": "Sujets récents", - "users": "Utilisateurs enregistrés", + "users/online": "Utilisateurs en ligne", + "users/latest": "Derniers inscrits", + "users/sort-posts": "Utilisateurs avec le plus de messages", + "users/sort-reputation": "Utilisateurs avec la plus grande réputation", + "users/map": "Carte des utilisateurs", + "users/search": "Rechercher des utilisateurs", "notifications": "Notifications", "tags": "Mots-clés", "tag": "Sujets ayant le mot-clé \"%1\"", - "user.edit": "Edite \"%1\"", - "user.following": "Personnes que %1 suit", - "user.followers": "Personnes qui suivent %1", - "user.posts": "Message écrit par %1", - "user.topics": "Sujets créés par %1", - "user.groups": "Les Groupes de %1", - "user.favourites": "Messages favoris de %1", - "user.settings": "Préférences utilisateur", - "user.watched": "Sujets surveillés par %1", + "register": "Créer un compte", + "login": "Connectez-vous à votre compte", + "reset": "Remettez à zéro votre mot de passe", + "categories": "Catégories", + "groups": "Groupes", + "group": "%1 groupe", + "chats": "Discussions", + "chat": "Conversation avec %1", + "account/edit": "Edition de \"%1\"", + "account/following": "Les personnes que %1 suit", + "account/followers": "Les personnes qui suivent %1", + "account/posts": "Messages postés par %1", + "account/topics": "Sujets créés par %1", + "account/groups": "Groupes auxquels appartient %1", + "account/favourites": "Messages favoris de %1", + "account/settings": "Paramètres d'utilisateur", + "account/watched": "Sujets surveillés par %1", "maintenance.text": "%1 est en maintenance. Veuillez revenir un peu plus tard.", "maintenance.messageIntro": "De plus, l'administrateur a laissé ce message:" } \ No newline at end of file diff --git a/public/language/fr/recent.json b/public/language/fr/recent.json index 6103856ee0..550a18c559 100644 --- a/public/language/fr/recent.json +++ b/public/language/fr/recent.json @@ -15,5 +15,5 @@ "there-are-new-topics-and-new-posts": "Il y a %1 nouveaux sujets et %2 nouveaux messages.", "there-is-a-new-post": "Il y a un nouveau message.", "there-are-new-posts": "Il y a %1 nouveaux messages.", - "click-here-to-reload": "Cliquer ici pour recharger." + "click-here-to-reload": "Cliquez ici pour recharger." } \ No newline at end of file diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index b6c5491426..6ef7e5640b 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -26,7 +26,7 @@ "flag": "Signaler", "locked": "Verrouillé", "bookmark_instructions": "Cliquez ici pour retourner à votre dernière position ou fermez pour ignorer.", - "flag_title": "Signaler ce post à la modération", + "flag_title": "Signaler ce message à la modération", "flag_confirm": "Êtes-vous sûr de bien vouloir signaler ce message ?", "flag_success": "Ce message a bien été signalé aux modérateurs.", "deleted_message": "Ce sujet a été supprimé. Seuls les utilsateurs avec les droits d'administration peuvent le voir.", @@ -34,10 +34,10 @@ "not_following_topic.message": "Vous ne recevrez plus de notifications pour ce sujet.", "login_to_subscribe": "Veuillez vous enregistrer ou vous connecter afin de vous abonner à ce sujet.", "markAsUnreadForAll.success": "Sujet marqué comme non lu pour tout le monde.", - "watch": "Suivre", - "unwatch": "Ne plus suivre", + "watch": "Surveiller", + "unwatch": "Ne plus surveiller", "watch.title": "Être notifié des nouvelles réponses dans ce sujet", - "unwatch.title": "Arrêter de suivre ce sujet", + "unwatch.title": "Arrêter de surveiller ce sujet", "share_this_post": "Partager ce message", "thread_tools.title": "Outils pour sujets", "thread_tools.markAsUnreadForAll": "Marquer comme non lu", diff --git a/public/language/fr/user.json b/public/language/fr/user.json index 92c82d7042..9cd36737a8 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Suivre les sujets auxquels vous répondez", "follow_topics_you_create": "Suivre les sujets que vous créez", "grouptitle": "Sélectionnez le titre de groupe que vous souhaitez afficher", - "no-group-title": "Aucun titre de groupe" + "no-group-title": "Aucun titre de groupe", + "select-skin": "Sélectionner un thème" } \ No newline at end of file diff --git a/public/language/he/global.json b/public/language/he/global.json index 19c2c2096e..37e81e135a 100644 --- a/public/language/he/global.json +++ b/public/language/he/global.json @@ -33,6 +33,7 @@ "header.notifications": "התראות", "header.search": "חיפוש", "header.profile": "פרופיל", + "header.navigation": "Navigation", "notifications.loading": "טוען התראות", "chats.loading": "טוען צ'אטים", "motd.welcome": "ברוכים הבאים ל NodeBB, פלטפורמת הדיון של העתיד", @@ -67,7 +68,7 @@ "recentposts": "פוסטים אחרונים", "recentips": "כתובות IP שנכנסו למערכת לאחרונה", "away": "לא נמצא", - "dnd": "לא להפריע", + "dnd": "Do not disturb", "invisible": "מוסתר", "offline": "מנותק", "email": "אימייל", diff --git a/public/language/he/modules.json b/public/language/he/modules.json index d0661a98fa..3f8ba8d30a 100644 --- a/public/language/he/modules.json +++ b/public/language/he/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "אין לך צ'אטים פעילים", "chat.user_typing": "%1 מקליד ...", "chat.user_has_messaged_you": "ל%1 יש הודעה עבורך.", - "chat.see_all": "צפה בכל הצ'אטים", + "chat.see_all": "See all chats", "chat.no-messages": "אנא בחר נמען על מנת לראות את היסטוריית הצ'אט איתו", "chat.recent-chats": "צ'אטים אחרונים", "chat.contacts": "אנשי קשר", @@ -22,5 +22,8 @@ "composer.user_said": "%1 אמר:", "composer.discard": "האם למחוק פוסט זה?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 358c7585ca..55173ad1cd 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -1,7 +1,7 @@ { "title": "התראות", "no_notifs": "אין התראות", - "see_all": "צפה בכל ההתראות", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "חזרה ל%1", "outgoing_link": "לינק", diff --git a/public/language/he/pages.json b/public/language/he/pages.json index 892ba1a918..f0fe179998 100644 --- a/public/language/he/pages.json +++ b/public/language/he/pages.json @@ -1,21 +1,37 @@ { "home": "דף הבית", "unread": "נושאים שלא נקראו", - "popular": "נושאים פופולריים", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "נושאים אחרונים", - "users": "משתמשים רשומים", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "התראות", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "עורך את %1", - "user.following": "אנשים ש%1 עוקב אחריהם", - "user.followers": "אנשים שעוקבים אחרי %1", - "user.posts": "פוסטים שהועלו על ידי %1", - "user.topics": "נושאים שנוצרו על ידי %1", - "user.groups": "הקבוצות של %1", - "user.favourites": "הפוסטים המועדפים על %1", - "user.settings": "הגדרות משתמש", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 כרגע תחת עבודות תחזוקה. אנא חזור בזמן מאוחר יותר.", "maintenance.messageIntro": "בנוסף, המנהל השאיר את ההודעה הזו:" } \ No newline at end of file diff --git a/public/language/he/user.json b/public/language/he/user.json index 0481813d4b..53a7c3311c 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/hu/global.json b/public/language/hu/global.json index 6f3754eb69..2391b77603 100644 --- a/public/language/hu/global.json +++ b/public/language/hu/global.json @@ -33,6 +33,7 @@ "header.notifications": "Értesítések", "header.search": "Keresés", "header.profile": "Profil", + "header.navigation": "Navigation", "notifications.loading": "Értesítések Betöltése", "chats.loading": "Chat Betöltése", "motd.welcome": "Üdvözlet a NodeBB-n, a jövő fórum platformján.", @@ -67,7 +68,7 @@ "recentposts": "Friss hozzászólások", "recentips": "Utoljára bejelentkezett IP címek", "away": "Távol van", - "dnd": "Elfoglalt", + "dnd": "Do not disturb", "invisible": "Láthatatlan", "offline": "Offline", "email": "Email", diff --git a/public/language/hu/modules.json b/public/language/hu/modules.json index 6c1d50915a..266c73da7f 100644 --- a/public/language/hu/modules.json +++ b/public/language/hu/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Nincs aktív csevegés.", "chat.user_typing": "%1 éppen ír ...", "chat.user_has_messaged_you": "%1 üzenetet küldött.", - "chat.see_all": "Minden beszélgetés mutatása", + "chat.see_all": "See all chats", "chat.no-messages": "Válasszuk ki a címzettet és tekintsük meg a chat előzményeket", "chat.recent-chats": "Legutóbbi beszélgetések", "chat.contacts": "Kapcsolatok", @@ -22,5 +22,8 @@ "composer.user_said": "%1 válasza:", "composer.discard": "Biztosan elvetjük ezt a hozzászólást?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json index dd364e0426..503dc41897 100644 --- a/public/language/hu/notifications.json +++ b/public/language/hu/notifications.json @@ -1,7 +1,7 @@ { "title": "Értesítések", "no_notifs": "Nincs új értesítés", - "see_all": "Összes értesítés megtekintése", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Vissza - %1", "outgoing_link": "Külső Link", diff --git a/public/language/hu/pages.json b/public/language/hu/pages.json index e628721286..f07ac7ba24 100644 --- a/public/language/hu/pages.json +++ b/public/language/hu/pages.json @@ -1,21 +1,37 @@ { "home": "Kezdőlap", "unread": "Olvasatlan témakörök", - "popular": "Népszerű Témák", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Friss Topikok", - "users": "Regisztrált Felhasználók", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Értesítések", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Szerkesztés \"%1\"", - "user.following": "Tagok akiket %1 követ", - "user.followers": "Tagok akik követik %1 -t", - "user.posts": "Hozzászólások által %1", - "user.topics": "%1 által létrehozott témák", - "user.groups": "%1's csoport", - "user.favourites": "%1 Kedvenc Hozzászólásai", - "user.settings": "Felhasználói Beállítások", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 jelenleg karbantartás alatt van. Kérlek nézz vissza késöbb!", "maintenance.messageIntro": "Ezenkívúl, az adminisztrátor ezt az üzenetet hagyta:" } \ No newline at end of file diff --git a/public/language/hu/user.json b/public/language/hu/user.json index 64f60f4a44..ceef9ff878 100644 --- a/public/language/hu/user.json +++ b/public/language/hu/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/id/global.json b/public/language/id/global.json index 338e358642..4feedbb21f 100644 --- a/public/language/id/global.json +++ b/public/language/id/global.json @@ -33,6 +33,7 @@ "header.notifications": "Pemberitahuan", "header.search": "Cari", "header.profile": "Profil", + "header.navigation": "Navigation", "notifications.loading": "Memuat Pemberitahuan", "chats.loading": "Memuat Chat", "motd.welcome": "Selamat datang di NodeBB, platform diskusi masa depan.", @@ -67,7 +68,7 @@ "recentposts": "Post Terbaru", "recentips": "Beberapa IP yang digunakan untuk login baru-baru ini", "away": "Tidak Ditempat", - "dnd": "Jangan ganggu", + "dnd": "Do not disturb", "invisible": "Tidak Terlihat", "offline": "Offline", "email": "Email", diff --git a/public/language/id/modules.json b/public/language/id/modules.json index 9c412d98fe..1b9672fb1b 100644 --- a/public/language/id/modules.json +++ b/public/language/id/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Kamu tidak memiliki percakapan yang aktif.", "chat.user_typing": "%1 sedang menulis ...", "chat.user_has_messaged_you": "%1 telah mengirimkan pesan untukmu.", - "chat.see_all": "Lihat seluruh Percakapan", + "chat.see_all": "See all chats", "chat.no-messages": "Mohon pilih satu penerima untuk melihat riwayat pesan percakapan", "chat.recent-chats": "Percakapan terbaru", "chat.contacts": "Kontak", @@ -22,5 +22,8 @@ "composer.user_said": "%1 berkata:", "composer.discard": "Kamu yakin akan membuang posting ini?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json index 84f8c41c85..6470fc7b7c 100644 --- a/public/language/id/notifications.json +++ b/public/language/id/notifications.json @@ -1,7 +1,7 @@ { "title": "Pemberitahuan", "no_notifs": "Kamu tidak memiliki pemberitahuan baru", - "see_all": "Lihat seluruh Pemberitahuan", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Kembali ke %1", "outgoing_link": "Tautan Keluar", diff --git a/public/language/id/pages.json b/public/language/id/pages.json index 43e2e94e40..8f6e76e299 100644 --- a/public/language/id/pages.json +++ b/public/language/id/pages.json @@ -1,21 +1,37 @@ { "home": "Beranda", "unread": "Topik belum Dibaca", - "popular": "Topik Populer", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Topik Terkini", - "users": "Pengguna Terdaftar", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Pemberitahuan", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Sedang merubah \"%1\"", - "user.following": "Mengikuti Pengguna %1", - "user.followers": "Pengguna yang mengikuti %1", - "user.posts": "Posting dibuat oleh %1", - "user.topics": "Topik dibuat oleh %1", - "user.groups": "%1's Groups", - "user.favourites": "Posting Favorit %1", - "user.settings": "Pengaturan Pengguna", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 saat ini sedang dalam masa pemeliharaan. Silahkan kembali lain waktu.", "maintenance.messageIntro": "Tambahan, Administrator meninggalkan pesan ini:" } \ No newline at end of file diff --git a/public/language/id/user.json b/public/language/id/user.json index 6b942f25e5..f1aa290504 100644 --- a/public/language/id/user.json +++ b/public/language/id/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/it/global.json b/public/language/it/global.json index a015eb3476..320a7f9498 100644 --- a/public/language/it/global.json +++ b/public/language/it/global.json @@ -33,6 +33,7 @@ "header.notifications": "Notifiche", "header.search": "Cerca", "header.profile": "Profilo", + "header.navigation": "Navigation", "notifications.loading": "Caricamento delle Notifiche", "chats.loading": "Caricamento Messaggi", "motd.welcome": "Benvenuti in NodeBB, la piattaforma di discussione del futuro.", @@ -67,7 +68,7 @@ "recentposts": "Post Recenti", "recentips": "Indirizzi IP Recentemente Loggati", "away": "Non disponibile", - "dnd": "Non disturbare", + "dnd": "Do not disturb", "invisible": "Invisibile", "offline": "Non in linea", "email": "Email", diff --git a/public/language/it/modules.json b/public/language/it/modules.json index 4b9c4905c1..a9ca9051a0 100644 --- a/public/language/it/modules.json +++ b/public/language/it/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Non hai chat attive.", "chat.user_typing": "%1 sta scrivendo...", "chat.user_has_messaged_you": "%1 ti ha scritto.", - "chat.see_all": "Vedi tutte le Chat", + "chat.see_all": "See all chats", "chat.no-messages": "Si prega di selezionare un destinatario per vedere la cronologia dei messaggi", "chat.recent-chats": "Chat Recenti", "chat.contacts": "Contatti", @@ -22,5 +22,8 @@ "composer.user_said": "%1 ha detto:", "composer.discard": "Sei sicuro di voler scartare questo post?", "composer.submit_and_lock": "Invia e Blocca", - "composer.toggle_dropdown": "Mostra/Nascondi menu a discesa" + "composer.toggle_dropdown": "Mostra/Nascondi menu a discesa", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index 7e40b19b11..b6052d0e92 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -1,7 +1,7 @@ { "title": "Notifiche", "no_notifs": "Non hai nuove notifiche", - "see_all": "Vedi tutte le Notifiche", + "see_all": "See all notifications", "mark_all_read": "Segna tutte le notifiche come già lette", "back_to_home": "Indietro a %1", "outgoing_link": "Link in uscita", diff --git a/public/language/it/pages.json b/public/language/it/pages.json index 31c72ce45b..210feb51fb 100644 --- a/public/language/it/pages.json +++ b/public/language/it/pages.json @@ -1,21 +1,37 @@ { "home": "Home", "unread": "Discussioni non lette", - "popular": "Discussioni Popolari", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Discussioni Recenti", - "users": "Utenti Registrati", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notifiche", "tags": "Tags", "tag": "Discussioni taggate \"%1\"", - "user.edit": "Modificando \"%1\"", - "user.following": "Persone seguite da %1", - "user.followers": "Persone che seguono %1", - "user.posts": "Post creati da %1", - "user.topics": "Discussioni create da %1", - "user.groups": "%1's Gruppi", - "user.favourites": "Post Favoriti da %1", - "user.settings": "Impostazioni Utente", - "user.watched": "Argomenti osservati da %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 è attualmente in manutenzione. Per favore ritorna più tardi.", "maintenance.messageIntro": "Inoltre, l'amministratore ha lasciato questo messaggio:" } \ No newline at end of file diff --git a/public/language/it/user.json b/public/language/it/user.json index f4e1a869d7..efdfafa7fe 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Segui le discussioni a cui hai risposto", "follow_topics_you_create": "Segui le discussioni che hai iniziato", "grouptitle": "Seleziona il titolo del gruppo che vorresti vedere", - "no-group-title": "Nessun titolo al gruppo" + "no-group-title": "Nessun titolo al gruppo", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/ja/global.json b/public/language/ja/global.json index 043bbbee5a..bc59718a7d 100644 --- a/public/language/ja/global.json +++ b/public/language/ja/global.json @@ -33,6 +33,7 @@ "header.notifications": "通知", "header.search": "検索", "header.profile": "プロフィール", + "header.navigation": "Navigation", "notifications.loading": "通知をロード中", "chats.loading": "チャットをロード中", "motd.welcome": "次世代の掲示板システム NodeBB へようこそ！", @@ -67,7 +68,7 @@ "recentposts": "最近のポスト", "recentips": "最近ログインしたIPアドレス", "away": "不在", - "dnd": "仕事中", + "dnd": "Do not disturb", "invisible": "不可視", "offline": "オフライン", "email": "メール", diff --git a/public/language/ja/modules.json b/public/language/ja/modules.json index 57daaef1c1..b8e51f3cb3 100644 --- a/public/language/ja/modules.json +++ b/public/language/ja/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "チャットはありません。", "chat.user_typing": "%1 は入力中 ...", "chat.user_has_messaged_you": "%1 has messaged you.", - "chat.see_all": "See all Chats", + "chat.see_all": "See all chats", "chat.no-messages": "Please select a recipient to view chat message history", "chat.recent-chats": "Recent Chats", "chat.contacts": "Contacts", @@ -22,5 +22,8 @@ "composer.user_said": "%1 said:", "composer.discard": "Are you sure you wish to discard this post?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json index 0569e4cf80..69a49aee20 100644 --- a/public/language/ja/notifications.json +++ b/public/language/ja/notifications.json @@ -1,7 +1,7 @@ { "title": "通知センター", "no_notifs": "新しい通知はありません", - "see_all": "すべての通知を確認", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "外部サイトへのリンク", diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json index 581b33a33d..600ca51a2e 100644 --- a/public/language/ja/pages.json +++ b/public/language/ja/pages.json @@ -1,21 +1,37 @@ { "home": "ホーム", "unread": "未読スレッド", - "popular": "人気スレッド", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "最新スレッド", - "users": "登録したユーザー", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "通知", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "編集中 \"%1\"", - "user.following": "%1がフォロー中", - "user.followers": "%1のフォロワー", - "user.posts": "%1が作成したポスト", - "user.topics": "%1が作成したスレッド", - "user.groups": "%1's Groups", - "user.favourites": "%1のお気に入りポスト", - "user.settings": "ユーザー設定", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", "maintenance.messageIntro": "Additionally, the administrator has left this message:" } \ No newline at end of file diff --git a/public/language/ja/user.json b/public/language/ja/user.json index 5100ffaaae..14b547545e 100644 --- a/public/language/ja/user.json +++ b/public/language/ja/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/ko/global.json b/public/language/ko/global.json index 8b3c19e634..6da57ffe9a 100644 --- a/public/language/ko/global.json +++ b/public/language/ko/global.json @@ -33,6 +33,7 @@ "header.notifications": "알림", "header.search": "검색", "header.profile": "프로필", + "header.navigation": "Navigation", "notifications.loading": "알림을 로딩중입니다.", "chats.loading": "채팅을 로딩중입니다.", "motd.welcome": "NodeBB에 오신 것을 환경합니다.", @@ -67,7 +68,7 @@ "recentposts": "최근 게시물", "recentips": "최근 로그인 IP", "away": "자리 비움", - "dnd": "다른 용무 중", + "dnd": "Do not disturb", "invisible": "오프라인으로 표시", "offline": "오프라인", "email": "이메일", diff --git a/public/language/ko/modules.json b/public/language/ko/modules.json index 5b25ee1201..2dda7bd187 100644 --- a/public/language/ko/modules.json +++ b/public/language/ko/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "활성화된 채팅이 없습니다.", "chat.user_typing": "%1님이 입력 중입니다.", "chat.user_has_messaged_you": "%1님이 메시지를 보냈습니다.", - "chat.see_all": "모든 대화 기록 보기", + "chat.see_all": "See all chats", "chat.no-messages": "대화 기록을 보려면 대화 상대를 선택하세요.", "chat.recent-chats": "최근 대화 내용", "chat.contacts": "연락처", @@ -22,5 +22,8 @@ "composer.user_said": "%1님의 말:", "composer.discard": "이 게시물을 지우겠습니까?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json index c65552e3fb..e50a24c363 100644 --- a/public/language/ko/notifications.json +++ b/public/language/ko/notifications.json @@ -1,7 +1,7 @@ { "title": "알림", "no_notifs": "새 알림이 없습니다.", - "see_all": "모든 알림 보기", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "%1로 돌아가기", "outgoing_link": "외부 링크", diff --git a/public/language/ko/pages.json b/public/language/ko/pages.json index d3197be70b..8824780e40 100644 --- a/public/language/ko/pages.json +++ b/public/language/ko/pages.json @@ -1,21 +1,37 @@ { "home": "홈", "unread": "읽지 않은 주제", - "popular": "인기 주제", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "최근 주제", - "users": "사용자", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "알림", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "%1님의 프로필 수정", - "user.following": "%1님이 팔로우하는 사용자", - "user.followers": "%1님을 팔로우하는 사용자", - "user.posts": "%1님이 작성한 게시물", - "user.topics": "%1님이 생성한 주제", - "user.groups": "%1's Groups", - "user.favourites": "%1님이 좋아하는 게시물", - "user.settings": "설정", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 사이트는 현재 점검 중입니다. 나중에 다시 방문해주세요.", "maintenance.messageIntro": "다음은 관리자가 전하는 메시지입니다." } \ No newline at end of file diff --git a/public/language/ko/user.json b/public/language/ko/user.json index 7d34664421..7f55b2c15b 100644 --- a/public/language/ko/user.json +++ b/public/language/ko/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/lt/global.json b/public/language/lt/global.json index f320a7c376..a926f4dcae 100644 --- a/public/language/lt/global.json +++ b/public/language/lt/global.json @@ -33,6 +33,7 @@ "header.notifications": "Pranešimai", "header.search": "Ieškoti", "header.profile": "Profilis", + "header.navigation": "Navigation", "notifications.loading": "Įkeliami pranešimai", "chats.loading": "Įkeliami susirašinėjimai", "motd.welcome": "Sveiki atvykę į NodeBB- ateities diskusijų platformą.", @@ -67,7 +68,7 @@ "recentposts": "Paskutiniai pranešimai", "recentips": "Paskutiniai prisijungimų IP adresai", "away": "Pasišalinęs", - "dnd": "Netrukdyti", + "dnd": "Do not disturb", "invisible": "Nematomas", "offline": "Atsijungęs", "email": "El. paštas", diff --git a/public/language/lt/modules.json b/public/language/lt/modules.json index 17e2994996..96f7ee6649 100644 --- a/public/language/lt/modules.json +++ b/public/language/lt/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Jūs neturite aktyvių susirašinėjimų.", "chat.user_typing": "%1 dabar rašo...", "chat.user_has_messaged_you": "%1 parašė jums.", - "chat.see_all": "Žiūrėti visus susirašynėjimus", + "chat.see_all": "See all chats", "chat.no-messages": "Prašome pasirikti gavėją, norėdami peržiūrėti žinučių istoriją", "chat.recent-chats": "Paskutiniai susirašinėjimai", "chat.contacts": "Kontaktai", @@ -22,5 +22,8 @@ "composer.user_said": "%1 parašė:", "composer.discard": "Ar tikrai norite sunaikinti šį pranešimą?", "composer.submit_and_lock": "Pateikti ir užrakinti", - "composer.toggle_dropdown": "Perjungti Nukritimą" + "composer.toggle_dropdown": "Perjungti Nukritimą", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json index 9da122b4e0..d4a5855d8a 100644 --- a/public/language/lt/notifications.json +++ b/public/language/lt/notifications.json @@ -1,7 +1,7 @@ { "title": "Pranešimai", "no_notifs": "Jūs neturite naujų pranešimų", - "see_all": "Peržiūrėti visus pranešimus", + "see_all": "See all notifications", "mark_all_read": "Žymėti visus perspėjimus kaip skaitytus", "back_to_home": "Atgal į %1", "outgoing_link": "Išeinanti nuoroda", diff --git a/public/language/lt/pages.json b/public/language/lt/pages.json index 067b94197f..bd41a09b65 100644 --- a/public/language/lt/pages.json +++ b/public/language/lt/pages.json @@ -1,21 +1,37 @@ { "home": "Namai", "unread": "Neskaitytos temos", - "popular": "Populiarios temos", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Paskutinės temos", - "users": "Registruoti vartotojai", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Pranešimai", "tags": "Žymos", "tag": "Temos su šia žymą \"%1\"", - "user.edit": "Redaguojama \"%1\"", - "user.following": "Vartotojas %1 seka", - "user.followers": "Žmonės, kurie seka %1", - "user.posts": "Pranešimai, kuriuos parašė %1", - "user.topics": "Temos, kurias sukūrė %1", - "user.groups": "%1's grupės", - "user.favourites": "Vartotojo %1 mėgstami pranešimai", - "user.settings": "Vartotojo nustatymai", - "user.watched": "Temos stebimos %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 dabar atnaujinimo darbuose. Prašome grįžti vėliau", "maintenance.messageIntro": "Be to, administratorius paliko šį pranešimą:" } \ No newline at end of file diff --git a/public/language/lt/user.json b/public/language/lt/user.json index b4bae70ee4..3d57aa0174 100644 --- a/public/language/lt/user.json +++ b/public/language/lt/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Sekti tas temas kur atrašai tu", "follow_topics_you_create": "Sekti tas temas kurias sukuri tu", "grouptitle": "Pasirinkite grupės pavadinimą kurį norėtumėte kad atvaizduotu", - "no-group-title": "Nėra grupės pavadinimo" + "no-group-title": "Nėra grupės pavadinimo", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/ms/global.json b/public/language/ms/global.json index c15415dc99..e80418651a 100644 --- a/public/language/ms/global.json +++ b/public/language/ms/global.json @@ -33,6 +33,7 @@ "header.notifications": "Pemberitahuan", "header.search": "Cari", "header.profile": "Profil", + "header.navigation": "Navigation", "notifications.loading": "Pemberitahuan sedang dimuatkan", "chats.loading": "Sembang sedang dimuatkan", "motd.welcome": "Selamat datang ke NodeBB, platfom perbincangan masa hadapan", @@ -67,7 +68,7 @@ "recentposts": "Kiriman terkini", "recentips": "IP berdaftar terkini", "away": "Jauh", - "dnd": "Jangan ganggu", + "dnd": "Do not disturb", "invisible": "Halimunan", "offline": "Luar talian", "email": "Emel", diff --git a/public/language/ms/modules.json b/public/language/ms/modules.json index a284cae6fe..c6963b6f73 100644 --- a/public/language/ms/modules.json +++ b/public/language/ms/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Anda tiada pesanan yang aktif", "chat.user_typing": "%1 menaip", "chat.user_has_messaged_you": "%1 mesej anda.", - "chat.see_all": "Lihat semua Sembang", + "chat.see_all": "See all chats", "chat.no-messages": "Sila pilih penerima untuk lihat sejarah sembang", "chat.recent-chats": "Sembang Terbaru", "chat.contacts": "Hubungi", @@ -22,5 +22,8 @@ "composer.user_said": "%1 berkata:", "composer.discard": "Anda yakin untuk membuang kiriman ini?", "composer.submit_and_lock": "Hantar dan Kunci", - "composer.toggle_dropdown": "Togol Kebawah" + "composer.toggle_dropdown": "Togol Kebawah", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json index d020f54afa..59c17ca8ab 100644 --- a/public/language/ms/notifications.json +++ b/public/language/ms/notifications.json @@ -1,7 +1,7 @@ { "title": "pemberitahuan", "no_notifs": "Anda tiada pemberitahuan baru", - "see_all": "Lihat semua pemberitahuan", + "see_all": "See all notifications", "mark_all_read": "Tandakan semua pemberitahuan sudah dibaca", "back_to_home": "Kembali ke %1", "outgoing_link": "Sambungan luar", diff --git a/public/language/ms/pages.json b/public/language/ms/pages.json index 07d202fb98..b2b47cb1e2 100644 --- a/public/language/ms/pages.json +++ b/public/language/ms/pages.json @@ -1,21 +1,37 @@ { "home": "Laman Utama", "unread": "Topik Belum Dibaca", - "popular": "Topik popular", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Topik Baru", - "users": "Pengguna Berdaftar", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Makluman", "tags": "Tag", "tag": "Topik ditag di bawwah \"%1\"", - "user.edit": "Menyunting \"%1\"", - "user.following": "Pengguna yang %1 diikuti", - "user.followers": "Pengguna yang Mengikut %1", - "user.posts": "Kiriman dibuat oleh %1", - "user.topics": "Topik dibuat oleh %1", - "user.groups": "Kumpulan-kumpulan %1", - "user.favourites": "Mesej Kegemaran %1", - "user.settings": "Tetapan Pengguna", - "user.watched": "Topik yand dilihat oleh %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 sedang berada dalam mod pembaikpulihan. Sila cuba lagi nanti.", "maintenance.messageIntro": "Tambahan, admin meninggalkan mesej ini :" } \ No newline at end of file diff --git a/public/language/ms/user.json b/public/language/ms/user.json index 66fb7492e8..2fa7ba79af 100644 --- a/public/language/ms/user.json +++ b/public/language/ms/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Ikut topik yang anda balas", "follow_topics_you_create": "Ikut topik yang anda buat", "grouptitle": "Pilih nama kumpulan yang anda ingin tunjukkan", - "no-group-title": "Tiada nama kumpulan" + "no-group-title": "Tiada nama kumpulan", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/nb/global.json b/public/language/nb/global.json index 6c5ea5e019..2a949c7365 100644 --- a/public/language/nb/global.json +++ b/public/language/nb/global.json @@ -33,6 +33,7 @@ "header.notifications": "Varsler", "header.search": "Søk", "header.profile": "Profil", + "header.navigation": "Navigation", "notifications.loading": "Laster varsler", "chats.loading": "Laster chatter", "motd.welcome": "Velkommen til NodeBB, fremtidens diskusjonsplatform.", @@ -67,7 +68,7 @@ "recentposts": "Seneste innlegg", "recentips": "Seneste innloggede IP-er", "away": "Borte", - "dnd": "Ikke forstyrr", + "dnd": "Do not disturb", "invisible": "Usynlig", "offline": "Offline", "email": "E-post", diff --git a/public/language/nb/modules.json b/public/language/nb/modules.json index e85add6129..4843077af8 100644 --- a/public/language/nb/modules.json +++ b/public/language/nb/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Du har ingen aktive chatter.", "chat.user_typing": "%1 skriver ...", "chat.user_has_messaged_you": "%1 har sendt deg en melding", - "chat.see_all": "Se alle chatter", + "chat.see_all": "See all chats", "chat.no-messages": "Vennligst velg en mottaker for å vise chatte-melding historikk", "chat.recent-chats": "Nylige chatter", "chat.contacts": "Kontakter", @@ -22,5 +22,8 @@ "composer.user_said": "%1 sa: ", "composer.discard": "Er du sikker på at du vil forkaste dette innlegget?", "composer.submit_and_lock": "Send og lås", - "composer.toggle_dropdown": "Veksle nedtrekksfelt" + "composer.toggle_dropdown": "Veksle nedtrekksfelt", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index 5c58b3d7f5..c182f8f7b9 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -1,7 +1,7 @@ { "title": "Varsler", "no_notifs": "Du har ingen nye varsler", - "see_all": "Se alle varsler", + "see_all": "See all notifications", "mark_all_read": "Merk alle varsler som lest", "back_to_home": "Tilbake til %1", "outgoing_link": "Utgående link", diff --git a/public/language/nb/pages.json b/public/language/nb/pages.json index 6f0ab862c4..da0fe0860d 100644 --- a/public/language/nb/pages.json +++ b/public/language/nb/pages.json @@ -1,21 +1,37 @@ { "home": "Hjem", "unread": "Uleste emner", - "popular": "Populære emner", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Seneste emner", - "users": "Registrerte brukere", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Varsler", "tags": "Tagger", "tag": "Emner tagget under \"%1\"", - "user.edit": "Endrer \"%1\"", - "user.following": "Personer %1 følger", - "user.followers": "Personer som følger %1", - "user.posts": "Innlegg laget av %1", - "user.topics": "Emner opprettet av %1", - "user.groups": "%1 sine grupper", - "user.favourites": "%1 sine favoritt-innlegg", - "user.settings": "Brukerinnstillinger", - "user.watched": "Innlegg overvåket av %|1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 er for tiden under vedlikehold. Kom tilbake en annen gang.", "maintenance.messageIntro": "I tillegg har administratoren skrevet denne meldingen:" } \ No newline at end of file diff --git a/public/language/nb/user.json b/public/language/nb/user.json index 983ed4ebb3..4d56c93279 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Følg emner du besvarer", "follow_topics_you_create": "Følg emner du oppretter", "grouptitle": "Velg gruppetittelen du vil vise", - "no-group-title": "Ingen gruppetittel" + "no-group-title": "Ingen gruppetittel", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/nl/global.json b/public/language/nl/global.json index 336be3a677..8cdd5286e3 100644 --- a/public/language/nl/global.json +++ b/public/language/nl/global.json @@ -33,6 +33,7 @@ "header.notifications": "Notificaties", "header.search": "Zoeken", "header.profile": "Profiel", + "header.navigation": "Navigation", "notifications.loading": "Notificaties laden", "chats.loading": "Chats laden", "motd.welcome": "Welkom bij NodeBB, het discussie platform van de toekomst.", @@ -67,7 +68,7 @@ "recentposts": "Recente berichten", "recentips": "IP-adressen van recente gebruikers", "away": "Afwezig", - "dnd": "Niet storen", + "dnd": "Do not disturb", "invisible": "Onzichtbaar", "offline": "Offline", "email": "E-mailadres", diff --git a/public/language/nl/modules.json b/public/language/nl/modules.json index 26f89112ba..538c5c9436 100644 --- a/public/language/nl/modules.json +++ b/public/language/nl/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Er zijn geen actieve chats.", "chat.user_typing": "%1 is aan het typen ...", "chat.user_has_messaged_you": "%1 heeft een bericht gestuurd", - "chat.see_all": "Bekijk alle gesprekken", + "chat.see_all": "See all chats", "chat.no-messages": "Selecteer een ontvanger om de chatgeschiedenis in te zien", "chat.recent-chats": "Recent gevoerde gesprekken", "chat.contacts": "Contacten", @@ -22,5 +22,8 @@ "composer.user_said": "%1 zegt:", "composer.discard": "Bericht plaatsen annuleren?", "composer.submit_and_lock": "Plaats een bericht en vergrendel direct het onderwerp", - "composer.toggle_dropdown": "Keuzelijst schakelen" + "composer.toggle_dropdown": "Keuzelijst schakelen", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json index f813085261..a53316b83e 100644 --- a/public/language/nl/notifications.json +++ b/public/language/nl/notifications.json @@ -1,7 +1,7 @@ { "title": "Notificaties", "no_notifs": "Je hebt geen nieuwe notificaties", - "see_all": "Bekijk alle notificaties", + "see_all": "See all notifications", "mark_all_read": "Markeer alles als gelezen", "back_to_home": "Terug naar %1", "outgoing_link": "Uitgaande Link", diff --git a/public/language/nl/pages.json b/public/language/nl/pages.json index d4ac82cc54..bc944d347e 100644 --- a/public/language/nl/pages.json +++ b/public/language/nl/pages.json @@ -1,21 +1,37 @@ { "home": "Home", "unread": "Ongelezen onderwerpen", - "popular": "Populaire onderwerpen", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Recente onderwerpen", - "users": "Geregistreerde gebruikers", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notificaties", "tags": "Tags", "tag": "Onderwerpen geplaatst onder \"%1\"", - "user.edit": "\"%1\" aanpassen", - "user.following": "Door %1 gevolgd", - "user.followers": "Die %1 volgen", - "user.posts": "Berichten geplaatst door %1", - "user.topics": "Onderwerpen begonnen door %1", - "user.groups": "%1's groepen", - "user.favourites": "Favoriete berichten van %1", - "user.settings": "Gebruikersinstellingen", - "user.watched": "Berichten die door %1 bekeken worden", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 is momenteel in onderhoud. Excuses voor het ongemak en probeer het later nog eens", "maintenance.messageIntro": "Daarnaast heeft de beheerder het volgende bericht achtergelaten:" } \ No newline at end of file diff --git a/public/language/nl/user.json b/public/language/nl/user.json index 60b7a9b279..343498373a 100644 --- a/public/language/nl/user.json +++ b/public/language/nl/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Volg de onderwerpen waarop ik gereageerd heb", "follow_topics_you_create": "Volg de onderwerpen waarvan ik de oorspronkelijke auteur ben", "grouptitle": "Selecteer de groepstitel voor weergave", - "no-group-title": "Geen groepstitel" + "no-group-title": "Geen groepstitel", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/pl/global.json b/public/language/pl/global.json index 7200671fce..111e816d1c 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -33,6 +33,7 @@ "header.notifications": "Powiadomienia", "header.search": "Szukaj", "header.profile": "Profil", + "header.navigation": "Navigation", "notifications.loading": "Ładowanie powiadomień", "chats.loading": "Ładowanie rozmów", "motd.welcome": "Witaj w NodeBB, platformie dyskusyjnej przyszłości.", @@ -67,7 +68,7 @@ "recentposts": "Ostatnie posty", "recentips": "Adresy IP ostatnich logowań", "away": "Z dala", - "dnd": "Nie przeszkadzać", + "dnd": "Do not disturb", "invisible": "Niewidoczny", "offline": "Niedostępny", "email": "Adres e-mail", diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json index f4df7edb9c..5df92f16bd 100644 --- a/public/language/pl/modules.json +++ b/public/language/pl/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Nie prowadzisz obecnie żadnych rozmów.", "chat.user_typing": "%1 pisze...", "chat.user_has_messaged_you": "%1 napisał do Ciebie", - "chat.see_all": "Pokaż wszystkie rozmowy", + "chat.see_all": "See all chats", "chat.no-messages": "Wybierz odbiorcę, by wyświetlić historię rozmów.", "chat.recent-chats": "Ostatnie rozmowy", "chat.contacts": "Kontakty", @@ -22,5 +22,8 @@ "composer.user_said": "%1 powiedział:", "composer.discard": "Na pewno chcesz porzucić ten post?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json index 789a871d02..5bbf449b4d 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -1,7 +1,7 @@ { "title": "Powiadomienia", "no_notifs": "Nie masz nowych powiadomień", - "see_all": "Zobacz wszystkie powiadomienia", + "see_all": "See all notifications", "mark_all_read": "Oznacz wszystkie powiadomienia jako przeczytane", "back_to_home": "Wróć do %1", "outgoing_link": "Łącze wychodzące", diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json index c566406d1a..e1f58fccd9 100644 --- a/public/language/pl/pages.json +++ b/public/language/pl/pages.json @@ -1,21 +1,37 @@ { "home": "Strona główna", "unread": "Nieprzeczytane wątki", - "popular": "Popularne wątki", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Ostatnie wątki", - "users": "Zarejestrowani użytkownicy", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Powiadomienia", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Edytowanie \"%1\"", - "user.following": "Obserwowani przez %1", - "user.followers": "Obserwujący %1", - "user.posts": "Posty napisane przez %1", - "user.topics": "Wątki stworzone przez %1", - "user.groups": "Grupy %1", - "user.favourites": "Ulubione posty %1", - "user.settings": "Ustawienia użytkownika", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "Obecnie trwają prace konserwacyjne nad %1. Proszę wrócić później.", "maintenance.messageIntro": "Dodatkowo, administrator zostawił wiadomość:" } \ No newline at end of file diff --git a/public/language/pl/user.json b/public/language/pl/user.json index af5cebafa6..c586b46b3e 100644 --- a/public/language/pl/user.json +++ b/public/language/pl/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/pt_BR/global.json b/public/language/pt_BR/global.json index 75285bba9a..986fd7344b 100644 --- a/public/language/pt_BR/global.json +++ b/public/language/pt_BR/global.json @@ -33,6 +33,7 @@ "header.notifications": "Notificações", "header.search": "Procurar", "header.profile": "Perfil", + "header.navigation": "Navigation", "notifications.loading": "Carregando Notificações", "chats.loading": "Carregando Chats", "motd.welcome": "Seja bem-vindo ao NodeBB, a plataforma de discussão do futuro.", @@ -67,7 +68,7 @@ "recentposts": "Posts Recentes", "recentips": "Recentemente Logado nos IPs", "away": "Ausente", - "dnd": "Não Perturbe", + "dnd": "Do not disturb", "invisible": "Invisível", "offline": "Offline", "email": "Email", diff --git a/public/language/pt_BR/modules.json b/public/language/pt_BR/modules.json index 734a60af2a..f9a8e4141e 100644 --- a/public/language/pt_BR/modules.json +++ b/public/language/pt_BR/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Você não tem chats ativos.", "chat.user_typing": "%1 está digitando ...", "chat.user_has_messaged_you": "%1 te enviou uma mensagem.", - "chat.see_all": "Vizualisar todos os Chats", + "chat.see_all": "See all chats", "chat.no-messages": "Por favor, escolha um destinatário para visualizar o histórico de conversas", "chat.recent-chats": "Conversas Recentes", "chat.contacts": "Contatos", @@ -22,5 +22,8 @@ "composer.user_said": "%1 disse:", "composer.discard": "Tem certeza que deseja descartar essa postagem?", "composer.submit_and_lock": "Envie e Tranque", - "composer.toggle_dropdown": "Alternar Dropdown" + "composer.toggle_dropdown": "Alternar Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/pt_BR/notifications.json b/public/language/pt_BR/notifications.json index 15c756b7dd..f25f1c2ead 100644 --- a/public/language/pt_BR/notifications.json +++ b/public/language/pt_BR/notifications.json @@ -1,7 +1,7 @@ { "title": "Notificações", "no_notifs": "Você não tem nenhuma notificação nova", - "see_all": "Ver todas as Notificações", + "see_all": "See all notifications", "mark_all_read": "Marcas todas as notificações como lidas", "back_to_home": "Voltar para %1", "outgoing_link": "Link Externo", diff --git a/public/language/pt_BR/pages.json b/public/language/pt_BR/pages.json index 5edce3eaac..abb3bd3883 100644 --- a/public/language/pt_BR/pages.json +++ b/public/language/pt_BR/pages.json @@ -1,21 +1,37 @@ { "home": "Home", "unread": "Tópicos Não Lidos", - "popular": "Tópicos Populares", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Tópicos Recentes", - "users": "Usuários Registrados", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notificações", "tags": "Tags", "tag": "Tópicos com a tag \"%1\"", - "user.edit": "Editando \"%1\"", - "user.following": "Pessoas que %1 Segue", - "user.followers": "Pessoas que Seguem %1", - "user.posts": "Posts feitos por %1", - "user.topics": "Tópicos criados por %1", - "user.groups": "%1's Grupos", - "user.favourites": "Posts Favoritos de %1", - "user.settings": "Configurações de Usuário", - "user.watched": "Topicos acompanhados por %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 está atualmente sob manutenção. Por favor retorne em outro momento.", "maintenance.messageIntro": "Adicionalmente, o administrador deixou esta mensagem:" } \ No newline at end of file diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json index 5c5cdef3e4..1fa01c1d60 100644 --- a/public/language/pt_BR/user.json +++ b/public/language/pt_BR/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Seguir tópicos que você responde", "follow_topics_you_create": "Seguir tópicos que você cria", "grouptitle": "Escolha o título do grupo que você deseja exibir", - "no-group-title": "Sem título de grupo" + "no-group-title": "Sem título de grupo", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/ro/global.json b/public/language/ro/global.json index a7557ad111..a9e6aac6c3 100644 --- a/public/language/ro/global.json +++ b/public/language/ro/global.json @@ -33,6 +33,7 @@ "header.notifications": "Notificări", "header.search": "Căutare", "header.profile": "Profil", + "header.navigation": "Navigation", "notifications.loading": "Se încarcă notificările", "chats.loading": "Se încarcă conversațiile", "motd.welcome": "Bine ai venit la NodeBB, platforma de discuții a viitorului.", @@ -67,7 +68,7 @@ "recentposts": "Mesaje Recente", "recentips": "Adrese IP autentificate recent", "away": "Plecat", - "dnd": "Nu mă deranja", + "dnd": "Do not disturb", "invisible": "Invizibil", "offline": "Deconectat", "email": "Email", diff --git a/public/language/ro/modules.json b/public/language/ro/modules.json index fcba85c55e..d4669de6b5 100644 --- a/public/language/ro/modules.json +++ b/public/language/ro/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Nu ai nici o conversație activă", "chat.user_typing": "%1 scrie ...", "chat.user_has_messaged_you": "%1 ți-a trimis un mesaj.", - "chat.see_all": "Vezi toate conversațiile", + "chat.see_all": "See all chats", "chat.no-messages": "Selectează un recipient pentru a vedea istoria mesajelor chat", "chat.recent-chats": "Conversații Recente", "chat.contacts": "Contacte", @@ -22,5 +22,8 @@ "composer.user_said": "%1 a spus:", "composer.discard": "Ești sigur că vrei să renunți la acest mesaj?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json index d98258e2c0..ff4aa6f796 100644 --- a/public/language/ro/notifications.json +++ b/public/language/ro/notifications.json @@ -1,7 +1,7 @@ { "title": "Notificări", "no_notifs": "Nu ai nici o notificare recentă", - "see_all": "Vezi toate notificările", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Înapoi la %1", "outgoing_link": "Link Extern", diff --git a/public/language/ro/pages.json b/public/language/ro/pages.json index a90cdc9d1a..92a64c7298 100644 --- a/public/language/ro/pages.json +++ b/public/language/ro/pages.json @@ -1,21 +1,37 @@ { "home": "Acasă", "unread": "Subiecte Necitite", - "popular": "Subiecte Populare", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Subiecte Noi", - "users": "Utilizatori înregistrați", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notificări", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Editează \"%1\"", - "user.following": "Utilizatori urmăriți de %1", - "user.followers": "Utilizatori care îl urmăresc pe %1", - "user.posts": "Mesaje postate de %1", - "user.topics": "Subiecte create de %1", - "user.groups": "%1's Groups", - "user.favourites": "Mesajele favorite ale lui %1", - "user.settings": "Setări Utilizator", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 este momentan în mentenanță. Întoarce-te în curând!", "maintenance.messageIntro": "Additionally, the administrator has left this message:" } \ No newline at end of file diff --git a/public/language/ro/user.json b/public/language/ro/user.json index e923453024..e44b727ea8 100644 --- a/public/language/ro/user.json +++ b/public/language/ro/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/ru/global.json b/public/language/ru/global.json index 7901c29219..1eb18ea2e3 100644 --- a/public/language/ru/global.json +++ b/public/language/ru/global.json @@ -33,6 +33,7 @@ "header.notifications": "Уведомления", "header.search": "Поиск", "header.profile": "Профиль", + "header.navigation": "Navigation", "notifications.loading": "Загружаем уведомления", "chats.loading": "Загружаем чаты", "motd.welcome": "Добро пожаловать в NodeBB, платформу будущего для общения.", @@ -67,7 +68,7 @@ "recentposts": "Свежие записи", "recentips": "Последние IP-адреса, с которых был осуществлен вход", "away": "Отсутствует", - "dnd": "Не беспокоить", + "dnd": "Do not disturb", "invisible": "Невидимый", "offline": "Не в сети", "email": "Email", diff --git a/public/language/ru/modules.json b/public/language/ru/modules.json index ec246f2652..a41aefadf4 100644 --- a/public/language/ru/modules.json +++ b/public/language/ru/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "У вас нет активных чатов.", "chat.user_typing": "%1 печатает ...", "chat.user_has_messaged_you": "%1 отправил вам сообщение.", - "chat.see_all": "Просмотр всех диалогов", + "chat.see_all": "See all chats", "chat.no-messages": "Пожалуйста, выберите собеседника для просмотра истории сообщений", "chat.recent-chats": "Последние переписки", "chat.contacts": "Контакты", @@ -22,5 +22,8 @@ "composer.user_said": "%1 сказал:", "composer.discard": "Вы уверены, что хотите отказаться от этого поста?", "composer.submit_and_lock": "Отправить и закрыть", - "composer.toggle_dropdown": "Показать выпадающий список" + "composer.toggle_dropdown": "Показать выпадающий список", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index c4a75a28b0..e1e54cda57 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -1,7 +1,7 @@ { "title": "Уведомления", "no_notifs": "Для Вас нет новых уведомлений", - "see_all": "Просмотреть все уведомления", + "see_all": "See all notifications", "mark_all_read": "Отметить все уведомления как прочитанные", "back_to_home": "Назад к %1", "outgoing_link": "Внешняя ссылка", diff --git a/public/language/ru/pages.json b/public/language/ru/pages.json index 7834c7951c..cf61dfdaa6 100644 --- a/public/language/ru/pages.json +++ b/public/language/ru/pages.json @@ -1,21 +1,37 @@ { "home": "Главная", "unread": "Непрочитанные темы", - "popular": "Популярные темы", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Последние темы", - "users": "Зарегистрированные пользователи", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Уведомления", "tags": "Теги", "tag": "Темы с тегом \"%1\"", - "user.edit": "Редактирование \"%1\"", - "user.following": "%1 читает", - "user.followers": "Читают %1", - "user.posts": "Пост написан %1", - "user.topics": "Темы созданы %1", - "user.groups": "Группы %1", - "user.favourites": "Избранные сообщения %1", - "user.settings": "Настройки", - "user.watched": "Темы смотрели %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 в настоящее время на обслуживании. Пожалуйста, возвращайтесь позже.", "maintenance.messageIntro": "Администратор оставил сообщение:" } \ No newline at end of file diff --git a/public/language/ru/user.json b/public/language/ru/user.json index 1f6a6fe20f..f6b9bf49e1 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Следить за темами в которых вы отвечаете", "follow_topics_you_create": "Следить за темами которые вы создаёте", "grouptitle": "Выберите бейдж группы для отображения", - "no-group-title": "Не показывать бейдж" + "no-group-title": "Не показывать бейдж", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/rw/global.json b/public/language/rw/global.json index fda0c9e222..2c5f421c16 100644 --- a/public/language/rw/global.json +++ b/public/language/rw/global.json @@ -33,6 +33,7 @@ "header.notifications": "Amatangazo", "header.search": "Shaka", "header.profile": "Ishusho", + "header.navigation": "Navigation", "notifications.loading": "Amatangazo Araje", "chats.loading": "Ubutumwa Buraje", "motd.welcome": "Urakaza neza kuri NodeBB, urubuga rujyanye n'ibihe bizaza", @@ -67,7 +68,7 @@ "recentposts": "Ibiherutseho", "recentips": "Aderesi za IP Ziheruka Gusura", "away": "Ahandi", - "dnd": "Nta Kubonana", + "dnd": "Do not disturb", "invisible": "Nta Kugaragara", "offline": "Nta Murongo", "email": "Email", diff --git a/public/language/rw/modules.json b/public/language/rw/modules.json index 401a21121c..f739592e11 100644 --- a/public/language/rw/modules.json +++ b/public/language/rw/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Nta biganiro byo mu gikari ufite. ", "chat.user_typing": "%1 ari kwandika ...", "chat.user_has_messaged_you": "%1 yagusigiye ubutumwa.", - "chat.see_all": "Reba Ubutumwa Bwose", + "chat.see_all": "See all chats", "chat.no-messages": "Hitamo umuntu ushaka kurebera ibyo mwandikiranye", "chat.recent-chats": "Ubutumwa Buheruka", "chat.contacts": "Abo Kuvugisha", @@ -22,5 +22,8 @@ "composer.user_said": "%1 yavuze:", "composer.discard": "Wiringiye neza ko ushaka kureka kubishyiraho?", "composer.submit_and_lock": "Shyiraho kandi Unafungirane", - "composer.toggle_dropdown": "Hindura Icyerekezo" + "composer.toggle_dropdown": "Hindura Icyerekezo", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/rw/notifications.json b/public/language/rw/notifications.json index e7cdb0a674..a75cdaa754 100644 --- a/public/language/rw/notifications.json +++ b/public/language/rw/notifications.json @@ -1,7 +1,7 @@ { "title": "Amatangazo", "no_notifs": "Nta matangazo mashya ufite", - "see_all": "Reba Amatangazo Yose", + "see_all": "See all notifications", "mark_all_read": "Garagaza amatangazo yose nk'ayasomwe", "back_to_home": "Subira kuri %1", "outgoing_link": "Umurongo Usohoka", diff --git a/public/language/rw/pages.json b/public/language/rw/pages.json index aa4a415f98..93df365b15 100644 --- a/public/language/rw/pages.json +++ b/public/language/rw/pages.json @@ -1,21 +1,37 @@ { "home": "Imbere", "unread": "Ibiganiro Bitarasomwa", - "popular": "Ibiganiro Bikunzwe", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Ibiganiro Biheruka", - "users": "Abantu Banditse", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Amatangazo", "tags": "Ibimenyetso", "tag": "Ibiganiro bifite ibimenyetso bya \"%1\"", - "user.edit": "Uguhinduraho kwa \"%1\"", - "user.following": "Abantu %1 Akurikira", - "user.followers": "Abantu Bakurikira %1", - "user.posts": "Ibyashyizweho na %1", - "user.topics": "Ibiganiro byatangijwe na %1", - "user.groups": "Amatsinda ya %1", - "user.favourites": "Ibyo %1 Yatonesheje", - "user.settings": "Ugutunganya", - "user.watched": "Ibiganiro bikurikirwa na %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 ntiboneka kuko ubu iri gutunganywa. Muze kongera kugaruka. ", "maintenance.messageIntro": "Byongeye, kandi, umuyobozi yasize ubu butumwa: " } \ No newline at end of file diff --git a/public/language/rw/user.json b/public/language/rw/user.json index 3deea4707a..d701769fc4 100644 --- a/public/language/rw/user.json +++ b/public/language/rw/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Kurikira ibiganiro ushyiraho ibisubizo", "follow_topics_you_create": "Kurikira ibiganiro uba watangije", "grouptitle": "Hitamo umutwe w'itsinda ushaka ko uzajya ugaragara", - "no-group-title": "Nta mutwe w'itsinda" + "no-group-title": "Nta mutwe w'itsinda", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/sc/global.json b/public/language/sc/global.json index 8017da2a06..cd721ec0db 100644 --- a/public/language/sc/global.json +++ b/public/language/sc/global.json @@ -33,6 +33,7 @@ "header.notifications": "Notìficas", "header.search": "Chirca", "header.profile": "Perfilu", + "header.navigation": "Navigation", "notifications.loading": "Carrighende Notìficas", "chats.loading": "Carrighende Tzarras", "motd.welcome": "Benebènnidu in NodeBB, sa prataforma de arresonos de su tempus benidore.", @@ -67,7 +68,7 @@ "recentposts": "Ùrtimos Arresonos", "recentips": "Ùrtimos IP Intrados", "away": "A tesu", - "dnd": "Non istrobbes", + "dnd": "Do not disturb", "invisible": "Invisìbile", "offline": "Non in lìnia", "email": "Email", diff --git a/public/language/sc/modules.json b/public/language/sc/modules.json index d22538edac..6a860a5edc 100644 --- a/public/language/sc/modules.json +++ b/public/language/sc/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Non tenes tzarras ativas.", "chat.user_typing": "%1 is typing ...", "chat.user_has_messaged_you": "%1 has messaged you.", - "chat.see_all": "See all Chats", + "chat.see_all": "See all chats", "chat.no-messages": "Please select a recipient to view chat message history", "chat.recent-chats": "Recent Chats", "chat.contacts": "Contacts", @@ -22,5 +22,8 @@ "composer.user_said": "%1 said:", "composer.discard": "Are you sure you wish to discard this post?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json index b65573fca1..c189956d8c 100644 --- a/public/language/sc/notifications.json +++ b/public/language/sc/notifications.json @@ -1,7 +1,7 @@ { "title": "Notìficas", "no_notifs": "Non tenes notìficas noas", - "see_all": "Càstia totus is Notìficas", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Acàpiu a Foras", diff --git a/public/language/sc/pages.json b/public/language/sc/pages.json index 96de17a0e8..eb74cfc49c 100644 --- a/public/language/sc/pages.json +++ b/public/language/sc/pages.json @@ -1,21 +1,37 @@ { "home": "Domo", "unread": "Arresonadas de Lèghere", - "popular": "Arresonadas Famadas", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Ùrtimas Arresonadas", - "users": "Impitadores Registrados", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notìficas", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Acontzende \"%1\"", - "user.following": "Gente chi %1 Sighit", - "user.followers": "Gente chi Sighit %1", - "user.posts": "Arresonos fatos dae %1", - "user.topics": "Topics created by %1", - "user.groups": "%1's Groups", - "user.favourites": "Arresonos Preferidos de %1", - "user.settings": "Sèberos de Impitadore", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", "maintenance.messageIntro": "Additionally, the administrator has left this message:" } \ No newline at end of file diff --git a/public/language/sc/user.json b/public/language/sc/user.json index 3137bbd954..c46910bbc8 100644 --- a/public/language/sc/user.json +++ b/public/language/sc/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/sk/global.json b/public/language/sk/global.json index b722a9567d..aa20fc8874 100644 --- a/public/language/sk/global.json +++ b/public/language/sk/global.json @@ -33,6 +33,7 @@ "header.notifications": "Notifikácie", "header.search": "Hľadať", "header.profile": "Moj profil", + "header.navigation": "Navigation", "notifications.loading": "Načítanie notifikácií", "chats.loading": "Načítanie grafov", "motd.welcome": "Vítajte na NodeBB, diskusná platforma budúcnosti.", @@ -67,7 +68,7 @@ "recentposts": "Posledné príspevky", "recentips": "Naposledy zaznamenané IP adresy", "away": "Preč", - "dnd": "Nevyrušovať", + "dnd": "Do not disturb", "invisible": "Neviditeľný", "offline": "Offline", "email": "Email", diff --git a/public/language/sk/modules.json b/public/language/sk/modules.json index f4ebca7595..614d067af6 100644 --- a/public/language/sk/modules.json +++ b/public/language/sk/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Nemáte žiadne aktívne konverzácie.", "chat.user_typing": "%1 práve píše ...", "chat.user_has_messaged_you": "%1 má pre Vás správu.", - "chat.see_all": "Pozri všetky rozhovory", + "chat.see_all": "See all chats", "chat.no-messages": "Please select a recipient to view chat message history", "chat.recent-chats": "Recent Chats", "chat.contacts": "Contacts", @@ -22,5 +22,8 @@ "composer.user_said": "%1 said:", "composer.discard": "Are you sure you wish to discard this post?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json index 26bb41cb32..639685922a 100644 --- a/public/language/sk/notifications.json +++ b/public/language/sk/notifications.json @@ -1,7 +1,7 @@ { "title": "Notifikácie", "no_notifs": "Nemáte žiadne nové notifikácie", - "see_all": "Pozri všetky notifikácie", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Odkaz mimo fórum", diff --git a/public/language/sk/pages.json b/public/language/sk/pages.json index 12bf4b817d..d6a5dfffba 100644 --- a/public/language/sk/pages.json +++ b/public/language/sk/pages.json @@ -1,21 +1,37 @@ { "home": "Home", "unread": "Neprečítané príspevky", - "popular": "Populárne Témy", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Najnovšie príspevky", - "users": "Prihlásení uživatelia", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notifikácie", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Uprav \"%1\"", - "user.following": "Užívatelia %1 následujú", - "user.followers": "Užívatelia následujúci %1", - "user.posts": "Príspevky od %1", - "user.topics": "Téma vytvorená %1\n", - "user.groups": "%1's Groups", - "user.favourites": "%1's obľubených príspevkov", - "user.settings": "Užívatelské nadstavenie", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", "maintenance.messageIntro": "Additionally, the administrator has left this message:" } \ No newline at end of file diff --git a/public/language/sk/user.json b/public/language/sk/user.json index 0133f70a97..1b09d21a94 100644 --- a/public/language/sk/user.json +++ b/public/language/sk/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/sr/global.json b/public/language/sr/global.json index 17aa370ea0..404843a075 100644 --- a/public/language/sr/global.json +++ b/public/language/sr/global.json @@ -33,6 +33,7 @@ "header.notifications": "Опавештења", "header.search": "Претрага", "header.profile": "Профил", + "header.navigation": "Navigation", "notifications.loading": "Учитавам обавештења", "chats.loading": "Учитавам ћаскања", "motd.welcome": "Добродошли на NodeBB, дискусиону платформу будућности.", @@ -67,7 +68,7 @@ "recentposts": "Скорашње теме", "recentips": "Недавно забележени ИП-ови", "away": "Одсутан", - "dnd": "Не узнемиравај", + "dnd": "Do not disturb", "invisible": "Невидљив", "offline": "Ван везе", "email": "Е-пошта", diff --git a/public/language/sr/modules.json b/public/language/sr/modules.json index f9c76f5b5f..cca3b1829f 100644 --- a/public/language/sr/modules.json +++ b/public/language/sr/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Немате активних ћаскања.", "chat.user_typing": "%1 куца ...", "chat.user_has_messaged_you": "%1 вам посла поруку.", - "chat.see_all": "Прикажи сва ћаскања", + "chat.see_all": "See all chats", "chat.no-messages": "Please select a recipient to view chat message history", "chat.recent-chats": "Недавна ћаскања", "chat.contacts": "Контакти", @@ -22,5 +22,8 @@ "composer.user_said": "%1 рече:", "composer.discard": "Желите ли да одбаците ову поруку?", "composer.submit_and_lock": "Пошаљи и закључај", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/sr/notifications.json b/public/language/sr/notifications.json index e5ebacb691..74a75a6450 100644 --- a/public/language/sr/notifications.json +++ b/public/language/sr/notifications.json @@ -1,7 +1,7 @@ { "title": "Обавештења", "no_notifs": "Немате нових обавештења", - "see_all": "Прикажи сва обавештења", + "see_all": "See all notifications", "mark_all_read": "Означи сва обавештења као прочитана", "back_to_home": "Назад на %1", "outgoing_link": "Одлазна веза", diff --git a/public/language/sr/pages.json b/public/language/sr/pages.json index 531561eb89..7c03bfdde7 100644 --- a/public/language/sr/pages.json +++ b/public/language/sr/pages.json @@ -1,21 +1,37 @@ { "home": "Почетна", "unread": "Непрочитане теме", - "popular": "Полуларне теме", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Скорашње теме", - "users": "Регистровани корисници", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Обавештења", "tags": "Ознаке", "tag": "Теме са ознаком „%1“", - "user.edit": "Уређивање „%1“", - "user.following": "Особе које %1 прати", - "user.followers": "Особе које прате %1", - "user.posts": "Поруке од %1", - "user.topics": "Теме од %1", - "user.groups": "Групе корисника %1", - "user.favourites": "Омиљене поруке корисника $1", - "user.settings": "Корисничке поставке", - "user.watched": "Теме које %1 прати", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", "maintenance.messageIntro": "Additionally, the administrator has left this message:" } \ No newline at end of file diff --git a/public/language/sr/user.json b/public/language/sr/user.json index 113cb7f8d3..b2e8547468 100644 --- a/public/language/sr/user.json +++ b/public/language/sr/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/sv/global.json b/public/language/sv/global.json index b7ad673b45..71b9f5a2e7 100644 --- a/public/language/sv/global.json +++ b/public/language/sv/global.json @@ -33,6 +33,7 @@ "header.notifications": "Notiser", "header.search": "Sök", "header.profile": "Profil", + "header.navigation": "Navigation", "notifications.loading": "Laddar Notiser", "chats.loading": "Laddar Chattar", "motd.welcome": "Välkommen till NodeBB, framtidens diskussions-plattform.", @@ -67,7 +68,7 @@ "recentposts": "Senaste ämnena", "recentips": "Nyligen inloggade IPn", "away": "Borta", - "dnd": "Stör ej", + "dnd": "Do not disturb", "invisible": "Osynlig", "offline": "Offline", "email": "Epost", diff --git a/public/language/sv/modules.json b/public/language/sv/modules.json index a370feb0b1..850345effa 100644 --- a/public/language/sv/modules.json +++ b/public/language/sv/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Du har inte några aktiva chattar.", "chat.user_typing": "%1 skriver ...", "chat.user_has_messaged_you": "%1 har skickat ett medelande till dig.", - "chat.see_all": "Visa alla chattar", + "chat.see_all": "See all chats", "chat.no-messages": "Välj mottagare för att visa historik för chatmeddelande", "chat.recent-chats": "Senaste chattarna", "chat.contacts": "Kontakter ", @@ -22,5 +22,8 @@ "composer.user_said": "%1 sa:", "composer.discard": "Är du säker på att du vill förkasta det här inlägget?", "composer.submit_and_lock": "Skicka och lås", - "composer.toggle_dropdown": "Visa/Dölj dropdown" + "composer.toggle_dropdown": "Visa/Dölj dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index 424b6f4e42..aeedd632e2 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -1,7 +1,7 @@ { "title": "Notiser", "no_notifs": "Du har inga nya notiser", - "see_all": "Visa alla notiser", + "see_all": "See all notifications", "mark_all_read": "Markera alla notiser som lästa", "back_to_home": "Tillbaka till %1", "outgoing_link": "Utgående länk", diff --git a/public/language/sv/pages.json b/public/language/sv/pages.json index b05979fb58..7e339b8068 100644 --- a/public/language/sv/pages.json +++ b/public/language/sv/pages.json @@ -1,21 +1,37 @@ { "home": "Hem", "unread": "Olästa ämnen", - "popular": "Populära ämnen", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Senaste ämnena", - "users": "Registrerade användare", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Notiser", "tags": "Märkord", "tag": "Ämnen märkta med \"%1\"", - "user.edit": "Ändrar \"%1\"", - "user.following": "Personer %1 Följer", - "user.followers": "Personer som följer %1", - "user.posts": "Inlägg skapat av %1", - "user.topics": "Ämnen skapade av %1", - "user.groups": "%1s grupper", - "user.favourites": "%1's favorit-inlägg", - "user.settings": "Avnändarinställningar", - "user.watched": "Ämnen bevakade av %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 genomgår underhåll just nu. Vänligen kom tillbaka lite senare.", "maintenance.messageIntro": "Ytterligare så lämnade administratören detta meddelande:" } \ No newline at end of file diff --git a/public/language/sv/user.json b/public/language/sv/user.json index 6ccc8a3760..8510e69ac9 100644 --- a/public/language/sv/user.json +++ b/public/language/sv/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Följ ämnen som du svarat på", "follow_topics_you_create": "Följ ämnen du skapat", "grouptitle": "Välj tittel för gruppen så som du vill att den ska visas", - "no-group-title": "Ingen titel på gruppen" + "no-group-title": "Ingen titel på gruppen", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/th/global.json b/public/language/th/global.json index b9acc67e30..c1f79a5c3f 100644 --- a/public/language/th/global.json +++ b/public/language/th/global.json @@ -33,6 +33,7 @@ "header.notifications": "แจ้งเตือน", "header.search": "ค้นหา", "header.profile": "รายละเอียด", + "header.navigation": "Navigation", "notifications.loading": "กำลังโหลดข้อแจ้งเตือน", "chats.loading": "กำลังโหลดหัวข้อสนทนา", "motd.welcome": "ยินดีต้อนรับสู่ NodeBB แพลตฟอร์มการสนทนาแห่งอนาคต", @@ -67,7 +68,7 @@ "recentposts": "กระทู้ล่าสุด", "recentips": "IP ที่ใช้เข้าสู่ระบบล่าสุด", "away": "ไม่อยู่", - "dnd": "อย่ารบกวน", + "dnd": "Do not disturb", "invisible": "ไม่ปรากฏตัว", "offline": "ออฟไลน์", "email": "Email", diff --git a/public/language/th/modules.json b/public/language/th/modules.json index 7af8cf639b..7a9815af69 100644 --- a/public/language/th/modules.json +++ b/public/language/th/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "คุณไม่มีแชทที่คุยอยู่", "chat.user_typing": "%1 is typing ...", "chat.user_has_messaged_you": "%1 has messaged you.", - "chat.see_all": "See all Chats", + "chat.see_all": "See all chats", "chat.no-messages": "Please select a recipient to view chat message history", "chat.recent-chats": "Recent Chats", "chat.contacts": "Contacts", @@ -22,5 +22,8 @@ "composer.user_said": "%1 said:", "composer.discard": "Are you sure you wish to discard this post?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json index bc03b9bad0..260d469867 100644 --- a/public/language/th/notifications.json +++ b/public/language/th/notifications.json @@ -1,7 +1,7 @@ { "title": "แจ้งเตือน", "no_notifs": "คุณไม่มีข้อแจ้งเตือนใหม่", - "see_all": "ดูข้อแจ้งเตือนทั้งหมด", + "see_all": "See all notifications", "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "ลิงค์ออก", diff --git a/public/language/th/pages.json b/public/language/th/pages.json index 2f253c17a6..b897794efe 100644 --- a/public/language/th/pages.json +++ b/public/language/th/pages.json @@ -1,21 +1,37 @@ { "home": "หน้าแรก", "unread": "กระทู้ที่ไม่ได้อ่าน", - "popular": "กระทู้ยอดฮิต", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "กระทู้ล่าสุด", - "users": "ผู้ใช้ที่ลงทะเบียน", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "แจ้งเตือน", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "แก้ไข \"%1\"", - "user.following": "ผู้ใช้ที่ %1 ติดตาม", - "user.followers": "ผู้ใช้ที่ติดตาม %1", - "user.posts": "กระทู้โดย %1", - "user.topics": "หัวข้อที่ถูกสร้างโดย %1", - "user.groups": "กลุ่มของ %1", - "user.favourites": "กระทู้ที่ %1 ชอบ", - "user.settings": "ตั้งค่าผู้ใช้", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 กำลังอยู่ระหว่างการปิดปรับปรุงชั่วคราว กรุณาลองใหม่อีกครั้งในภายหลัง", "maintenance.messageIntro": "ผู้ดูแลระบบได้ฝากข้อความต่อไปนี้เอาไว้" } \ No newline at end of file diff --git a/public/language/th/user.json b/public/language/th/user.json index 697b13ec9e..104bb9a426 100644 --- a/public/language/th/user.json +++ b/public/language/th/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/tr/global.json b/public/language/tr/global.json index 979e9715c5..d6da9c3e05 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -33,6 +33,7 @@ "header.notifications": "Bildirimler", "header.search": "Arama", "header.profile": "Profil", + "header.navigation": "Navigation", "notifications.loading": "Bildirimler Yükleniyor", "chats.loading": "Sohbetler Yükleniyor", "motd.welcome": "NodeBB, geleceğin tartışma platformuna hoş geldiniz.", @@ -67,7 +68,7 @@ "recentposts": "Güncel İletiler", "recentips": "Güncel giriş yapilan IP adresleri", "away": "Dışarıda", - "dnd": "Rahatsız Etmeyin", + "dnd": "Do not disturb", "invisible": "Görünmez", "offline": "Çevrimdışı", "email": "E-posta", diff --git a/public/language/tr/modules.json b/public/language/tr/modules.json index 47929205ca..310c7824e3 100644 --- a/public/language/tr/modules.json +++ b/public/language/tr/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Aktif sohbet mevcut değil", "chat.user_typing": "%1 yazıyor ...", "chat.user_has_messaged_you": "%1 size bir mesaj gönderdi.", - "chat.see_all": "Bütün mesajları gör", + "chat.see_all": "See all chats", "chat.no-messages": "Lütfen sohbet geçmişini görmek için bir kontak seçin", "chat.recent-chats": "Güncel Sohbetler", "chat.contacts": "Kontaklar", @@ -22,5 +22,8 @@ "composer.user_said": "%1 söyledi:", "composer.discard": "Bu iletiyi iptal etmek istediğinizden eminmisiniz?", "composer.submit_and_lock": "Gönder ve Kitle", - "composer.toggle_dropdown": "Menü aç" + "composer.toggle_dropdown": "Menü aç", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index d498a13dbe..0ccd12db98 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -1,7 +1,7 @@ { "title": "Bildirimler", "no_notifs": "Yeni bildirimleriniz yok", - "see_all": "Bütün bildirimleri gör", + "see_all": "See all notifications", "mark_all_read": "Okunmuş bütün bildirimleri işaretle", "back_to_home": "Geri dön %1", "outgoing_link": "Harici Link", diff --git a/public/language/tr/pages.json b/public/language/tr/pages.json index 922562f348..8a4da32fbe 100644 --- a/public/language/tr/pages.json +++ b/public/language/tr/pages.json @@ -1,21 +1,37 @@ { "home": "Ana Sayfa", "unread": "Okunmayan Başlıklar", - "popular": "Popüler Başlıklar", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Güncel Konular", - "users": "Kayıtlı Kullanıcılar", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Bildirimler", "tags": "Etiketler", "tag": "“%1“ ile etiketlenmiş konular", - "user.edit": "\"% 1\" düzenleniyor", - "user.following": "İnsanlar %1 Takip Ediyor", - "user.followers": "%1 takip edenler", - "user.posts": "%1 tarafından gönderilen iletiler", - "user.topics": "%1 tarafından gönderilen başlıklar", - "user.groups": "%1 Kişisine Ait Gruplar", - "user.favourites": "%1'in Favori İletileri", - "user.settings": "Kullanıcı Ayarları", - "user.watched": "%1 tarafından izlenen konular", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 şu anda bakımda. Lütfen bir süre sonra tekrar deneyin.", "maintenance.messageIntro": "Ayrıca, yönetici şu mesaji bıraktı:" } \ No newline at end of file diff --git a/public/language/tr/user.json b/public/language/tr/user.json index ac16ae1970..51e995af0a 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Cevap verdiğim konuları takip et", "follow_topics_you_create": "Kendi konularımı takip et", "grouptitle": "Göstermek istediğiniz gurup başlığını seçin", - "no-group-title": "Grup başlığı yok" + "no-group-title": "Grup başlığı yok", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/vi/category.json b/public/language/vi/category.json index ef607a6f36..54cb81187f 100644 --- a/public/language/vi/category.json +++ b/public/language/vi/category.json @@ -1,15 +1,15 @@ { - "category": "Category", - "subcategories": "Subcategories", + "category": "Danh mục", + "subcategories": "Danh mục con", "new_topic_button": "Chủ đề mới", "guest-login-post": "Đăng nhập để viết bài", "no_topics": "Không có bài viết trong danh mục này.
Hãy đăng một bài viết mới.", "browsing": "đang xem", "no_replies": "Chưa có bình luận nào", - "no_new_posts": "No new posts.", + "no_new_posts": "Không có bài mới.", "share_this_category": "Chia sẻ thư mục này", - "watch": "Watch", + "watch": "Theo dõi", "ignore": "Bỏ qua", - "watch.message": "You are now watching updates from this category", - "ignore.message": "You are now ignoring updates from this category" + "watch.message": "Bạn đang theo dõi các cập nhật của danh mục này", + "ignore.message": "Bạn đang gỡ bỏ theo dõi danh mục này" } \ No newline at end of file diff --git a/public/language/vi/email.json b/public/language/vi/email.json index 5dd2385df7..10ec2917fc 100644 --- a/public/language/vi/email.json +++ b/public/language/vi/email.json @@ -1,15 +1,15 @@ { "password-reset-requested": "Yêu cầu tạo lại mật khẩu - %1!", "welcome-to": "Chào mừng đến với %1", - "invite": "Invitation from %1", + "invite": "Lời mời từ %1", "greeting_no_name": "Xin chào", "greeting_with_name": "Xin chào %1", "welcome.text1": "Cảm ơn bạn đã đăng ký tại %1!", "welcome.text2": "Để kích hoạt đầy đủ tính năng của tài khoản, chúng tôi cần xác định bạn là chủ của địa chỉ email mà bạn đã đăng ký.", - "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.", + "welcome.text3": "Quản trị viên đã chấp nhận đơn đăng ký của bạn. Bạn có thể đăng nhập với tên đăng nhập/mật khẩu ngay bây giờ.", "welcome.cta": "Nhấn vào đây để xác nhận địa chỉ email", - "invitation.text1": "%1 has invited you to join %2", - "invitation.ctr": "Click here to create your account.", + "invitation.text1": "%1 đã mời bạn tham gia %2", + "invitation.ctr": "Click vào đây để tạo tài khoản.", "reset.text1": "Chúng tôi nhận được yêu cầu khởi tạo lại mật khẩu của bạn, rất có thể vì bạn đã quên mất nó. Nếu bạn không gởi yêu cầu, hãy bỏ qua email này.", "reset.text2": "Để đặt lại mật khẩu, hãy click vào liên kết sau:", "reset.cta": "Click vào đây để khởi tạo lại mật khẩu", diff --git a/public/language/vi/global.json b/public/language/vi/global.json index 58f157d119..43fb23603a 100644 --- a/public/language/vi/global.json +++ b/public/language/vi/global.json @@ -33,6 +33,7 @@ "header.notifications": "Thông báo", "header.search": "Tìm kiếm", "header.profile": "Hồ sơ", + "header.navigation": "Navigation", "notifications.loading": "Đang tải Thông báo", "chats.loading": "Đang tải phần Chat", "motd.welcome": "Chào mừng bạn tới NodeBB, Platform của tương lai", @@ -67,7 +68,7 @@ "recentposts": "Số bài viết gần đây", "recentips": "Các IP vừa mới đăng nhập", "away": "Đang đi vắng", - "dnd": "Đang bận", + "dnd": "Do not disturb", "invisible": "Ẩn", "offline": "Đang offline", "email": "Email", diff --git a/public/language/vi/modules.json b/public/language/vi/modules.json index 2d54413f69..cd83ef37bb 100644 --- a/public/language/vi/modules.json +++ b/public/language/vi/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "Bạn hiện giờ không có cuộc chat nào", "chat.user_typing": "%1b đang gõ", "chat.user_has_messaged_you": "%1 đã gửi tin cho bạn.", - "chat.see_all": "Tất cả tin nhắn.", + "chat.see_all": "See all chats", "chat.no-messages": "Hãy chọn 1 tài khoản để xem lịch sử chat", "chat.recent-chats": "Vừa chat", "chat.contacts": "Liên hệ", @@ -22,5 +22,8 @@ "composer.user_said": "%1 đã nói:", "composer.discard": "Bạn có chắc chắn hủy bỏ bài viết này?", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index d4fa621186..7b990fc0e0 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -1,7 +1,7 @@ { "title": "Thông báo", "no_notifs": "Bạn không có thông báo nào mới", - "see_all": "Xem tất cả thông báo", + "see_all": "See all notifications", "mark_all_read": "Đánh dấu đã xem tất cả thông báo", "back_to_home": "Quay lại %1", "outgoing_link": "Liên kết ngoài", diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json index aa2afcd916..698dc47c23 100644 --- a/public/language/vi/pages.json +++ b/public/language/vi/pages.json @@ -1,21 +1,37 @@ { "home": "Trang chủ", "unread": "Chủ đề chưa đọc", - "popular": "Các chủ đề nổi bật", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "Chủ đề gần đây", - "users": "Số người dùng đã đăng ký", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "Thông báo", "tags": "Tags", "tag": "Topics tagged under \"%1\"", - "user.edit": "Chỉnh sửa \"%1\"", - "user.following": "Người mà %1 theo dõi", - "user.followers": "Người đang theo dõi %1", - "user.posts": "Các bài được %1 viết", - "user.topics": "Các chủ đề được %1 tạo", - "user.groups": "%1's Groups", - "user.favourites": "Các bài gửi yêu thích của %1", - "user.settings": "Thiết lập cho người dùng", - "user.watched": "Topics watched by %1", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "%1 đang được bảo trì. Xin vui lòng quay lại sau.", "maintenance.messageIntro": "Ban quản lí để lại lời nhắn sau:" } \ No newline at end of file diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index f2c2193892..b4db088e72 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -5,7 +5,7 @@ "no_topics_found": "Không tìm thấy chủ đề nào!", "no_posts_found": "Không tìm thấy bài gửi nào", "post_is_deleted": "Bài gửi này đã bị xóa!", - "topic_is_deleted": "This topic is deleted!", + "topic_is_deleted": "Chủ đề này đã bị xóa!", "profile": "Hồ sơ", "posted_by": "Được viết bởi %1", "posted_by_guest": "Đăng bởi khách", diff --git a/public/language/vi/user.json b/public/language/vi/user.json index bef9123115..3c062711a1 100644 --- a/public/language/vi/user.json +++ b/public/language/vi/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Chọn tên nhóm mà bạn muốn hiển thị", - "no-group-title": "No group title" + "no-group-title": "No group title", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/language/zh_CN/global.json b/public/language/zh_CN/global.json index 69daf31adf..e287fd7339 100644 --- a/public/language/zh_CN/global.json +++ b/public/language/zh_CN/global.json @@ -33,6 +33,7 @@ "header.notifications": "通知", "header.search": "搜索", "header.profile": "设置", + "header.navigation": "导航", "notifications.loading": "正在加载通知", "chats.loading": "正在加载聊天", "motd.welcome": "欢迎来到 NodeBB，未来的社区论坛平台。", diff --git a/public/language/zh_CN/modules.json b/public/language/zh_CN/modules.json index e6a2678ea4..f49cc2f7e0 100644 --- a/public/language/zh_CN/modules.json +++ b/public/language/zh_CN/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "暂无聊天", "chat.user_typing": "%1 正在输入……", "chat.user_has_messaged_you": "%1 向您发送了消息。", - "chat.see_all": "查看全部聊天", + "chat.see_all": "查看所有对话", "chat.no-messages": "请选择接收人，以查看聊天消息历史", "chat.recent-chats": "最近聊天", "chat.contacts": "联系人", @@ -22,5 +22,8 @@ "composer.user_said": "%1 说：", "composer.discard": "确定想要取消此帖？", "composer.submit_and_lock": "提交并锁定", - "composer.toggle_dropdown": "标为 Dropdown" + "composer.toggle_dropdown": "标为 Dropdown", + "bootbox.ok": "确认", + "bootbox.cancel": "取消", + "bootbox.confirm": "确认" } \ No newline at end of file diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json index e25241b363..bef1a693a6 100644 --- a/public/language/zh_CN/notifications.json +++ b/public/language/zh_CN/notifications.json @@ -1,7 +1,7 @@ { "title": "通知", "no_notifs": "您没有新的通知", - "see_all": "查看全部通知", + "see_all": "查看全部消息", "mark_all_read": "标记全部为已读", "back_to_home": "返回 %1", "outgoing_link": "站外链接", diff --git a/public/language/zh_CN/pages.json b/public/language/zh_CN/pages.json index 1ec319a476..42cd89007b 100644 --- a/public/language/zh_CN/pages.json +++ b/public/language/zh_CN/pages.json @@ -1,21 +1,37 @@ { "home": "主页", "unread": "未读", - "popular": "热门主题", + "popular-day": "今日热门话题", + "popular-week": "本周热门话题", + "popular-month": "当月热门话题", + "popular-alltime": "热门主题", "recent": "最新主题", - "users": "已注册用户", + "users/online": "在线会员", + "users/latest": "最新会员", + "users/sort-posts": "最多发帖的会员", + "users/sort-reputation": "最多积分的会员", + "users/map": "会员地图", + "users/search": "会员搜索", "notifications": "提醒", "tags": "话题", "tag": "\"%1\" 下的主题", - "user.edit": "正在编辑 \"%1\"", - "user.following": "%1 关注", - "user.followers": "关注 %1 的人", - "user.posts": "%1 发布的帖子", - "user.topics": "%1 创建的主题", - "user.groups": "%1 的用户组", - "user.favourites": "%1 收藏的帖子", - "user.settings": "用户设置", - "user.watched": "主题已被 %1 关注", + "register": "注册帐号", + "login": "登录帐号", + "reset": "重置帐户密码", + "categories": "版面", + "groups": "小组", + "group": "%1 的小组", + "chats": "聊天", + "chat": "与 %1 聊天", + "account/edit": "正在编辑 \"%1\"", + "account/following": "%1 关注", + "account/followers": "关注 %1 的人", + "account/posts": "%1 发布的帖子", + "account/topics": "%1 创建的主题", + "account/groups": "%1 的小组", + "account/favourites": "%1 收藏的帖子", + "account/settings": "用户设置", + "account/watched": "主题已被 %1 关注", "maintenance.text": "%1 正在进行维护。请稍后再来。", "maintenance.messageIntro": "此外，管理员留下的消息：" } \ No newline at end of file diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json index c7e23fa7a6..5eabb24fec 100644 --- a/public/language/zh_CN/user.json +++ b/public/language/zh_CN/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "关注您回复的主题", "follow_topics_you_create": "关注您创建的主题", "grouptitle": "选择展示的小组称号", - "no-group-title": "不展示小组称号" + "no-group-title": "不展示小组称号", + "select-skin": "选择皮肤" } \ No newline at end of file diff --git a/public/language/zh_TW/global.json b/public/language/zh_TW/global.json index 81c70f3faf..57f379b825 100644 --- a/public/language/zh_TW/global.json +++ b/public/language/zh_TW/global.json @@ -33,6 +33,7 @@ "header.notifications": "通知", "header.search": "搜尋", "header.profile": "設置", + "header.navigation": "Navigation", "notifications.loading": "消息載入中", "chats.loading": "聊天載入中···", "motd.welcome": "歡迎來到 NodeBB，一個未來的討論平台。", @@ -67,7 +68,7 @@ "recentposts": "最近的文章", "recentips": "最近登錄的 IP 來源位址", "away": "離開", - "dnd": "勿擾", + "dnd": "Do not disturb", "invisible": "隱藏", "offline": "離線", "email": "Email", diff --git a/public/language/zh_TW/modules.json b/public/language/zh_TW/modules.json index 7e39342ebf..d51ca5b5ea 100644 --- a/public/language/zh_TW/modules.json +++ b/public/language/zh_TW/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "暫無聊天", "chat.user_typing": "%1 正在輸入中...", "chat.user_has_messaged_you": "%1 已傳送訊息給你了", - "chat.see_all": "顯示全部聊天室", + "chat.see_all": "See all chats", "chat.no-messages": "請選擇收件人來查看聊天記錄", "chat.recent-chats": "最近的聊天記錄", "chat.contacts": "通訊錄", @@ -22,5 +22,8 @@ "composer.user_said": "%1說：", "composer.discard": "你確定要放棄這帖子嗎？", "composer.submit_and_lock": "Submit and Lock", - "composer.toggle_dropdown": "Toggle Dropdown" + "composer.toggle_dropdown": "Toggle Dropdown", + "bootbox.ok": "OK", + "bootbox.cancel": "Cancel", + "bootbox.confirm": "Confirm" } \ No newline at end of file diff --git a/public/language/zh_TW/notifications.json b/public/language/zh_TW/notifications.json index 0bd309b17f..b565350f12 100644 --- a/public/language/zh_TW/notifications.json +++ b/public/language/zh_TW/notifications.json @@ -1,7 +1,7 @@ { "title": "通知", "no_notifs": "沒有新消息", - "see_all": "顯示全部", + "see_all": "See all notifications", "mark_all_read": "所有訊息設為已讀", "back_to_home": "返回%1", "outgoing_link": "站外連結", diff --git a/public/language/zh_TW/pages.json b/public/language/zh_TW/pages.json index d004a0f742..cadbe3188b 100644 --- a/public/language/zh_TW/pages.json +++ b/public/language/zh_TW/pages.json @@ -1,21 +1,37 @@ { "home": "首頁", "unread": "未讀的主題", - "popular": "受歡迎的主題", + "popular-day": "Popular topics today", + "popular-week": "Popular topics this week", + "popular-month": "Popular topics this month", + "popular-alltime": "All time popular topics", "recent": "近期的主題", - "users": "已註冊的使用者", + "users/online": "Online Users", + "users/latest": "Latest Users", + "users/sort-posts": "Users with the most posts", + "users/sort-reputation": "Users with the most reputation", + "users/map": "User Map", + "users/search": "User Search", "notifications": "新訊息通知", "tags": "標籤", "tag": "Topics tagged under \"%1\"", - "user.edit": "編輯中 \"%1\"", - "user.following": "People %1 Follows", - "user.followers": "People who Follow %1", - "user.posts": "文章由 %1 所張貼", - "user.topics": "主題由 %1 所創建", - "user.groups": "%1 的群組", - "user.favourites": "%1's 最喜愛的文章", - "user.settings": "使用者設定", - "user.watched": "主題由 %1 所觀看", + "register": "Register an account", + "login": "Login to your account", + "reset": "Reset your account password", + "categories": "Categories", + "groups": "Groups", + "group": "%1 group", + "chats": "Chats", + "chat": "Chatting with %1", + "account/edit": "Editing \"%1\"", + "account/following": "People %1 follows", + "account/followers": "People who follow %1", + "account/posts": "Posts made by %1", + "account/topics": "Topics created by %1", + "account/groups": "%1's Groups", + "account/favourites": "%1's Favourite Posts", + "account/settings": "User Settings", + "account/watched": "Topics watched by %1", "maintenance.text": "目前 %1 正在進行維修。請稍後再來。", "maintenance.messageIntro": "此外，管理員有以下訊息：" } \ No newline at end of file diff --git a/public/language/zh_TW/user.json b/public/language/zh_TW/user.json index e8532b0d58..9a71d77b9a 100644 --- a/public/language/zh_TW/user.json +++ b/public/language/zh_TW/user.json @@ -84,5 +84,6 @@ "follow_topics_you_reply_to": "Follow topics that you reply to", "follow_topics_you_create": "Follow topics you create", "grouptitle": "Select the group title you would like to display", - "no-group-title": "無此群組標題" + "no-group-title": "無此群組標題", + "select-skin": "Select a Skin" } \ No newline at end of file diff --git a/public/less/admin/header.less b/public/less/admin/header.less index df91bd4787..ea0e9fb0d1 100644 --- a/public/less/admin/header.less +++ b/public/less/admin/header.less @@ -1,4 +1,5 @@ .header { + .no-select; position: relative; background: #333; width: 100%; diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index 91771a13b2..a1ac7376f3 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -105,15 +105,17 @@ } function launchSnackbar(params) { - var bar = $.snackbar({ - content: "" + params.title + "" + params.message, - timeout: 3000, - htmlAllowed: true - }); + translator.translate("" + params.title + "" + params.message, function(html) { + var bar = $.snackbar({ + content: html, + timeout: 3000, + htmlAllowed: true + }); - if (params.clickfn) { - bar.on('click', params.clickfn); - } + if (params.clickfn) { + bar.on('click', params.clickfn); + } + }); } function configureSlidemenu() { diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js index 6e758e9580..25832bcac6 100644 --- a/public/src/admin/manage/category.js +++ b/public/src/admin/manage/category.js @@ -63,17 +63,22 @@ define('admin/manage/category', [ }); } - // If any inputs have changed, prepare it for saving - $('form.category input, form.category select').on('change', function(ev) { - modified(ev.target); - }); + + $('form.category input, form.category select') + .on('change', function(ev) { + modified(ev.target); + }) + .on('keydown', function(ev) { + if (ev.which === 13) { + ev.preventDefault(); + return false; + } + }); - // Update preview image size on change $('[data-name="imageClass"]').on('change', function(ev) { $('.category-preview').css('background-size', $(this).val()); }); - // Colour Picker $('[data-name="bgColor"], [data-name="color"]').each(enableColorPicker); $('#save').on('click', save); @@ -94,7 +99,6 @@ define('admin/manage/category', [ }); }); - // Image Uploader $('.upload-button').on('click', function() { var inputEl = $(this), cid = inputEl.attr('data-cid'); @@ -107,7 +111,6 @@ define('admin/manage/category', [ }); }); - // Image Remover $('.delete-image').on('click', function(e) { e.preventDefault(); @@ -120,12 +123,10 @@ define('admin/manage/category', [ $(this).parent().addClass('hide').hide(); }); - // Icon selection $('.category-preview').on('click', function(ev) { iconSelect.init($(this).find('i'), modified); }); - // Parent Category Selector $('button[data-action="setParent"], button[data-action="changeParent"]').on('click', Category.launchParentSelector); $('button[data-action="removeParent"]').on('click', function() { var payload= {}; @@ -146,7 +147,6 @@ define('admin/manage/category', [ }; Category.setupPrivilegeTable = function() { - // Checkbox event capture $('.privilege-table-container').on('change', 'input[type="checkbox"]', function() { var checkboxEl = $(this), privilege = checkboxEl.parent().attr('data-privilege'), diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index 97d2ea4a2e..9b04f29423 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -46,7 +46,9 @@ define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) { break; case 'checkbox': - field.prop('checked', parseInt(app.config[key], 10) === 1); + var checked = parseInt(app.config[key], 10) === 1; + field.prop('checked', checked); + field.parents('.mdl-switch').toggleClass('is-checked', checked); break; } } diff --git a/public/src/admin/settings/general.js b/public/src/admin/settings/general.js new file mode 100644 index 0000000000..6f3faeb8c7 --- /dev/null +++ b/public/src/admin/settings/general.js @@ -0,0 +1,16 @@ +"use strict"; +/* global define, socket */ + +define('admin/settings/general', ['admin/settings'], function(Settings) { + var Module = {} + + Module.init = function() { + $('button[data-action="removeLogo"]').on('click', function() { + socket.emit('admin.settings.removeLogo', function() { + app.alertSuccess('Logo removed'); + }); + }); + }; + + return Module; +}); diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index da8b2e6e9e..4412d185b1 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -58,7 +58,6 @@ $(document).ready(function() { $('#footer, #content').removeClass('hide').addClass('ajaxifying'); - ajaxify.variables.flush(); ajaxify.loadData(url, function(err, data) { if (err) { return onAjaxError(err, url, callback, quiet); @@ -111,14 +110,15 @@ $(document).ready(function() { textStatus = err.textStatus; if (data) { + data.responseJSON.config = config; var status = parseInt(data.status, 10); - if (status === 403 || status === 404 || status === 500 || status === 502) { + if (status === 403 || status === 404 || status === 500 || status === 502 || status === 503) { if (status === 502) { status = 500; } $('#footer, #content').removeClass('hide').addClass('ajaxifying'); - return renderTemplate(url, status.toString(), data.responseJSON, (new Date()).getTime(), callback); + return renderTemplate(url, status.toString(), data.responseJSON, callback); } else if (status === 401) { app.alertError('[[global:please_log_in]]'); app.previousUrl = url; @@ -215,8 +215,10 @@ $(document).ready(function() { if (!data) { return; } + ajaxify.data = data; - data.relative_path = RELATIVE_PATH; + data.config = config; + $(window).trigger('action:ajaxify.dataLoaded', {url: url, data: data}); if (callback) { diff --git a/public/src/app.js b/public/src/app.js index 6fb289b041..a55dc9d2ab 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -406,18 +406,6 @@ app.cacheBuster = null; } }; - app.exposeConfigToTemplates = function() { - $(document).ready(function() { - templates.setGlobal('loggedIn', config.loggedIn); - templates.setGlobal('relative_path', RELATIVE_PATH); - for(var key in config) { - if (config.hasOwnProperty(key)) { - templates.setGlobal('config.' + key, config[key]); - } - } - }); - }; - function createHeaderTooltips() { var env = utils.findBootstrapEnvironment(); if (env === 'xs' || env === 'sm') { @@ -651,10 +639,10 @@ app.cacheBuster = null; showWelcomeMessage = window.location.href.indexOf('loggedin') !== -1; - app.exposeConfigToTemplates(); - socketIOConnect(); + templates.setGlobal('config', config); + app.cacheBuster = config['cache-buster']; require(['csrf'], function(csrf) { diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js index eb651ca677..c3de1ec9bf 100644 --- a/public/src/client/account/edit.js +++ b/public/src/client/account/edit.js @@ -245,7 +245,6 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'], var password_confirm = $('#inputNewPasswordAgain'); var passwordvalid = false; var passwordsmatch = false; - var successIcon = ''; function onPasswordChanged() { if (password.val().length < config.minimumPasswordLength) { @@ -255,7 +254,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'], showError(password_notify, '[[user:change_password_error]]'); passwordvalid = false; } else { - showSuccess(password_notify, successIcon); + showSuccess(password_notify); passwordvalid = true; } } @@ -266,7 +265,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'], passwordsmatch = false; } else { if (password.val()) { - showSuccess(password_confirm_notify, successIcon); + showSuccess(password_confirm_notify); } else { password_confirm_notify.parent().removeClass('alert-success alert-danger'); password_confirm_notify.children().show(); @@ -369,7 +368,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'], function showError(element, msg) { translator.translate(msg, function(msg) { - element.find('.msg').html(msg).siblings().hide(); + element.find('.error').html(msg).removeClass('hide').siblings().addClass('hide'); element.parent() .removeClass('alert-success') @@ -378,14 +377,12 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'], }); } - function showSuccess(element, msg) { - translator.translate(msg, function(msg) { - element.find('.msg').html(msg); - element.parent() - .removeClass('alert-danger') - .addClass('alert-success'); - element.show(); - }); + function showSuccess(element) { + element.find('.success').removeClass('hide').siblings().addClass('hide'); + element.parent() + .removeClass('alert-danger') + .addClass('alert-success'); + element.show(); } return AccountEdit; diff --git a/public/src/client/topic.js b/public/src/client/topic.js index c1bd11c26c..12363e08bf 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -122,9 +122,9 @@ define('forum/topic', [ if (postIndex && window.location.search.indexOf('page=') === -1) { if (components.get('post/anchor', postIndex).length) { - return navigator.scrollToPostIndex(postIndex - 1, true); + return navigator.scrollToPostIndex(postIndex, true); } - } else if (bookmark && (!config.usePagination || (config.usePagination && pagination.currentPage === 1)) && ajaxify.data.postcount > 1) { + } else if (bookmark && (!config.usePagination || (config.usePagination && pagination.currentPage === 1)) && ajaxify.data.postcount > 10) { app.alert({ alert_id: 'bookmark', message: '[[topic:bookmark_instructions]]', @@ -137,6 +137,9 @@ define('forum/topic', [ localStorage.removeItem('topic:' + tid + ':bookmark'); } }); + setTimeout(function() { + app.removeAlert('bookmark'); + }, 10000); } } @@ -144,13 +147,13 @@ define('forum/topic', [ var parts = window.location.pathname.split('/'); var lastPart = parts[parts.length - 1]; if (lastPart && utils.isNumber(lastPart)) { - lastPart = parseInt(lastPart, 10); + lastPart = Math.max(0, parseInt(lastPart, 10) - 1); } else { return 0; } - while (lastPart > 0 && !components.get('post/anchor', lastPart).length) { - lastPart --; + if (lastPart > 0 && !components.get('post/anchor', lastPart).length) { + return components.get('post/anchor').last().attr('name'); } return lastPart; @@ -184,6 +187,7 @@ define('forum/topic', [ } else { components.get('navbar/title').find('span').text('').hide(); } + app.removeAlert('bookmark'); } Topic.calculateIndex = function(index, elementCount) { diff --git a/public/src/client/topic/fork.js b/public/src/client/topic/fork.js index 5321202e49..abf03ae526 100644 --- a/public/src/client/topic/fork.js +++ b/public/src/client/topic/fork.js @@ -53,6 +53,7 @@ define('forum/topic/fork', ['components'], function(components) { } function createTopicFromPosts() { + forkCommit.attr('disabled', true); socket.emit('topics.createTopicFromPosts', { title: forkModal.find('#fork-title').val(), pids: pids @@ -62,7 +63,7 @@ define('forum/topic/fork', ['components'], function(components) { $(this).remove(); }); } - + forkCommit.removeAttr('disabled'); if (err) { return app.alertError(err.message); } @@ -116,7 +117,7 @@ define('forum/topic/fork', ['components'], function(components) { } function checkForkButtonEnable() { - if(forkModal.find('#fork-title').length && pids.length) { + if (forkModal.find('#fork-title').length && pids.length) { forkCommit.removeAttr('disabled'); } else { forkCommit.attr('disabled', true); diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index 69b2cf3449..ac6e37ff3c 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -14,18 +14,18 @@ properties = item.properties; if (properties) { - if ((properties.loggedIn && !data.loggedIn) || + if ((properties.loggedIn && !data.config.loggedIn) || (properties.adminOnly && !data.isAdmin) || (properties.installed && properties.installed.search && !data.searchEnabled)) { return false; } } - if (item.route.match('/users') && data.privateUserInfo && !data.loggedIn) { + if (item.route.match('/users') && data.config.privateUserInfo && !data.config.loggedIn) { return false; } - if (item.route.match('/tags') && data.privateTagListing && !data.loggedIn) { + if (item.route.match('/tags') && data.config.privateTagListing && !data.config.loggedIn) { return false; } diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index a94c4f635c..03f5e7b2d5 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -6,9 +6,9 @@ define('notifications', ['sounds', 'translator', 'components'], function(sound, var Notifications = {}; Notifications.prepareDOM = function() { - var notifContainer = $('.notifications'), + var notifContainer = components.get('notifications'), notifTrigger = notifContainer.children('a'), - notifList = $('#notif-list'), + notifList = components.get('notifications/list'), notifIcon = components.get('notifications/icon'); notifTrigger.on('click', function(e) { diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js index 0092f4ca46..652398f539 100644 --- a/public/src/modules/settings.js +++ b/public/src/modules/settings.js @@ -468,6 +468,9 @@ define('settings', function () { } $(formEl).deserialize(values); + $(formEl).find('input[type="checkbox"]').each(function() { + $(this).parents('.mdl-switch').toggleClass('is-checked', $(this).is(':checked')); + }); $(window).trigger('action:admin.settingsLoaded'); callback(null, values); diff --git a/public/src/variables.js b/public/src/variables.js index 1a4b4e244c..52674df429 100644 --- a/public/src/variables.js +++ b/public/src/variables.js @@ -2,47 +2,10 @@ /*global ajaxify*/ (function(ajaxify) { - var parsedVariables = {}; ajaxify.variables = {}; - ajaxify.variables.set = function(key, value) { - if (typeof console !== 'undefined' && console.warn) { - console.warn('[deprecated] variables.set is deprecated, please use ajaxify.data, key=' + key); - } - parsedVariables[key] = value; - }; - - ajaxify.variables.get = function(key) { - if (typeof console !== 'undefined' && console.warn) { - console.warn('[deprecated] variables.get is deprecated, please use ajaxify.data, key=' + key); - } - return parsedVariables[key]; - }; - - ajaxify.variables.flush = function() { - parsedVariables = {}; - }; - ajaxify.variables.parse = function() { - $('#content [template-variable]').each(function(index, element) { - var value = null; - - switch ($(element).attr('template-type')) { - case 'boolean': - value = ($(element).val() === 'true' || $(element).val() === '1') ? true : false; - break; - case 'int': - case 'integer': - value = parseInt($(element).val(), 10); - break; - default: - value = $(element).val(); - break; - } - - ajaxify.variables.set($(element).attr('template-variable'), value); - }); var dataEl = $('#content [ajaxify-data]'); if (dataEl.length) { ajaxify.data = JSON.parse(decodeURIComponent(dataEl.attr('ajaxify-data'))); diff --git a/src/categories/delete.js b/src/categories/delete.js index 8483efaf72..7bfe03a005 100644 --- a/src/categories/delete.js +++ b/src/categories/delete.js @@ -49,13 +49,30 @@ module.exports = function(Categories) { function removeFromParent(cid, callback) { async.waterfall([ function(next) { - Categories.getCategoryField(cid, 'parentCid', next); + async.parallel({ + parentCid: function(next) { + Categories.getCategoryField(cid, 'parentCid', next); + }, + children: function(next) { + db.getSortedSetRange('cid:' + cid + ':children', 0, -1, next); + } + }, next); }, - function(parentCid, next) { - parentCid = parseInt(parentCid, 10) || 0; - db.sortedSetRemove('cid:' + parentCid + ':children', cid, next); + function(results, next) { + async.parallel([ + function(next) { + results.parentCid = parseInt(results.parentCid, 10) || 0; + db.sortedSetRemove('cid:' + results.parentCid + ':children', cid, next); + }, + function(next) { + async.each(results.children, function(cid, next) { + db.setObjectField('category:' + cid, 'parentCid', 0, next); + }, next); + } + ], next); } - ], callback); - + ], function(err, results) { + callback(err); + }); } }; \ No newline at end of file diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 5023d24d55..6a1d4f100e 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -6,6 +6,7 @@ var fs = require('fs'), nconf = require('nconf'), async = require('async'), validator = require('validator'), + winston = require('winston'), db = require('../database'), user = require('../user'), @@ -50,7 +51,7 @@ function getUserDataByUserSlug(userslug, callerUID, callback) { groups.getUserGroups([uid], next); } }, function(err, results) { - if(err || !results.userData) { + if (err || !results.userData) { return callback(err || new Error('[[error:invalid-uid]]')); } @@ -111,17 +112,13 @@ accountsController.getUserByUID = function(req, res, next) { var uid = req.params.uid ? req.params.uid : 0; async.parallel({ - settings: async.apply(user.getSettings, uid), - userData: async.apply(user.getUserData, uid) + userData: async.apply(user.getUserData, uid), + settings: async.apply(user.getSettings, uid) }, function(err, results) { - if (err) { + if (err || !results.userData) { return next(err); } - if (!results.userData) { - return helpers.notFound(req, res); - } - results.userData.email = results.settings.showemail ? results.userData.email : undefined; results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined; @@ -141,14 +138,10 @@ accountsController.getAccount = function(req, res, next) { } getUserDataByUserSlug(req.params.userslug, req.uid, function (err, userData) { - if (err) { + if (err || !userData) { return next(err); } - if (!userData) { - return helpers.notFound(req, res); - } - if (req.uid !== parseInt(userData.uid, 10)) { user.incrementUserFieldBy(userData.uid, 'profileviews', 1); } @@ -208,7 +201,7 @@ accountsController.getFollowers = function(req, res, next) { getFollow('account/followers', 'followers', req, res, next); }; -function getFollow(tpl, name, req, res, next) { +function getFollow(tpl, name, req, res, callback) { var userData; async.waterfall([ @@ -218,14 +211,14 @@ function getFollow(tpl, name, req, res, next) { function(data, next) { userData = data; if (!userData) { - return helpers.notFound(req, res); + return callback(); } var method = name === 'following' ? 'getFollowing' : 'getFollowers'; user[method](userData.uid, 0, 49, next); } ], function(err, users) { if (err) { - return next(err); + return callback(err); } userData.users = users; @@ -254,14 +247,10 @@ accountsController.getTopics = function(req, res, next) { accountsController.getGroups = function(req, res, next) { accountsController.getBaseUser(req.params.userslug, req.uid, function(err, userData) { - if (err) { + if (err || !userData) { return next(err); } - if (!userData) { - return helpers.notFound(req, res); - } - groups.getUserGroups([userData.uid], function(err, groupsData) { if (err) { return next(err); @@ -284,13 +273,11 @@ function getFromUserSet(tpl, set, method, type, req, res, next) { accountsController.getBaseUser(req.params.userslug, req.uid, next); } }, function(err, results) { - if (err) { + if (err || !results.userData) { return next(err); } + var userData = results.userData; - if (!userData) { - return helpers.notFound(req, res); - } var setName = 'uid:' + userData.uid + ':' + set; @@ -364,7 +351,7 @@ accountsController.getBaseUser = function(userslug, callerUID, callback) { }); }; -accountsController.accountEdit = function(req, res, next) { +accountsController.accountEdit = function(req, res, callback) { var userData; async.waterfall([ function(next) { @@ -372,11 +359,14 @@ accountsController.accountEdit = function(req, res, next) { }, function(data, next) { userData = data; + if (!userData) { + return callback(); + } db.getObjectField('user:' + userData.uid, 'password', next); } ], function(err, password) { if (err) { - return next(err); + return callback(err); } userData.hasPassword = !!password; @@ -385,7 +375,7 @@ accountsController.accountEdit = function(req, res, next) { }); }; -accountsController.accountSettings = function(req, res, next) { +accountsController.accountSettings = function(req, res, callback) { var userData; async.waterfall([ function(next) { @@ -394,7 +384,7 @@ accountsController.accountSettings = function(req, res, next) { function(_userData, next) { userData = _userData; if (!userData) { - return helpers.notFound(req, res); + return callback(); } async.parallel({ settings: function(next) { @@ -421,7 +411,7 @@ accountsController.accountSettings = function(req, res, next) { } ], function(err) { if (err) { - return next(err); + return callback(err); } userData.dailyDigestFreqOptions = [ @@ -433,74 +423,23 @@ accountsController.accountSettings = function(req, res, next) { userData.bootswatchSkinOptions = [ - { - "name": "Default", - "value": "default" - }, - { - "name": "Cerulean", - "value": "cerulean" - }, - { - "name": "Cosmo", - "value": "cosmo" - }, - { - "name": "Cyborg", - "value": "cyborg" - }, - { - "name": "Darkly", - "value": "darkly" - }, - { - "name": "Flatly", - "value": "flatly" - }, - { - "name": "Journal", - "value": "journal" - }, - { - "name": "Lumen", - "value": "lumen" - }, - { - "name": "Paper", - "value": "paper" - }, - { - "name": "Readable", - "value": "readable" - }, - { - "name": "Sandstone", - "value": "sandstone" - }, - { - "name": "Simplex", - "value": "simplex" - }, - { - "name": "Slate", - "value": "slate" - }, - { - "name": "Spacelab", - "value": "spacelab" - }, - { - "name": "Superhero", - "value": "superhero" - }, - { - "name": "United", - "value": "united" - }, - { - "name": "Yeti", - "value": "yeti" - } + { "name": "Default", "value": "default" }, + { "name": "Cerulean", "value": "cerulean" }, + { "name": "Cosmo", "value": "cosmo" }, + { "name": "Cyborg", "value": "cyborg" }, + { "name": "Darkly", "value": "darkly" }, + { "name": "Flatly", "value": "flatly" }, + { "name": "Journal", "value": "journal" }, + { "name": "Lumen", "value": "lumen" }, + { "name": "Paper", "value": "paper" }, + { "name": "Readable", "value": "readable" }, + { "name": "Sandstone", "value": "sandstone" }, + { "name": "Simplex", "value": "simplex" }, + { "name": "Slate", "value": "slate" }, + { "name": "Spacelab", "value": "spacelab" }, + { "name": "Superhero", "value": "superhero" }, + { "name": "United", "value": "united" }, + { "name": "Yeti", "value": "yeti" } ]; userData.bootswatchSkinOptions.forEach(function(skin) { @@ -553,7 +492,9 @@ accountsController.uploadPicture = function (req, res, next) { user.uploadPicture(updateUid, userPhoto, next); } ], function(err, image) { - fs.unlink(userPhoto.path); + fs.unlink(userPhoto.path, function(err) { + winston.error('unable to delete picture', err); + }); if (err) { return next(err); } @@ -574,9 +515,9 @@ accountsController.getNotifications = function(req, res, next) { }); }; -accountsController.getChats = function(req, res, next) { - if (parseInt(meta.config.disableChat) === 1) { - return helpers.notFound(req, res); +accountsController.getChats = function(req, res, callback) { + if (parseInt(meta.config.disableChat, 10) === 1) { + return callback(); } // In case a userNAME is passed in instead of a slug, the route should not 404 @@ -590,17 +531,16 @@ accountsController.getChats = function(req, res, next) { recentChats: async.apply(messaging.getRecentChats, req.user.uid, 0, 19) }, function(err, results) { if (err) { - return next(err); + return callback(err); } - //Remove entries if they were already present as a followed contact - if (results.contacts && results.contacts.length) { - var contactUids = results.contacts.map(function(contact) { - return parseInt(contact.uid, 10); + if (results.recentChats.users && results.recentChats.users.length) { + var contactUids = results.recentChats.users.map(function(chatObj) { + return parseInt(chatObj.uid, 10); }); - results.recentChats.users = results.recentChats.users.filter(function(chatObj) { - return contactUids.indexOf(parseInt(chatObj.uid, 10)) === -1; + results.contacts = results.contacts.filter(function(contact) { + return contactUids.indexOf(parseInt(contact.uid, 10)) === -1; }); } @@ -618,7 +558,7 @@ accountsController.getChats = function(req, res, next) { async.apply(user.getUidByUserslug, req.params.userslug), function(toUid, next) { if (!toUid || parseInt(toUid, 10) === parseInt(req.user.uid, 10)) { - return helpers.notFound(req, res); + return callback(); } async.parallel({ @@ -634,7 +574,7 @@ accountsController.getChats = function(req, res, next) { } ], function(err, data) { if (err) { - return next(err); + return callback(err); } res.render('chats', { diff --git a/src/controllers/admin/groups.js b/src/controllers/admin/groups.js index c52204f7a5..38b59a45e2 100644 --- a/src/controllers/admin/groups.js +++ b/src/controllers/admin/groups.js @@ -50,7 +50,7 @@ groupsController.list = function(req, res, next) { }); }; -groupsController.get = function(req, res, next) { +groupsController.get = function(req, res, callback) { var groupName = req.params.name; async.waterfall([ function(next){ @@ -58,13 +58,13 @@ groupsController.get = function(req, res, next) { }, function(exists, next) { if (!exists) { - return helpers.notFound(req, res); + return callback(); } groups.get(groupName, {uid: req.uid}, next); } ], function(err, group) { if (err) { - return next(err); + return callback(err); } res.render('admin/manage/group', {group: group}); }); diff --git a/src/controllers/api.js b/src/controllers/api.js index ed0be22efe..9bbb6dc5d7 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -70,8 +70,8 @@ apiController.getConfig = function(req, res, next) { config.environment = process.env.NODE_ENV; config.loggedIn = !!req.user; config['cache-buster'] = meta.config['cache-buster'] || ''; - config['script-buster'] = meta.js.hash; - config['css-buster'] = meta.css.hash; + config['script-buster'] = meta.js.hash || ''; + config['css-buster'] = meta.css.hash || ''; config.requireEmailConfirmation = parseInt(meta.config.requireEmailConfirmation, 10) === 1; config.topicPostSort = meta.config.topicPostSort || 'oldest_to_newest'; config.categoryTopicSort = meta.config.categoryTopicSort || 'newest_to_oldest'; diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 5509b0530a..b770598311 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -76,13 +76,13 @@ categoriesController.list = function(req, res, next) { }); }; -categoriesController.get = function(req, res, next) { +categoriesController.get = function(req, res, callback) { var cid = req.params.category_id, page = parseInt(req.query.page, 10) || 1, userPrivileges; if ((req.params.topic_index && !utils.isNumber(req.params.topic_index)) || !utils.isNumber(cid)) { - return helpers.notFound(req, res); + return callback(); } async.waterfall([ @@ -106,7 +106,7 @@ categoriesController.get = function(req, res, next) { userPrivileges = results.privileges; if (!results.exists || (results.categoryData && parseInt(results.categoryData.disabled, 10) === 1)) { - return helpers.notFound(req, res); + return callback(); } if (!results.privileges.read) { @@ -127,7 +127,7 @@ categoriesController.get = function(req, res, next) { } if (settings.usePagination && (page < 1 || page > pageCount)) { - return helpers.notFound(req, res); + return callback(); } if (!settings.usePagination) { @@ -245,7 +245,7 @@ categoriesController.get = function(req, res, next) { } ], function (err, data) { if (err) { - return next(err); + return callback(err); } data.currentPage = page; @@ -259,7 +259,7 @@ categoriesController.get = function(req, res, next) { plugins.fireHook('filter:category.build', {req: req, res: res, templateData: data}, function(err, data) { if (err) { - return next(err); + return callback(err); } res.render('category', data.templateData); }); diff --git a/src/controllers/groups.js b/src/controllers/groups.js index a44307d41e..2d4f97bc89 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -42,39 +42,34 @@ groupsController.getGroupsFromSet = function(uid, sort, start, stop, callback) { }); }; -groupsController.details = function(req, res, next) { +groupsController.details = function(req, res, callback) { async.waterfall([ async.apply(groups.exists, res.locals.groupName), function(exists, next) { if (!exists) { - return next(undefined, null); + return callback(); } - // Ensure the group isn't hidden either groups.isHidden(res.locals.groupName, next); }, function(hidden, next) { - if (hidden === null) { return next(undefined, false); } // Group didn't exist, not ok - if (!hidden) { - next(null, true); - } else { - // If not, only members are granted access - async.parallel([ - async.apply(groups.isMember, req.uid, res.locals.groupName), - async.apply(groups.isInvited, req.uid, res.locals.groupName) - ], function(err, checks) { - next(err, checks[0] || checks[1]); - }); + return next(); } - } - ], function(err, ok) { - if (err) { - return next(err); - } - if (!ok) { - return helpers.redirect(res, '/groups'); + async.parallel({ + isMember: async.apply(groups.isMember, req.uid, res.locals.groupName), + isInvited: async.apply(groups.isInvited, req.uid, res.locals.groupName) + }, function(err, checks) { + if (err || checks.isMember || checks.isInvited) { + return next(err); + } + callback(); + }); + } + ], function(err) { + if (err) { + return callback(err); } async.parallel({ @@ -90,12 +85,8 @@ groupsController.details = function(req, res, next) { }, isAdmin: async.apply(user.isAdministrator, req.uid) }, function(err, results) { - if (err) { - return next(err); - } - - if (!results.group) { - return helpers.notFound(req, res); + if (err || !results.group) { + return callback(err); } results.title = '[[pages:group, ' + results.group.displayName + ']]'; diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index ffc20fb90a..5486bcf009 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -11,28 +11,6 @@ var nconf = require('nconf'), var helpers = {}; -helpers.notFound = function(req, res, error) { - if (plugins.hasListeners('action:meta.override404')) { - plugins.fireHook('action:meta.override404', { - req: req, - res: res, - error: error - }); - } else if (res.locals.isAPI) { - res.status(404).json({ - path: req.path.replace(/^\/api/, ''), - error: error, - title: '[[global:404.title]]' - }); - } else { - res.status(404).render('404', { - path: req.path, - error: error, - title: '[[global:404.title]]' - }); - } -}; - helpers.notAllowed = function(req, res, error) { if (req.uid) { if (res.locals.isAPI) { diff --git a/src/controllers/index.js b/src/controllers/index.js index f6cf3c3c6d..53ae658937 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -101,7 +101,7 @@ Controllers.register = function(req, res, next) { var registrationType = meta.config.registrationType || 'normal'; if (registrationType === 'disabled') { - return helpers.notFound(req, res); + return next(); } async.waterfall([ @@ -164,7 +164,7 @@ Controllers.confirmEmail = function(req, res, next) { Controllers.sitemap = function(req, res, next) { if (parseInt(meta.config['feeds:disableSitemap'], 10) === 1) { - return helpers.notFound(req, res); + return next(); } var sitemap = require('../sitemap.js'); @@ -204,7 +204,7 @@ Controllers.outgoing = function(req, res, next) { Controllers.termsOfUse = function(req, res, next) { if (!meta.config.termsOfUse) { - return helpers.notFound(req, res); + return next(); } res.render('tos', {termsOfUse: meta.config.termsOfUse}); }; diff --git a/src/controllers/posts.js b/src/controllers/posts.js index a2bbfab226..33e314a191 100644 --- a/src/controllers/posts.js +++ b/src/controllers/posts.js @@ -16,12 +16,10 @@ postsController.getPost = function(req, res, next) { posts.getPostData(req.params.pid, next); } }, function(err, results) { - if (err) { + if (err || !results.postData) { return next(err); } - if (!results.postData) { - return helpers.notFound(req, res); - } + if (!results.canRead) { return helpers.notAllowed(req, res); } diff --git a/src/controllers/search.js b/src/controllers/search.js index 2148e6644b..5da395c2b8 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -12,7 +12,7 @@ var searchController = {}, searchController.search = function(req, res, next) { if (!plugins.hasListeners('filter:search.query')) { - return helpers.notFound(req, res); + return next(); } var breadcrumbs = helpers.buildBreadcrumbs([{text: '[[global:search]]'}]); diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 2975c73cb3..c1798d5bb4 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -16,13 +16,13 @@ var topicsController = {}, pagination = require('../pagination'), utils = require('../../public/src/utils'); -topicsController.get = function(req, res, next) { +topicsController.get = function(req, res, callback) { var tid = req.params.topic_id, sort = req.query.sort, userPrivileges; if ((req.params.post_index && !utils.isNumber(req.params.post_index)) || !utils.isNumber(tid)) { - return helpers.notFound(req, res); + return callback(); } async.waterfall([ @@ -60,7 +60,7 @@ topicsController.get = function(req, res, next) { } if (settings.usePagination && (page < 1 || page > pageCount)) { - return helpers.notFound(req, res); + return callback(); } var set = 'tid:' + tid + ':posts', @@ -109,7 +109,7 @@ topicsController.get = function(req, res, next) { topics.getTopicWithPosts(tid, set, req.uid, start, stop, reverse, function (err, topicData) { if (err && err.message === '[[error:no-topic]]' && !topicData) { - return helpers.notFound(req, res); + return callback(); } if (err && !topicData) { @@ -247,7 +247,7 @@ topicsController.get = function(req, res, next) { } ], function (err, data) { if (err) { - return next(err); + return callback(err); } data.privileges = userPrivileges; @@ -264,7 +264,7 @@ topicsController.get = function(req, res, next) { plugins.fireHook('filter:topic.build', {req: req, res: res, templateData: data}, function(err, data) { if (err) { - return next(err); + return callback(err); } res.render('topic', data.templateData); }); diff --git a/src/groups.js b/src/groups.js index f0f7efe066..13bae53e5f 100644 --- a/src/groups.js +++ b/src/groups.js @@ -296,11 +296,10 @@ var async = require('async'), Groups.isHidden = function(groupName, callback) { Groups.getGroupFields(groupName, ['hidden'], function(err, values) { if (err) { - winston.warn('[groups.isHidden] Could not determine group hidden state (group: ' + groupName + ')'); - return callback(null, true); // Default true + return callback(err); } - callback(null, parseInt(values.hidden, 10)); + callback(null, parseInt(values.hidden, 10) === 1); }); }; diff --git a/src/messaging.js b/src/messaging.js index e42b6758c9..ab27543f96 100644 --- a/src/messaging.js +++ b/src/messaging.js @@ -253,6 +253,22 @@ var db = require('./database'), }, users: function(next) { user.getMultipleUserFields(uids, ['uid', 'username', 'picture', 'status'] , next); + }, + teasers: function(next) { + var teasers = []; + async.each(uids, function(fromuid, next) { + Messaging.getMessages({ + fromuid: fromuid, + touid: uid, + isNew: false, + count: 1 + }, function(err, teaser) { + teasers[uids.indexOf(fromuid)] = teaser[0]; + next(err); + }); + }, function(err) { + next(err, teasers); + }); } }, function(err, results) { if (err) { @@ -277,6 +293,7 @@ var db = require('./database'), if (user) { user.unread = results.unread[index]; user.status = sockets.isUserOnline(user.uid) ? user.status : 'offline'; + user.teaser = results.teasers[index]; } }); diff --git a/src/middleware/admin.js b/src/middleware/admin.js index cba2bc8bec..db4116adc6 100644 --- a/src/middleware/admin.js +++ b/src/middleware/admin.js @@ -93,15 +93,16 @@ middleware.renderHeader = function(req, res, data, next) { res.locals.config = results.config; var templateValues = { - relative_path: nconf.get('relative_path'), + config: results.config, configJSON: JSON.stringify(results.config), + relative_path: results.config.relative_path, user: userData, userJSON: JSON.stringify(userData).replace(/'/g, "\\'"), plugins: results.custom_header.plugins, authentication: results.custom_header.authentication, scripts: results.scripts, 'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '', - env: process.env.NODE_ENV ? true : false, + env: process.env.NODE_ENV ? true : false }; templateValues.template = {name: res.locals.template}; diff --git a/src/middleware/maintenance.js b/src/middleware/maintenance.js new file mode 100644 index 0000000000..f03a804bb9 --- /dev/null +++ b/src/middleware/maintenance.js @@ -0,0 +1,75 @@ +'use strict'; + +var nconf = require('nconf'); +var meta = require('../meta'); +var user = require('../user'); +var translator = require('../../public/src/modules/translator'); + + +module.exports = function(middleware) { + + middleware.maintenanceMode = function(req, res, next) { + if (parseInt(meta.config.maintenanceMode, 10) !== 1) { + return next(); + } + var url = req.url.replace(nconf.get('relative_path'), ''); + + var allowedRoutes = [ + '^/login', + '^/stylesheet.css', + '^/favicon', + '^/nodebb.min.js', + '^/vendor/fontawesome/fonts/fontawesome-webfont.woff', + '^/src/(modules|client)/[\\w/]+.js', + '^/templates/[\\w/]+.tpl', + '^/api/login', + '^/api/widgets/render', + '^/language/.+', + '^/uploads/system/site-logo.png' + ], + render = function() { + res.status(503); + var data = { + site_title: meta.config.title || 'NodeBB', + message: meta.config.maintenanceModeMessage + }; + if (!isApiRoute.test(url)) { + middleware.buildHeader(req, res, function() { + res.render('503', data); + }); + } else { + res.json(data); + } + }, + isAllowed = function(url) { + for(var x=0,numAllowed=allowedRoutes.length,route;x
Plugin Search
-
+
diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 29bf0b8288..9d2a2fd0f4 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -60,10 +60,6 @@ - - - - diff --git a/src/views/admin/general/navigation.tpl b/src/views/admin/general/navigation.tpl index eca07b44c1..779d6bf5a9 100644 --- a/src/views/admin/general/navigation.tpl +++ b/src/views/admin/general/navigation.tpl @@ -82,7 +82,6 @@ coreplugin - diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl index a73ca45444..b1d9eeb8af 100644 --- a/src/views/admin/manage/category.tpl +++ b/src/views/admin/manage/category.tpl @@ -106,21 +106,17 @@
-
-
-

- You can configure the access control privileges for this category in this section. Privileges can be granted on a per-user or - a per-group basis. You can add a new user to this table by searching for them in the form below. -

-

- Note: Privilege settings take effect immediately. It is not necessary to save the category after adjusting - these settings. -

-
-
- -
-
+

+ You can configure the access control privileges for this category in this section. Privileges can be granted on a per-user or + a per-group basis. You can add a new user to this table by searching for them in the form below. +

+

+ Note: Privilege settings take effect immediately. It is not necessary to save the category after adjusting + these settings. +

+
+
+
@@ -131,4 +127,3 @@ save - \ No newline at end of file diff --git a/src/views/admin/manage/groups.tpl b/src/views/admin/manage/groups.tpl index e2079e74b4..72ad905427 100644 --- a/src/views/admin/manage/groups.tpl +++ b/src/views/admin/manage/groups.tpl @@ -77,6 +77,5 @@ - diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index 96df92ca3f..275e1d6255 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -118,7 +118,6 @@
- diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl index 8b4a775fb8..4c483ad1ba 100644 --- a/src/views/admin/partials/menu.tpl +++ b/src/views/admin/partials/menu.tpl @@ -83,6 +83,7 @@ +

Advanced

@@ -98,8 +99,6 @@
- -