diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c602661541..5223929285 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -50,6 +50,15 @@ $ git rev-parse HEAD If you have downloaded the `.zip` or `.tar.gz` packages from GitHub (or elsewhere), please let us know. +## Provide theme versions if issue is related to the theme/display + +``` bash +$ npm ls nodebb-theme-vanilla nodebb-theme-lavender +nodebb@0.7.0-dev /home/julian/Projects/nodebb/forum +├── nodebb-theme-lavender@0.2.13 +└── nodebb-theme-vanilla@0.2.35 +``` + ## Attempt to use `git bisect` If you have installed NodeBB via GitHub clone, are familiar with utilising git, and are willing to help us narrow down the specific commit that causes a bug, consider running `git bisect`. diff --git a/Gruntfile.js b/Gruntfile.js index b1a381b64f..551d8d7ed3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -63,7 +63,7 @@ module.exports = function(grunt) { files: ['*.js', 'src/**/*.js'] }, templatesUpdated: { - files: ['src/views/**/*.tpl', 'node_modules/nodebb-*/*.tpl', 'node_modules/nodebb-*/*/*.tpl', 'node_modules/nodebb-*/*/*/*.tpl', 'node_modules/nodebb-*/*/*/*/*.tpl'] + files: ['src/views/**/*.tpl', 'node_modules/nodebb-*/*.tpl', 'node_modules/nodebb-*/*/*.tpl', 'node_modules/nodebb-*/*/*/*.tpl', 'node_modules/nodebb-*/*/*/*/*.tpl', 'node_modules/nodebb-*/*/*/*/*/*.tpl'] } } }); diff --git a/install/data/navigation.json b/install/data/navigation.json new file mode 100644 index 0000000000..228f9c4b3d --- /dev/null +++ b/install/data/navigation.json @@ -0,0 +1,82 @@ +[ + { + "id": "unread-count", + "route": "/unread", + "title": "\\[\\[global:header.unread\\]\\]", + "enabled": true, + "iconClass": "fa-inbox", + "textClass": "visible-xs-inline", + "text": "\\[\\[global:header.unread\\]\\]", + "properties": { + "loggedIn": true + } + }, + { + "route": "/recent", + "title": "\\[\\[global:header.recent\\]\\]", + "enabled": true, + "iconClass": "fa-clock-o", + "textClass": "visible-xs-inline", + "text": "\\[\\[global:header.recent\\]\\]" + }, + { + "route": "/tags", + "title": "\\[\\[global:header.tags\\]\\]", + "enabled": true, + "iconClass": "fa-tags", + "textClass": "visible-xs-inline", + "text": "\\[\\[global:header.tags\\]\\]" + }, + { + "route": "/popular", + "title": "\\[\\[global:header.popular\\]\\]", + "enabled": true, + "iconClass": "fa-fire", + "textClass": "visible-xs-inline", + "text": "\\[\\[global:header.popular\\]\\]" + }, + { + "route": "/users", + "title": "\\[\\[global:header.users\\]\\]", + "enabled": true, + "iconClass": "fa-user", + "textClass": "visible-xs-inline", + "text": "\\[\\[global:header.users\\]\\]", + "properties": { + "loggedIn": true + } + }, + { + "route": "/groups", + "title": "\\[\\[global:header.groups\\]\\]", + "enabled": true, + "iconClass": "fa-group", + "textClass": "visible-xs-inline", + "text": "\\[\\[global:header.groups\\]\\]" + }, + { + "route": "/admin", + "title": "\\[\\[global:header.admin\\]\\]", + "enabled": true, + "iconClass": "fa-cogs", + "textClass": "visible-xs-inline", + "text": "\\[\\[global:header.admin\\]\\]", + "properties": { + "target": "_top", + "adminOnly": true + } + }, + { + "route": "/search", + "title": "\\[\\[global:header.search\\]\\]", + "enabled": true, + "iconClass": "fa-search", + "textClass": "visible-xs-inline", + "text": "\\[\\[global:header.search\\]\\]", + "properties": { + "installed": { + "search": true + } + } + } +] \ No newline at end of file diff --git a/package.json b/package.json index 93c685afec..6f38b87f0d 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-spam-be-gone": "^0.4.0", "nodebb-theme-lavender": "^1.0.6", - "nodebb-theme-vanilla": "^1.0.14", + "nodebb-theme-vanilla": "^1.0.28", "nodebb-widget-essentials": "~0.2.12", "nodebb-rewards-essentials": "^0.0.1", "npm": "^2.1.4", @@ -63,7 +63,7 @@ "socket.io-redis": "^0.1.3", "socketio-wildcard": "~0.1.1", "string": "^3.0.0", - "templates.js": "^0.1.15", + "templates.js": "^0.1.23", "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git", "underscore": "~1.7.0", "validator": "^3.30.0", diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 73eb289378..51993e5f98 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -19,6 +19,8 @@ "email-taken": "البريد الالكتروني مأخوذ", "email-not-confirmed": "عنوان بريدك الإلكتروني غير مفعل بعد. انقر هنا لتفعيله من فضلك.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "اسم المستخدم قصير.", "username-too-long": "اسم المستخدم طويل", "user-banned": "المستخدم محظور", @@ -33,6 +35,7 @@ "no-emailers-configured": "لا يمكن إرسال رسالة إلكترونية تجريبية لعدم وجود قوالب خاصة بالرسائل الإلكترونية،", "category-disabled": "قائمة معطلة", "topic-locked": "الموضوع مقفول", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "الرجاء انتظار الرفع", "content-too-short": "المرجو إدخال موضوع أطول من هذا. يجب أن تتوفر المواضيع على %1 حروف على الأقل.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "المرجو إدخال عنوان أقصر من هذا. يجب ألا تتجاوز العناوين %1 حرفًا.", "too-many-posts": "يمكنك إنشاء المواضيع بمعدل موضوع واحد كل %1 ثانية - المرجو الانتظار قليلا.", "too-many-posts-newbie": "بصفتك مستخدمًا جديدًا، يمكنك إنشاء المواضيع بمعدل موضوع واحد كل %1 ثانية حتى تحصل على سمعة %2 - المرجو الانتظار قليلا.", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "حجم الملفات الأقصى المسموح به هو %1 كب - المرجو رفع ملف أقل حجمًا", "cant-vote-self-post": "لايمكنك التصويت لردك", "already-favourited": "لقد سبق وأضفت هذا الرد إلى المفضلة", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "اسم المجموعة قصير", "group-already-exists": "المجموعة موجودة مسبقا", "group-name-change-not-allowed": "لايسمح بتغيير أسماء المجموعات", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "الصور المصغرة غير مفعلة.", "invalid-file": "ملف غير مقبول", "uploads-are-disabled": "رفع الملفات غير مفعل", - "upload-error": "مشكلة في الرفع: 1%", "signature-too-long": "عذرا، توقيعك يجب ألا يتجاوز %1 حرفًا", "cant-chat-with-yourself": "لايمكنك فتح محادثة مع نفسك", "chat-restricted": "هذا المستخدم عطل المحادثات الواردة عليه. يجب أن يتبعك حتى تتمكن من فتح محادثة معه.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "ليس لديك سمعة تكفي للإشعار بموضوع مخل", "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\". سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.", "registration-error": "حدث خطأ أثناء التسجيل", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ar/groups.json b/public/language/ar/groups.json index b006f74391..0975ca84ca 100644 --- a/public/language/ar/groups.json +++ b/public/language/ar/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "أعضاء هذه المجموعة لم يضيفوا أية مشاركة", "details.latest_posts": "آخر المشاركات", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ar/login.json b/public/language/ar/login.json index ffc5beb15a..f6575cf40a 100644 --- a/public/language/ar/login.json +++ b/public/language/ar/login.json @@ -1,5 +1,7 @@ { - "username": "اسم المستخدم / عنوان البريد الإلكتروني", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "تذكرني؟", "forgot_password": "نسيت كلمة المرور؟", "alternative_logins": "تسجيلات الدخول البديلة", diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index 0c1f53f377..711a1a4450 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -2,6 +2,7 @@ "title": "تنبيهات", "no_notifs": "ليس لديك أية تنبيهات جديدة", "see_all": "معاينة كل التنبيهات", + "mark_all_read": "Mark all notifications read", "back_to_home": "عودة إلى %1", "outgoing_link": "رابط خارجي", "outgoing_link_message": "أنت تغادر %1 حاليا.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 صار يتابعك.", "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني", "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.", - "email-confirm-error": "حدث خطأ ما...", "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.", "email-confirm-sent": "تم إرسال بريد التفعيل." } \ No newline at end of file diff --git a/public/language/ar/recent.json b/public/language/ar/recent.json index 41da45d951..02003e5d81 100644 --- a/public/language/ar/recent.json +++ b/public/language/ar/recent.json @@ -6,6 +6,7 @@ "year": "سنة", "alltime": "دائمًا", "no_recent_topics": "لاوجود لمشاركات جديدة", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/ar/search.json b/public/language/ar/search.json index 50b985d452..9128baf408 100644 --- a/public/language/ar/search.json +++ b/public/language/ar/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ar/tags.json b/public/language/ar/tags.json index 2aa28aa7c5..004681a32a 100644 --- a/public/language/ar/tags.json +++ b/public/language/ar/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "لاوجود لمواضيع تحمل هذا الوسم.", "tags": "بطاقات", - "enter_tags_here": "أدخل البطاقات هنا. اضغط ENTER بعد كل بطاقة.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "أدخل البطاقات...", "no_tags": "لاتوجد هناك بطاقات بعد." } \ No newline at end of file diff --git a/public/language/bn/error.json b/public/language/bn/error.json index d1abf066d9..946b152345 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -19,6 +19,8 @@ "email-taken": "ইমেইল আগেই ব্যবহৃত", "email-not-confirmed": "আপনার ইমেইল এড্রেস নিশ্চিত করা হয় নি, নিশ্চিত করতে এখানে ক্লিক করুন।", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "খুব ছোট ইউজারনেম", "username-too-long": "ইউজারনেম বড় হয়ে গিয়েছে", "user-banned": "ব্যবহারকারী নিষিদ্ধ", @@ -33,6 +35,7 @@ "no-emailers-configured": "কোন ইমেল প্লাগইন লোড করা নেই, কাজেই টেস্ট মেইল পাঠানো সম্ভব হচ্ছে না", "category-disabled": "বিভাগটি নিষ্ক্রিয়", "topic-locked": "টপিক বন্ধ", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "আপলোড সম্পূর্ণ জন্য অনুগ্রহ করে অপেক্ষা করুন", "content-too-short": "অনুগ্রহকরে অপেক্ষকৃত বড় পোষ্ট করুন। একটি পোষ্টে নূন্যতম %1 অক্ষর থাকতে হবে।", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "অনুগ্রহ করে সংক্ষিপ্ত শিরোনাম লিখুন। শিরোনাম %1 অক্ষরের বেশি হতে পারবে না।", "too-many-posts": "আপনি প্রতি %1 সেকেন্ডে একবার পোষ্ট করতে পারবেন। পরবর্তী পোষ্ট করার জন্য অপেক্ষা করুন। ", "too-many-posts-newbie": "নতুন সদস্য হিসাবে %2 সন্মানণা পাওয়া পর্যন্ত আপনি প্রতি %1 সেকেন্ডে একবার পোষ্ট করতে পারবেন। পরবর্তী পোষ্ট করার জন্য অপেক্ষা করুন। ", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "সর্বোচ্চ গৃহীত ফাইলসাইজ হচ্ছে %1 kb - অনুগ্রহপূর্বক ছোট ফাইল আপলোড করুন", "cant-vote-self-post": "আপনি নিজের পোস্টে ভোট দিতে পারবেন না।", "already-favourited": "আপনি ইতিমধ্যে এই পোষ্টটি পছন্দের তালিকায় যোগ করেছেন", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "আপনি অন্য এ্যাডমিনদের নিষিদ্ধ করতে পারেন না!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "গ্রুপের নাম খুব ছোট", "group-already-exists": "গ্রুপ ইতিমধ্যেই বিদ্যমান", "group-name-change-not-allowed": "গ্রুপের নাম পরিবর্তনের অনুমতি নেই", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "টপিক থাম্বনেল নিষ্ক্রিয় করা। ", "invalid-file": "ভুল ফাইল", "uploads-are-disabled": "আপলোড নিষ্ক্রিয় করা", - "upload-error": "আপলোড ত্রুটিঃ %1", "signature-too-long": "দুঃখিত, আপনার সাক্ষর %1 অক্ষরের বেশী হতে পারবে না। ", "cant-chat-with-yourself": "আপনি নিজের সাথে চ্যাট করতে পারবেন না!", "chat-restricted": "এই সদস্য তার বার্তালাপ সংরক্ষিত রেখেছেন। এই সদস্য আপনাকে ফলো করার পরই কেবলমাত্র আপনি তার সাথে চ্যাট করতে পারবেন", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "এই পোষ্টকে ফ্লাগ করার জন্য আপনার পর্যাপ্ত সম্মাননা নেই", "reload-failed": "\"%1\" রিলোড করতে সমস্যা হয়েছে। রিলোডের পূর্বে যা করা হয়েছিল সেটি আনডু করা সমীচীন। ", "registration-error": "নিবন্ধন এরর!", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/bn/groups.json b/public/language/bn/groups.json index fe8c9fed1d..50e0a886dc 100644 --- a/public/language/bn/groups.json +++ b/public/language/bn/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "এই গ্রুপের সদস্যরা এখনো কোন পোষ্ট করেন নি", "details.latest_posts": "সর্বশেষ পোষ্টসমূহ", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/bn/login.json b/public/language/bn/login.json index e9e2529361..c34f1de706 100644 --- a/public/language/bn/login.json +++ b/public/language/bn/login.json @@ -1,5 +1,7 @@ { - "username": "ইউজারনেম / ইমেইল", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "মনে রাখুন", "forgot_password": "পাসওয়ার্ড ভুলে গিয়েছেন?", "alternative_logins": "বিকল্প প্রবেশ", diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json index 14604f6b38..2c29c68362 100644 --- a/public/language/bn/notifications.json +++ b/public/language/bn/notifications.json @@ -2,6 +2,7 @@ "title": "বিজ্ঞপ্তিগুলো", "no_notifs": "আপনার নতুন কোন বিজ্ঞপ্তি নেই", "see_all": "সকল বিজ্ঞপ্তিগুলো দেখুন", + "mark_all_read": "Mark all notifications read", "back_to_home": "ফিরুন %1", "outgoing_link": "বহির্গামী লিঙ্ক", "outgoing_link_message": "আপনি এখন %1 ত্যাগ করছেন", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 আপনাকে অনুসরন করা শুরু করেছেন।", "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে", "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।", - "email-confirm-error": "একটি ত্রুটি ঘটেছে...", "email-confirm-error-message": "আপনার ইমেল ঠিকানার বৈধতা যাচাইয়ে একটি সমস্যা হয়েছে। সম্ভবত কোডটি ভুল ছিল অথবা কোডের মেয়াদ শেষ হয়ে গিয়েছে।", "email-confirm-sent": "নিশ্চিতকরণ ইমেইল পাঠানো হয়েছে।" } \ No newline at end of file diff --git a/public/language/bn/recent.json b/public/language/bn/recent.json index 518b443560..720bab2407 100644 --- a/public/language/bn/recent.json +++ b/public/language/bn/recent.json @@ -6,6 +6,7 @@ "year": "বছর", "alltime": "সবসময় ", "no_recent_topics": "কোন সাম্প্রতিক টপিক নেই। ", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/bn/search.json b/public/language/bn/search.json index 0038567599..8fef1aef5a 100644 --- a/public/language/bn/search.json +++ b/public/language/bn/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/bn/tags.json b/public/language/bn/tags.json index 9db45491d2..e99c0f835d 100644 --- a/public/language/bn/tags.json +++ b/public/language/bn/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "এই ট্যাগ সম্বলিত কোন টপিক নেই", "tags": "ট্যাগসমূহ", - "enter_tags_here": "এখানে আপনার ট্যাগ টাইপ করুন, প্রত্যেকটি ট্যাগের পর Enter চাপুন", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "ট্যাগ বসান", "no_tags": "এখন পর্যন্ত কোন ট্যাগ নেই" } \ No newline at end of file diff --git a/public/language/cs/error.json b/public/language/cs/error.json index f858b2b15f..6be7f9f69d 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -19,6 +19,8 @@ "email-taken": "Email je již použit", "email-not-confirmed": "Vaše emailová adresa zatím nebyla potvrzena. Kliknutím zde svůj email potvrdíte.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Uživatelské jméno je příliš krátké", "username-too-long": "Uživatelské jméno je příliš dlouhé", "user-banned": "Uživatel byl zakázán", @@ -33,6 +35,7 @@ "no-emailers-configured": "Protože není zaveden žádný emailový plugin, není možné odeslat testovací email.", "category-disabled": "Kategorie zakázána", "topic-locked": "Téma uzamčeno", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Vyčkejte, prosím, nežli se vše kompletně nahraje.", "content-too-short": "Vložte, prosím, delší příspěvek. Příspěvky by měly obsahovat nejméně %1 znaků.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Vložte, prosím, kratší titulek. Titulky by neměly být delší, než-li %1 znaků.", "too-many-posts": "Své příspěvky můžete odesílat po %1 sekundách - vyčkejte, prosím, před dalším odesláním", "too-many-posts-newbie": "Jako nový uživatel můžete své příspěvky odesílat po %1 sekundách, dokud nedosáhnete %2 reputace - vyčkejte, prosím, před dalším odesláním", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximální povolená velikost souboru je %1 kbs - nahrávejte, prosím, menší soubory", "cant-vote-self-post": "Nemůžete hlasovat pro svůj vlastní příspěvek", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Nemůžete zakazovat ostatní administrátory!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Název skupiny je příliš krátký", "group-already-exists": "Skupina už exstuje", "group-name-change-not-allowed": "Změna názvu skupiny není povolena", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Neplatný soubor", "uploads-are-disabled": "Nahrávání je zakázáno", - "upload-error": "Chyba při nahrávání : %1", "signature-too-long": "Pardon, ale váš podpis nemůže být delší, než-li %1 znaků.", "cant-chat-with-yourself": "Nemůžete chatovat sami se sebou!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Chyba při registraci", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/cs/groups.json b/public/language/cs/groups.json index 95d083451f..06b86790ae 100644 --- a/public/language/cs/groups.json +++ b/public/language/cs/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Členové této skupiny dosud neodeslali ani jeden příspěvek.", "details.latest_posts": "Nejnovější příspěvky", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/cs/login.json b/public/language/cs/login.json index a2bb040e89..3308fbdde6 100644 --- a/public/language/cs/login.json +++ b/public/language/cs/login.json @@ -1,5 +1,7 @@ { - "username": "Uživatelské jméno / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Zapamatovat si mě?", "forgot_password": "Zapomněli jste heslo?", "alternative_logins": "Další způsoby přihlášení", diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index de2aad9422..791c3dc948 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -2,6 +2,7 @@ "title": "Upozornění", "no_notifs": "You have no new 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", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/cs/recent.json b/public/language/cs/recent.json index 9432ffeac8..13e8b2284e 100644 --- a/public/language/cs/recent.json +++ b/public/language/cs/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "There are no recent topics.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/cs/search.json b/public/language/cs/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/cs/search.json +++ b/public/language/cs/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/cs/tags.json b/public/language/cs/tags.json index 55bce276dc..f2003f978a 100644 --- a/public/language/cs/tags.json +++ b/public/language/cs/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Není zde žádné téma s tímto tagem.", "tags": "Tagy", - "enter_tags_here": "Zde vložte tagy. Po každém vložení tagu zmáčkněte enter.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Vložte tagy ...", "no_tags": "Zatím tu není žádný tag." } \ No newline at end of file diff --git a/public/language/de/error.json b/public/language/de/error.json index b2deb8a2d3..a05417d878 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -19,6 +19,8 @@ "email-taken": "Die E-Mail-Adresse ist bereits vergeben", "email-not-confirmed": "Deine E-Mail wurde noch nicht bestätigt. Bitte klicke hier, um deine E-Mail zu bestätigen.", "email-not-confirmed-chat": "Der Chat ist deaktiviert bis Du deine E-Mail bestätigt hast", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Benutzername ist zu kurz", "username-too-long": "Der Benutzername ist zu lang", "user-banned": "Der Benutzer ist gesperrt", @@ -33,6 +35,7 @@ "no-emailers-configured": "Es wurde keine E-Mail-Plugins geladen, weshalb eine Test-E-Mail nicht gesendet werden konnte.", "category-disabled": "Kategorie ist deaktiviert", "topic-locked": "Thema ist gesperrt", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.", "content-too-short": "Bitte gib einen längeren Beitrag ein. Beiträge sollten mindestens %1 Zeichen enthalten.", "content-too-long": "Bitte schreibe einen kürzeren Beitrag. Beiträge können nicht mehr als %1 Zeichen enthalten.", @@ -40,6 +43,8 @@ "title-too-long": "Der Titel darf maximal %1 Zeichen enthalten.", "too-many-posts": "Du kannst maximal alle %1 Sekunden einen Beitrag erstellen - bitte warte, bevor du einen neuen Beitrag erstellst", "too-many-posts-newbie": "Als neuer Benutzer kannst du nur alle %1 Sekunden einen Beitrag verfassen, bis du %2 Reputationspunkte hast - Bitte warte etwas, bevor du erneut einen Beitrag verfasst", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Die maximale Dateigröße beträgt %1 kbs - bitte lade eine kleinere Datei hoch", "cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten.", "already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!", "invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1", "invalid-image-extension": "Ungültige Dateinamenerweiterung", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Gruppenname zu kurz", "group-already-exists": "Gruppe existiert bereits", "group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Vorschaubilder für Themen sind deaktiviert", "invalid-file": "Datei ungültig", "uploads-are-disabled": "Uploads sind deaktiviert", - "upload-error": "Upload-Fehler: %1", "signature-too-long": "Entschuldigung, deine Signatur darf maximal %1 Zeichen enthalten.", "cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!", "chat-restricted": "Dieser Benutzer hat seine Chatfunktion eingeschränkt. Du kannst nur mit diesem Benutzer chatten, wenn er dir folgt.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Deine Reputation ist nicht gut genug, um diesen Beitrag zu melden", "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen.", "registration-error": "Registrierungsfehler", - "parse-error": "Ein Fehler ist beim Parsen der Server-Antwort aufgetreten" + "parse-error": "Ein Fehler ist beim Parsen der Server-Antwort aufgetreten", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/de/groups.json b/public/language/de/groups.json index 92b805dd6a..3f81c9bfea 100644 --- a/public/language/de/groups.json +++ b/public/language/de/groups.json @@ -4,6 +4,8 @@ "owner": "Gruppenbesitzer", "new_group": "Neue Gruppe erstellen", "no_groups_found": "Es sind keine Gruppen vorhanden", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop ein Foto, bewege es in Position, dann drücke Speichern", "cover-change": "Ändern", "cover-save": "Speichern", @@ -13,11 +15,20 @@ "details.pending": "Ausstehende Mitglieder", "details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.", "details.latest_posts": "Aktuelle Beiträge", - "details.private": "Private Gruppe", - "details.public": "Öffentliche Gruppe", + "details.private": "Private", "details.grant": "Gewähre/Widerrufe Besitz", "details.kick": "Kick", "details.owner_options": "Gruppenadministration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Gruppendetails wurden aktualisiert", "event.deleted": "Die Gruppe \"% 1\" wurde gelöscht" } \ No newline at end of file diff --git a/public/language/de/login.json b/public/language/de/login.json index 099b5a48c4..4099772d0d 100644 --- a/public/language/de/login.json +++ b/public/language/de/login.json @@ -1,5 +1,7 @@ { - "username": "Nutzername / E-Mail Adresse", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Eingeloggt bleiben?", "forgot_password": "Passwort vergessen?", "alternative_logins": "Login Alternativen", diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index 5a8981943d..f032f7151e 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -2,6 +2,7 @@ "title": "Benachrichtigungen", "no_notifs": "Du hast keine neuen Benachrichtigungen", "see_all": "Alle Benachrichtigungen ansehen", + "mark_all_read": "Mark all notifications read", "back_to_home": "Zurück zu %1", "outgoing_link": "Externer Link", "outgoing_link_message": "Du verlässt nun %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 folgt dir jetzt.", "email-confirmed": "E-Mail bestätigt", "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.", - "email-confirm-error": "Es ist ein Fehler aufgetreten ...", "email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.", "email-confirm-sent": "Bestätigungs-E-Mail gesendet." } \ No newline at end of file diff --git a/public/language/de/recent.json b/public/language/de/recent.json index 7242d231da..3fb6fc7ea7 100644 --- a/public/language/de/recent.json +++ b/public/language/de/recent.json @@ -6,6 +6,7 @@ "year": "Jahr", "alltime": "Gesamter Zeitraum", "no_recent_topics": "Es gibt keine aktuellen Themen.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Es gibt ein neues Thema.", "there-is-a-new-topic-and-a-new-post": "Es gibt ein neues Thema und einen neuen Beitrag.", "there-is-a-new-topic-and-new-posts": "Es gibt ein neues Thema und %1 neue Beiträge.", diff --git a/public/language/de/search.json b/public/language/de/search.json index d817f2aa7f..29a51edbe3 100644 --- a/public/language/de/search.json +++ b/public/language/de/search.json @@ -31,5 +31,10 @@ "username": "Benutzername", "category": "Kategorie", "descending": "In absteigender Reihenfolge", - "ascending": "In aufsteigender Reihenfolge" + "ascending": "In aufsteigender Reihenfolge", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/de/tags.json b/public/language/de/tags.json index 13a2b4b0d0..7e7e548c8f 100644 --- a/public/language/de/tags.json +++ b/public/language/de/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Es gibt keine Themen mit diesem Tag.", "tags": "Tags", - "enter_tags_here": "Gib hier Tags ein und drück die Eingabetaste nach jedem Tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Gib Tags ein...", "no_tags": "Es gibt bisher keine Tags." } \ No newline at end of file diff --git a/public/language/el/error.json b/public/language/el/error.json index 9cadac2731..26ca6539ba 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -19,6 +19,8 @@ "email-taken": "Το email είναι πιασμένο", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Το όνομα χρήστη είναι πολύ μικρό", "username-too-long": "Το όνομα χρήστη είναι πολύ μεγάλο", "user-banned": "Ο Χρήστης είναι αποκλεισμένος/η", @@ -33,6 +35,7 @@ "no-emailers-configured": "Δεν έχουν φορτωθεί email plugins, οποτε το δοκιμαστικό email δεν μπορεί να σταλθεί", "category-disabled": "Η κατηγορία έχει απενεργοποιηθεί", "topic-locked": "Το θέμα έχει κλειδωθεί", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Παρακαλώ περίμενε να τελειώσει το ανέβασμα των αρχείων.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Παρακαλώ γράψε έναν μικρότερο τίτλο. Δεν μπορεί να είναι μεγαλύτερος από %1 χαρακτήρες.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "Δεν μπορείς να ψηφίσεις την δημοσίευσή σου", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Δεν μπορείς να αποκλείσεις άλλους διαχειριστές!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Το όνομα της ομάδας είναι πολύ μικρό", "group-already-exists": "Το όνομα της ομάδας υπάρχει ήδη", "group-name-change-not-allowed": "Αλλαγή του ονόματος της ομάδας δεν επιτρέπεται", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Οι εικόνες θεμάτων είναι απενεργοποιημένες", "invalid-file": "Άκυρο Αρχείο", "uploads-are-disabled": "Το ανέβασμα αρχείων έχει απενεργοποιηθεί", - "upload-error": "Λάθος ανεβάσματος αρχείου: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Δεν μπορείς να συνομιλήσεις με τον εαυτό σου!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "Το NodeBB συνάντησε ένα πρόβλημα καθώς γινόταν η ανανέωση: \"%1\". Το NodeBB θα συνεχίσει να προσφέρει τα στοιχεία του χρήστη, αν και θα ήταν καλή ιδέα να επαναφέρεις ότι έκανες πριν την ανανέωση.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/el/groups.json b/public/language/el/groups.json index 9ad8583476..305920e189 100644 --- a/public/language/el/groups.json +++ b/public/language/el/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Τα μέλη αυτής της ομάδας δεν έχουν δημοσιεύσει τίποτα.", "details.latest_posts": "Τελευταίες δημοσιεύσεις.", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/el/login.json b/public/language/el/login.json index e8ba8157d5..6c10fb3de8 100644 --- a/public/language/el/login.json +++ b/public/language/el/login.json @@ -1,5 +1,7 @@ { - "username": "Όνομα χρήστη / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Απομνημόνευση;", "forgot_password": "Ξέχασες τον κωδικό σου;", "alternative_logins": "Εναλλακτικά Login", diff --git a/public/language/el/notifications.json b/public/language/el/notifications.json index d59bf490c6..68fe73ee7f 100644 --- a/public/language/el/notifications.json +++ b/public/language/el/notifications.json @@ -2,6 +2,7 @@ "title": "Ειδοποιήσεις", "no_notifs": "Δεν έχεις νέες ειδοποιήσεις;", "see_all": "Προβολή όλων των ειδοποιήσεων", + "mark_all_read": "Mark all notifications read", "back_to_home": "Πίσω στο %1", "outgoing_link": "Εξερχόμενος Σύνδεσμος", "outgoing_link_message": "Τώρα φεύγεις από το %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "Ο/Η %1 σε ακολουθεί.", "email-confirmed": "Το Εmail Επιβεβαιώθηκε", "email-confirmed-message": "Ευχαριστούμε που επιβεβαίωσες το email σου. Ο λογαριασμός σου είναι πλέον πλήρως ενεργοποιημένος.", - "email-confirm-error": "Συνέβη κάποιο σφάλμα...", "email-confirm-error-message": "Υπήρξε κάποιο πρόβλημα με την επιβεβαίωση της διεύθυνσής email σου. Ίσως ο κώδικας να είναι άκυρος ή να έχει λήξει.", "email-confirm-sent": "Στάλθηκε email επιβεβαίωσης." } \ No newline at end of file diff --git a/public/language/el/recent.json b/public/language/el/recent.json index d5ca1ec34f..8424eb4616 100644 --- a/public/language/el/recent.json +++ b/public/language/el/recent.json @@ -6,6 +6,7 @@ "year": "Έτος", "alltime": "Όλο το Ιστορικό", "no_recent_topics": "Δεν υπάρχουν πρόσφατα θέματα.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/el/search.json b/public/language/el/search.json index eb08d6b538..11b0b90621 100644 --- a/public/language/el/search.json +++ b/public/language/el/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/el/tags.json b/public/language/el/tags.json index 0447ae05b3..4264ed78aa 100644 --- a/public/language/el/tags.json +++ b/public/language/el/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Δεν υπάρχουν θέματα με αυτή την ετικέτα.", "tags": "Ετικέτες", - "enter_tags_here": "Εισαγωγή ετικετών εδώ. Πάτα enter μετά από κάθε ετικέτα.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Εισαγωγή ετικετών...", "no_tags": "Δεν υπάρχουν ακόμα ετικέτες." } \ No newline at end of file diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json index 9bbcf03247..e0700f76c4 100644 --- a/public/language/en@pirate/error.json +++ b/public/language/en@pirate/error.json @@ -19,6 +19,8 @@ "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "User banned", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Invalid File", "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/en@pirate/groups.json b/public/language/en@pirate/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/en@pirate/groups.json +++ b/public/language/en@pirate/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/en@pirate/login.json b/public/language/en@pirate/login.json index 70876d7617..6e7b7a36c0 100644 --- a/public/language/en@pirate/login.json +++ b/public/language/en@pirate/login.json @@ -1,5 +1,7 @@ { - "username": "Yer handle or email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Remember Me?", "forgot_password": "My mind be a scatt'rbrain, help a matey out!", "alternative_logins": "Oth'r gangplanks", diff --git a/public/language/en@pirate/notifications.json b/public/language/en@pirate/notifications.json index 67e29239a7..3eb4fba74d 100644 --- a/public/language/en@pirate/notifications.json +++ b/public/language/en@pirate/notifications.json @@ -2,6 +2,7 @@ "title": "Notifications", "no_notifs": "You have no new notifications", "see_all": "Spy wit' ye eye all ye notifications", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Go offshore", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/en@pirate/recent.json b/public/language/en@pirate/recent.json index 065b6dc6a5..791760308e 100644 --- a/public/language/en@pirate/recent.json +++ b/public/language/en@pirate/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "There be no recent topics.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/en@pirate/search.json b/public/language/en@pirate/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/en@pirate/search.json +++ b/public/language/en@pirate/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/en@pirate/tags.json b/public/language/en@pirate/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/en@pirate/tags.json +++ b/public/language/en@pirate/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index b2f9a3b86b..8bb83071fc 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -25,6 +25,7 @@ "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username too short", "username-too-long": "Username too long", @@ -44,6 +45,7 @@ "category-disabled": "Category disabled", "topic-locked": "Topic Locked", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json index a72cf20110..09b1509171 100644 --- a/public/language/en_GB/groups.json +++ b/public/language/en_GB/groups.json @@ -29,6 +29,7 @@ "details.change_icon": "Change Icon", "details.change_colour": "Change Colour", "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", "details.private_help": "If enabled, joining of groups requires approval from a group owner", "details.hidden": "Hidden", "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", diff --git a/public/language/en_GB/notifications.json b/public/language/en_GB/notifications.json index 96aef60183..19de8e2c28 100644 --- a/public/language/en_GB/notifications.json +++ b/public/language/en_GB/notifications.json @@ -25,7 +25,6 @@ "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json index 9c32b2d26e..f7460a8821 100644 --- a/public/language/en_GB/user.json +++ b/public/language/en_GB/user.json @@ -65,6 +65,7 @@ "digest_monthly": "Monthly", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.", "has_no_follower": "This user doesn't have any followers :(", "follows_no_one": "This user isn't following anyone :(", @@ -88,5 +89,7 @@ "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", "follow_topics_you_reply_to": "Follow topics that you reply to.", - "follow_topics_you_create": "Follow topics you create." + "follow_topics_you_create": "Follow topics you create.", + + "grouptitle": "Select the group title you would like to display" } diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json index 9bbcf03247..e0700f76c4 100644 --- a/public/language/en_US/error.json +++ b/public/language/en_US/error.json @@ -19,6 +19,8 @@ "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "User banned", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Invalid File", "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/en_US/groups.json b/public/language/en_US/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/en_US/groups.json +++ b/public/language/en_US/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/en_US/login.json b/public/language/en_US/login.json index 5ec7affa9a..70b7b98dd5 100644 --- a/public/language/en_US/login.json +++ b/public/language/en_US/login.json @@ -1,5 +1,7 @@ { - "username": "Username / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Remember Me?", "forgot_password": "Forgot Password?", "alternative_logins": "Alternative Logins", diff --git a/public/language/en_US/notifications.json b/public/language/en_US/notifications.json index 1cf64627a4..32ddb12eb7 100644 --- a/public/language/en_US/notifications.json +++ b/public/language/en_US/notifications.json @@ -2,6 +2,7 @@ "title": "Notifications", "no_notifs": "You have no new notifications", "see_all": "See all Notifications", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Outgoing Link", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/en_US/recent.json b/public/language/en_US/recent.json index 5e105ace78..f638d2f8ac 100644 --- a/public/language/en_US/recent.json +++ b/public/language/en_US/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "There are no recent topics.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/en_US/search.json b/public/language/en_US/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/en_US/search.json +++ b/public/language/en_US/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/en_US/tags.json b/public/language/en_US/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/en_US/tags.json +++ b/public/language/en_US/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/es/error.json b/public/language/es/error.json index 7a79b28ba4..1fd31a5b00 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -19,6 +19,8 @@ "email-taken": "Correo electrónico ocupado", "email-not-confirmed": "Su cuenta de correo electrónico no ha sido confirmada aún, por favor haga click aquí para confirmarla.", "email-not-confirmed-chat": "No puedes hacer uso del chat hasta que confirmes tu email", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nombre de usuario es demasiado corto", "username-too-long": "Nombre de usuario demasiado largo", "user-banned": "Usuario baneado", @@ -33,6 +35,7 @@ "no-emailers-configured": "No se ha cargado ningún plugin de email, así que no se pudo enviar el email de prueba.", "category-disabled": "Categoría deshabilitada", "topic-locked": "Tema bloqueado", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Por favor, espera a que terminen las subidas.", "content-too-short": "Por favor introduzca una publicación más larga. Las publicaciones deben contener al menos %1 caracteres.", "content-too-long": "Por favor introduzca un mensaje más corto. Los mensajes no pueden exceder los %1 caracteres.", @@ -40,6 +43,8 @@ "title-too-long": "Por favor, introduce un título más corto, que no sobrepase los %1 caracteres.", "too-many-posts": "Solo puedes publicar una vez cada %1 segundos - por favor espere antes de volver a publicar", "too-many-posts-newbie": "Como nuevo usuario, solo puedes publicar una vez cada %1 segundos hasta hayas ganado una reputación de %2 - por favor espere antes de volver a publicar", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "El tamaño de fichero máximo es de %1 kbs - por favor, suba un fichero más pequeño", "cant-vote-self-post": "No puedes votar tus propios posts", "already-favourited": "Ya ha marcado esta publicación como favorita", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "¡No puedes expulsar a otros administradores!", "invalid-image-type": "Tipo de imagen inválido. Los tipos permitidos son: %1", "invalid-image-extension": "Extensión de imagen inválida", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nombre del grupo es demasiado corto.", "group-already-exists": "El grupo ya existe.", "group-name-change-not-allowed": "El nombre del grupo deseado no está permitido.", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Las miniaturas de los temas están deshabilitadas.", "invalid-file": "Archivo no válido", "uploads-are-disabled": "Las subidas están deshabilitadas.", - "upload-error": "Error de subida: %1", "signature-too-long": "Lo sentimos, pero tu firma no puede ser más larga de %1 caracteres.", "cant-chat-with-yourself": "¡No puedes conversar contigo mismo!", "chat-restricted": "Este usuario tiene restringidos los mensajes de chat. Los usuarios deben seguirte antes de que pueda charlar con ellos", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "No tiene suficiente reputación para poner reportar esta publicación", "reload-failed": "NodeBB encontró un problema al refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste justo antes.", "registration-error": "Error de registro", - "parse-error": "Algo ha ido mal mientras se parseaba la respuesta del servidor" + "parse-error": "Algo ha ido mal mientras se parseaba la respuesta del servidor", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/es/groups.json b/public/language/es/groups.json index 999550b671..112cce2994 100644 --- a/public/language/es/groups.json +++ b/public/language/es/groups.json @@ -4,6 +4,8 @@ "owner": "Propietario del Grupo", "new_group": "Crear Nuevo Grupo", "no_groups_found": "No hay grupos que ver", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Arrastra y suelta una foto, arrastra a la posición, y pulsa Guardar ", "cover-change": "Cambiar", "cover-save": "Guardar", @@ -13,11 +15,20 @@ "details.pending": "Miembros Pendientes", "details.has_no_posts": "Los miembros de este grupo no han hecho ninguna publicación.", "details.latest_posts": "Últimas Publicaciones", - "details.private": "Grupo Privado", - "details.public": "Grupo Público", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Administración De Grupo", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Los detalles del grupo han sido actualizados", "event.deleted": "El grupo \"%1\" ha sido eliminado" } \ No newline at end of file diff --git a/public/language/es/login.json b/public/language/es/login.json index abf84d1921..e30f15dff4 100644 --- a/public/language/es/login.json +++ b/public/language/es/login.json @@ -1,5 +1,7 @@ { - "username": "Usuario / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "¿Recordarme?", "forgot_password": "¿Olvidaste tu contraseña?", "alternative_logins": "Métodos alternativos", diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index 36cc975006..630e9376fe 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -2,6 +2,7 @@ "title": "Notificaciones", "no_notifs": "No tiene nuevas notificaciones", "see_all": "Ver todas las notificaciones", + "mark_all_read": "Mark all notifications read", "back_to_home": "Volver a %1", "outgoing_link": "Enlace externo", "outgoing_link_message": "Ahora estás saliendo de %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 comenzó a seguirte.", "email-confirmed": "Correo electrónico confirmado", "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.", - "email-confirm-error": "Ha ocurrido un error...", "email-confirm-error-message": "Hubo un problema al validar tu cuenta de correo electrónico. Quizá el código era erróneo o expiró...", "email-confirm-sent": "Correo de confirmación enviado." } \ No newline at end of file diff --git a/public/language/es/recent.json b/public/language/es/recent.json index ea473a2b51..1ff9669e51 100644 --- a/public/language/es/recent.json +++ b/public/language/es/recent.json @@ -6,6 +6,7 @@ "year": "Año", "alltime": "Siempre", "no_recent_topics": "No hay publicaciones recientes.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Hay una nueva publicación.", "there-is-a-new-topic-and-a-new-post": "hay una nueva publicación y un nuevo mensaje.", "there-is-a-new-topic-and-new-posts": "Hay una nueva publicación y %1 nuevos mensajes.", diff --git a/public/language/es/search.json b/public/language/es/search.json index e23eea6ba8..2378430561 100644 --- a/public/language/es/search.json +++ b/public/language/es/search.json @@ -31,5 +31,10 @@ "username": "Usuario", "category": "Categoría", "descending": "En orden descendente", - "ascending": "En orden ascendente" + "ascending": "En orden ascendente", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/es/tags.json b/public/language/es/tags.json index 2b41cc48c5..3a86bb7da7 100644 --- a/public/language/es/tags.json +++ b/public/language/es/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "No hay temas con esta etiqueta.", "tags": "Etiquetas", - "enter_tags_here": "Introduce las etiquetas aquí. Pulsa Intro después de introducir cada una.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Introduzca las etiquetas...", "no_tags": "Aún no hay etiquetas." } \ No newline at end of file diff --git a/public/language/et/error.json b/public/language/et/error.json index 277568c591..303197735f 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -19,6 +19,8 @@ "email-taken": "Email on võetud", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Kasutajanimi on liiga lühike", "username-too-long": "Username too long", "user-banned": "Kasutaja bannitud", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategooria keelatud", "topic-locked": "Teema lukustatud", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Palun oota, kuni üleslaadimised on laetud.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Palun sisesta lühem pealkiri. Pealkirjad ei saa olla pikemad kui %1 tähemärki.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "Sa ei saa hääletada enda postituse poolt", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Sa ei saa bannida teisi administraatoreid!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Grupi nimi liiga lühike", "group-already-exists": "Grupp juba eksisteerib", "group-name-change-not-allowed": "Grupi nimevahetus ei ole lubatud", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Teema thumbnailid on keelatud.", "invalid-file": "Vigane fail", "uploads-are-disabled": "Üleslaadimised on keelatud", - "upload-error": "Üleslaadimise viga: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Sa ei saa endaga vestelda!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/et/groups.json b/public/language/et/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/et/groups.json +++ b/public/language/et/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/et/login.json b/public/language/et/login.json index 0981b34e8c..20bd7e3f0d 100644 --- a/public/language/et/login.json +++ b/public/language/et/login.json @@ -1,5 +1,7 @@ { - "username": "Kasutajanimi / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Mäleta mind?", "forgot_password": "Unustasid parooli?", "alternative_logins": "Alternatiivsed sisse logimise võimalused", diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json index fad40fc5d7..46718ce1d4 100644 --- a/public/language/et/notifications.json +++ b/public/language/et/notifications.json @@ -2,6 +2,7 @@ "title": "Teated", "no_notifs": "Sul pole uusi teateid", "see_all": "Vaata kõiki teateid", + "mark_all_read": "Mark all notifications read", "back_to_home": "Tagasi %1", "outgoing_link": "Väljaminev link", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Emaili aadress kinnitatud", "email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja omn nüüd täielikult aktiveeritud.", - "email-confirm-error": "Süsteemis tekkis viga...", "email-confirm-error-message": "Emaili aadressi kinnitamisel tekkis viga. Võibolla kinnituskood oli vale või aegunud.", "email-confirm-sent": "Kinnituskiri on saadetud." } \ No newline at end of file diff --git a/public/language/et/recent.json b/public/language/et/recent.json index 4c35d7484b..272a2b9131 100644 --- a/public/language/et/recent.json +++ b/public/language/et/recent.json @@ -6,6 +6,7 @@ "year": "Aasta", "alltime": "Kogu aja vältel", "no_recent_topics": "Hetkel ei ole hiljutisi teemasid.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/et/search.json b/public/language/et/search.json index 448f45b055..661cebbacd 100644 --- a/public/language/et/search.json +++ b/public/language/et/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/et/tags.json b/public/language/et/tags.json index 4464ed5090..5f63e2b3e7 100644 --- a/public/language/et/tags.json +++ b/public/language/et/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Teemasid, mis sisaldaksid seda märksõna, ei eksisteeri.", "tags": "Märksõnad", - "enter_tags_here": "Sisesta märksõnad siia. Iga märksõna tagant sisesta enterit.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Sisesta märksõnu...", "no_tags": "Siin ei ole veel ühtegi märksõna." } \ No newline at end of file diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json index e99118134c..40ce45c9e0 100644 --- a/public/language/fa_IR/error.json +++ b/public/language/fa_IR/error.json @@ -19,6 +19,8 @@ "email-taken": "این رایانامه گرفته شده است.", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "نام کاربری خیلی کوتاه است.", "username-too-long": "Username too long", "user-banned": "کاربر محروم شد.", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "دسته غیر‌فعال شد.", "topic-locked": "جستار بسته شد.", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "خواهشمندیم عنوان کوتاه‌تری بنویسید. عنوان‌ها نمی‌توانند بیش‌تر از %1 نویسه داشته باشند.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "شما نمی‌توانید به دیدگاه خود رای بدهید.", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "شما نمی‌توانید دیگر مدیران را محروم کنید!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "نام گروه خیلی کوتاه است.", "group-already-exists": "این گروه از پیش وجود دارد.", "group-name-change-not-allowed": "تغیر نام گروه نیاز به دسترسی دارد.", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "چهرک‌های جستار غیرفعال شده است.", "invalid-file": "فایل نامعتبر است.", "uploads-are-disabled": "امکان بارگذاری غیرفعال شده است.", - "upload-error": "خطای بارگذاری: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "شما نمی‌توانید با خودتان گفتگو کنید!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/fa_IR/groups.json b/public/language/fa_IR/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/fa_IR/groups.json +++ b/public/language/fa_IR/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/fa_IR/login.json b/public/language/fa_IR/login.json index 87936c3112..07012aad28 100644 --- a/public/language/fa_IR/login.json +++ b/public/language/fa_IR/login.json @@ -1,5 +1,7 @@ { - "username": "نام کاربری / رایانامه", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "مرا به یاد بسپار؟", "forgot_password": "گذرواژه را فراموش کرده‌اید؟", "alternative_logins": "روش‌های درون آمدن جایگزین", diff --git a/public/language/fa_IR/notifications.json b/public/language/fa_IR/notifications.json index fe0a2aa45d..e56553bba6 100644 --- a/public/language/fa_IR/notifications.json +++ b/public/language/fa_IR/notifications.json @@ -2,6 +2,7 @@ "title": "آگاه‌سازی‌ها", "no_notifs": "هیچ آگاه‌سازی تازه‌ای ندارید", "see_all": "دیدن همهٔ آگاه‌سازی‌ها", + "mark_all_read": "Mark all notifications read", "back_to_home": "بازگشت به %1", "outgoing_link": "پیوند برون‌رو", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "رایانامه تایید شد", "email-confirmed-message": "بابت تایید ایمیلتان سپاس‌گزاریم. حساب کاربری شما اکنون به صورت کامل فعال شده است.", - "email-confirm-error": "خطایی پیش آمده است...", "email-confirm-error-message": "خطایی در تایید آدرس ایمیل شما پیش آمده است. ممکن است کد نا‌معتبر و یا منقضی شده باشد.", "email-confirm-sent": "ایمیل تایید ارسال شد." } \ No newline at end of file diff --git a/public/language/fa_IR/recent.json b/public/language/fa_IR/recent.json index 19fff6a7a7..2a9060fad9 100644 --- a/public/language/fa_IR/recent.json +++ b/public/language/fa_IR/recent.json @@ -6,6 +6,7 @@ "year": "سال", "alltime": "All Time", "no_recent_topics": "There are no recent topics.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/fa_IR/search.json b/public/language/fa_IR/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/fa_IR/search.json +++ b/public/language/fa_IR/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/fa_IR/tags.json b/public/language/fa_IR/tags.json index 78c658e958..82e477f4cc 100644 --- a/public/language/fa_IR/tags.json +++ b/public/language/fa_IR/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "جُستاری با این برچسب وجود ندارد.", "tags": "برچسب‌ها", - "enter_tags_here": "برچسب‌ها را اینجا وارد کنید. بعد از هر برچسب، اینتر بزنید.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "هنوز برچسبی وجود ندارد." } \ No newline at end of file diff --git a/public/language/fi/category.json b/public/language/fi/category.json index 3b098b3cfe..6e36ca410c 100644 --- a/public/language/fi/category.json +++ b/public/language/fi/category.json @@ -1,9 +1,9 @@ { "new_topic_button": "Uusi aihe", - "guest-login-post": "Log in to post", - "no_topics": "Tällä aihealueella ei ole yhtään aihetta.
Miksi et aloittaisi uutta?", + "guest-login-post": "Kirjaudu sisään voidaksesi kirjoittaa viesti", + "no_topics": "Tässä kategoriassa ei ole yhtään aihetta.
Miksi et aloittaisi uutta?", "browsing": "selaamassa", "no_replies": "Kukaan ei ole vastannut", "share_this_category": "Jaa tämä kategoria", - "ignore": "Ignore" + "ignore": "Sivuuta" } \ No newline at end of file diff --git a/public/language/fi/email.json b/public/language/fi/email.json index f290435e75..50237b0d03 100644 --- a/public/language/fi/email.json +++ b/public/language/fi/email.json @@ -1,11 +1,11 @@ { - "password-reset-requested": "Password Reset Requested - %1!", - "welcome-to": "Welcome to %1", - "greeting_no_name": "Hello", - "greeting_with_name": "Hello %1", - "welcome.text1": "Thank you for registering with %1!", - "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.", - "welcome.cta": "Click here to confirm your email address", + "password-reset-requested": "Pyydetty salasanan palautuskoodia - %1!", + "welcome-to": "%1 - Tervetuloa", + "greeting_no_name": "Hei", + "greeting_with_name": "Hei %1", + "welcome.text1": "Kiitos rekisteröitymisestäsi sivustolle %1!", + "welcome.text2": "Meidän täytyy varmistaa, että omistat sen sähköpostiosoitteen, jolla rekisteröidyit, ennen kuin tilisi voidaan aktivoida kokonaan.", + "welcome.cta": "Napsauta tästä vahvistaaksesi sähköpostiosoitteesi", "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 813f7896e2..9ca0ec4973 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -12,27 +12,30 @@ "invalid-title": "Virheellinen otsikko!", "invalid-user-data": "Virheellinen käyttäjätieto", "invalid-password": "Virheellinen salasana", - "invalid-username-or-password": "Please specify both a username and password", - "invalid-search-term": "Invalid search term", + "invalid-username-or-password": "Ole hyvä ja anna sekä käyttäjänimi että salasana", + "invalid-search-term": "Virheellinen hakutermi", "invalid-pagination-value": "Virheellinen taittoarvo", "username-taken": "Käyttäjänimi varattu", "email-taken": "Sähköpostiosoite varattu", - "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed": "Sähköpostiasi ei ole vielä vahvistettu, ole hyvä ja napsauta tätä vahvistaaksesi sen.", + "email-not-confirmed-chat": "Et voi käyttää chattia ennen kuin sähköpostisi on vahvistettu", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Käyttäjänimi on liian lyhyt", - "username-too-long": "Username too long", + "username-too-long": "Käyttäjänimi on liian pitkä", "user-banned": "Käyttäjä on estetty", - "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post", - "no-category": "Category does not exist", - "no-topic": "Topic does not exist", - "no-post": "Post does not exist", - "no-group": "Group does not exist", - "no-user": "User does not exist", + "user-too-new": "Pahottelut, joudut odottamaan %1 sekuntia ennen ensimmäisen viestin kirjoittamista", + "no-category": "Kategoriaa ei ole olemassa", + "no-topic": "Aihetta ei ole olemassa", + "no-post": "Viestiä ei ole olemassa", + "no-group": "Ryhmää ei ole olemassa", + "no-user": "Käyttäjää ei ole olemassa", "no-teaser": "Teaser does not exist", - "no-privileges": "You do not have enough privileges for this action.", + "no-privileges": "Oikeutesi eivät riitä toiminnon suorittamiseen.", "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategoria ei ole käytössä", "topic-locked": "Aihe lukittu", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Ole hyvä ja odota tiedostojen lähettämisen valmistumista.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,13 +43,16 @@ "title-too-long": "Otsikkosi on liian pitkä. Otsikoiden pituuden tulee olla enintään %1 merkkiä.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", - "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", + "file-too-big": "Suurin sallittu tiedostokoko on %1 kbs - ole hyvä ja lataa pienempi tiedosto", "cant-vote-self-post": "Et voi antaa ääntä omalle viestillesi", - "already-favourited": "You have already favourited this post", - "already-unfavourited": "You have already unfavourited this post", + "already-favourited": "Tämä viesti on jo suosikeissasi", + "already-unfavourited": "Olet jo poistanut tämän viestin suosikeistasi", "cant-ban-other-admins": "Et voi estää muita ylläpitäjiä!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Ryhmän nimi on liian lyhyt", "group-already-exists": "Ryhmä on jo olemassa", "group-name-change-not-allowed": "Et voi vaihtaa ryhmän nimeä", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Aiheiden kuvakkeet eivät ole käytössä", "invalid-file": "Virheellinen tiedosto", "uploads-are-disabled": "Et voi lähettää tiedostoa", - "upload-error": "Lähetysvirhe: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Et voi keskustella itsesi kanssa!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/fi/global.json b/public/language/fi/global.json index 7e0be437c7..b5823b4f45 100644 --- a/public/language/fi/global.json +++ b/public/language/fi/global.json @@ -3,10 +3,10 @@ "search": "Hae", "buttons.close": "Sulje", "403.title": "Pääsy kielletty", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "Olet päätynyt sivulle, johon sinulla ei ole tarvittavia oikeuksia.", + "403.login": "Sinun pitäisi kai kirjautua sisään?", "404.title": "Ei löydy", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "Olet päätynyt sivulle, jota ei ole olemassa. Palaa etusivulle.", "500.title": "Sisäinen virhe.", "500.message": "Oho! Jotain meni pieleen!", "register": "Rekisteröidy", @@ -14,20 +14,20 @@ "please_log_in": "Kirjaudu, ole hyvä", "logout": "Kirjaudu ulos", "posting_restriction_info": "Kirjoittaminen on tällä hetkellä rajattu vain rekisteröityneille käyttäjille. Napsauta tätä kirjautuaksesi.", - "welcome_back": "Welcome Back", + "welcome_back": "Tervetuloa takaisin", "you_have_successfully_logged_in": "Olet onnistuneesti kirjautunut sisään", "save_changes": "Tallenna muutokset", "close": "Sulje", "pagination": "Sivutus", "pagination.out_of": "%1/%2", - "pagination.enter_index": "Enter index", + "pagination.enter_index": "Syötä indeksi", "header.admin": "Ylläpitäjä", "header.recent": "Viimeisimmät", "header.unread": "Lukemattomat", - "header.tags": "Tags", + "header.tags": "Tagit", "header.popular": "Suositut", "header.users": "Käyttäjät", - "header.groups": "Groups", + "header.groups": "Ryhmät", "header.chats": "Keskustelut", "header.notifications": "Ilmoitukset", "header.search": "Hae", @@ -40,7 +40,7 @@ "alert.success": "Onnistui", "alert.error": "Virhe", "alert.banned": "Estetty", - "alert.banned.message": "You have just been banned, you will now be logged out.", + "alert.banned.message": "Sinut estettiin juuri ja kirjaudut nyt ulos.", "alert.unfollow": "Et seuraa enää %1!", "alert.follow": "Seuraat nyt %1!", "online": "Online", @@ -74,8 +74,8 @@ "guests": "Vieraat", "updated.title": "Foorumi päivitetty", "updated.message": "Tämä foorumi on juuri päivitetty uusimpaan versioon. Paina tästä päivittääksesi sivun.", - "privacy": "Privacy", - "follow": "Follow", - "unfollow": "Unfollow", - "delete_all": "Delete All" + "privacy": "Yksityisyys", + "follow": "Seuraa", + "unfollow": "Älä seuraa", + "delete_all": "Poista kaikki" } \ No newline at end of file diff --git a/public/language/fi/groups.json b/public/language/fi/groups.json index 950fe6dca3..c8538e2c28 100644 --- a/public/language/fi/groups.json +++ b/public/language/fi/groups.json @@ -1,23 +1,34 @@ { - "groups": "Groups", + "groups": "Ryhmät", "view_group": "View Group", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "owner": "Ryhmän omistaja", + "new_group": "Luo uusi ryhmä", + "no_groups_found": "Ei ryhmiä", + "pending.accept": "Accept", + "pending.reject": "Reject", + "cover-instructions": "Vedä ja pudota kuva, raahaa oikeaan kohtaan ja paina Tallenna", "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", - "details.title": "Group Details", - "details.members": "Member List", + "cover-save": "Tallenna", + "cover-saving": "Tallennetaan", + "details.title": "Ryhmän tiedot", + "details.members": "Jäsenluettelo", "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.latest_posts": "Uusimmat viestit", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", + "details.kick": "Potkaise", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/fi/login.json b/public/language/fi/login.json index 6f6285b001..3dc14792ee 100644 --- a/public/language/fi/login.json +++ b/public/language/fi/login.json @@ -1,5 +1,7 @@ { - "username": "Käyttäjätunnus tai sähköpostiosoite", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Muista minut?", "forgot_password": "Unohditko salasanasi?", "alternative_logins": "Vaihtoehtoiset kirjautumistavat", diff --git a/public/language/fi/modules.json b/public/language/fi/modules.json index 1edf78c52d..cce7d25fbe 100644 --- a/public/language/fi/modules.json +++ b/public/language/fi/modules.json @@ -1,21 +1,21 @@ { "chat.chatting_with": "Keskustele käyttäjän kanssa", - "chat.placeholder": "Type chat message here, press enter to send", + "chat.placeholder": "Kirjoita viestisi tähän ja paina enter lähettääksesi", "chat.send": "Lähetä", "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.no-messages": "Please select a recipient to view chat message history", - "chat.recent-chats": "Recent Chats", + "chat.no-messages": "Valitse vastaanottaja katsellaksesi keskusteluhistoriaa", + "chat.recent-chats": "Viimeisimmät keskustelut", "chat.contacts": "Contacts", - "chat.message-history": "Message History", + "chat.message-history": "Viestihistoria", "chat.pop-out": "Pop out chat", - "chat.maximize": "Maximize", - "chat.seven_days": "7 Days", - "chat.thirty_days": "30 Days", - "chat.three_months": "3 Months", + "chat.maximize": "Suurenna", + "chat.seven_days": "7 päivää", + "chat.thirty_days": "30 päivää", + "chat.three_months": "3 kuukautta", "composer.user_said_in": "%1 said in %2:", - "composer.user_said": "%1 said:", - "composer.discard": "Are you sure you wish to discard this post?" + "composer.user_said": "%1 sanoi:", + "composer.discard": "Oletko varma, että haluat hylätä viestin?" } \ No newline at end of file diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index 3a0a4ff25c..2b45a426b6 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -2,6 +2,7 @@ "title": "Ilmoitukset", "no_notifs": "Sinulla ei ole uusia ilmoituksia", "see_all": "Katso kaikki ilmoitukset", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Ulkopuolinen linkki", "outgoing_link_message": "You are now leaving %1.", @@ -11,17 +12,16 @@ "you_have_unread_notifications": "Sinulla on lukemattomia ilmoituksia.", "new_message_from": "Uusi viesti käyttäjältä %1", "upvoted_your_post_in": "%1 has upvoted your post in %2.", - "moved_your_post": "%1 has moved your post.", - "moved_your_topic": "%1 has moved your topic.", + "moved_your_post": "%1 on siirtänyt viestisi.", + "moved_your_topic": "%1 on siirtänyt aiheesi.", "favourited_your_post_in": "%1 has favourited your post in %2.", "user_flagged_post_in": "%1 flagged a post in %2", - "user_posted_to": "%1 has posted a reply to: %2", - "user_posted_topic": "%1 has posted a new topic: %2", - "user_mentioned_you_in": "%1 mentioned you in %2", - "user_started_following_you": "%1 started following you.", + "user_posted_to": "%1 on vastannut viestiin: %2", + "user_posted_topic": "%1 on kirjoittanut uuden aiheen: %2", + "user_mentioned_you_in": "%1 mainitsi sinut viestissä %2", + "user_started_following_you": "%1 alkoi seurata sinua.", "email-confirmed": "Sähköpostiosoite vahvistettu", "email-confirmed-message": "Kiitos sähköpostiosoitteesi vahvistamisesta. Käyttäjätilisi on nyt täysin aktivoitu.", - "email-confirm-error": "Tapahtui virhe...", "email-confirm-error-message": "Ongelma sähköpostiosoitteen vahvistamisessa. Ehkäpä koodi oli virheellinen tai vanhentunut.", "email-confirm-sent": "Vahvistussähköposti lähetetty." } \ No newline at end of file diff --git a/public/language/fi/recent.json b/public/language/fi/recent.json index b28b1cddbb..aed5a7a0fd 100644 --- a/public/language/fi/recent.json +++ b/public/language/fi/recent.json @@ -3,16 +3,17 @@ "day": "Päivä", "week": "Viikko", "month": "Kuukausi", - "year": "Year", - "alltime": "All Time", + "year": "Vuosi", + "alltime": "Alusta lähtien", "no_recent_topics": "Ei viimeisimpiä aiheita.", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "no_popular_topics": "There are no popular topics.", + "there-is-a-new-topic": "Uusi aihe.", + "there-is-a-new-topic-and-a-new-post": "Uusi aihe ja uusi viesti.", + "there-is-a-new-topic-and-new-posts": "Uusi aihe ja %1 uutta viestiä.", + "there-are-new-topics": "%1 uutta aihetta.", + "there-are-new-topics-and-a-new-post": "%1 uutta aihetta ja uusi viesti.", + "there-are-new-topics-and-new-posts": "%1 uutta aihetta ja %2 uutta viestiä.", + "there-is-a-new-post": "Uusi viesti.", + "there-are-new-posts": "%1 uutta viestiä.", + "click-here-to-reload": "Päivitä napsauttamalla tätä." } \ No newline at end of file diff --git a/public/language/fi/reset_password.json b/public/language/fi/reset_password.json index 9d78c5f372..9b523e7e2b 100644 --- a/public/language/fi/reset_password.json +++ b/public/language/fi/reset_password.json @@ -11,6 +11,6 @@ "enter_email_address": "Syötä sähköpostiosoite", "password_reset_sent": "Salasanan palautuskoodi lähetetty", "invalid_email": "Virheellinen sähköpostiosoite / Sähköpostiosoitetta ei ole olemassa!", - "password_too_short": "The password entered is too short, please pick a different password.", - "passwords_do_not_match": "The two passwords you've entered do not match." + "password_too_short": "Salasana on liian lyhyt, käytä pidempää salasanaa.", + "passwords_do_not_match": "Salasana ja sen vahvistus eivät täsmää." } \ No newline at end of file diff --git a/public/language/fi/search.json b/public/language/fi/search.json index a04eb4fc1e..df7f7a2352 100644 --- a/public/language/fi/search.json +++ b/public/language/fi/search.json @@ -3,33 +3,38 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "titles": "Titles", - "titles-posts": "Titles and Posts", - "posted-by": "Posted by", + "titles": "Otsikot", + "titles-posts": "Otsikot ja Viestit", + "posted-by": "Kirjoittanut", "in-categories": "In Categories", - "search-child-categories": "Search child categories", - "reply-count": "Reply Count", - "at-least": "At least", - "at-most": "At most", - "post-time": "Post time", - "newer-than": "Newer than", - "older-than": "Older than", - "any-date": "Any date", - "yesterday": "Yesterday", - "one-week": "One week", - "two-weeks": "Two weeks", - "one-month": "One month", - "three-months": "Three months", - "six-months": "Six months", - "one-year": "One year", - "sort-by": "Sort by", - "last-reply-time": "Last reply time", - "topic-title": "Topic title", - "number-of-replies": "Number of replies", - "number-of-views": "Number of views", - "topic-start-date": "Topic start date", - "username": "Username", - "category": "Category", - "descending": "In descending order", - "ascending": "In ascending order" + "search-child-categories": "Hae alikategorioista", + "reply-count": "Vastausten määrä", + "at-least": "Vähintään", + "at-most": "Enintään", + "post-time": "Julkaisuaika", + "newer-than": "Uudemmat kuin", + "older-than": "Vanhemmat kuin", + "any-date": "Mikä tahansa päivä", + "yesterday": "Eilen", + "one-week": "Yksi viikko", + "two-weeks": "Kaksi viikkoa", + "one-month": "Yksi kuukausi", + "three-months": "Kolme kuukautta", + "six-months": "Kuusi kuukautta", + "one-year": "Yksi vuosi", + "sort-by": "Lajitteluperuste", + "last-reply-time": "Vastattu viimeksi", + "topic-title": "Aiheen otsikko", + "number-of-replies": "Vastausten määrä", + "number-of-views": "Katselukertojen määrä", + "topic-start-date": "Aiheen aloituspäivä", + "username": "Käyttäjänimi", + "category": "Kategoria", + "descending": "Laskevassa järjestyksessä", + "ascending": "Nousevassa järjestyksessä", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/fi/tags.json b/public/language/fi/tags.json index d2e9a213ac..3d1cf1271b 100644 --- a/public/language/fi/tags.json +++ b/public/language/fi/tags.json @@ -1,7 +1,7 @@ { - "no_tag_topics": "There are no topics with this tag.", - "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", - "enter_tags_here_short": "Enter tags...", - "no_tags": "There are no tags yet." + "no_tag_topics": "Ei viimeisimpiä aiheita tällä tagilla.", + "tags": "Tagit", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here_short": "Syötä tagit...", + "no_tags": "Ei vielä yhtään tagia." } \ No newline at end of file diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index eef05da8ee..d6812a7fa4 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -1,61 +1,61 @@ { "topic": "Aihe", - "topic_id": "Topic ID", - "topic_id_placeholder": "Enter topic ID", + "topic_id": "Aiheen ID", + "topic_id_placeholder": "Syötä aiheen ID", "no_topics_found": "Aiheita ei löytynyt!", "no_posts_found": "Viestejä ei löytynyt!", - "post_is_deleted": "This post is deleted!", + "post_is_deleted": "Tämä viesti poistettiin!", "profile": "Profiili", - "posted_by": "Posted by %1", - "posted_by_guest": "Posted by Guest", + "posted_by": "%1 kirjoitti", + "posted_by_guest": "Vieras kirjoitti", "chat": "Keskustele", "notify_me": "Ilmoita, kun tähän keskusteluun tulee uusia viestejä", "quote": "Lainaa", "reply": "Vastaa", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "Kirjaudu sisään voidaksesi vastata", "edit": "Muokkaa", "delete": "Poista", "purge": "Purge", - "restore": "Restore", + "restore": "Palauta", "move": "Siirrä", "fork": "Haaroita", "link": "Linkitä", "share": "Jaa", "tools": "Työkalut", "flag": "Ilmianna", - "locked": "Locked", + "locked": "Lukittu", "bookmark_instructions": "Click here to return to your last position or close to discard.", "flag_title": "Ilmianna tämä viesti moderaattoreille", - "flag_confirm": "Are you sure you want to flag this post?", - "flag_success": "This post has been flagged for moderation.", - "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.", + "flag_confirm": "Oletko varma, että haluat ilmiantaa tämän viestin?", + "flag_success": "Tämä viesti ilmiannettiin moderaattoreille.", + "deleted_message": "Tämä aihe on poistettu. Vain käyttäjät, joilla on aiheen hallintaoikeudet, voivat nähdä sen.", "following_topic.message": "Saat nyt ilmoituksen, kun joku kirjoittaa tähän aiheeseen.", "not_following_topic.message": "Et saa enää ilmoituksia tästä aiheesta.", - "login_to_subscribe": "Please register or log in in order to subscribe to this topic.", - "markAsUnreadForAll.success": "Topic marked as unread for all.", + "login_to_subscribe": "Ole hyvä ja rekisteröidy tai kirjaudu sisään tilataksesi tämän aiheen.", + "markAsUnreadForAll.success": "Aihe merkitty lukemattomaksi kaikille.", "watch": "Tarkkaile", - "unwatch": "Unwatch", - "watch.title": "Be notified of new replies in this topic", - "unwatch.title": "Stop watching this topic", + "unwatch": "Älä seuraa", + "watch.title": "Ilmoita, kun tähän keskusteluun tulee uusia viestejä", + "unwatch.title": "Lopeta tämän aiheen seuraaminen", "share_this_post": "Jaa tämä viesti", - "thread_tools.title": "Topic Tools", + "thread_tools.title": "Aiheen työkalut", "thread_tools.markAsUnreadForAll": "Merkitse lukemattomaksi", "thread_tools.pin": "Kiinnitä aihe", "thread_tools.unpin": "Poista aiheen kiinnitys", "thread_tools.lock": "Lukitse aihe", "thread_tools.unlock": "Poista aiheen lukitus", "thread_tools.move": "Siirrä aihe", - "thread_tools.move_all": "Move All", + "thread_tools.move_all": "Siirrä kaikki", "thread_tools.fork": "Haaroita aihe", "thread_tools.delete": "Poista aihe", - "thread_tools.delete_confirm": "Are you sure you want to delete this topic?", + "thread_tools.delete_confirm": "Haluatko varmasti poistaa tämän aiheen?", "thread_tools.restore": "Palauta aihe", - "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", + "thread_tools.restore_confirm": "Haluatko varmasti palauttaa tämän aiheen?", "thread_tools.purge": "Purge Topic", "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", "topic_move_success": "This topic has been successfully moved to %1", - "post_delete_confirm": "Are you sure you want to delete this post?", - "post_restore_confirm": "Are you sure you want to restore this post?", + "post_delete_confirm": "Haluatko varmasti poistaa tämän viestin?", + "post_restore_confirm": "Haluatko varmasti palauttaa tämän viestin?", "post_purge_confirm": "Are you sure you want to purge this post?", "load_categories": "Ladataan aihealueita", "disabled_categories_note": "Käytöstä poistetut aihealueet ovat harmaina", diff --git a/public/language/fi/user.json b/public/language/fi/user.json index 4942b2d587..3f0768bf00 100644 --- a/public/language/fi/user.json +++ b/public/language/fi/user.json @@ -2,12 +2,12 @@ "banned": "Bannattu", "offline": "Offline", "username": "Käyttäjän nimi", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Liittymispäivä", + "postcount": "Viestien määrä", "email": "Sähköposti", - "confirm_email": "Confirm Email", - "delete_account": "Delete Account", - "delete_account_confirm": "Are you sure you want to delete your account?
This action is irreversible and you will not be able to recover any of your data

Enter your username to confirm that you wish to destroy this account.", + "confirm_email": "Vahvista sähköpostiosoite", + "delete_account": "Poista käyttäjätili", + "delete_account_confirm": "Oletko täysin varma, että haluat poistaa käyttäjätilisi?
Tätä toimintoa ei voi kumonta eikä poistettua dataa voida palauttaa

Syötä käyttäjänimesi vahvistaaksesi, että haluat poistaa tilisi.", "fullname": "Koko nimi", "website": "Kotisivu", "location": "Sijainti", @@ -18,7 +18,7 @@ "profile_views": "Profiilia katsottu", "reputation": "Maine", "favourites": "Suosikit", - "watched": "Watched", + "watched": "Seurattu", "followers": "Seuraajat", "following": "Seuratut", "signature": "Allekirjoitus", @@ -32,49 +32,49 @@ "edit": "Muokkaa", "uploaded_picture": "Ladattu kuva", "upload_new_picture": "Lataa uusi kuva", - "upload_new_picture_from_url": "Upload New Picture From URL", + "upload_new_picture_from_url": "Lataa uusi kuva URL-osoitteesta", "current_password": "Nykyinen salasana", "change_password": "Vaihda salasana", "change_password_error": "Virheellinen salasana", "change_password_error_wrong_current": "Nykyinen salasanasi ei ole oikein!", "change_password_error_length": "Salasana on liian lyhyt!", "change_password_error_match": "Salasanojen täytyy olla samat!", - "change_password_error_privileges": "You do not have the rights to change this password.", + "change_password_error_privileges": "Sinulla ei ole oikeuksia vaihtaa tätä salasanaa.", "change_password_success": "Salasanasi on päivitetty!", "confirm_password": "Vahvista salasana", "password": "Salasana", - "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as %1", + "username_taken_workaround": "Pyytämäsi käyttäjänimi oli jo varattu, joten muutimme sitä hieman. Käyttäjänimesi on siis nyt %1", "upload_picture": "Lataa kuva", "upload_a_picture": "Lataa kuva", "image_spec": "Voit ladata vain PNG-, JPG- tai GIF-tiedostoja", "max": "max.", "settings": "Asetukset", "show_email": "Näytä sähköpostiosoitteeni", - "show_fullname": "Show My Full Name", - "restrict_chats": "Only allow chat messages from users I follow", + "show_fullname": "Näytä koko nimeni", + "restrict_chats": "Salli pikaviestit vain seuraamiltani käyttäjiltä", "digest_label": "Subscribe to Digest", - "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule", - "digest_off": "Off", - "digest_daily": "Daily", - "digest_weekly": "Weekly", - "digest_monthly": "Monthly", - "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "digest_description": "Tilaa päivitykset sähköpostilla tästä foorumista (uudet ilmoitukset ja aiheet) asetetun ajastuksen mukaan", + "digest_off": "Pois päältä", + "digest_daily": "Päivittäin", + "digest_weekly": "Viikottain", + "digest_monthly": "Kuukausittain", + "send_chat_notifications": "Lähetä minulle sähköposti, jos uusi pikaviesti saapuu, kun en ole paikalla", + "send_post_notifications": "Lähetä minulle sähköposti, kun tilaamiini aiheisiin tulee vastauksia", "has_no_follower": "Kukaan ei seuraa tätä käyttäjää :(", "follows_no_one": "Tämä käyttäjä ei seuraa ketään :(", "has_no_posts": "Tämä käyttäjä ei ole kirjoittanut vielä mitään.", "has_no_topics": "Tämä käyttäjä ei ole kirjoittanut vielä yhtään aihetta.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "Tämä käyttäjä ei seuraa vielä yhtään aihetta.", "email_hidden": "Sähköposti piilotettu", "hidden": "piilotettu", "paginate_description": "Sivuta aiheet ja viestit loputtoman vierittämisen sijaan.", "topics_per_page": "Aihetta per sivu", "posts_per_page": "Viestiä per sivu", "notification_sounds": "Soita merkkiääni ilmoituksen saapuessa.", - "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?", - "enable_topic_searching": "Enable In-Topic Searching", + "browsing": "Selataan asetuksia", + "open_links_in_new_tab": "Avaa muualle vievät linkit uudessa välilehdessä?", + "enable_topic_searching": "Salli aiheen sisäiset haut", "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", - "follow_topics_you_reply_to": "Follow topics that you reply to.", - "follow_topics_you_create": "Follow topics you create." + "follow_topics_you_reply_to": "Seuraa aiheita, joihin olen vastannut.", + "follow_topics_you_create": "Seuraa aloittamiani aiheita." } \ No newline at end of file diff --git a/public/language/fi/users.json b/public/language/fi/users.json index f1cca4ea56..fe90faeaeb 100644 --- a/public/language/fi/users.json +++ b/public/language/fi/users.json @@ -5,8 +5,8 @@ "search": "Hae", "enter_username": "Syötä käyttäjätunnus hakeaksesi", "load_more": "Lataa lisää", - "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", - "filter-by": "Filter By", - "online-only": "Online only", + "users-found-search-took": "%1 käyttäjä(ä) löytyi! Haku kesti %2 sekuntia.", + "filter-by": "Suodata", + "online-only": "Vain verkossa olevat", "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 3ceda0c847..f6354486ff 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -19,6 +19,8 @@ "email-taken": "Email déjà utilisé", "email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquez ici pour la valider.", "email-not-confirmed-chat": "Vous ne pouver discuter tant que votre email n'est pas confirmé", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nom d'utilisateur trop court", "username-too-long": "Nom d'utilisateur trop long", "user-banned": "Utilisateur banni", @@ -33,6 +35,7 @@ "no-emailers-configured": "Un email de test n'a pas pu être envoyé car aucun plugin de gestion des emails n'était chargé", "category-disabled": "Catégorie désactivée", "topic-locked": "Sujet verrouillé", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Veuillez patienter pendant le téléchargement.", "content-too-short": "Veuillez entrer un message plus long. %1 caractères minimum.", "content-too-long": "Veuillez poster un message plus cours. Les messages ne peuvent être plus long que %1 caractères.", @@ -40,6 +43,8 @@ "title-too-long": "Veuillez entrer un titre plus court. Les titres ne peuvent excéder %1 caractères.", "too-many-posts": "Vous ne pouvez poster que toutes les %1 secondes.", "too-many-posts-newbie": "En tant que nouvel utilisateur, vous ne pouvez poster que toutes les %1 secondes jusqu'à ce que vous obteniez une réputation de %2 - patientez avant de publier de nouveau. ", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "La taille maximum des fichiers est de %1 kbs.", "cant-vote-self-post": "Vous ne pouvez pas voter pour vos propres messages", "already-favourited": "Vous avez déjà mis ce message en favoris", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !", "invalid-image-type": "Type d'image invalide. Les types autorisés sont: %1", "invalid-image-extension": "Extension d'image invalide", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nom de groupe trop court", "group-already-exists": "Ce groupe existe déjà", "group-name-change-not-allowed": "Modification du nom de groupe non permise", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Les miniatures de sujet sont désactivés", "invalid-file": "Fichier invalide", "uploads-are-disabled": "Les envois sont désactivés", - "upload-error": "Erreur d'envoi : %1", "signature-too-long": "La signature ne peut dépasser %1 caractères !", "cant-chat-with-yourself": "Vous ne pouvez chatter avec vous même !", "chat-restricted": "Cet utilisateur a restreint les ses messages de chat. Il doit d'abord vous suivre avant de pouvoir discuter avec lui.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Vous n'avez pas une réputation assez élevée pour signaler ce message", "reload-failed": "NodeBB a rencontré un problème lors du rechargement : \"% 1\" . NodeBB continuera de fonctionner côté client, même si vous devez annuler ce que vous avez fait juste avant de recharger .", "registration-error": "Erreur d'enregistrement", - "parse-error": "Une erreur est survenue en analysant la réponse du serveur" + "parse-error": "Une erreur est survenue en analysant la réponse du serveur", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/fr/groups.json b/public/language/fr/groups.json index 39a9efcff2..03b25aebc8 100644 --- a/public/language/fr/groups.json +++ b/public/language/fr/groups.json @@ -4,6 +4,8 @@ "owner": "Propriétaire du groupe", "new_group": "Créer un nouveau groupe", "no_groups_found": "Il n'y a aucun groupe", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Glissez-déposez une image, ajustez la position, et cliquez sur Enregistrer", "cover-change": "Modifier", "cover-save": "Enregistrer", @@ -13,11 +15,20 @@ "details.pending": "Membres en attente", "details.has_no_posts": "Les membres de ce groupe n'ont envoyé aucun message.", "details.latest_posts": "Derniers messages", - "details.private": "Groupe privé", - "details.public": "Groupe public", + "details.private": "Private", "details.grant": "Promouvoir/rétrograder comme propriétaire", "details.kick": "Exclure", "details.owner_options": "Administration du groupe", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Les détails du groupe ont été mis à jour", "event.deleted": "Le groupe é%1\" a été supprimé" } \ No newline at end of file diff --git a/public/language/fr/login.json b/public/language/fr/login.json index 39978db58b..b34dda64b5 100644 --- a/public/language/fr/login.json +++ b/public/language/fr/login.json @@ -1,5 +1,7 @@ { - "username": "Nom d'utilisateur / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Se souvenir de moi ?", "forgot_password": "Mot de passe oublié ?", "alternative_logins": "Autres méthodes de connexion", diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index 597388efdb..139b0a30da 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -2,6 +2,7 @@ "title": "Notifications", "no_notifs": "Vous n'avez aucune notification", "see_all": "Voir toutes les notifications.", + "mark_all_read": "Mark all notifications read", "back_to_home": "Revenir à %1", "outgoing_link": "Lien sortant", "outgoing_link_message": "Vous quittez %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 vous suit.", "email-confirmed": "Email vérifié", "email-confirmed-message": "Merci pour la validation de votre adresse email. Votre compte est désormais activé.", - "email-confirm-error": "Un erreur est survenue ...", "email-confirm-error-message": "Il y a un un problème dans la vérification de votre adresse email. Le code est peut être invalide ou a expiré.", "email-confirm-sent": "Email de vérification envoyé." } \ No newline at end of file diff --git a/public/language/fr/recent.json b/public/language/fr/recent.json index d2ee95b1b6..bd3b216df0 100644 --- a/public/language/fr/recent.json +++ b/public/language/fr/recent.json @@ -6,6 +6,7 @@ "year": "An", "alltime": "Toujours", "no_recent_topics": "Il n'y a aucun sujet récent.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Il y a un nouveau sujet.", "there-is-a-new-topic-and-a-new-post": "Il y a un nouveau sujet et un nouveau message.", "there-is-a-new-topic-and-new-posts": "Il y a un nouveau sujet et %1 nouveaux messages.", diff --git a/public/language/fr/search.json b/public/language/fr/search.json index 01574ac59b..cd5f207136 100644 --- a/public/language/fr/search.json +++ b/public/language/fr/search.json @@ -31,5 +31,10 @@ "username": "Nom d'utilisateur", "category": "Catégorie", "descending": "Par ordre décroissant", - "ascending": "Par ordre croissant" + "ascending": "Par ordre croissant", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/fr/tags.json b/public/language/fr/tags.json index 91a1f0aaa4..8c533e76ca 100644 --- a/public/language/fr/tags.json +++ b/public/language/fr/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Il n'y a aucun sujet ayant ce mot-clé", "tags": "Mots-clés", - "enter_tags_here": "Entrez les mots-clés ici. Appuyez sur entrer après chaque mot-clé.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Entrez des mots-clés...", "no_tags": "Il n'y a pas encore de mots-clés." } \ No newline at end of file diff --git a/public/language/he/error.json b/public/language/he/error.json index 23d21ee1ae..d6f29ea755 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -19,6 +19,8 @@ "email-taken": "כתובת אימייל תפוסה", "email-not-confirmed": "כתובת המייל שלך עוד לא אושרה, לחץ כאן על-מנת לאשר את המייל שלך.", "email-not-confirmed-chat": "לא תוכל לדבר בצ'אט עד שלא תאשר את כתובת המייל שלך", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "שם משתמש קצר מדי", "username-too-long": "שם משתמש ארוך מדי", "user-banned": "המשתמש חסום", @@ -33,6 +35,7 @@ "no-emailers-configured": "לא נמצאו פלאגינים למייל, לכן אין אפשרות לשלוח מייל ניסיון.", "category-disabled": "קטגוריה לא פעילה", "topic-locked": "נושא נעול", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "אנא המתן לסיום ההעלאות", "content-too-short": "יש להכניס פוסט ארוך יותר. פוסטים חייבים להכיל לפחות %1 תווים.", "content-too-long": "יש לקצר את הפוסט. פוסטים אינם יכולים להיות ארוכים מ %1 תווים.", @@ -40,6 +43,8 @@ "title-too-long": "יש לקצר את הכותרת. כותרות אינן יכולות להיות ארוכות מ %1 תווים.", "too-many-posts": "אתה יכול להעלות פוסט כל %1 שניות בלבד - אנא המתן.", "too-many-posts-newbie": "כמשתמש חדש, אתה יכול להעלות פוסט כל %1 שניות עד שצברת %2 מוניטין - אנא המתן.", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "גודל קובץ מקסימלי הינו %1 קילובייט - אנא העלה קובץ קטן יותר.", "cant-vote-self-post": "לא ניתן להצביע לפוסט שלך", "already-favourited": "כבר הוספת פוסט זה למועדפים", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!", "invalid-image-type": "פורמט תמונה לא תקין. הפורמטים המורשים הם: %1", "invalid-image-extension": "פורמט תמונה לא תקין", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "שם הקבוצה קצר מדי", "group-already-exists": "הקבוצה כבר קיימת", "group-name-change-not-allowed": "לא ניתן לשנות את שם הקבוצה", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "תמונות ממוזערות לנושא אינן מאופשרות.", "invalid-file": "קובץ לא תקין", "uploads-are-disabled": "העלאת קבצים אינה מאופשרת", - "upload-error": "שגיאה בהעלאה : %1", "signature-too-long": "מצטערים, אורך החתימה המקסימלי הוא %1 תווים.", "cant-chat-with-yourself": "לא ניתן לעשות צ'אט עם עצמך!", "chat-restricted": "משתמש זה חסם את הודעות הצ'אט שלו ממשתמשים זרים. המשתמש חייב לעקוב אחריך לפני שתוכל לשוחח איתו בצ'אט", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "אין לך מוניטין מספק על מנת לסמן את הפוסט הזה", "reload-failed": "אירעה תקלה ב NodeBB בזמן הטעינה של: \"%1\". המערכת תמשיך להגיש דפים קיימים, אבל כדאי שתשחזר את הפעולות שלך מהפעם האחרונה שהמערכת עבדה כראוי.", "registration-error": "שגיאה בהרשמה", - "parse-error": "אירעה שגיאה בעת בעת ניתוח תגובת השרת" + "parse-error": "אירעה שגיאה בעת בעת ניתוח תגובת השרת", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/he/groups.json b/public/language/he/groups.json index 6754a5611c..a6bcffab82 100644 --- a/public/language/he/groups.json +++ b/public/language/he/groups.json @@ -4,6 +4,8 @@ "owner": "מנהל הקבוצה", "new_group": "צור קבוצה חדשה", "no_groups_found": "אין קבוצות לצפייה", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "גרור תמונה, הזז למיקום הרצוי ואז לחץ על שמור", "cover-change": "שנה", "cover-save": "שמור", @@ -13,11 +15,20 @@ "details.pending": "חברי קבוצה הממתינים לאישור", "details.has_no_posts": "חברי הקבוצה הזו לא העלו אף פוסט.", "details.latest_posts": "פוסטים אחרונים", - "details.private": "קבוצה פרטית", - "details.public": "קבוצה פומבית", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "ניהול הקבוצה", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "פרטי הקבוצה עודכנו", "event.deleted": "קבוצת \"%1\" נמחקה" } \ No newline at end of file diff --git a/public/language/he/login.json b/public/language/he/login.json index 181cd62240..0a21aa92ba 100644 --- a/public/language/he/login.json +++ b/public/language/he/login.json @@ -1,5 +1,7 @@ { - "username": "שם משתמש / אימייל", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "זכור אותי?", "forgot_password": "שכחת סיסמתך?", "alternative_logins": "התחבר באמצעות...", diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 515b890810..215356f8e4 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -2,6 +2,7 @@ "title": "התראות", "no_notifs": "אין התראות", "see_all": "צפה בכל ההתראות", + "mark_all_read": "Mark all notifications read", "back_to_home": "חזרה ל%1", "outgoing_link": "לינק", "outgoing_link_message": "אתה כעת עוזב את %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 התחיל לעקוב אחריך.", "email-confirmed": "כתובת המייל אושרה", "email-confirmed-message": "תודה שאישרת את כתובת המייל שלך. החשבון שלך פעיל כעת.", - "email-confirm-error": "אירעה שגיאה...", "email-confirm-error-message": "אירעה שגיאה בעת אישור המייל שלך. ייתכן כי הקוד היה שגוי או פג תוקף.", "email-confirm-sent": "מייל אישור נשלח." } \ No newline at end of file diff --git a/public/language/he/recent.json b/public/language/he/recent.json index 44960c78f7..7d4d3bf1a9 100644 --- a/public/language/he/recent.json +++ b/public/language/he/recent.json @@ -6,6 +6,7 @@ "year": "שנה", "alltime": "כל הזמן", "no_recent_topics": "אין נושאים חדשים", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "יש נושא חדש.", "there-is-a-new-topic-and-a-new-post": "יש נושא ופוסט חדש.", "there-is-a-new-topic-and-new-posts": "יש נושא ו%1 פוסטים חדשים.", diff --git a/public/language/he/search.json b/public/language/he/search.json index fec789c3be..b9ca111d91 100644 --- a/public/language/he/search.json +++ b/public/language/he/search.json @@ -31,5 +31,10 @@ "username": "שם משתמש", "category": "קטגוריה", "descending": "בסדר יורד", - "ascending": "בסדר עולה" + "ascending": "בסדר עולה", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/he/tags.json b/public/language/he/tags.json index 13912500cb..54ead310ad 100644 --- a/public/language/he/tags.json +++ b/public/language/he/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "אין פוסטים עם תגית זו.", "tags": "תגיות", - "enter_tags_here": "יש להכניס כאן את התגיות. לחץ אנטר אחרי כל תגית.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "הכנס תגיות", "no_tags": "אין עדיין תגיות." } \ No newline at end of file diff --git a/public/language/hu/error.json b/public/language/hu/error.json index 821145775e..e03041b557 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -19,6 +19,8 @@ "email-taken": "Foglalt e-mail", "email-not-confirmed": "Az e-mail címed még nem lett ellenőrizve, kérlek kattints ide az e-mail címed ellenőrzéséhez!", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Túl rövid felhasználónév", "username-too-long": "Túl hosszú felhasználónév", "user-banned": "Kitiltott felhasználó", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategória kikapcsolva", "topic-locked": "Téma lezárva", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "A csoport név túl rövid", "group-already-exists": "A csoport nem létezik", "group-name-change-not-allowed": "A csoport névváltoztatás nem engedélyezett", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Témakör bélyegképek tíltásra kerültek.", "invalid-file": "Érvénytelen fájl", "uploads-are-disabled": "A feltöltés nem engedélyezett", - "upload-error": "Feltöltés hiba: %1", "signature-too-long": "Sajnáljuk, az aláírás nem lehet hosszabb %1 karakternél.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Regisztrációs hiba", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/hu/groups.json b/public/language/hu/groups.json index 09324055a0..75a7b053d5 100644 --- a/public/language/hu/groups.json +++ b/public/language/hu/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "A csoport felhasználói nem tettek még közzé bejegyzést.", "details.latest_posts": "Legújabb bejegyzések", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/hu/language.json b/public/language/hu/language.json index a1a3c30c09..7c6d5e8fb0 100644 --- a/public/language/hu/language.json +++ b/public/language/hu/language.json @@ -1,5 +1,5 @@ { - "name": "Angol (Egyesült Királyság/Kanada)", - "code": "en_GB", + "name": "Magyar Nyelv", + "code": "hu", "dir": "ltr" } \ No newline at end of file diff --git a/public/language/hu/login.json b/public/language/hu/login.json index df6d518f81..14be774171 100644 --- a/public/language/hu/login.json +++ b/public/language/hu/login.json @@ -1,5 +1,7 @@ { - "username": "Felhasználónév / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Megjegyzés", "forgot_password": "Elfelejtett Jelszó?", "alternative_logins": "Alternatív belépés", diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json index d6efa73982..f991c637f6 100644 --- a/public/language/hu/notifications.json +++ b/public/language/hu/notifications.json @@ -2,6 +2,7 @@ "title": "Értesítések", "no_notifs": "Nincs új értesítés", "see_all": "Összes értesítés megtekintése", + "mark_all_read": "Mark all notifications read", "back_to_home": "Vissza - %1", "outgoing_link": "Külső Link", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/hu/recent.json b/public/language/hu/recent.json index f749b684d9..c20cbf3d6f 100644 --- a/public/language/hu/recent.json +++ b/public/language/hu/recent.json @@ -6,6 +6,7 @@ "year": "Év", "alltime": "Minden idők", "no_recent_topics": "Nincs friss topik.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/hu/search.json b/public/language/hu/search.json index 6cae8bb926..5c09b69e77 100644 --- a/public/language/hu/search.json +++ b/public/language/hu/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/hu/tags.json b/public/language/hu/tags.json index d818646831..aa7a02a772 100644 --- a/public/language/hu/tags.json +++ b/public/language/hu/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nem létezik témakör ezzel a címkével.", "tags": "Címkék", - "enter_tags_here": "Adjunk meg címkét majd nyomjuk meg az entert.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Címke megadása...", "no_tags": "Nincs címke." } \ No newline at end of file diff --git a/public/language/id/error.json b/public/language/id/error.json index ce802296e2..d2ceed9a23 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -19,6 +19,8 @@ "email-taken": "Email sudah terdaftar", "email-not-confirmed": "Email kamu belum dikonfirmasi, klik disini untuk mengkonfirmasi email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username terlalu pendek", "username-too-long": "Username terlalu panjang", "user-banned": "Pengguna dibanned", @@ -33,6 +35,7 @@ "no-emailers-configured": "Tidak ada plugin email, jadi test email tidak dapat dikirim", "category-disabled": "Kategori ditiadakan", "topic-locked": "Topik dikunci", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Tunggu proses upload sampai selesai", "content-too-short": "Mohon masukkan posting yang lebih panjang. Posting harus memuat setidaknya %1 karakter.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Mohon masukkan judul yang lebih pendek. Judul tidak dapat melebihi %1 karakter.", "too-many-posts": "Kamu hanya dapat melakukan posting satu kali setiap %1 detik - mohon tunggu beberapa saat sebelum melakukan posting kembali", "too-many-posts-newbie": "Sebagai pengguna baru, kamu hanya diijinkan membuat posting satu kali setiap %1 detik sampai kamu mendapatkan %2 reputasi - mohon tunggu beberapa saat sebelum melakukan posting kembali", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Ukuran file yang boleh diupload %1 kbs - mohon upload file dengan ukuran lebih kecil", "cant-vote-self-post": "Kamu tidak dapat vote postingan sendiri", "already-favourited": "Post ini sudah kamu favorit", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Kamu tidak dapat ban admin lainnya!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nama grup terlalu pendek", "group-already-exists": "Grup sudah ada", "group-name-change-not-allowed": "Perubahan nama grup tidak dibolehkan", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Thumbnail di topik ditiadakan", "invalid-file": "File Salah", "uploads-are-disabled": "Upload ditiadakan", - "upload-error": "Upload Error: %1", "signature-too-long": "Maaf, tanda pengenalmu tidak dapat melebihi %1 karakter.", "cant-chat-with-yourself": "Kamu tidak dapat chat dengan akun sendiri", "chat-restricted": "Pengguna ini telah membatasi percakapa mereka. Mereka harus mengikutimu sebelum kamu dapat melakukan percakapan dengan mereka ", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Tidak cukup reputation untuk flag post ini", "reload-failed": "NodeBB mengalami masalah saat memuat \"%1\". NodeBB akan melanjutkan pemuatan, kamu harus membatalkan tindakanmu sebelum pemuatan kembali dilakukan.", "registration-error": "Registrasti Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/id/groups.json b/public/language/id/groups.json index 3bae971661..f70bea0bf5 100644 --- a/public/language/id/groups.json +++ b/public/language/id/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Anggota grup ini belum membuat posting satupun.", "details.latest_posts": "Posting Terkini", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/id/login.json b/public/language/id/login.json index 8aede403da..7a1c52fe71 100644 --- a/public/language/id/login.json +++ b/public/language/id/login.json @@ -1,5 +1,7 @@ { - "username": "Username / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Ingin Diingat?", "forgot_password": "Lupa Password?", "alternative_logins": "Login Alternatif", diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json index 6a4145dc63..ee609afb0b 100644 --- a/public/language/id/notifications.json +++ b/public/language/id/notifications.json @@ -2,6 +2,7 @@ "title": "Pemberitahuan", "no_notifs": "Kamu tidak memiliki pemberitahuan baru", "see_all": "Lihat seluruh Pemberitahuan", + "mark_all_read": "Mark all notifications read", "back_to_home": "Kembali ke %1", "outgoing_link": "Tautan Keluar", "outgoing_link_message": "Saat ini kamu meninggalkan %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 mulai mengikutimu.", "email-confirmed": "Email telah Dikonfirmasi", "email-confirmed-message": "Terimakasih telah melakukan validasi email. Akunmu saat ini telah aktif sepenuhnya.", - "email-confirm-error": "Terjadi error...", "email-confirm-error-message": "Terjadi masalah saat melakukan validasi emailmu. Mungkin terjadi kesalahan kode atau waktu habis.", "email-confirm-sent": "Email konfirmasi telah dikirim." } \ No newline at end of file diff --git a/public/language/id/recent.json b/public/language/id/recent.json index 75c621983d..896583950f 100644 --- a/public/language/id/recent.json +++ b/public/language/id/recent.json @@ -6,6 +6,7 @@ "year": "Tahun", "alltime": "Sepanjang Waktu", "no_recent_topics": "Tidak ada topik terbaru.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/id/search.json b/public/language/id/search.json index 5eb7f1f851..544579a3ff 100644 --- a/public/language/id/search.json +++ b/public/language/id/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/id/tags.json b/public/language/id/tags.json index d6fece770e..647542884e 100644 --- a/public/language/id/tags.json +++ b/public/language/id/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Tidak ada topik dengan tag ini.", "tags": "Tag", - "enter_tags_here": "Masukkan tag di sini. Tekan enter untuk setiap tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Masukkan tag...", "no_tags": "Belum ada tag." } \ No newline at end of file diff --git a/public/language/it/category.json b/public/language/it/category.json index 3e018bf12f..5721f6eb3f 100644 --- a/public/language/it/category.json +++ b/public/language/it/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Nuova Discussione", - "guest-login-post": "Log in to post", + "guest-login-post": "Effettua il Log in per pubblicare", "no_topics": "Non ci sono discussioni in questa categoria.
Perché non ne inizi una?", "browsing": "visualizzando", "no_replies": "Nessuno ha risposto", diff --git a/public/language/it/email.json b/public/language/it/email.json index d54cf8c4cd..be6567c1c2 100644 --- a/public/language/it/email.json +++ b/public/language/it/email.json @@ -9,8 +9,8 @@ "reset.text1": "Abbiamo ricevuto una richiesta di reset della tua password, probabilmente perché l'hai dimenticata. Se non è così si prega di ignorare questa email.", "reset.text2": "Per confermare il reset della password per favore clicca il seguente link:", "reset.cta": "Clicca qui per resettare la tua password", - "reset.notify.subject": "Password successfully changed", - "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.subject": "Possword modificata con successo.", + "reset.notify.text1": "Ti informiamo che in data %1, la password è stata cambiata con successo.", "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "Hai una notifica non letta da %1:", "digest.latest_topics": "Ultimi argomenti su %1", @@ -20,7 +20,7 @@ "notif.chat.subject": "Nuovo messaggio in chat da %1", "notif.chat.cta": "Clicca qui per continuare la conversazione", "notif.chat.unsub.info": "Questa notifica di chat ti è stata inviata perché l'hai scelta nelle impostazioni.", - "notif.post.cta": "Click here to read the full topic", + "notif.post.cta": "Clicca qui per leggere il topic completo.", "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Questa è una email di test per verificare che il servizio di invio email è configurato correttamente sul tuo NodeBB.", "unsub.cta": "Clicca qui per modificare queste impostazioni", diff --git a/public/language/it/error.json b/public/language/it/error.json index fe207d0502..777c76856c 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -18,7 +18,9 @@ "username-taken": "Nome utente già preso", "email-taken": "Email già esistente", "email-not-confirmed": "La tua Email deve essere ancora confermata, per favore clicca qui per confermare la tua Email.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "Non potrai chattare finchè non avrai confermato la tua email", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nome utente troppo corto", "username-too-long": "Nome utente troppo lungo", "user-banned": "Utente bannato", @@ -33,25 +35,29 @@ "no-emailers-configured": "Nessun plugin per le email è caricato, quindi la mail di test non può essere inviata", "category-disabled": "Categoria disabilitata", "topic-locked": "Discussione Bloccata", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Per favore attendere il completamento degli uploads.", "content-too-short": "Inserisci un post più lungo. Il Messaggio deve contenere almeno %1 caratteri.", - "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", + "content-too-long": "Per favore inserisci un post più breve. I post non possono essere più lunghi di %1 caratteri.", "title-too-short": "Inserisci un titolo più lungo. I titoli devono contenere almeno %1 caratteri.", "title-too-long": "Per favore inserire un titolo più corto, non può essere più lungo di %1 caratteri.", "too-many-posts": "È possibile inserire un Post ogni %1 secondi - si prega di attendere prima di postare di nuovo", "too-many-posts-newbie": "Come nuovo utente puoi postare solamente una volta ogni %1 secondi finché non hai raggiunto un livello di reputazione %2 - per favore attendi prima di inviare ancora", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "La dimensione massima del file consentita è di % 1 kbs - si prega di caricare un file più piccolo", "cant-vote-self-post": "Non puoi votare il tuo stesso post", "already-favourited": "Hai già inserito tra i preferiti questo post", "already-unfavourited": "Hai già inserito tra i Non Preferiti questo post", "cant-ban-other-admins": "Non puoi bannare altri amministratori!", - "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", + "invalid-image-type": "Tipo dell'immagine non valido. I tipi permessi sono: %1", + "invalid-image-extension": "Estensione immagine non valida", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nome del Gruppo troppo corto", "group-already-exists": "Il Gruppo esiste già", "group-name-change-not-allowed": "Il cambio di nome al Gruppo non è consentito", - "group-already-member": "You are already part of this group", - "group-needs-owner": "This group requires at least one owner", + "group-already-member": "Fai già parte di questo gruppo", + "group-needs-owner": "Questo gruppo richiede almeno un proprietario.", "post-already-deleted": "Questo Post è già stato cancellato", "post-already-restored": "Questo Post è già stato ripristinato", "topic-already-deleted": "Questo Topic è già stato cancellato", @@ -59,16 +65,17 @@ "topic-thumbnails-are-disabled": "Le anteprime della Discussione sono disabilitate.", "invalid-file": "File non valido", "uploads-are-disabled": "Uploads disabilitati", - "upload-error": "Errore upload: %1", "signature-too-long": "Spiacenti, la tua firma non può essere lunga %1 caratteri.", "cant-chat-with-yourself": "Non puoi chattare con te stesso!", "chat-restricted": "Questo utente ha ristretto i suoi messaggi in chat alle persone che segue. Per poter chattare con te ti deve prima seguire.", - "too-many-messages": "You have sent too many messages, please wait awhile.", + "too-many-messages": "Hai inviato troppi messaggi, aspetta un attimo.", "reputation-system-disabled": "Il sistema di reputazione è disabilitato.", "downvoting-disabled": "Il Downvoting è disabilitato", "not-enough-reputation-to-downvote": "Non hai i privilegi per votare negativamente questo post", "not-enough-reputation-to-flag": "Tu non hai abbastanza reputazione per segnalare questo Post", "reload-failed": "NodeBB ha incontrato un problema durante il ricaricamento: \"%1\". NodeBB continuerà a servire gli assets esistenti lato client, così puoi annullare quello che hai fatto prima di ricaricare.", "registration-error": "Errore nella registrazione", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Qualcosa è andato storto durante l'analisi della risposta proveniente dal server", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/it/global.json b/public/language/it/global.json index 35d1244d7f..ed27a9340d 100644 --- a/public/language/it/global.json +++ b/public/language/it/global.json @@ -3,10 +3,10 @@ "search": "Cerca", "buttons.close": "Chiudi", "403.title": "Accesso Proibito", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "Sembra tu sia arrivato ad una pagina a cui non hai accesso.", + "403.login": "Forse dovresti effettuare l'accesso?", "404.title": "Non trovato", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "Sembra tu sia arrivato ad una pagina che non esiste. Torna alla home page.", "500.title": "Errore interno.", "500.message": "Oops! Qualcosa non funziona come si deve!", "register": "Registrazione", @@ -27,7 +27,7 @@ "header.tags": "Tags", "header.popular": "Popolare", "header.users": "Utenti", - "header.groups": "Groups", + "header.groups": "Gruppi", "header.chats": "Messaggi", "header.notifications": "Notifiche", "header.search": "Cerca", @@ -57,7 +57,7 @@ "posted_in_ago_by": "postato in %1 %2 da %3", "posted_in_ago": "postato in %1 %2", "replied_ago": "risposto %1", - "user_posted_ago": "%1 postato %2", + "user_posted_ago": "%1 ha postato %2", "guest_posted_ago": "Ospite ha scritto %1", "last_edited_by_ago": "ultima modifica di %1 %2", "norecentposts": "Nessun Post Recente", @@ -75,7 +75,7 @@ "updated.title": "Forum Aggiornato", "updated.message": "Questo forum è stato aggiornato all'ultima versione. Clicca qui per ricaricare la pagina.", "privacy": "Privacy", - "follow": "Follow", - "unfollow": "Unfollow", + "follow": "Segui", + "unfollow": "Non seguire", "delete_all": "Elimina Tutto" } \ No newline at end of file diff --git a/public/language/it/groups.json b/public/language/it/groups.json index f4e5f32787..96b915d56e 100644 --- a/public/language/it/groups.json +++ b/public/language/it/groups.json @@ -1,23 +1,34 @@ { "groups": "Gruppi", "view_group": "Vedi Gruppo", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "owner": "Proprietario del Gruppo", + "new_group": "Crea Nuovo Gruppo", + "no_groups_found": "Non ci sono gruppi da vedere", + "pending.accept": "Accept", + "pending.reject": "Reject", + "cover-instructions": "Drag and Drop una fotografia, spostarla ad una posizione, e premere Salva", + "cover-change": "Cambia", + "cover-save": "Salva", + "cover-saving": "Salvando", "details.title": "Dettagli Gruppo", "details.members": "Lista Membri", - "details.pending": "Pending Members", + "details.pending": "Membri in attesa", "details.has_no_posts": "I membri di questo gruppo non hanno ancora postato.", "details.latest_posts": "Ultimi Post", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.owner_options": "Amministratore del Grupo", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", + "event.updated": "I dettagli del Gruppo sono stati aggiornati", + "event.deleted": "Il gruppo \"%1\" è stato eliminato" } \ No newline at end of file diff --git a/public/language/it/login.json b/public/language/it/login.json index c4961f6221..75747e30d1 100644 --- a/public/language/it/login.json +++ b/public/language/it/login.json @@ -1,5 +1,7 @@ { - "username": "Nome utente / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Ricordami?", "forgot_password": "Password dimenticata?", "alternative_logins": "Accessi Alternativi", diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index f888a9a744..a52aabb969 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -2,6 +2,7 @@ "title": "Notifiche", "no_notifs": "Non hai nuove notifiche", "see_all": "Vedi tutte le Notifiche", + "mark_all_read": "Mark all notifications read", "back_to_home": "Indietro a %1", "outgoing_link": "Link in uscita", "outgoing_link_message": "Stai lasciando %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 ha iniziato a seguirti.", "email-confirmed": "Email Confermata", "email-confirmed-message": "Grazie per aver validato la tua email. Il tuo account è ora completamente attivato.", - "email-confirm-error": "Si è verificato un errore...", "email-confirm-error-message": "C'è stato un problema nella validazione del tuo indirizzo email. Potrebbe essere il codice non valido o scaduto.", "email-confirm-sent": "Email di conferma inviata." } \ No newline at end of file diff --git a/public/language/it/recent.json b/public/language/it/recent.json index f7d5f4d624..bf4485644c 100644 --- a/public/language/it/recent.json +++ b/public/language/it/recent.json @@ -6,13 +6,14 @@ "year": "Anno", "alltime": "Sempre", "no_recent_topics": "Non ci sono discussioni recenti.", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "no_popular_topics": "There are no popular topics.", + "there-is-a-new-topic": "C'è un nuovo topic.", + "there-is-a-new-topic-and-a-new-post": "C'è un nuovo topic e un nuovo post.", + "there-is-a-new-topic-and-new-posts": "C'è una nuova discussione e %1 nuovi post.", + "there-are-new-topics": "Ci sono %1 nuove discussioni.", + "there-are-new-topics-and-a-new-post": "Ci sono %1 nuove discussioni e un nuovo post.", + "there-are-new-topics-and-new-posts": "Ci sono %1 nuove discussioni e %2 nuovi post.", + "there-is-a-new-post": "C'è un nuovo post.", + "there-are-new-posts": "Ci sono %1 nuovi post.", + "click-here-to-reload": "Clicca qui per ricaricare." } \ No newline at end of file diff --git a/public/language/it/reset_password.json b/public/language/it/reset_password.json index 4789b7f1c1..d89642e43b 100644 --- a/public/language/it/reset_password.json +++ b/public/language/it/reset_password.json @@ -11,6 +11,6 @@ "enter_email_address": "Inserisci l'Indirizzo Email", "password_reset_sent": "Password Reset Inviata", "invalid_email": "Email invalida / L'email non esiste!", - "password_too_short": "The password entered is too short, please pick a different password.", - "passwords_do_not_match": "The two passwords you've entered do not match." + "password_too_short": "La password inserita è troppo corta, inserisci una password differente.", + "passwords_do_not_match": "Le due password che hai inserito non corrispondono." } \ No newline at end of file diff --git a/public/language/it/search.json b/public/language/it/search.json index 479fec6287..14ddeaa98a 100644 --- a/public/language/it/search.json +++ b/public/language/it/search.json @@ -9,8 +9,8 @@ "in-categories": "In Categorie", "search-child-categories": "Search child categories", "reply-count": "Numero Risposte", - "at-least": "At least", - "at-most": "At most", + "at-least": "Almeno", + "at-most": "Al massimo", "post-time": "Ora invio", "newer-than": "Più nuovi di", "older-than": "Più vecchi di", @@ -31,5 +31,10 @@ "username": "Nome utente", "category": "Categoria", "descending": "In ordine decrescente", - "ascending": "In ordine crescente" + "ascending": "In ordine crescente", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/it/tags.json b/public/language/it/tags.json index f8f88265a4..c3364a0bbf 100644 --- a/public/language/it/tags.json +++ b/public/language/it/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Non ci sono discussioni con questo tag.", "tags": "Tags", - "enter_tags_here": "Inserire qui i tags. Premere invio dopo ogni tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Inserisci i tags...", "no_tags": "Non ci sono ancora tags." } \ No newline at end of file diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 1cc385c23f..e53ac5c6f2 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -12,7 +12,7 @@ "notify_me": "Ricevi notifiche di nuove risposte in questa discussione", "quote": "Cita", "reply": "Rispondi", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "Effettua il Log in per rispondere", "edit": "Modifica", "delete": "Cancella", "purge": "Svuota", @@ -75,7 +75,7 @@ "fork_no_pids": "Nessun post selezionato!", "fork_success": "Topic Diviso con successo ! Clicca qui per andare al Topic Diviso.", "composer.title_placeholder": "Inserisci qui il titolo della discussione...", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "Nome", "composer.discard": "Annulla", "composer.submit": "Invia", "composer.replying_to": "Rispondendo a %1", @@ -95,5 +95,5 @@ "oldest_to_newest": "Da Vecchi a Nuovi", "newest_to_oldest": "Da Nuovi a Vecchi", "most_votes": "Più votati", - "most_posts": "Most posts" + "most_posts": "Ulteriori post" } \ No newline at end of file diff --git a/public/language/it/user.json b/public/language/it/user.json index ddbc35be12..e93be01541 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -2,8 +2,8 @@ "banned": "Bannato", "offline": "Non in linea", "username": "Nome Utente", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Data di adesione", + "postcount": "Numero post", "email": "Email", "confirm_email": "Conferma Email", "delete_account": "Elimina Account", @@ -18,7 +18,7 @@ "profile_views": "Visite al profilo", "reputation": "Reputazione", "favourites": "Favoriti", - "watched": "Watched", + "watched": "Osservati", "followers": "Da chi è seguito", "following": "Chi segue", "signature": "Firma", @@ -59,12 +59,12 @@ "digest_weekly": "Settimanale", "digest_monthly": "Mensile", "send_chat_notifications": "Invia una email se arriva un nuovo messaggio di chat e non sono online", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "send_post_notifications": "Invia una email quando le risposte sono fatte a discussioni a cui sono sottoscritto", "has_no_follower": "Questo utente non è seguito da nessuno :(", "follows_no_one": "Questo utente non segue nessuno :(", "has_no_posts": "Questo utente non ha ancora postato nulla.", "has_no_topics": "Questo utente non ha ancora avviato discussioni.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "Questo utente non sta ancora osservando alcuna discussione.", "email_hidden": "Email Nascosta", "hidden": "nascosta", "paginate_description": "Dividi discussioni e post in pagine anziché usare lo scroll infinito.", diff --git a/public/language/it/users.json b/public/language/it/users.json index 44f4b4f916..4774dd2909 100644 --- a/public/language/it/users.json +++ b/public/language/it/users.json @@ -5,8 +5,8 @@ "search": "Cerca", "enter_username": "Inserisci il nome utente da cercare", "load_more": "Carica altri", - "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "users-found-search-took": "%1 utente(i) trovati! La ricerca ha impiegato %2 secondi.", + "filter-by": "Filtra per", + "online-only": "Solo online", + "picture-only": "Solo con foto" } \ No newline at end of file diff --git a/public/language/ja/error.json b/public/language/ja/error.json index 2a4a1ebac9..95cf6728ac 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -19,6 +19,8 @@ "email-taken": "メールアドレスが使用された", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "ユーザーが停止された", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "この板は無効された", "topic-locked": "スレッドがロックされた", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "アップロードが完成するまでお待ちください。", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "タイトルに最大 %1 文字の制限があります。", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "自分のポストに評価することはできません。", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "ほかの管理者を停止することはできません！", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "グループ名は短すぎます。", "group-already-exists": "グループ名はすでに存在しています", "group-name-change-not-allowed": "グループ名の修正はできません", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "スレッドのサムネイルが無効された", "invalid-file": "無効なファイル", "uploads-are-disabled": "アップロードが無効された", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "自分にチャットすることはできません！", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ja/groups.json b/public/language/ja/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/ja/groups.json +++ b/public/language/ja/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ja/login.json b/public/language/ja/login.json index 915c86a4cd..82a18ea9b1 100644 --- a/public/language/ja/login.json +++ b/public/language/ja/login.json @@ -1,5 +1,7 @@ { - "username": "ユーザー名 / メール", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "ログイン情報を記憶", "forgot_password": "パスワードがわからない？", "alternative_logins": "ほかのログイン方法", diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json index 80467939b6..6677d832e2 100644 --- a/public/language/ja/notifications.json +++ b/public/language/ja/notifications.json @@ -2,6 +2,7 @@ "title": "通知センター", "no_notifs": "新しい通知はありません", "see_all": "すべての通知を確認", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "外部サイトへのリンク", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/ja/recent.json b/public/language/ja/recent.json index 1aa2f932f3..5b76f5d6fc 100644 --- a/public/language/ja/recent.json +++ b/public/language/ja/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "最近のスレッドはありません。", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/ja/search.json b/public/language/ja/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/ja/search.json +++ b/public/language/ja/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ja/tags.json b/public/language/ja/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/ja/tags.json +++ b/public/language/ja/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/ko/error.json b/public/language/ko/error.json index fcca053185..bf1eb8d8e4 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -19,6 +19,8 @@ "email-taken": "이미 사용 중인 이메일입니다.", "email-not-confirmed": "아직 이메일이 인증되지 않았습니다. 여기를 누르면 인증 메일을 발송할 수 있습니다.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "사용자 이름이 너무 짧습니다.", "username-too-long": "사용자 이름이 너무 깁니다.", "user-banned": "차단된 사용자입니다.", @@ -33,6 +35,7 @@ "no-emailers-configured": "이메일 추가기능이 로드되지 않았으므로 테스트 메일을 발송할 수 없습니다.", "category-disabled": "비활성화된 카테고리입니다.", "topic-locked": "잠긴 주제입니다.", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "업로드가 끝날 때까지 기다려 주세요.", "content-too-short": "게시물의 내용이 너무 짧습니다. 최소 %1자 이상이어야 합니다.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "제목은 최대 %1자로 제한됩니다.", "too-many-posts": "새 게시물 작성은 %1초 간격으로 제한됩니다 - 잠시 기다렸다가 작성해주세요.", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "파일의 크기는 최대 %1KB로 제한됩니다 - 더 작은 파일을 업로드하세요.", "cant-vote-self-post": "자신의 게시물에는 투표할 수 없습니다.", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "다른 관리자를 차단할 수 없습니다.", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "그룹 이름이 너무 짧습니다.", "group-already-exists": "이미 존재하는 그룹입니다.", "group-name-change-not-allowed": "금지된 그룹 이름입니다.", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "주제 섬네일이 이미 해제되었습니다.", "invalid-file": "올바르지 않은 파일입니다.", "uploads-are-disabled": "업로드는 비활성화되어 있습니다.", - "upload-error": "업로드 오류가 발생했습니다. : %1", "signature-too-long": "죄송합니다. 서명은 최대 %1자로 제한됩니다.", "cant-chat-with-yourself": "자신과는 채팅할 수 없습니다.", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "인기도가 낮아 이 게시물을 신고할 수 없습니다.", "reload-failed": "NodeBB를 다시 읽어들이는 중 다음과 같은 문제가 발생했습니다. \"%1\" 다시 읽어들이기 직전에 했던 동작은 되돌리세요. 클라이언트측 자원은 문제없이 계속 전송됩니다.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ko/groups.json b/public/language/ko/groups.json index 344c35078b..a3383c2ce2 100644 --- a/public/language/ko/groups.json +++ b/public/language/ko/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "이 그룹의 구성원이 작성한 게시물이 없습니다.", "details.latest_posts": "최근 게시물", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ko/login.json b/public/language/ko/login.json index 2898cb892d..736c28484f 100644 --- a/public/language/ko/login.json +++ b/public/language/ko/login.json @@ -1,5 +1,7 @@ { - "username": "사용자 이름 / 이메일", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "로그인 유지", "forgot_password": "비밀번호 초기화", "alternative_logins": "다른 방법으로 로그인", diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json index 9489b51e45..d0240f52ae 100644 --- a/public/language/ko/notifications.json +++ b/public/language/ko/notifications.json @@ -2,6 +2,7 @@ "title": "알림", "no_notifs": "새 알림이 없습니다.", "see_all": "모든 알림 보기", + "mark_all_read": "Mark all notifications read", "back_to_home": "%1로 돌아가기", "outgoing_link": "외부 링크", "outgoing_link_message": "%1에서 다른 사이트로 이동합니다.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1님이 나를 팔로우합니다.", "email-confirmed": "확인된 이메일", "email-confirmed-message": "이메일을 확인해주셔서 감사합니다. 계정이 완전히 활성화되었습니다.", - "email-confirm-error": "에러가 발생했습니다...", "email-confirm-error-message": "이메일 주소를 검증하지 못했습니다. 코드가 올바르지 않거나 만료되었을 수 있습니다.", "email-confirm-sent": "확인 이메일이 발송되었습니다." } \ No newline at end of file diff --git a/public/language/ko/recent.json b/public/language/ko/recent.json index f05f6ff771..9fdf7af769 100644 --- a/public/language/ko/recent.json +++ b/public/language/ko/recent.json @@ -6,6 +6,7 @@ "year": "연간", "alltime": "전체", "no_recent_topics": "최근 생성된 주제가 없습니다.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/ko/search.json b/public/language/ko/search.json index 3905534515..3ec01cd868 100644 --- a/public/language/ko/search.json +++ b/public/language/ko/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ko/tags.json b/public/language/ko/tags.json index a1e86639cb..a50fc5e9e1 100644 --- a/public/language/ko/tags.json +++ b/public/language/ko/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "이 태그에 해당하는 주제가 없습니다.", "tags": "태그", - "enter_tags_here": "태그를 여기에 입력하세요. 태그 한 개마다 엔터를 누르세요.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "태그 입력...", "no_tags": "아직 아무런 태그도 없습니다." } \ No newline at end of file diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 1951d21778..295af44ce4 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -19,6 +19,8 @@ "email-taken": "El. pašto adresas jau užimtas", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Slapyvardis per trumpas", "username-too-long": "Username too long", "user-banned": "Vartotojas užblokuotas", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategorija išjungta", "topic-locked": "Tema užrakinta", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Prašome palaukti kol bus baigti visi kėlimai į serverį", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Pavadinimas turėtų būti trumpesnis. Maksimalus leistinas ilgis- %1 simbolių.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "Jūs negalite balsuoti už savo pranešimą", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Jūs negalite užblokuoti kitų administratorių!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Grupės pavadinimas per trumpas", "group-already-exists": "Tokia grupė jau egzistuoja", "group-name-change-not-allowed": "Grupės pavadinimas keitimas neleidžiamas", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Temos paveikslėliai neleidžiami.", "invalid-file": "Klaidingas failas", "uploads-are-disabled": "Įkėlimai neleidžiami", - "upload-error": "Įkėlimo klaida: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Jūs negalite susirašinėti su savimi!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/lt/groups.json b/public/language/lt/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/lt/groups.json +++ b/public/language/lt/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/lt/login.json b/public/language/lt/login.json index ce993ead94..ea6dab6e24 100644 --- a/public/language/lt/login.json +++ b/public/language/lt/login.json @@ -1,5 +1,7 @@ { - "username": "Vartotojo vardas / El. paštas", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Prisiminti?", "forgot_password": "Užmiršote slaptažodį?", "alternative_logins": "Alternatyvūs prisijungimo būdai", diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json index 10a4cd914e..0a38999bff 100644 --- a/public/language/lt/notifications.json +++ b/public/language/lt/notifications.json @@ -2,6 +2,7 @@ "title": "Pranešimai", "no_notifs": "Jūs neturite naujų pranešimų", "see_all": "Peržiūrėti visus pranešimus", + "mark_all_read": "Mark all notifications read", "back_to_home": "Atgal į %1", "outgoing_link": "Išeinanti nuoroda", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "El. paštas patvirtintas", "email-confirmed-message": "Dėkojame už el. pašto patvirtinimą. Jūsų paskyra pilnai aktyvuota.", - "email-confirm-error": "Įvyko klaida...", "email-confirm-error-message": "Įvyko klaida mėginant patvirtinti Jūsų el. pašto adresą. Galbūt kodas yra neteisingas, arba nebegalioajantis.", "email-confirm-sent": "Patvirtinimo laiškas išsiųstas." } \ No newline at end of file diff --git a/public/language/lt/recent.json b/public/language/lt/recent.json index d9257022d6..ebb6269a19 100644 --- a/public/language/lt/recent.json +++ b/public/language/lt/recent.json @@ -6,6 +6,7 @@ "year": "Metai", "alltime": "All Time", "no_recent_topics": "Paskutinių temų nėra", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/lt/search.json b/public/language/lt/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/lt/search.json +++ b/public/language/lt/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/lt/tags.json b/public/language/lt/tags.json index 93a06c9cbe..2f2b9e11d2 100644 --- a/public/language/lt/tags.json +++ b/public/language/lt/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Temų su šią žyma nėra.", "tags": "Žymos", - "enter_tags_here": "Čia surašykite žymas. Paspauskite enter po kiekvienos žymos.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "Žymų kolkas nėra." } \ No newline at end of file diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 3c68a1d7e5..340e4e528b 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -19,6 +19,8 @@ "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nama pengunna terlalu pendek", "username-too-long": "Username too long", "user-banned": "User banned", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Invalid File", "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ms/groups.json b/public/language/ms/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/ms/groups.json +++ b/public/language/ms/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ms/login.json b/public/language/ms/login.json index 7836b6feb7..3f0d1e37ea 100644 --- a/public/language/ms/login.json +++ b/public/language/ms/login.json @@ -1,5 +1,7 @@ { - "username": "Nama pengguna / Emel", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Ingat Saya?", "forgot_password": "Lupa Kata Laluan?", "alternative_logins": "Login Alternatif", diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json index 8026012905..e8fffb1cd8 100644 --- a/public/language/ms/notifications.json +++ b/public/language/ms/notifications.json @@ -2,6 +2,7 @@ "title": "pemberitahuan", "no_notifs": "Anda tiada pemberitahuan baru", "see_all": "LIhat semua pemberitahuan", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Sambungan luar", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/ms/recent.json b/public/language/ms/recent.json index 237ababd11..fe18961628 100644 --- a/public/language/ms/recent.json +++ b/public/language/ms/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "Tiada topik terkini", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/ms/search.json b/public/language/ms/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/ms/search.json +++ b/public/language/ms/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ms/tags.json b/public/language/ms/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/ms/tags.json +++ b/public/language/ms/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/nb/error.json b/public/language/nb/error.json index a19bdad64d..2fe73f83a4 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -19,6 +19,8 @@ "email-taken": "E-post opptatt", "email-not-confirmed": "E-posten din har ikke blitt bekreftet enda, vennligst klikk for å bekrefte din e-post.", "email-not-confirmed-chat": "Du kan ikke chatte før e-posten din har blitt bekreftet", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Brukernavnet er for kort", "username-too-long": "Brukernavnet er for langt", "user-banned": "Bruker utestengt", @@ -33,6 +35,7 @@ "no-emailers-configured": "Ingen e-post-tillegg er lastet, så ingen test e-post kunne bli sendt", "category-disabled": "Kategori deaktivert", "topic-locked": "Emne låst", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Vennligst vent til opplastingene blir fullført.", "content-too-short": "Vennligst skriv et lengere innlegg. Innlegg må inneholde minst %1 tegn.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Vennligst skriv en kortere tittel. Titler må inneholde minst %1 tegn.", "too-many-posts": "Du kan bare poste et innlegg hvert %1 sekund - vennligst vent før du poster igjen", "too-many-posts-newbie": "Som en ny bruker, kan du bare poste et innlegg hvert %1 sekund til du har tjent deg opp %2 i rykte - vennligst vent før du poster igjen", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Max tilatte filstørrelse er %1 kbs - vennligst last opp en mindre fil", "cant-vote-self-post": "Du kan ikke stemme på ditt eget innlegg", "already-favourited": "Du har allerede favorittmerket dette innlegget", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Du kan ikke utestenge andre administratorer!", "invalid-image-type": "Ugyldig bildetype. Tilatte typer er: %1", "invalid-image-extension": "Ugyldig bildefiltype", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Gruppenavnet er for kort", "group-already-exists": "Gruppe eksisterer allerede", "group-name-change-not-allowed": "Gruppenavn ikke tillatt", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Emne-minatyrbilder har blitt deaktivert", "invalid-file": "Ugyldig fil", "uploads-are-disabled": "Opplastninger er deaktivert", - "upload-error": "Opplastningfeil: %1", "signature-too-long": "Beklager, signaturen din kan ikke være lengre en %1 tegn.", "cant-chat-with-yourself": "Du kan ikke chatte med deg selv!", "chat-restricted": "Denne brukeren har begrenset sine chat-meldinger. De må følge deg før du kan chatte med dem", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Du har ikke nok rykte til å flagge dette innlegget", "reload-failed": "NodeBB støtte på et problem under lasting på nytt: \"%1\". NodeBB vil fortsette å servere eksisterende klientside ressureser, selv om du burde angre endringene du gjorde før du lastet på nytt.", "registration-error": "Feil under registrering", - "parse-error": "Noe gikk feil under analysering av serversvar" + "parse-error": "Noe gikk feil under analysering av serversvar", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/nb/groups.json b/public/language/nb/groups.json index 894bbc0a12..e837ac8961 100644 --- a/public/language/nb/groups.json +++ b/public/language/nb/groups.json @@ -4,6 +4,8 @@ "owner": "Gruppe-eier", "new_group": "Opprett ny gruppe", "no_groups_found": "Det er ingen grupper å se", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Dra og slipp et bilde, dra til posisjon, og trykk Lagre", "cover-change": "Endre", "cover-save": "Lagre", @@ -13,11 +15,20 @@ "details.pending": "Ventende meldemmer", "details.has_no_posts": "Medlemmene i denne gruppen har ikke skrevet noen innlegg.", "details.latest_posts": "Seneste innlegg", - "details.private": "Privat grup", - "details.public": "Offentlig grup", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Gruppeadministrasjon", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Gruppedetaljer har blitt oppgradert", "event.deleted": "Gruppen \"%1\" har blitt slettet" } \ No newline at end of file diff --git a/public/language/nb/login.json b/public/language/nb/login.json index 92e26c01da..2b51b10c6a 100644 --- a/public/language/nb/login.json +++ b/public/language/nb/login.json @@ -1,5 +1,7 @@ { - "username": "Brukernavn / E-post", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Husk meg?", "forgot_password": "Glemt passord?", "alternative_logins": "Alternativ innlogging", diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index f85acbdd55..33ff86eff6 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -2,6 +2,7 @@ "title": "Varsler", "no_notifs": "Du har ingen nye varsler", "see_all": "Se alle varsler", + "mark_all_read": "Mark all notifications read", "back_to_home": "Tilbake til %1", "outgoing_link": "Utgående link", "outgoing_link_message": "Du forlater nå %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 begynte å følge deg.", "email-confirmed": "E-post bekreftet", "email-confirmed-message": "Thank for at du har validert din e-post. Kontoen din er nå fullstendig aktivert.", - "email-confirm-error": "En feil oppsto...", "email-confirm-error-message": "Det oppsto et problem under valdiering av din e-post. Koden kan ha vært ugyldig eller ha utløpt.", "email-confirm-sent": "Bekreftelsesepost sendt." } \ No newline at end of file diff --git a/public/language/nb/recent.json b/public/language/nb/recent.json index 24ece53c70..3b980f6f02 100644 --- a/public/language/nb/recent.json +++ b/public/language/nb/recent.json @@ -6,6 +6,7 @@ "year": "År", "alltime": "All tid", "no_recent_topics": "Det er ingen nye tråder.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Det finnes et nytt emne.", "there-is-a-new-topic-and-a-new-post": "Det finnes et nytt emne og et nytt innlegg.", "there-is-a-new-topic-and-new-posts": "Det finnes et nytt emne og %1 nye innlegg.", diff --git a/public/language/nb/search.json b/public/language/nb/search.json index 053950fd9e..74fdc462a6 100644 --- a/public/language/nb/search.json +++ b/public/language/nb/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/nb/tags.json b/public/language/nb/tags.json index 3e2f7961ce..d38e00a025 100644 --- a/public/language/nb/tags.json +++ b/public/language/nb/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Det er ingen emnet med denne taggen.", "tags": "Tagger", - "enter_tags_here": "Skriv tagger her. Trykk enter etter hver tagg.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Skriv tagger...", "no_tags": "Det finnes ingen tagger enda." } \ No newline at end of file diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 8b2c37d5a1..de83d31255 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -19,6 +19,8 @@ "email-taken": "Email adres is al gebruikt", "email-not-confirmed": "U email adres is niet bevestigd, Klik hier om uw email adres te bevestigen", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Gebruikersnaam is te kort", "username-too-long": "Gebruikersnaam is te lang", "user-banned": "Gebruiker verbannen", @@ -33,6 +35,7 @@ "no-emailers-configured": "Er zijn geen email plugins geladen, een test email kan dus niet verzonden worden", "category-disabled": "Categorie uitgeschakeld", "topic-locked": "Onderwerp gesloten", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Heb even geduld totdat de alle bestanden geüpload zijn", "content-too-short": "Maak de bericht alsjeblieft wat langer. Op z'n minst %1 karakters", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Maak de titel wat korter. Het kan niet langer zijn dan %1 karakters", "too-many-posts": "Je kan eens in de %1 seconden een bericht aanmaken. Wacht alstublieft.", "too-many-posts-newbie": "Als een nieuwe gebruiker kan je maar om de %1 seconden een bericht plaatsen vanwege je reputatie. Uw moet deze level van reputatie verdienen %2. Wacht alstublieft met het plaatsen van uw bericht.", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "De maximale bestandsgrootte is %1 kbs", "cant-vote-self-post": "Je kan niet op je eigen berichten stemmen", "already-favourited": "U heeft al dit bericht in uw favorieten staan", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "U kunt niet de andere admins bannen!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "De groepsnaam is te kort", "group-already-exists": "Deze groep bestaat al", "group-name-change-not-allowed": "Het veranderen van de groepsnaam is niet toegestaan!", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Onderwerp thumbnails zijn uitgeschakeld", "invalid-file": "Ongeldig bestand", "uploads-are-disabled": "Uploads zijn uitgeschakeld", - "upload-error": "Upload Fout : %1", "signature-too-long": "Sorry, maar deze handtekening kan niet groter zijn dan %1 karakters!", "cant-chat-with-yourself": "Je kan niet met jezelf chatten!", "chat-restricted": "Deze gebruiker heeft beperkingen gelegd op chatfunctie. Hun moeten jouw volgen voordat je met hun kan chatten", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "U heeft niet de benodigde reputatie om dit bericht te melden aan de admins", "reload-failed": "NodeBB heeft een probleem geconstateerd tijdens het laden van: \"%1\".\nNodeBB blijft verder draaien. Het is wel verstandig om de actie wat u daarvoor heeft gedaan ongedaan te maken door te herladen.", "registration-error": "Registratie fout", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/nl/groups.json b/public/language/nl/groups.json index 59681475d1..9fe5c00975 100644 --- a/public/language/nl/groups.json +++ b/public/language/nl/groups.json @@ -4,6 +4,8 @@ "owner": "Groep eigenaar", "new_group": "Maak een nieuwe groep", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Opslaan", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Deze groepleden hebben nog geen berichten geplaatst", "details.latest_posts": "Nieuwste Berichten", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/nl/login.json b/public/language/nl/login.json index fa8f5d55d7..ec75667e86 100644 --- a/public/language/nl/login.json +++ b/public/language/nl/login.json @@ -1,5 +1,7 @@ { - "username": "Gebruikersnaam / Emailadres", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Mij Onthouden?", "forgot_password": "Wachtwoord Vergeten?", "alternative_logins": "Alternatieve Loginmethodes", diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json index a63b085026..f0dc76c27f 100644 --- a/public/language/nl/notifications.json +++ b/public/language/nl/notifications.json @@ -2,6 +2,7 @@ "title": "Notificaties", "no_notifs": "Je hebt geen nieuwe notificaties", "see_all": "Bekijk alle Notificaties", + "mark_all_read": "Mark all notifications read", "back_to_home": "Terug naar %1", "outgoing_link": "Uitgaande Link", "outgoing_link_message": "Je verlaat nu %1", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 volgt u nu.", "email-confirmed": "Email adres bevestigd", "email-confirmed-message": "Bedankt voor het bevestigen van uw email adres. Uw account is nu volledig actief.", - "email-confirm-error": "Een fout vond plaats", "email-confirm-error-message": "Er was een probleem met het bevestigen van uw email adres. Misschien was de code niet goed of was door de tijd verstreken.", "email-confirm-sent": "Bevestigings email verstuurd" } \ No newline at end of file diff --git a/public/language/nl/recent.json b/public/language/nl/recent.json index 2b1b292298..e2f3471de6 100644 --- a/public/language/nl/recent.json +++ b/public/language/nl/recent.json @@ -6,6 +6,7 @@ "year": "Jaar", "alltime": "Intussen", "no_recent_topics": "Er zijn geen recente reacties.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Er is een nieuw onderwerp", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "Er is een nieuwe onderwerp en %1 nieuwe berichten", diff --git a/public/language/nl/search.json b/public/language/nl/search.json index 168dde5142..756a0ef3a7 100644 --- a/public/language/nl/search.json +++ b/public/language/nl/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/nl/tags.json b/public/language/nl/tags.json index 07e2c9ccf0..85c11b0476 100644 --- a/public/language/nl/tags.json +++ b/public/language/nl/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Er zijn geen onderwerpen met deze tag", "tags": "Tags", - "enter_tags_here": "Voer hier uw tags in. Druk op enter na elke tag ingevoerd te hebben", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Voer uw tags in...", "no_tags": "Er zijn nog geen tags te vinden" } \ No newline at end of file diff --git a/public/language/pl/error.json b/public/language/pl/error.json index eaebbb6fcd..c09640123e 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -19,6 +19,8 @@ "email-taken": "E-mail zajęty.", "email-not-confirmed": "Twój email nie został jeszcze potwierdzony. Proszę kliknąć tutaj by go potwierdzić.", "email-not-confirmed-chat": "Nie możesz rozmawiać do czasu, gdy twój email zostanie potwierdzony.", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nazwa użytkownika za krótka.", "username-too-long": "Zbyt długa nazwa użytkownika", "user-banned": "Użytkownik zbanowany", @@ -33,6 +35,7 @@ "no-emailers-configured": "Nie zainstalowano żadnego dodatku obsługującego e-mail, więc nie można wysłać testowej wiadomości.", "category-disabled": "Kategoria wyłączona.", "topic-locked": "Temat zamknięty", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Poczekaj na pełne załadowanie", "content-too-short": "Proszę wpisać dłuższy post. Posty powinny zawierać co najmniej %1 znaków.", "content-too-long": "Proszę wpisać krótszy post. Posty nie mogą zawierać więcej niż %1 znaków.", @@ -40,6 +43,8 @@ "title-too-long": "Wpisz krótszy tytuł, nie może być dłuższy niż %1 znaków.", "too-many-posts": "Możesz wysyłać posty co %1 sekund - proszę poczekać", "too-many-posts-newbie": "Jako nowy użytkownik, możesz wysyłać posty co %1 sekund, do chwili aż zbierzesz %2 reputacji - proszę poczekać przed ponownym wysłaniem posta", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maksymalny dozwolony rozmiar pliku to %1 kb - proszę wybrać mniejszy plik", "cant-vote-self-post": "Nie możesz głosować na własny post", "already-favourited": "Już polubiłeś ten post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Nie możesz zbanować innych adminów!", "invalid-image-type": "Błędny typ pliku. Dozwolone typy to: %1", "invalid-image-extension": "Błędne rozszerzenie pliku", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nazwa grupy za krótka", "group-already-exists": "Grupa już istnieje", "group-name-change-not-allowed": "Nie można zmieniać nazwy tej grupy.", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Miniatury tematów są wyłączone", "invalid-file": "Błędny plik", "uploads-are-disabled": "Uploadowanie jest wyłączone", - "upload-error": "Błąd uploadu: %1", "signature-too-long": "Przepraszamy, ale podpis nie może być dłuższy niż %1 znaków.", "cant-chat-with-yourself": "Nie możesz rozmawiać ze sobą", "chat-restricted": "Ten użytkownik ograniczył swoje czaty. Musi Cię śledzić, zanim będziesz mógł z nim czatować.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Nie masz dość reputacji, by flagować ten post", "reload-failed": "NodeBB napotkał problem w czasie ładowania \"%1\". Forum będzie nadal dostarczać zasoby dostępne w kliencie, jednak powinieneś cofnąć ostatnią akcję.", "registration-error": "Błąd rejestracji", - "parse-error": "Coś poszło nie tak podczas parsingu odpowiedzi serwera" + "parse-error": "Coś poszło nie tak podczas parsingu odpowiedzi serwera", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json index ca279d4b90..19f43e2d89 100644 --- a/public/language/pl/groups.json +++ b/public/language/pl/groups.json @@ -4,6 +4,8 @@ "owner": "Właściciel grupy", "new_group": "Stwórz nową grupę", "no_groups_found": "Brak grup do wyświetlenia", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Przeciągnij i upuść zdjęcie, ustaw w odpowiedniej pozycji i kliknij Zapisz", "cover-change": "Zmień", "cover-save": "Zapisz", @@ -13,11 +15,20 @@ "details.pending": "Członkowie oczekujący", "details.has_no_posts": "Członkowie tej grupy nie napisali żadnych postów.", "details.latest_posts": "Ostatnie posty", - "details.private": "Grupa prywatna", - "details.public": "Grupa publiczna", + "details.private": "Private", "details.grant": "Nadaj/Cofnij prawa Właściciela", "details.kick": "Wykop", "details.owner_options": "Administracja grupy", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Dane grupy zostały zaktualizowane", "event.deleted": "Grupa \"%1\" została skasowana" } \ No newline at end of file diff --git a/public/language/pl/login.json b/public/language/pl/login.json index cc6f749e15..4a95c6d26e 100644 --- a/public/language/pl/login.json +++ b/public/language/pl/login.json @@ -1,5 +1,7 @@ { - "username": "Nazwa użytkownika lub adres e-mail", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Zapamiętaj mnie", "forgot_password": "Zapomniałeś hasło?", "alternative_logins": "Alternatywne logowanie", diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json index ad8cc4de3d..5e84128ee9 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -2,6 +2,7 @@ "title": "Powiadomienia", "no_notifs": "Nie masz nowych powiadomień", "see_all": "Zobacz wszystkie powiadomienia", + "mark_all_read": "Mark all notifications read", "back_to_home": "Wróć do %1", "outgoing_link": "Łącze wychodzące", "outgoing_link_message": "Opuszczasz %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 zaczął Cię śledzić.", "email-confirmed": "E-mail potwierdzony", "email-confirmed-message": "Dziękujemy za potwierdzenie maila. Twoje konto zostało aktywowane.", - "email-confirm-error": "Wystąpił błąd.", "email-confirm-error-message": "Wystąpił problem przy aktywacji, - kod jest błędny lub przestarzały", "email-confirm-sent": "E-mail potwierdzający wysłany" } \ No newline at end of file diff --git a/public/language/pl/recent.json b/public/language/pl/recent.json index 3a5ed0fa33..d395ee5722 100644 --- a/public/language/pl/recent.json +++ b/public/language/pl/recent.json @@ -6,6 +6,7 @@ "year": "Rok", "alltime": "Od początku", "no_recent_topics": "Brak ostatnich wątków.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Masz nowy wątek.", "there-is-a-new-topic-and-a-new-post": "Masz nowy wątek i nowy post.", "there-is-a-new-topic-and-new-posts": "Masz nowy wątek i %1 nowych postów.", diff --git a/public/language/pl/search.json b/public/language/pl/search.json index 6f2afda91d..7a055eb66c 100644 --- a/public/language/pl/search.json +++ b/public/language/pl/search.json @@ -31,5 +31,10 @@ "username": "Nazwa użytkownika", "category": "Kategoria", "descending": "W kolejności malejącej", - "ascending": "W kolejności rosnącej" + "ascending": "W kolejności rosnącej", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/pl/tags.json b/public/language/pl/tags.json index 57f1a280df..c4d9498474 100644 --- a/public/language/pl/tags.json +++ b/public/language/pl/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nie ma tematów z tym tagiem", "tags": "Tagi", - "enter_tags_here": "Tutaj wpisz tagi. Naciśnij enter po każdym.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Wpisz tagi...", "no_tags": "Jeszcze nie ma tagów." } \ No newline at end of file diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json index e0ad9b1e67..359f3c654a 100644 --- a/public/language/pt_BR/error.json +++ b/public/language/pt_BR/error.json @@ -19,6 +19,8 @@ "email-taken": "Email já cadastrado", "email-not-confirmed": "O seu email ainda não foi confirmado, por favor clique aqui para confirmar seu email.", "email-not-confirmed-chat": "Você não pode usar o chat até que seu email seja confirmado", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nome de usuário muito curto", "username-too-long": "Nome de usuário muito longo", "user-banned": "Usuário banido", @@ -33,6 +35,7 @@ "no-emailers-configured": "Nenhum plugin de email foi carregado, por isso um email de teste não pôde ser enviado", "category-disabled": "Categoria desativada", "topic-locked": "Tópico Trancado", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Aguarde a conclusão dos uploads.", "content-too-short": "Por favor digite um post mais longo. Posts devem conter no mínimo %1 caracteres.", "content-too-long": "Por favor entre com um post mais curto. Posts não podem ser maiores do que %1 caracteres.", @@ -40,6 +43,8 @@ "title-too-long": "Por favor entre com um título mais curto; Títulos não podem ser maiores que %1 caracteres.", "too-many-posts": "Você pode postar apenas uma vez a cada %1 segundos - por favor aguarde antes de postar novamente", "too-many-posts-newbie": "Como novo usuário, você pode postar apenas uma vez a cada %1 segundos até que você tenha recebido reputação de %2 - por favor aguarde antes de postar novamente", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "O tamanho máximo permitido de arquivo é %1 kbs - por favor faça upload de um arquivo menor", "cant-vote-self-post": "Você não pode votar no seu próprio post", "already-favourited": "Você já adicionou este post aos favoritos", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Você não pode banir outros administradores!", "invalid-image-type": "Tipo inválido de imagem. Os tipos permitidos são: %1", "invalid-image-extension": "Extensão de imagem inválida", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nome do grupo é muito curto", "group-already-exists": "O grupo já existe", "group-name-change-not-allowed": "Sem permissão para alterar nome do grupo", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Thumbnails para tópico estão desativados.", "invalid-file": "Arquivo Inválido", "uploads-are-disabled": "Uploads estão desativados", - "upload-error": "Erro de Upload : %1", "signature-too-long": "Desculpe, sua assinatura não pode ser maior que %1 caracteres.", "cant-chat-with-yourself": "Você não pode iniciar um chat consigo mesmo!", "chat-restricted": "Este usuário restringiu suas mensagens de chat. Eles devem seguir você antes que você possa conversar com eles", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Você não possui reputação suficiente para sinalizar este post", "reload-failed": "O NodeBB encontrou um problema ao recarregar: \"%1\". O NodeBB continuará a servir os assets existentes no lado do cliente, apesar de que você deve desfazer o que você fez antes de recarregar.", "registration-error": "Erro de Cadastro", - "parse-error": "Algo deu errado ao conseguir resposta do servidor" + "parse-error": "Algo deu errado ao conseguir resposta do servidor", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/pt_BR/groups.json b/public/language/pt_BR/groups.json index f3a19ea8ef..a9e9efa321 100644 --- a/public/language/pt_BR/groups.json +++ b/public/language/pt_BR/groups.json @@ -4,6 +4,8 @@ "owner": "Dono do Grupo", "new_group": "Criar Novo Grupo", "no_groups_found": "Não há grupos para ver", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Arraste uma foto, arraste para a posição correta e clique em Salvar", "cover-change": "Alterar", "cover-save": "Salvar", @@ -13,11 +15,20 @@ "details.pending": "Membros Pendentes", "details.has_no_posts": "Os membros deste grupo não fizeram quaisquer posts.", "details.latest_posts": "Últimos Posts", - "details.private": "Grupo Privado", - "details.public": "Grupo Público.", + "details.private": "Private", "details.grant": "Conceder/Retomar a Posse", "details.kick": "Chutar", "details.owner_options": "Administração do Grupo", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Os detalhes do grupo foram atualizados", "event.deleted": "O grupo \"%1\" foi deletado" } \ No newline at end of file diff --git a/public/language/pt_BR/login.json b/public/language/pt_BR/login.json index 210ff01ef7..9b267d8d9c 100644 --- a/public/language/pt_BR/login.json +++ b/public/language/pt_BR/login.json @@ -1,5 +1,7 @@ { - "username": "Nome de Usuário / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Lembrar de Mim?", "forgot_password": "Esqueceu a Senha?", "alternative_logins": "Logins Alternativos", diff --git a/public/language/pt_BR/notifications.json b/public/language/pt_BR/notifications.json index 48220327e2..72b406d47b 100644 --- a/public/language/pt_BR/notifications.json +++ b/public/language/pt_BR/notifications.json @@ -2,6 +2,7 @@ "title": "Notificações", "no_notifs": "Você não tem nenhuma notificação nova", "see_all": "Ver todas as Notificações", + "mark_all_read": "Mark all notifications read", "back_to_home": "Voltar para %1", "outgoing_link": "Link Externo", "outgoing_link_message": "Você deixou de seguir %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 começou a seguir você.", "email-confirmed": "Email Confirmado", "email-confirmed-message": "Obrigado por validar o seu email. Agora sua conta está plenamente ativada.", - "email-confirm-error": "Ocorreu um erro...", "email-confirm-error-message": "Houve um problema ao validar o seu endereço de email. Talvez o código era invalido ou tenha expirado.", "email-confirm-sent": "Email de confirmação enviado." } \ No newline at end of file diff --git a/public/language/pt_BR/recent.json b/public/language/pt_BR/recent.json index b0dd732602..2af16e248a 100644 --- a/public/language/pt_BR/recent.json +++ b/public/language/pt_BR/recent.json @@ -6,6 +6,7 @@ "year": "Ano", "alltime": "Todos os Tempos", "no_recent_topics": "Não há tópicos recentes.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Há um novo tópico.", "there-is-a-new-topic-and-a-new-post": "Há um novo tópico e um novo post.", "there-is-a-new-topic-and-new-posts": "Há um novo tópico e %1 novos posts.", diff --git a/public/language/pt_BR/search.json b/public/language/pt_BR/search.json index f1b47b737e..695d7795ce 100644 --- a/public/language/pt_BR/search.json +++ b/public/language/pt_BR/search.json @@ -31,5 +31,10 @@ "username": "Nome de usuário", "category": "Categoria", "descending": "Em ordem descendente", - "ascending": "Em ordem ascendente" + "ascending": "Em ordem ascendente", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/pt_BR/tags.json b/public/language/pt_BR/tags.json index 4d598667b8..267888cbfa 100644 --- a/public/language/pt_BR/tags.json +++ b/public/language/pt_BR/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Não há tópicos com esta tag.", "tags": "Tags", - "enter_tags_here": "Digite as tags aqui. Pressione enter após cada tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Digite tags...", "no_tags": "Ainda não há tags." } \ No newline at end of file diff --git a/public/language/ro/error.json b/public/language/ro/error.json index 1e7de8b50b..51ad7c7cbc 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -19,6 +19,8 @@ "email-taken": "Adresa de email este deja folostă", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Numele de utilizator este prea scurt", "username-too-long": "Numele de utilizator este prea lung", "user-banned": "Utilizator banat", @@ -33,6 +35,7 @@ "no-emailers-configured": "Nici un plugin pentru email nu a fost încărcat, așa că un email de test nu a fost trimis.", "category-disabled": "Categorie dezactivată", "topic-locked": "Subiect Închis", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Te rugăm să aștepți până se termină uploadul.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Te rugăm să introduci un titlu mai scurt. Titlurile nu pot fi mai lungi de %1 caractere.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "Nu poți vota propriul tău mesaj", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Nu poți bana alți administratori!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Numele grupului este prea scurt", "group-already-exists": "Grupul deja există", "group-name-change-not-allowed": "Schimbarea numelui grupului este interzisă", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Pictogramele pentru subiect sunt interzise.", "invalid-file": "Fișier invalid", "uploads-are-disabled": "Uploadurile sunt dezactivate", - "upload-error": "Eroare Upload : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Nu poți conversa cu tine!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB a întâmpinat o problemă la reîncarcare: \"%1\". NodeBB va continua să servească fișierele existente pentru partea-client, dar tu va trebuie să refaci modificările pe care le-ai facut înainte de reîncarcare.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ro/groups.json b/public/language/ro/groups.json index 03cacf8b36..c41b17a0c5 100644 --- a/public/language/ro/groups.json +++ b/public/language/ro/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Membrii acestui grup nu au facut nici o postare.", "details.latest_posts": "Ultimele Mesaje", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ro/login.json b/public/language/ro/login.json index 806a40d81b..31504eb1c1 100644 --- a/public/language/ro/login.json +++ b/public/language/ro/login.json @@ -1,5 +1,7 @@ { - "username": "Utilizator / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Autentifică-mă automat la fiecare vizită", "forgot_password": "Ai uitat parola?", "alternative_logins": "Autentificare Alternativă", diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json index bf0fba8426..46bdd5fa7a 100644 --- a/public/language/ro/notifications.json +++ b/public/language/ro/notifications.json @@ -2,6 +2,7 @@ "title": "Notificări", "no_notifs": "Nu ai nici o notificare recentă", "see_all": "Vezi toate notificările", + "mark_all_read": "Mark all notifications read", "back_to_home": "Înapoi la %1", "outgoing_link": "Link Extern", "outgoing_link_message": "Acum părăsești %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 a început să te urmărească.", "email-confirmed": "Email confirmat", "email-confirmed-message": "Îți mulțumim pentru validarea emailului. Contul tău este acuma activat.", - "email-confirm-error": "S-a produs o eroare ...", "email-confirm-error-message": "A fost o problemă cu activarea adresei tale de email. Poate codul de activare a fost invalid sau expirat.", "email-confirm-sent": "Un email de confirmare a fost trimis." } \ No newline at end of file diff --git a/public/language/ro/recent.json b/public/language/ro/recent.json index a630ebe91a..5b657f39b1 100644 --- a/public/language/ro/recent.json +++ b/public/language/ro/recent.json @@ -6,6 +6,7 @@ "year": "An", "alltime": "Tot Timpul", "no_recent_topics": "Nu există subiecte recente.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/ro/search.json b/public/language/ro/search.json index cdae3636ce..54328cf585 100644 --- a/public/language/ro/search.json +++ b/public/language/ro/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ro/tags.json b/public/language/ro/tags.json index d5e5b040a2..483efa66f6 100644 --- a/public/language/ro/tags.json +++ b/public/language/ro/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nu există nici un subiect cu acest tag.", "tags": "Taguri", - "enter_tags_here": "Introdu tagurile aici. Apasă enter după fiecare tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Introdu taguri...", "no_tags": "În acest moment nu există nici un tag." } \ No newline at end of file diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 25309f37d4..cb43902332 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -19,6 +19,8 @@ "email-taken": "Email занят", "email-not-confirmed": "Ваш email не подтвержден, нажмите для подтверждения.", "email-not-confirmed-chat": "Вы не можете оставлять сообщения, пока Ваш email не подтверждён", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Слишком короткое имя пользователя", "username-too-long": "Имя пользователя слишком длинное", "user-banned": "Пользователь заблокирован", @@ -33,6 +35,7 @@ "no-emailers-configured": "Не подключен ни один плагин для отправки почты, поэтому тестовый email не может быть отправлен", "category-disabled": "Категория отключена", "topic-locked": "Тема закрыта", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Пожалуйста, подождите завершения загрузки.", "content-too-short": "Пост должен содержать минимум %1 симв.", "content-too-long": "Размер поста не должен превышать %1 символов. Пожалуйста, сделайте его короче.", @@ -40,6 +43,8 @@ "title-too-long": "Заголовок не может быть длиннее %1 символов.", "too-many-posts": "Вы можете делать пост один раз в %1 сек.", "too-many-posts-newbie": "Вы новый пользователь, поэтому можете делать пост раз в %1 сек., пока не заработаете %2 п. репутации.", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Максимальный разрешенный размер файла - %1 Кбайт. Пожалуйста, загрузите файл меньшего размера.", "cant-vote-self-post": "Вы не можете проголосовать за Ваш пост", "already-favourited": "Вы уже добавили этот пост в избранное", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Вы не можете забанить других администраторов!", "invalid-image-type": "Неверный формат изображения. Поддерживаемые форматы: %1", "invalid-image-extension": "Недопустимое расширение файла", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Название группы слишком короткое", "group-already-exists": "Группа уже существует", "group-name-change-not-allowed": "Изменение названия группы запрещено", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Иконки для темы запрещены", "invalid-file": "Файл испорчен", "uploads-are-disabled": "Загрузка запрещена", - "upload-error": "Ошибка загрузки : %1", "signature-too-long": "Ваша подпись не может быть длиннее %1 симв.", "cant-chat-with-yourself": "Вы не можете общаться с самим собой", "chat-restricted": "Пользователь ограничил прием сообщений. Он должен подписаться на Вас, чтобы Вы могли вести переписку с ним.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "У Вас недостаточно репутации, чтобы пометить этот пост.", "reload-failed": "NodeBB обнаружил проблему при перезагрузке: \"%1\". NodeBB продолжит работать с существующими ресурсами клиента, но Вы должны отменить то, что сделали перед перезагрузкой.", "registration-error": "Ошибка при регистрации", - "parse-error": "Похоже, что-то пошло не так в процессе обработки ответа сервера." + "parse-error": "Похоже, что-то пошло не так в процессе обработки ответа сервера.", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json index 544998a50e..c46e857368 100644 --- a/public/language/ru/groups.json +++ b/public/language/ru/groups.json @@ -4,6 +4,8 @@ "owner": "Администратор группы", "new_group": "Создать группу", "no_groups_found": "Нет групп для отображения", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Перетяните сюда изображение, переместите на нужную позицию и нажмите Сохранить", "cover-change": "Изменить", "cover-save": "Сохранить", @@ -13,11 +15,20 @@ "details.pending": "Заявки в группу", "details.has_no_posts": "Пользователями этой группы не публиковали никаких записей", "details.latest_posts": "Последние записи", - "details.private": "Приватная группа", - "details.public": "Открытая группа", + "details.private": "Private", "details.grant": "Выдать/забрать администратора", "details.kick": "Исключить", "details.owner_options": "Настройки группы", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Настройки группы обновлены", "event.deleted": "Группа \"%1\" удалена" } \ No newline at end of file diff --git a/public/language/ru/login.json b/public/language/ru/login.json index e3c85ddeac..b371df159e 100644 --- a/public/language/ru/login.json +++ b/public/language/ru/login.json @@ -1,5 +1,7 @@ { - "username": "Имя пользователя / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Запомнить меня", "forgot_password": "Забыли пароль?", "alternative_logins": "Войти через", diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index 4cc64159b5..0618e808db 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -2,6 +2,7 @@ "title": "Уведомления", "no_notifs": "Для Вас нет новых уведомлений", "see_all": "Просмотреть все уведомления", + "mark_all_read": "Mark all notifications read", "back_to_home": "Назад к %1", "outgoing_link": "Внешняя ссылка", "outgoing_link_message": "Вы покидаете %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 подписался на Вас.", "email-confirmed": "Email подтвержден", "email-confirmed-message": "Спасибо за подтверждение Вашего Email-адреса. Ваш аккаунт активирован.", - "email-confirm-error": "Произошла ошибка...", "email-confirm-error-message": "Ошибка проверки Email-адреса. Возможно, код неверен, либо у него истек срок действия.", "email-confirm-sent": "Письмо с проверочным кодом отправлено" } \ No newline at end of file diff --git a/public/language/ru/recent.json b/public/language/ru/recent.json index c232a6bb5e..83c1e01b53 100644 --- a/public/language/ru/recent.json +++ b/public/language/ru/recent.json @@ -6,6 +6,7 @@ "year": "Год", "alltime": "За всё время", "no_recent_topics": "Нет свежих тем.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Опубликована новая тема.", "there-is-a-new-topic-and-a-new-post": "Опубликована новая тема и новое сообщение.", "there-is-a-new-topic-and-new-posts": "Опубликована новая тема и %1 новых сообщений.", diff --git a/public/language/ru/search.json b/public/language/ru/search.json index 943b857c9b..a3929d303b 100644 --- a/public/language/ru/search.json +++ b/public/language/ru/search.json @@ -31,5 +31,10 @@ "username": "Имя пользователя", "category": "Категория", "descending": "В порядке возрастания", - "ascending": "В порядке убывания" + "ascending": "В порядке убывания", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ru/tags.json b/public/language/ru/tags.json index 0ec34e5741..fa5fa0b9b2 100644 --- a/public/language/ru/tags.json +++ b/public/language/ru/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Нет топиков с таким тегом.", "tags": "Теги", - "enter_tags_here": "Укажите теги здесь. Нажимайте Enter после каждого тега.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Введите теги...", "no_tags": "Здесь еще нет тегов." } \ No newline at end of file diff --git a/public/language/ru/user.json b/public/language/ru/user.json index 0b5a541199..99be44abd6 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -62,7 +62,7 @@ "send_post_notifications": "Отправлять email, когда отвечают в темы, на которые я подписан(а)", "has_no_follower": "Этого пользователя никто не читает :(", "follows_no_one": "Этот пользователь никого не читает :(", - "has_no_posts": "Это пользователь еще ничего не написал.", + "has_no_posts": "Этот пользователь еще ничего не написал.", "has_no_topics": "Этот пользователь еще не создал ни одной темы", "has_no_watched_topics": "Этот пользователь еще не просмотрел ни одной темы", "email_hidden": "Email скрыт", diff --git a/public/language/sc/error.json b/public/language/sc/error.json index 9bbcf03247..e0700f76c4 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -19,6 +19,8 @@ "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "User banned", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Invalid File", "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/sc/groups.json b/public/language/sc/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/sc/groups.json +++ b/public/language/sc/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/sc/login.json b/public/language/sc/login.json index 13c8f5cae9..83a84e0ad1 100644 --- a/public/language/sc/login.json +++ b/public/language/sc/login.json @@ -1,5 +1,7 @@ { - "username": "Username / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Regorda·mi?", "forgot_password": "Password Iscarèssida?", "alternative_logins": "Intradas Alternativas", diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json index 70ce1dd022..a3a210afe8 100644 --- a/public/language/sc/notifications.json +++ b/public/language/sc/notifications.json @@ -2,6 +2,7 @@ "title": "Notìficas", "no_notifs": "Non tenes notìficas noas", "see_all": "Càstia totus is Notìficas", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Acàpiu a Foras", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/sc/recent.json b/public/language/sc/recent.json index 7c7d242a90..ea0c3c0752 100644 --- a/public/language/sc/recent.json +++ b/public/language/sc/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "Non bi sunt ùrtimas arresonadas.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/sc/search.json b/public/language/sc/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/sc/search.json +++ b/public/language/sc/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/sc/tags.json b/public/language/sc/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/sc/tags.json +++ b/public/language/sc/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/sk/error.json b/public/language/sk/error.json index 0ca1924e76..069d7b8deb 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -19,6 +19,8 @@ "email-taken": "Email je obsadený", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "Užívateľ je zakázaný", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategória je znefunkčená.", "topic-locked": "Uzamknutá téma", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Prosím čakajte na dokončenie nahrávania", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Prosím uvedťe kratší názov. Názov nesmie byť dlhší ako 1 % znakov", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "Nedá sa hlasovať za vlastný príspevok", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Nemožte zakázať druhých adminov.", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Názov skupiny je príliš krátky", "group-already-exists": "Skupina už existuje", "group-name-change-not-allowed": "Nepovolená zmena mena skupiny", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Nahľady tém sú znefunkčnené.", "invalid-file": "Neplatný súbor", "uploads-are-disabled": "Nahrávanie je znefunkčnené", - "upload-error": "Upload chyba: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Nemôžete chatovat so samým sebou.", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/sk/groups.json b/public/language/sk/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/sk/groups.json +++ b/public/language/sk/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/sk/login.json b/public/language/sk/login.json index a7c029ab74..bc2f675ff2 100644 --- a/public/language/sk/login.json +++ b/public/language/sk/login.json @@ -1,5 +1,7 @@ { - "username": "Prihlasovacie meno / email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Zapamätať si ma?", "forgot_password": "Zabudol si heslo?", "alternative_logins": "Ďalšie spôsoby prihlásenia", diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json index be2f47b646..31f981cbee 100644 --- a/public/language/sk/notifications.json +++ b/public/language/sk/notifications.json @@ -2,6 +2,7 @@ "title": "Notifikácie", "no_notifs": "Nemáte žiadne nové notifikácie", "see_all": "Pozri všetky notifikácie", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Odkaz mimo fórum", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email bol potvrdený", "email-confirmed-message": "Ďakujeme za potvrdenie tvojho emailu. Účet je plne aktivovaný.", - "email-confirm-error": "Vyskytla sa chyba...", "email-confirm-error-message": "Vyskytla sa chyba pri overení tvojej emailovej adresy. ", "email-confirm-sent": "Práve sme poslali potvrdzujúci email." } \ No newline at end of file diff --git a/public/language/sk/recent.json b/public/language/sk/recent.json index 13fb11de81..123d7f43ed 100644 --- a/public/language/sk/recent.json +++ b/public/language/sk/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "Nie sú žiadne posledné témy", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/sk/search.json b/public/language/sk/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/sk/search.json +++ b/public/language/sk/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/sk/tags.json b/public/language/sk/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/sk/tags.json +++ b/public/language/sk/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/sv/error.json b/public/language/sv/error.json index bf9769aa41..8f8c577d0d 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -19,6 +19,8 @@ "email-taken": "Epostadress upptagen", "email-not-confirmed": "Din epostadress är ännu inte bekräftad. Klicka här för att bekräfta din epostadress.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Användarnamnet är för kort", "username-too-long": "Användarnamnet är för långt", "user-banned": "Användare bannlyst", @@ -33,6 +35,7 @@ "no-emailers-configured": "Inga tillägg för epostadress har laddats, så något textmeddelande kunde inte skickas", "category-disabled": "Kategorin inaktiverad", "topic-locked": "Ämnet låst", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Vänta medan uppladdningen slutförs.", "content-too-short": "Skriv ett längre inlägg. Inlägget måste ha minst %1 tecken.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Skriv in en kortare rubrik. Rubriker får inte vara längre än %1 tecken.", "too-many-posts": "Du kan endast skapa inlägg var %1:e sekund - vänta ett tag innan du försöker skapa ett nytt inlägg", "too-many-posts-newbie": "Som en ny användare kan du endast skapa nya inlägg var %1:e sekund tills du har %2 förtroende - vänta ett tag innan du försöker skapa ett nytt inlägg", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximal filstorlek är %1 kbs - var god ladda upp en mindre fil", "cant-vote-self-post": "Du kan inte rösta på ditt eget inlägg.", "already-favourited": "Du har redan favoriserat det här inlägget", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Du kan inte bannlysa andra administratörer.", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Gruppnamnet är för kort", "group-already-exists": "Gruppen existerar redan", "group-name-change-not-allowed": "Gruppnamnet får inte ändras", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Miniatyrbilder för ämnen är inaktiverat", "invalid-file": "Ogiltig fil", "uploads-are-disabled": "Uppladdningar är inaktiverat", - "upload-error": "Fel vid uppladdning: %1", "signature-too-long": "Signaturer kan tyvärr inte vara längre än %1 tecken.", "cant-chat-with-yourself": "Du kan inte chatta med dig själv.", "chat-restricted": "Denna användaren har begränsat sina chatt-meddelanden. Användaren måste följa dig innan ni kan chatta med varann", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Du har inte tillräckligt förtroende för att flagga det här inlägget.", "reload-failed": "NodeBB stötte på problem med att ladda om: \"%1\". NodeBB kommer fortsätta servera den befintliga resurser till klienten, men du borde återställa det du gjorde alldeles innan du försökte ladda om.", "registration-error": "Registreringsfel", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/sv/groups.json b/public/language/sv/groups.json index fdba1db1b1..8474322fa4 100644 --- a/public/language/sv/groups.json +++ b/public/language/sv/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Den här gruppens medlemmar har inte skrivit några inlägg.", "details.latest_posts": "Senaste inlägg", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/sv/login.json b/public/language/sv/login.json index 51f4e33296..c96dd64485 100644 --- a/public/language/sv/login.json +++ b/public/language/sv/login.json @@ -1,5 +1,7 @@ { - "username": "Användarnamn eller epostadress", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Kom ihåg mig?", "forgot_password": "Glömt lösenord?", "alternative_logins": "Alternativa inloggningssätt", diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index eddc4f1ae0..1be16f89db 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -2,6 +2,7 @@ "title": "Notiser", "no_notifs": "Du har inga nya notiser", "see_all": "Visa alla notiser", + "mark_all_read": "Mark all notifications read", "back_to_home": "Tillbaka till %1", "outgoing_link": "Utgående länk", "outgoing_link_message": "Du lämnar nu %1. ", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 började följa dig.", "email-confirmed": "Epost bekräftad", "email-confirmed-message": "Tack för att du bekräftat din epostadress. Ditt konto är nu fullt ut aktiverat.", - "email-confirm-error": "Ett fel uppstod...", "email-confirm-error-message": "Det uppstod ett fel med att bekräfta din epostadress. Kanske var koden ogiltig eller har gått ut.", "email-confirm-sent": "Bekräftelseepost skickat." } \ No newline at end of file diff --git a/public/language/sv/recent.json b/public/language/sv/recent.json index 17de423337..28a0d6f599 100644 --- a/public/language/sv/recent.json +++ b/public/language/sv/recent.json @@ -6,6 +6,7 @@ "year": "År", "alltime": "Alltid", "no_recent_topics": "Det finns inga olästa ämnen.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/sv/search.json b/public/language/sv/search.json index 0e4e831f93..4418f62e13 100644 --- a/public/language/sv/search.json +++ b/public/language/sv/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/sv/tags.json b/public/language/sv/tags.json index 09f84c36b9..fffe39ea0a 100644 --- a/public/language/sv/tags.json +++ b/public/language/sv/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Det finns inga ämnen med detta märkord.", "tags": "Märkord", - "enter_tags_here": "Skriv in märkord här. Tryck på enter efter varje märkord.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Ange taggar...", "no_tags": "Det finns inga märkord ännu." } \ No newline at end of file diff --git a/public/language/th/error.json b/public/language/th/error.json index 05985e9b49..064bd1b530 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -19,6 +19,8 @@ "email-taken": "อีเมลนี้มีการใช้แล้ว", "email-not-confirmed": "ยังไม่มีการยืนยันอีเมลของคุณ, โปรดกดยืนยันอีเมลของคุณตรงนี้", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "ชื่อบัญชีผู้ใช้ สั้นเกินไป", "username-too-long": "ชื่อบัญชีผู้ใช้ ยาวเกินไป", "user-banned": "User banned", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Invalid File", "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/th/groups.json b/public/language/th/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/th/groups.json +++ b/public/language/th/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/th/login.json b/public/language/th/login.json index bb93152904..f0aff3c796 100644 --- a/public/language/th/login.json +++ b/public/language/th/login.json @@ -1,5 +1,7 @@ { - "username": "ชื่อบัญชีส่วนตัว / อีเมล", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "จำไว้ในระบบ?", "forgot_password": "ลืมรหัสผ่าน?", "alternative_logins": "เข้าสู่ระบบโดยทางอื่น", diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json index d8f0875a8f..53d7dc8ea7 100644 --- a/public/language/th/notifications.json +++ b/public/language/th/notifications.json @@ -2,6 +2,7 @@ "title": "แจ้งเตือน", "no_notifs": "คุณไม่มีข้อแจ้งเตือนใหม่", "see_all": "ดูข้อแจ้งเตือนทั้งหมด", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "ลิงค์ออก", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/th/recent.json b/public/language/th/recent.json index 369a88a1dc..2a6beb73f4 100644 --- a/public/language/th/recent.json +++ b/public/language/th/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "ไม่มีกระทู้ล่าสุด", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/th/search.json b/public/language/th/search.json index 4e865998e1..167d50d0de 100644 --- a/public/language/th/search.json +++ b/public/language/th/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/th/tags.json b/public/language/th/tags.json index 0dc699ef23..d2d0ff6fe0 100644 --- a/public/language/th/tags.json +++ b/public/language/th/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "ไม่มีหัวข้อสนทนาที่เกี่ยวข้องกับป้ายคำศัพท์นี้", "tags": "ป้ายคำศัพท์", - "enter_tags_here": "ใส่ป้ายคำศัพท์ตรงนี้. โปรดกด 'Enter' หลังทุกป้ายคำศัพท์", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "ใส่ป้ายคำศัพท์ ...", "no_tags": "ยังไม่มีป้ายคำศัพท์" } \ No newline at end of file diff --git a/public/language/tr/error.json b/public/language/tr/error.json index a18f42652b..69cd323a2f 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -19,6 +19,8 @@ "email-taken": "E-posta Alınmış", "email-not-confirmed": "E-postanız onaylanmamış, onaylamak için lütfen buraya tıklayın.", "email-not-confirmed-chat": "Email adresiniz doğrulanmadan sohbet edemezsiniz.", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Kullanıcı ismi çok kısa", "username-too-long": "Kullanıcı ismi çok uzun.", "user-banned": "Kullanıcı Yasaklı", @@ -33,6 +35,7 @@ "no-emailers-configured": "E-posta eklentisi kurulu değil bu yüzden test e-postası gönderilemedi", "category-disabled": "Kategori aktif değil", "topic-locked": "Başlık Kilitli", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Lütfen yüklemelerin bitmesini bekleyin.", "content-too-short": "Lütfen daha uzun bir ileti girin. En az %1 karakter.", "content-too-long": "Lütfen daha kısa bir yayın girin. Yayınlar %1 karakterden uzun olamaz.", @@ -40,6 +43,8 @@ "title-too-long": "Lütfen daha kısa bir başlık girin. Başlıklar %1 karakterden uzun olamaz.", "too-many-posts": "Sadece %1 saniyede bir ileti gönderebilirsiniz.", "too-many-posts-newbie": "Yeni bir kullanıcı olarak, %2 saygınlığınız olana kadar sadece %1 saniyede bir mesaj gönderebilirsiniz. Lütfen tekrar ileti göndermeden önce bekleyin.", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "İzin verilen en büyük dosya boyutu %1 kbs.", "cant-vote-self-post": "Kendi iletinize oy veremezsiniz", "already-favourited": "Bu iletiyi zaten favorilerinize eklediniz", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Başka yöneticileri yasaklayamazsınız!", "invalid-image-type": "Geçersiz resim uzantısı. Izin verilen uzantılar: %1", "invalid-image-extension": "Geçersiz resim uzantısı", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Grup ismi çok kısa", "group-already-exists": "Grup zaten var", "group-name-change-not-allowed": "Grup ismini değiştiremezsiniz", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Başlık resimleri kapalı.", "invalid-file": "Geçersiz Dosya", "uploads-are-disabled": "Yüklemeler kapalı", - "upload-error": "Yükleme Hatası : %1", "signature-too-long": "İmza en fazla %1 karakter olabilir!", "cant-chat-with-yourself": "Kendinizle sohbet edemezsiniz!", "chat-restricted": "Bu kullanıcı sohbet ayarlarını kısıtlamış. Bu kişiye mesaj gönderebilmeniz için sizi takip etmeleri gerekiyor", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Bu iletiyi bayraklamak için yeterince saygınlığınız yok", "reload-failed": "NodeBB tekrar yüklenirken bir sorunla karşılaştı: “%1“. NodeBB varolan dosyaları servis etmeye devam edecek.", "registration-error": "Kayıt Hatası", - "parse-error": "Sunucu yanıtı çözümlemesi sırasında bir şeyler ters gitti" + "parse-error": "Sunucu yanıtı çözümlemesi sırasında bir şeyler ters gitti", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/tr/groups.json b/public/language/tr/groups.json index 3b765a2f7b..7191d93c86 100644 --- a/public/language/tr/groups.json +++ b/public/language/tr/groups.json @@ -4,6 +4,8 @@ "owner": "Grup Kurucusu", "new_group": "Yeni Grup Oluştur", "no_groups_found": "Henüz hiç grup yok", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Bir fotoğrafı Sürükleyin ve Bırakın, uygun yere sürükleyip Kaydet'e tıklayın.", "cover-change": "Değiştir", "cover-save": "Kaydet", @@ -13,11 +15,20 @@ "details.pending": "Üyeler bekleniyor", "details.has_no_posts": "Bu grubun üyeleri henüz bir ileti göndermedi.", "details.latest_posts": "En son iletiler", - "details.private": "Özel Grup", - "details.public": "Herkese Açık Grup", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Grup Yöneticisi", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Grup detayları güncellenmiştir", "event.deleted": "\"%1\" grubu silinmiş" } \ No newline at end of file diff --git a/public/language/tr/login.json b/public/language/tr/login.json index 1cc526d5c2..e18bc769ca 100644 --- a/public/language/tr/login.json +++ b/public/language/tr/login.json @@ -1,5 +1,7 @@ { - "username": "Kullanıcı İsmi / E-posta", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Beni Hatırla!", "forgot_password": "Şifrenizi mi unuttunuz?", "alternative_logins": "Alternatif Girişler", diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index 006f9f70e2..c87b3ec4ee 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -2,6 +2,7 @@ "title": "Bildirimler", "no_notifs": "Yeni bildirimleriniz yok", "see_all": "Bütün bildirimleri gör", + "mark_all_read": "Mark all notifications read", "back_to_home": "Geri dön %1", "outgoing_link": "Harici Link", "outgoing_link_message": "Bu forumdan ayrılıyorsunuz", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 sizi takip etmeye başladı.", "email-confirmed": "E-posta onaylandı", "email-confirmed-message": "E-postanızı onaylandığınız için teşekkürler. Hesabınız tamamen aktive edildi.", - "email-confirm-error": "Bir hata oluştu...", "email-confirm-error-message": "E-posta adresinizi onaylarken bir hata oluştu. Kodunuz geçersiz ya da eski olabilir.", "email-confirm-sent": "Onay e-postası gönderildi." } \ No newline at end of file diff --git a/public/language/tr/recent.json b/public/language/tr/recent.json index a1af8adb56..817a69b2f8 100644 --- a/public/language/tr/recent.json +++ b/public/language/tr/recent.json @@ -6,6 +6,7 @@ "year": "Yıl", "alltime": "Hepsi", "no_recent_topics": "Güncel konular yok.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Yeni bir konu mevcut.", "there-is-a-new-topic-and-a-new-post": "Yeni bir konu ve yayın mevcut.", "there-is-a-new-topic-and-new-posts": "Bir adet yeni konu ve %1 adet yeni yayın var.", diff --git a/public/language/tr/search.json b/public/language/tr/search.json index 0d079ffe4a..1819a07de3 100644 --- a/public/language/tr/search.json +++ b/public/language/tr/search.json @@ -31,5 +31,10 @@ "username": "Kullanıcı Adı", "category": "Kategori", "descending": "Azalan düzene göre", - "ascending": "Artan düzene göre" + "ascending": "Artan düzene göre", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/tr/tags.json b/public/language/tr/tags.json index 4ef4669f63..c0ffd63eb1 100644 --- a/public/language/tr/tags.json +++ b/public/language/tr/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Bu etiketli başlık yok.", "tags": "Etiketler", - "enter_tags_here": "Etiketleri buraya girin.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Etiketleri gir...", "no_tags": "Henüz etiket yok." } \ No newline at end of file diff --git a/public/language/vi/error.json b/public/language/vi/error.json index e8da82c330..65ddf93ba0 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -19,6 +19,8 @@ "email-taken": "Email đã được đăng kí", "email-not-confirmed": "Email của bạn chưa được xác nhận, xin hãy nhấn vào đây để xác nhận địa chỉ này là của bạn", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Tên đăng nhập quá ngắn", "username-too-long": "Tên đăng nhập quá dài", "user-banned": "Tài khoản bị ban", @@ -33,6 +35,7 @@ "no-emailers-configured": "Không có trình cắm email nào được tải, vì vậy email kiểm tra không thể gửi được", "category-disabled": "Danh mục bị khóa", "topic-locked": "Chủ đề bị khóa", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Vui lòng chờ upload", "content-too-short": "Vui lòng tạo bài viết dài hơn. Bài viết phải có ít nhất %1 ký tự.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Yêu cầu tiêu đề ngắn hơn. Không dài quá %1 ký tự", "too-many-posts": "Bạn chỉ có thể gửi một bài viết mỗi %1 giây - Xin chờ trong giây lát trước khi gửi lại.", "too-many-posts-newbie": "Tài khoản mới chỉ có thể gởi 1 bài mỗi %1 giây cho đến khi bạn có được %2 điểm tín nhiệm - Xin vui lòng chờ giây lát trước khi thử lại", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Kích thước tối đa cho phép là %1 kb - xin lựa chọn tập tin nhỏ hơn", "cant-vote-self-post": "Bạn không thể vote cho chính bài viết của bạn", "already-favourited": "Bạn đã bấm yêu thích cho bài viết này rồi", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Bạn không thể ban được các admin khác", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Tên nhóm quá ngắn", "group-already-exists": "Nhóm đã tồn tại", "group-name-change-not-allowed": "Không cho phép đổi tên nhóm", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Thumbnails cho chủ đề đã bị tắt", "invalid-file": "File không hợp lệ", "uploads-are-disabled": "Đã khóa lựa chọn tải lên", - "upload-error": "Lỗi tải lên : %1", "signature-too-long": "Chứ ký không được dài quá %1 ký tự", "cant-chat-with-yourself": "Bạn không thể chat với chính bạn!", "chat-restricted": "Người dùng này đã bật chế độ hạn chế tin nhắn chat. Bạn phải được anh/cô ta follow thì mới có thể gởi tin nhắn đến họ được.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Bạn không đủ tín nhiệm để đánh dấu bài viết này", "reload-failed": "NodeBB gặp lỗi trong khi tải lại: \"%1\". NodeBB sẽ tiếp tục hoạt động với dữ liệu trước đó, tuy nhiên bạn nên tháo gỡ những gì bạn vừa thực hiện trước khi tải lại.", "registration-error": "Lỗi đăng kí", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/vi/groups.json b/public/language/vi/groups.json index b649073d9b..511c942133 100644 --- a/public/language/vi/groups.json +++ b/public/language/vi/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Nhóm thành viên này chưa viết bài viết nào.", "details.latest_posts": "Bài mới nhất", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/vi/login.json b/public/language/vi/login.json index 0190bd059e..4ae9230b8a 100644 --- a/public/language/vi/login.json +++ b/public/language/vi/login.json @@ -1,5 +1,7 @@ { - "username": "Tên người dùng / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Ghi nhớ tôi?", "forgot_password": "Quên mật khẩu?", "alternative_logins": "Đăng nhập bằng tên khác", diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index 2c3be42609..d204c2fd0b 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -2,6 +2,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", + "mark_all_read": "Mark all notifications read", "back_to_home": "Quay lại %1", "outgoing_link": "Liên kết ngoài", "outgoing_link_message": "Bạn đang rời khỏi %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 đã theo dõi bạn.", "email-confirmed": "Đã xác nhận email", "email-confirmed-message": "Cảm ơn bạn đã xác nhận địa chỉ email của bạn. Tài khoản của bạn đã được kích hoạt đầy đủ.", - "email-confirm-error": "Đã có lỗi xảy ra...", "email-confirm-error-message": "Đã có lỗi khi xác nhận địa chỉ email. Có thể đoạn mã không đúng hoặc đã hết hạn.", "email-confirm-sent": "Email xác nhận đã gửi." } \ No newline at end of file diff --git a/public/language/vi/recent.json b/public/language/vi/recent.json index ad679de4e7..b97df0e137 100644 --- a/public/language/vi/recent.json +++ b/public/language/vi/recent.json @@ -6,6 +6,7 @@ "year": "Năm", "alltime": "Tất cả thời gian", "no_recent_topics": "Không có chủ đề nào gần đây", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/vi/search.json b/public/language/vi/search.json index a6450e408b..c9c176ba74 100644 --- a/public/language/vi/search.json +++ b/public/language/vi/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/vi/tags.json b/public/language/vi/tags.json index 80954cface..68f5639c02 100644 --- a/public/language/vi/tags.json +++ b/public/language/vi/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Không có bài viết nào với thẻ này.", "tags": "Thẻ", - "enter_tags_here": "Nhập tên thẻ ở đây. Nhấn enter sau mỗi thẻ.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Tên thẻ...", "no_tags": "Chưa có thẻ nào." } \ No newline at end of file diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json index 2511027169..69ea834c58 100644 --- a/public/language/zh_CN/error.json +++ b/public/language/zh_CN/error.json @@ -19,6 +19,8 @@ "email-taken": "电子邮箱已被占用", "email-not-confirmed": "您的电子邮箱尚未确认，请点击这里确认您的电子邮箱。", "email-not-confirmed-chat": "在确认您的邮箱之前，您不能使用聊天功能", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "用户名太短", "username-too-long": "用户名太长", "user-banned": "用户已禁止", @@ -33,6 +35,7 @@ "no-emailers-configured": "未加载任何电子邮箱插件，无法发送测试邮件", "category-disabled": "版块已禁用", "topic-locked": "主题已锁定", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "请等待上传完成", "content-too-short": "请再输入一些内容，帖子至少要有 %1 个字符。", "content-too-long": "请输入更短的发帖。发帖字数不能超过 %1 个字符。", @@ -40,6 +43,8 @@ "title-too-long": "请输入更短的标题。不超过 %1 字。", "too-many-posts": "发帖间隔至少要 %1 秒 - 请稍候再发帖", "too-many-posts-newbie": "作为新用户，您必须每隔 %1 秒才能发帖一次，直到您有 %2 点威望为止 —— 请稍候再发帖", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "文件不能超过 %1k 字节 - 请上传更小的文件", "cant-vote-self-post": "您不能给自己的帖子投票。", "already-favourited": "您已收藏该帖", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "您不能禁止其他管理员！", "invalid-image-type": "无效的图像类型。允许的类型有：%1", "invalid-image-extension": "无效的图像扩展", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "用户组名称太短", "group-already-exists": "用户组已存在", "group-name-change-not-allowed": "不允许更改用户组名称", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "主题缩略图已禁用", "invalid-file": "无效文件", "uploads-are-disabled": "上传已禁用", - "upload-error": "上传错误：%1", "signature-too-long": "抱歉，您的签名不能超过 %1 个字符。", "cant-chat-with-yourself": "您不能和自己聊天！", "chat-restricted": "此用户限制了他的聊天消息。必须他先关注您，您才能和他聊天。", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "您没有足够的威望标记此帖", "reload-failed": "NodeBB 重新加载时遇到问题: \"%1\"。NodeBB 会继续给已存在的客户端组件服务，虽然您应该撤销在重新加载前执行的操作。", "registration-error": "注册错误", - "parse-error": "解析服务器响应时出错" + "parse-error": "解析服务器响应时出错", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/zh_CN/groups.json b/public/language/zh_CN/groups.json index bd0abbbf67..39eb395078 100644 --- a/public/language/zh_CN/groups.json +++ b/public/language/zh_CN/groups.json @@ -4,6 +4,8 @@ "owner": "用户组组长", "new_group": "创建新用户组", "no_groups_found": "还没有用户组", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "拖放照片，拖动位置，然后点击 保存", "cover-change": "变更", "cover-save": "保存", @@ -13,11 +15,20 @@ "details.pending": "预备成员", "details.has_no_posts": "此用户组的会员尚未发表任何帖子。", "details.latest_posts": "最新帖子", - "details.private": "私有组", - "details.public": "公共组", + "details.private": "Private", "details.grant": "授予/取消所有权", "details.kick": "踢", "details.owner_options": "用户组管理", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "用户组信息已更新", "event.deleted": "用户组 \"%1\" 已被删除" } \ No newline at end of file diff --git a/public/language/zh_CN/login.json b/public/language/zh_CN/login.json index 49cf1cc83f..3e8d54af50 100644 --- a/public/language/zh_CN/login.json +++ b/public/language/zh_CN/login.json @@ -1,5 +1,7 @@ { - "username": "用户名/电子邮箱", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "记住我？", "forgot_password": "忘记密码？", "alternative_logins": "使用合作网站帐号登录", diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json index b48aa7378a..f8a88ca3fe 100644 --- a/public/language/zh_CN/notifications.json +++ b/public/language/zh_CN/notifications.json @@ -2,6 +2,7 @@ "title": "通知", "no_notifs": "您没有新的通知", "see_all": "查看全部通知", + "mark_all_read": "Mark all notifications read", "back_to_home": "返回 %1", "outgoing_link": "站外链接", "outgoing_link_message": "您正在离开 %1。", @@ -21,7 +22,6 @@ "user_started_following_you": "%1关注了您。", "email-confirmed": "电子邮箱已确认", "email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已全面激活。", - "email-confirm-error": "出错了.……", "email-confirm-error-message": "验证您电子邮箱地址时出现了问题。可能是因为验证码无效或已过期。", "email-confirm-sent": "确认邮件已发送。" } \ No newline at end of file diff --git a/public/language/zh_CN/recent.json b/public/language/zh_CN/recent.json index 8aa1e96ab2..c37b2c0557 100644 --- a/public/language/zh_CN/recent.json +++ b/public/language/zh_CN/recent.json @@ -6,6 +6,7 @@ "year": "年度热帖榜", "alltime": "总热帖榜", "no_recent_topics": "暂无主题。", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "这是个新主题。", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/zh_CN/search.json b/public/language/zh_CN/search.json index 1b1096b667..68799a19f9 100644 --- a/public/language/zh_CN/search.json +++ b/public/language/zh_CN/search.json @@ -31,5 +31,10 @@ "username": "用户名", "category": "版面", "descending": "逆序", - "ascending": "顺序" + "ascending": "顺序", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/zh_CN/tags.json b/public/language/zh_CN/tags.json index cfea2abd2c..a50705d3d6 100644 --- a/public/language/zh_CN/tags.json +++ b/public/language/zh_CN/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "此话题还没有主题帖。", "tags": "话题", - "enter_tags_here": "在此输入话题。每输入一个话题后，按回车确认。", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "输入话题...", "no_tags": "尚无话题。" } \ No newline at end of file diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json index cb254c35aa..9efb1e5ec1 100644 --- a/public/language/zh_TW/error.json +++ b/public/language/zh_TW/error.json @@ -19,6 +19,8 @@ "email-taken": "該信箱已被使用", "email-not-confirmed": "您的電郵尚未得到確認，請點擊此處確認您的電子郵件。", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "用戶名太短", "username-too-long": "用戶名太長", "user-banned": "該使用者已被停用", @@ -33,6 +35,7 @@ "no-emailers-configured": "未加載電郵插件，所以無法發送測試郵件", "category-disabled": "該類別已被關閉", "topic-locked": "該主題已被鎖定", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "請等待上傳完成。", "content-too-short": "請輸入一個較長的帖子。 帖子需至少有 %1 個字。", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "請輸入一個較短的主題名稱。 標題不能超過 %1 個字元。", "too-many-posts": "你必須間隔 %1 秒後才能發表文章－請稍後", "too-many-posts-newbie": "新用戶在贏得%2信譽前，每隔%1秒才能發佈新文章－請稍後再試", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "允許的最大檔案大小是 ％1 kbs－請上傳一個較小的檔案", "cant-vote-self-post": "你不能對自己的文章說讚！", "already-favourited": "你已經收藏了這篇文章", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "你不能禁用其他管理員！", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "群組名稱太短了", "group-already-exists": "群組名稱已存在", "group-name-change-not-allowed": "變更群組名稱不被允許", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "禁用主題縮圖", "invalid-file": "無效的檔案", "uploads-are-disabled": "上傳功能被停用", - "upload-error": "上傳錯誤：%1", "signature-too-long": "對不起，簽名檔長度不能超過 %1 字元！", "cant-chat-with-yourself": "你不能與自己聊天！", "chat-restricted": "此用戶已限制了他的聊天功能。你要在他關注你之後，才能跟他聊天", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "你沒有足夠的信譽來舉報這個帖子", "reload-failed": "NodeBB重載\"%1\"時遇到了問題。 NodeBB將繼續提供現有的客戶端資源，但請你撤消重載前的動作。", "registration-error": "註冊錯誤", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/zh_TW/groups.json b/public/language/zh_TW/groups.json index a6c0d93c19..97401e5d7d 100644 --- a/public/language/zh_TW/groups.json +++ b/public/language/zh_TW/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "這個群組的成員還未發出任何帖子。", "details.latest_posts": "最新帖子", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/zh_TW/login.json b/public/language/zh_TW/login.json index 3f0879b49d..f93286b21a 100644 --- a/public/language/zh_TW/login.json +++ b/public/language/zh_TW/login.json @@ -1,5 +1,7 @@ { - "username": "使用者名稱 / 電郵", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "記住我？", "forgot_password": "忘記密碼？", "alternative_logins": "其他登錄方式", diff --git a/public/language/zh_TW/notifications.json b/public/language/zh_TW/notifications.json index f0023a1d49..6736c06584 100644 --- a/public/language/zh_TW/notifications.json +++ b/public/language/zh_TW/notifications.json @@ -2,6 +2,7 @@ "title": "通知", "no_notifs": "沒有新消息", "see_all": "顯示全部", + "mark_all_read": "Mark all notifications read", "back_to_home": "返回%1", "outgoing_link": "站外鏈接", "outgoing_link_message": "你正在離開 %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 開始關注你。", "email-confirmed": "已確認電郵", "email-confirmed-message": "感謝您驗證您的電郵。您的帳戶現已全面啟用。", - "email-confirm-error": "發生錯誤...", "email-confirm-error-message": "驗證您的電郵地址時出現問題。也許啟動碼無效或已過期。", "email-confirm-sent": "已發送確認電郵。" } \ No newline at end of file diff --git a/public/language/zh_TW/recent.json b/public/language/zh_TW/recent.json index 3234bb7376..476bc25844 100644 --- a/public/language/zh_TW/recent.json +++ b/public/language/zh_TW/recent.json @@ -6,6 +6,7 @@ "year": "全年", "alltime": "所有時間", "no_recent_topics": "最近沒新主題.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/zh_TW/search.json b/public/language/zh_TW/search.json index 9fa8e84f2a..66fee75c1a 100644 --- a/public/language/zh_TW/search.json +++ b/public/language/zh_TW/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/zh_TW/tags.json b/public/language/zh_TW/tags.json index 25985a9391..dc5c1601ba 100644 --- a/public/language/zh_TW/tags.json +++ b/public/language/zh_TW/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "沒有此標籤的主題。", "tags": "標籤", - "enter_tags_here": "在這裡輸入標籤。每個標籤後按Enter。", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "輸入標籤...", "no_tags": "還沒有標籤呢。" } \ No newline at end of file diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 1e4a10643d..528c9f7381 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -2,6 +2,7 @@ @import "./mixins"; @import "./general/dashboard"; +@import "./general/navigation"; @import "./manage/categories"; @import "./manage/groups"; @import "./manage/tags"; diff --git a/public/less/admin/extend/plugins.less b/public/less/admin/extend/plugins.less index cc2c264920..b07d9f16b9 100644 --- a/public/less/admin/extend/plugins.less +++ b/public/less/admin/extend/plugins.less @@ -18,4 +18,10 @@ font-size: 12px; } } + + .plugin-list.ui-sortable { + li { + .pointer; + } + } } \ No newline at end of file diff --git a/public/less/admin/general/navigation.less b/public/less/admin/general/navigation.less new file mode 100644 index 0000000000..338971b4a1 --- /dev/null +++ b/public/less/admin/general/navigation.less @@ -0,0 +1,10 @@ +#navigation { + ul { + list-style-type: none; + padding: 0; + + li { + cursor: move; + } + } +} \ No newline at end of file diff --git a/public/src/admin/advanced/logs.js b/public/src/admin/advanced/logs.js index c44f6bf93f..78581d9cea 100644 --- a/public/src/admin/advanced/logs.js +++ b/public/src/admin/advanced/logs.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, socket */ +/* global define, socket, app */ define('admin/advanced/logs', function() { var Logs = {}; @@ -28,7 +28,7 @@ define('admin/advanced/logs', function() { case 'clear': socket.emit('admin.logs.clear', function(err) { if (!err) { - app.alertSuccess('Logs Cleared!') + app.alertSuccess('Logs Cleared!'); btnEl.prev().click(); } }); diff --git a/public/src/admin/appearance/customise.js b/public/src/admin/appearance/customise.js index 97dd77290b..a135a240fe 100644 --- a/public/src/admin/appearance/customise.js +++ b/public/src/admin/appearance/customise.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, app, socket */ +/* global ace, define, app, socket */ define('admin/appearance/customise', ['admin/settings'], function(Settings) { var Customise = {}; diff --git a/public/src/admin/appearance/skins.js b/public/src/admin/appearance/skins.js index df21cb5b0a..b67842b1b5 100644 --- a/public/src/admin/appearance/skins.js +++ b/public/src/admin/appearance/skins.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, app, socket */ +/* global define, app, socket, templates */ define('admin/appearance/skins', function() { var Skins = {}; diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js index 220c4e1980..e2484b1f07 100644 --- a/public/src/admin/extend/plugins.js +++ b/public/src/admin/extend/plugins.js @@ -144,7 +144,7 @@ define('admin/extend/plugins', function() { socket.emit('admin.plugins.upgrade', { id: pluginID, version: version - }, function(err) { + }, function(err, isActive) { if (err) { return app.alertError(err.message); } @@ -152,6 +152,18 @@ define('admin/extend/plugins', function() { parent.find('.fa-exclamation-triangle').remove(); parent.find('.currentVersion').text(version); btn.remove(); + if (isActive) { + app.alert({ + alert_id: 'plugin_upgraded', + title: 'Plugin Upgraded', + message: 'Please reload your NodeBB to fully upgrade this plugin', + type: 'warning', + timeout: 5000, + clickfn: function() { + socket.emit('admin.reload'); + } + }); + } }); } diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index 43f70de05a..239d5bd809 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -31,15 +31,19 @@ define('admin/extend/widgets', function() { connectToSortable: ".widget-area" }); - $('#widgets .available-containers .containers > [data-container-html]').draggable({ - helper: function(e) { - var target = $(e.target); - target = target.attr('data-container-html') ? target : target.parents('[data-container-html]'); - - return target.clone().addClass('block').width(target.width()).css('opacity', '0.5'); - }, - distance: 10 - }); + $('#widgets .available-containers .containers > [data-container-html]') + .draggable({ + helper: function(e) { + var target = $(e.target); + target = target.attr('data-container-html') ? target : target.parents('[data-container-html]'); + + return target.clone().addClass('block').width(target.width()).css('opacity', '0.5'); + }, + distance: 10 + }) + .each(function() { + $(this).attr('data-container-html', $(this).attr('data-container-html').replace(/\\\{([\s\S]*?)\\\}/g, '{$1}')); + }); $('#widgets .widget-area').sortable({ update: function (event, ui) { diff --git a/public/src/admin/general/dashboard.js b/public/src/admin/general/dashboard.js index f24bd485a0..7a2243465d 100644 --- a/public/src/admin/general/dashboard.js +++ b/public/src/admin/general/dashboard.js @@ -1,5 +1,5 @@ "use strict"; -/*global define, ajaxify, app, socket, bootbox, Chart, RELATIVE_PATH*/ +/*global define, ajaxify, app, socket, utils, bootbox, Chart, RELATIVE_PATH*/ define('admin/general/dashboard', ['semver'], function(semver) { var Admin = {}, diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js new file mode 100644 index 0000000000..9bd684ec80 --- /dev/null +++ b/public/src/admin/general/navigation.js @@ -0,0 +1,91 @@ +"use strict"; +/* global define, app, ajaxify, socket, templates, bootbox, translator */ + +define('admin/general/navigation', function() { + var navigation = {}, + available; + + navigation.init = function() { + available = JSON.parse(ajaxify.variables.get('available')); + + $('#enabled').html(translator.unescape($('#enabled').html())); + translator.translate(translator.unescape($('#available').html()), function(html) { + $('#available').html(html) + .find('li').draggable({ + connectToSortable: '#enabled', + helper: 'clone', + distance: 10, + stop: drop + }); + }); + + $('#enabled') + .on('click', '.delete', remove) + .on('click', '.toggle', toggle) + .sortable() + .droppable({ + accept: $('#available li') + }); + + $('#save').on('click', save); + }; + + function drop(ev, ui) { + var id = ui.helper.attr('data-id'), + el = $('#enabled [data-id="' + id + '"]'), + data = id === 'custom' ? {} : available[id]; + + data.enabled = false; + + templates.parse('admin/general/navigation', 'enabled', {enabled: [data]}, function(li) { + li = $(translator.unescape(li)); + el.after(li); + el.remove(); + }); + } + + function save() { + var nav = []; + + $('#enabled li').each(function() { + var form = $(this).find('form').serializeArray(), + data = {}; + + form.forEach(function(input) { + data[input.name] = translator.escape(input.value); + }); + + available.forEach(function(item) { + if (item.route.match(data.route)) { + data.properties = item.properties; + } + }); + + nav.push(data); + }); + + socket.emit('admin.navigation.save', nav, function(err) { + if (err) { + app.alertError(err.message); + } else { + app.alertSuccess('Successfully saved navigation'); + } + }); + } + + function remove() { + $(this).parents('li').remove(); + return false; + } + + function toggle() { + var btn = $(this), + disabled = btn.html() === 'Enable'; + + btn.toggleClass('btn-warning').toggleClass('btn-success').html(!disabled ? 'Enable' : 'Disable'); + btn.parents('li').find('[name="enabled"]').val(!disabled ? '' : 'on'); + return false; + } + + return navigation; +}); \ No newline at end of file diff --git a/public/src/admin/general/sounds.js b/public/src/admin/general/sounds.js index 9ec9708df5..73899144a0 100644 --- a/public/src/admin/general/sounds.js +++ b/public/src/admin/general/sounds.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, socket */ +/* global app, define, socket */ define('admin/general/sounds', ['sounds', 'settings'], function(Sounds, Settings) { var SoundsAdmin = {}; diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index 54385b6d0c..a9cf3b60e8 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -80,6 +80,10 @@ define('admin/manage/categories', [ order: $('.admin-categories #entry-container').children().length + 1 }; + saveNew(category); + } + + function saveNew(category) { socket.emit('admin.categories.create', category, function(err, data) { if(err) { return app.alertError(err.message); @@ -190,6 +194,27 @@ define('admin/manage/categories', [ }); }); + $('.admin-categories').on('click', '.duplicate', function() { + var inputs = $(this).parents('li[data-cid]').find('[data-name]'), + data = {}; + + inputs.each(function() { + var name = $(this).attr('data-name'); + switch (name) { + case 'icon': + data[name] = $(this).attr('value'); + break; + case 'name': + data[name] = $(this).val() + ' (copy)'; + break; + default: + data[name] = $(this).val(); + } + }); + + saveNew(data); + }); + $('.admin-categories').on('click', '.permissions', function() { var cid = $(this).parents('li[data-cid]').attr('data-cid'); Categories.launchPermissionsModal(cid); @@ -201,7 +226,7 @@ define('admin/manage/categories', [ var inputEl = $(this), cid = inputEl.parents('li[data-cid]').attr('data-cid'); - uploader.open(RELATIVE_PATH + '/admin/category/uploadpicture', { cid: cid }, 0, function(imageUrlOnServer) { + uploader.open(RELATIVE_PATH + '/api/admin/category/uploadpicture', { cid: cid }, 0, function(imageUrlOnServer) { inputEl.val(imageUrlOnServer); var previewBox = inputEl.parents('li[data-cid]').find('.preview-box'); previewBox.css('background', 'url(' + imageUrlOnServer + '?' + new Date().getTime() + ')') diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index d9eb888985..5909522f8c 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -1,5 +1,5 @@ "use strict"; -/* global socket, define, templates, bootbox, app, ajaxify, */ +/* global config, socket, define, templates, bootbox, app, ajaxify, */ define('admin/manage/users', ['admin/modules/selectable'], function(selectable) { var Users = {}; @@ -145,7 +145,7 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable) } app.alertSuccess('[[notifications:email-confirm-sent]]'); }); - }) + }); $('.password-reset-email').on('click', function() { var uids = getSelectedUids(); diff --git a/public/src/admin/modules/search.js b/public/src/admin/modules/search.js index b7cd131925..dec438165d 100644 --- a/public/src/admin/modules/search.js +++ b/public/src/admin/modules/search.js @@ -23,7 +23,7 @@ define(function() { setupACPSearch(); }); - };; + }; function setupACPSearch() { var menu = $('#acp-search .dropdown-menu'), diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index cd87159420..74c588a1ed 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -3,319 +3,264 @@ var ajaxify = ajaxify || {}; $(document).ready(function() { - require(['templates'], function (templatesModule) { - /*global app, templates, utils, socket, translator, config, RELATIVE_PATH*/ - var location = document.location || window.location, - rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : ''), - apiXHR = null; + /*global app, templates, utils, socket, translator, config, RELATIVE_PATH*/ + var location = document.location || window.location, + rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : ''), + apiXHR = null; - window.onpopstate = function (event) { - if (event !== null && event.state && event.state.url !== undefined && !ajaxify.initialLoad) { - ajaxify.go(event.state.url, function() { - $(window).trigger('action:popstate', {url: event.state.url}); - }, true); - } - }; - - ajaxify.currentPage = null; - ajaxify.initialLoad = false; - - - function onAjaxError(err, url, callback, quiet) { - var data = err.data, - textStatus = err.textStatus; - - if (data) { - var status = parseInt(data.status, 10); - - if (status === 403 || status === 404 || status === 500) { - $('#footer, #content').removeClass('hide').addClass('ajaxifying'); - return renderTemplate(url, status.toString(), data.responseJSON, (new Date()).getTime(), callback); - } else if (status === 401) { - app.alertError('[[global:please_log_in]]'); - app.previousUrl = url; - return ajaxify.go('login'); - } else if (status === 302) { - if (data.responseJSON.path) { - if (!ajaxify.go(data.responseJSON.path, callback, quiet)) { - window.location.href = data.responseJSON.path; - } - } else if (data.responseJSON) { - ajaxify.go(data.responseJSON.slice(1), callback, quiet); - } - } - } else if (textStatus !== 'abort') { - app.alertError(data.responseJSON.error); - } + window.onpopstate = function (event) { + if (event !== null && event.state && event.state.url !== undefined) { + ajaxify.go(event.state.url, function() { + $(window).trigger('action:popstate', {url: event.state.url}); + }, true); } + }; - ajaxify.go = function (url, callback, quiet) { - // "quiet": If set to true, will not call pushState - app.enterRoom(''); + ajaxify.currentPage = null; - $(window).off('scroll'); + ajaxify.go = function (url, callback, quiet) { + app.enterRoom(''); - if ($('#content').hasClass('ajaxifying') && apiXHR) { - apiXHR.abort(); - } - - // Remove relative path and trailing slash - url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); - - var tpl_url = ajaxify.getTemplateMapping(url); + $(window).off('scroll'); - $(window).trigger('action:ajaxify.start', {url: url, tpl_url: tpl_url}); + if ($('#content').hasClass('ajaxifying') && apiXHR) { + apiXHR.abort(); + } - var hash = ''; - if(ajaxify.initialLoad) { - hash = window.location.hash ? window.location.hash : ''; - } + url = ajaxify.start(url, quiet); - if (ajaxify.isTemplateAvailable(tpl_url) && !!!templatesModule.config.force_refresh[tpl_url]) { - ajaxify.currentPage = url; + $('#footer, #content').removeClass('hide').addClass('ajaxifying'); - if (window.history && window.history.pushState) { - window.history[!quiet ? 'pushState' : 'replaceState']({ - url: url + hash - }, url, RELATIVE_PATH + '/' + url + hash); - } + var startTime = (new Date()).getTime(); - translator.load(config.defaultLang, tpl_url); + ajaxify.variables.flush(); + ajaxify.loadData(url, function(err, data) { + if (err) { + return onAjaxError(err, url, callback, quiet); + } - $('#footer, #content').removeClass('hide').addClass('ajaxifying'); + app.template = data.template.name; - var startTime = (new Date()).getTime(); + translator.load(config.defaultLang, data.template.name); - ajaxify.variables.flush(); - ajaxify.loadData(url, function(err, data) { - if (err) { - return onAjaxError(err, url, callback, quiet); - } + renderTemplate(url, data.template.name, data, startTime, callback); - renderTemplate(url, tpl_url, data, startTime, callback); + require(['search'], function(search) { + search.topicDOM.end(); + }); + }); - require(['search'], function(search) { - search.topicDOM.end(); - }); - }); + return true; + }; - return true; - } + ajaxify.start = function(url, quiet, search) { + url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); + var hash = window.location.hash; + search = search || ''; - return false; - }; + $(window).trigger('action:ajaxify.start', {url: url}); - function renderTemplate(url, tpl_url, data, startTime, callback) { - var animationDuration = parseFloat($('#content').css('transition-duration')) || 0.2; - $(window).trigger('action:ajaxify.loadingTemplates', {}); + ajaxify.currentPage = url; - templates.parse(tpl_url, data, function(template) { - translator.translate(template, function(translatedTemplate) { - setTimeout(function() { - $('#content').html(translatedTemplate); + if (window.history && window.history.pushState) { + window.history[!quiet ? 'pushState' : 'replaceState']({ + url: url + search + hash + }, url, RELATIVE_PATH + '/' + url + search + hash); + } + return url; + }; - ajaxify.variables.parse(); + function onAjaxError(err, url, callback, quiet) { + var data = err.data, + textStatus = err.textStatus; - ajaxify.widgets.render(tpl_url, url, function() { - $(window).trigger('action:ajaxify.end', {url: url, tpl_url: tpl_url}); - }); + if (data) { + var status = parseInt(data.status, 10); - $(window).trigger('action:ajaxify.contentLoaded', {url: url}); + if (status === 403 || status === 404 || status === 500) { + $('#footer, #content').removeClass('hide').addClass('ajaxifying'); + return renderTemplate(url, status.toString(), data.responseJSON, (new Date()).getTime(), callback); + } else if (status === 401) { + app.alertError('[[global:please_log_in]]'); + app.previousUrl = url; + return ajaxify.go('login'); + } else if (status === 302) { + if (data.responseJSON.path) { + if (!ajaxify.go(data.responseJSON.path, callback, quiet)) { + window.location.href = data.responseJSON.path; + } + } else if (data.responseJSON) { + ajaxify.go(data.responseJSON.slice(1), callback, quiet); + } + } + } else if (textStatus !== 'abort') { + app.alertError(data.responseJSON.error); + } + } - ajaxify.loadScript(tpl_url); + function renderTemplate(url, tpl_url, data, startTime, callback) { + var animationDuration = parseFloat($('#content').css('transition-duration')) || 0.2; + $(window).trigger('action:ajaxify.loadingTemplates', {}); - if (typeof callback === 'function') { - callback(); - } + templates.parse(tpl_url, data, function(template) { + translator.translate(template, function(translatedTemplate) { + setTimeout(function() { + $('#content').html(translatedTemplate); - app.processPage(); + ajaxify.end(url, tpl_url); - $('#content, #footer').removeClass('ajaxifying'); - ajaxify.initialLoad = false; + if (typeof callback === 'function') { + callback(); + } - app.refreshTitle(url); - }, animationDuration * 1000 - ((new Date()).getTime() - startTime)); + $('#content, #footer').removeClass('ajaxifying'); - }); + app.refreshTitle(url); + }, animationDuration * 1000 - ((new Date()).getTime() - startTime)); }); + }); + } - } - - ajaxify.removeRelativePath = function(url) { - if (url.indexOf(RELATIVE_PATH.slice(1)) === 0) { - url = url.slice(RELATIVE_PATH.length); - } - return url; - }; - - ajaxify.refresh = function() { - ajaxify.go(ajaxify.currentPage); - }; + ajaxify.end = function(url, tpl_url) { + ajaxify.variables.parse(); - ajaxify.loadScript = function(tpl_url, callback) { - var location = !app.inAdmin ? 'forum/' : ''; + ajaxify.loadScript(tpl_url); - require([location + tpl_url], function(script) { - if (script && script.init) { - script.init(); - } + ajaxify.widgets.render(tpl_url, url, function() { + $(window).trigger('action:ajaxify.end', {url: url}); + }); - if (callback) { - callback(); - } - }); - }; + $(window).trigger('action:ajaxify.contentLoaded', {url: url}); - ajaxify.isTemplateAvailable = function(tpl) { - return $.inArray(tpl + '.tpl', templatesModule.available) !== -1; - }; + app.processPage(); + }; - ajaxify.getTemplateMapping = function(url) { - var tpl_url = ajaxify.getCustomTemplateMapping(url.split('?')[0]); + ajaxify.removeRelativePath = function(url) { + if (url.indexOf(RELATIVE_PATH.slice(1)) === 0) { + url = url.slice(RELATIVE_PATH.length); + } + return url; + }; - if (tpl_url === false && !templates[url]) { - tpl_url = url.split('/'); + ajaxify.refresh = function() { + ajaxify.go(ajaxify.currentPage); + }; - while(tpl_url.length) { - if (ajaxify.isTemplateAvailable(tpl_url.join('/'))) { - tpl_url = tpl_url.join('/'); - break; - } - tpl_url.pop(); - } + ajaxify.loadScript = function(tpl_url, callback) { + var location = !app.inAdmin ? 'forum/' : ''; - if (!tpl_url.length) { - tpl_url = url.split('/')[0].split('?')[0]; - } - } else if (templates[url]) { - tpl_url = url; + require([location + tpl_url], function(script) { + if (script && script.init) { + script.init(); } - return tpl_url; - }; - - ajaxify.getCustomTemplateMapping = function(tpl) { - if (templatesModule.config && templatesModule.config.custom_mapping && tpl !== undefined) { - for (var pattern in templatesModule.config.custom_mapping) { - var match = tpl.match(pattern); - if (match && match[0] === tpl) { - return (templatesModule.config.custom_mapping[pattern]); - } - } + if (callback) { + callback(); } + }); + }; - return false; - }; + ajaxify.loadData = function(url, callback) { + url = ajaxify.removeRelativePath(url); - ajaxify.loadData = function(url, callback) { - url = ajaxify.removeRelativePath(url); + $(window).trigger('action:ajaxify.loadingData', {url: url}); - $(window).trigger('action:ajaxify.loadingData', {url: url}); + apiXHR = $.ajax({ + url: RELATIVE_PATH + '/api/' + url, + cache: false, + success: function(data) { + if (!data) { + return; + } - var location = document.location || window.location, - tpl_url = ajaxify.getCustomTemplateMapping(url.split('?')[0]); + data.relative_path = RELATIVE_PATH; - if (!tpl_url) { - tpl_url = ajaxify.getTemplateMapping(url); + if (callback) { + callback(null, data); + } + }, + error: function(data, textStatus) { + callback({ + data: data, + textStatus: textStatus + }); } - - apiXHR = $.ajax({ - url: RELATIVE_PATH + '/api/' + url, - cache: false, + }); + }; + + ajaxify.loadTemplate = function(template, callback) { + if (templates.cache[template]) { + callback(templates.cache[template]); + } else { + $.ajax({ + url: RELATIVE_PATH + '/templates/' + template + '.tpl' + (config['cache-buster'] ? '?v=' + config['cache-buster'] : ''), + type: 'GET', success: function(data) { - if (!data) { - return; - } - - data.relative_path = RELATIVE_PATH; - - if (callback) { - callback(null, data); - } + callback(data.toString()); }, - error: function(data, textStatus) { - callback({ - data: data, - textStatus: textStatus - }); + error: function(error) { + throw new Error("Unable to load template: " + template + " (" + error.statusText + ")"); } }); - }; - - ajaxify.loadTemplate = function(template, callback) { - if (templates.cache[template]) { - callback(templates.cache[template]); - } else { - $.ajax({ - url: RELATIVE_PATH + '/templates/' + template + '.tpl' + (config['cache-buster'] ? '?v=' + config['cache-buster'] : ''), - type: 'GET', - success: function(data) { - callback(data.toString()); - }, - error: function(error) { - throw new Error("Unable to load template: " + template + " (" + error.statusText + ")"); - } - }); - } - }; - - $('document').ready(function () { - templates.registerLoader(ajaxify.loadTemplate); - templatesModule.refresh(app.load); + } + }; - if (!window.history || !window.history.pushState) { - return; // no ajaxification for old browsers - } + function ajaxifyAnchors() { + templates.registerLoader(ajaxify.loadTemplate); - function hrefEmpty(href) { - return href === undefined || href === '' || href === 'javascript:;' || href === window.location.href + "#" || href.slice(0, 1) === "#"; - } + if (!window.history || !window.history.pushState) { + return; // no ajaxification for old browsers + } - // Enhancing all anchors to ajaxify... - $(document.body).on('click', 'a', function (e) { - if (this.target !== '') { - return; - } else if (hrefEmpty(this.href) || this.protocol === 'javascript:' || $(this).attr('data-ajaxify') === 'false') { - return e.preventDefault(); - } + function hrefEmpty(href) { + return href === undefined || href === '' || href === 'javascript:;' || href === window.location.href + "#" || href.slice(0, 1) === "#"; + } - if (!window.location.pathname.match(/\/(403|404)$/g)) { - app.previousUrl = window.location.href; - } + // Enhancing all anchors to ajaxify... + $(document.body).on('click', 'a', function (e) { + if (this.target !== '') { + return; + } else if (hrefEmpty(this.href) || this.protocol === 'javascript:' || $(this).attr('data-ajaxify') === 'false') { + return e.preventDefault(); + } - if (!e.ctrlKey && !e.shiftKey && !e.metaKey && e.which === 1) { - if (this.host === '' || this.host === window.location.host) { - // Internal link - var url = this.href.replace(rootUrl + '/', ''); + if (!window.location.pathname.match(/\/(403|404)$/g)) { + app.previousUrl = window.location.href; + } - if(window.location.pathname === this.pathname && this.hash) { - if (this.hash !== window.location.hash) { - window.location.hash = this.hash; - } + if (!e.ctrlKey && !e.shiftKey && !e.metaKey && e.which === 1) { + if (this.host === '' || this.host === window.location.host) { + // Internal link + var url = this.href.replace(rootUrl + '/', ''); - ajaxify.loadScript(ajaxify.getTemplateMapping(url)); - e.preventDefault(); - } else { - if (ajaxify.go(url)) { - e.preventDefault(); - } + if(window.location.pathname === this.pathname && this.hash) { + if (this.hash !== window.location.hash) { + window.location.hash = this.hash; } - } else if (window.location.pathname !== '/outgoing') { - // External Link - if (config.openOutgoingLinksInNewTab) { - window.open(this.href, '_blank'); - e.preventDefault(); - } else if (config.useOutgoingLinksPage) { - ajaxify.go('outgoing?url=' + encodeURIComponent(this.href)); + + e.preventDefault(); + } else { + if (ajaxify.go(url)) { e.preventDefault(); } } + } else if (window.location.pathname !== '/outgoing') { + // External Link + if (config.openOutgoingLinksInNewTab) { + window.open(this.href, '_blank'); + e.preventDefault(); + } else if (config.useOutgoingLinksPage) { + ajaxify.go('outgoing?url=' + encodeURIComponent(this.href)); + e.preventDefault(); + } } - }); - + } }); + } + + ajaxifyAnchors(); + app.load(); - }); }); \ No newline at end of file diff --git a/public/src/app.js b/public/src/app.js index d3a47a1bc6..53e43e86fc 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -1,5 +1,5 @@ "use strict"; -/*global io, templates, translator, ajaxify, utils, bootbox, RELATIVE_PATH, config*/ +/*global io, templates, translator, ajaxify, utils, bootbox, RELATIVE_PATH, config, Visibility*/ var socket, app = app || {}; @@ -366,7 +366,7 @@ app.cacheBuster = null; } } }); - } + }; function createHeaderTooltips() { if (utils.findBootstrapEnvironment() === 'xs') { @@ -459,7 +459,7 @@ app.cacheBuster = null; } function collapseNavigationOnClick() { - $('#main-nav a, #user-control-list a, #logged-out-menu li a, #logged-in-menu .visible-xs').off('click').on('click', function() { + $('#nav-dropdown').off('click').on('click', '#main-nav a, #user-control-list a, #logged-out-menu li a, #logged-in-menu .visible-xs, #chat-list a', function() { if($('.navbar .navbar-collapse').hasClass('in')) { $('.navbar-header button').click(); } @@ -481,17 +481,8 @@ app.cacheBuster = null; app.load = function() { $('document').ready(function () { - var url = ajaxify.removeRelativePath(window.location.pathname.slice(1).replace(/\/$/, "")), - tpl_url = ajaxify.getTemplateMapping(url), - search = window.location.search, - hash = window.location.hash, - $window = $(window); - - - $window.trigger('action:ajaxify.start', { - url: url, - tpl_url: tpl_url - }); + var url = ajaxify.start(window.location.pathname.slice(1), true, window.location.search); + ajaxify.end(url, app.template); collapseNavigationOnClick(); @@ -515,29 +506,6 @@ app.cacheBuster = null; createHeaderTooltips(); showEmailConfirmWarning(); - ajaxify.variables.parse(); - ajaxify.currentPage = url; - - $window.trigger('action:ajaxify.contentLoaded', { - url: url - }); - - if (window.history && window.history.replaceState) { - window.history.replaceState({ - url: url + search + hash - }, url, RELATIVE_PATH + '/' + url + search + hash); - } - - ajaxify.loadScript(tpl_url, function() { - ajaxify.widgets.render(tpl_url, url, function() { - app.processPage(); - $window.trigger('action:ajaxify.end', { - url: url, - tpl_url: tpl_url - }); - }); - }); - socket.removeAllListeners('event:nodebb.ready'); socket.on('event:nodebb.ready', function(cacheBusters) { if ( diff --git a/public/src/client/account/groups.js b/public/src/client/account/groups.js index ea70433de3..e4c932161d 100644 --- a/public/src/client/account/groups.js +++ b/public/src/client/account/groups.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, app, socket, utils */ +/* globals ajaxify, define, app, socket, utils */ define('forum/account/groups', ['forum/account/header'], function(header) { var AccountTopics = {}; diff --git a/public/src/client/account/settings.js b/public/src/client/account/settings.js index fef95fc495..20b33a613b 100644 --- a/public/src/client/account/settings.js +++ b/public/src/client/account/settings.js @@ -36,16 +36,26 @@ define('forum/account/settings', ['forum/account/header'], function(header) { } app.alertSuccess('[[success:settings-saved]]'); - + var requireReload = false; for (var key in newSettings) { if (newSettings.hasOwnProperty(key)) { - config[key] = newSettings[key]; + if (key === 'userLang' && config.userLang !== newSettings.userLang) { + requireReload = true; + } + config[key] = newSettings[key]; } } app.exposeConfigToTemplates(); - - if (parseInt(app.user.uid, 10) === parseInt(ajaxify.variables.get('theirid'), 10)) { - ajaxify.refresh(); + if (requireReload && parseInt(app.user.uid, 10) === parseInt(ajaxify.variables.get('theirid'), 10)) { + app.alert({ + id: 'setting-change', + message: '[[user:settings-require-reload]]', + type: 'warning', + timeout: 5000, + clickfn: function() { + ajaxify.refresh(); + } + }); } }); diff --git a/public/src/client/categories.js b/public/src/client/categories.js index 6840f69e89..d3cf1cae43 100644 --- a/public/src/client/categories.js +++ b/public/src/client/categories.js @@ -6,7 +6,7 @@ define('forum/categories', function() { var categories = {}; $(window).on('action:ajaxify.start', function(ev, data) { - if (data.tpl_url !== 'categories') { + if (ajaxify.currentPage !== data.url) { socket.removeListener('event:new_post', categories.onNewPost); } }); diff --git a/public/src/client/category.js b/public/src/client/category.js index 2dccb5f85d..3b6a0e69b9 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -13,13 +13,19 @@ define('forum/category', [ var Category = {}; $(window).on('action:ajaxify.start', function(ev, data) { - if(data && data.tpl_url !== 'category') { + if (ajaxify.currentPage !== data.url) { navigator.hide(); removeListeners(); } }); + $(window).on('action:composer.topics.post', function(ev, data) { + localStorage.removeItem('category:' + data.data.cid + ':bookmark'); + localStorage.removeItem('category:' + data.data.cid + ':bookmark:clicked'); + ajaxify.go('topic/' + data.data.slug); + }); + function removeListeners() { socket.removeListener('event:new_topic', Category.onNewTopic); categoryTools.removeListeners(); @@ -50,11 +56,11 @@ define('forum/category', [ } $('#topics-container').on('click', '.topic-title', function() { - var clickedTid = $(this).parents('li.category-item[data-tid]').attr('data-tid'); + var clickedIndex = $(this).parents('[data-index]').attr('data-index'); $('#topics-container li.category-item').each(function(index, el) { - if($(el).offset().top - $(window).scrollTop() > 0) { - localStorage.setItem('category:' + cid + ':bookmark', $(el).attr('data-tid')); - localStorage.setItem('category:' + cid + ':bookmark:clicked', clickedTid); + if ($(el).offset().top - $(window).scrollTop() > 0) { + localStorage.setItem('category:' + cid + ':bookmark', $(el).attr('data-index')); + localStorage.setItem('category:' + cid + ':bookmark:clicked', clickedIndex); return false; } }); @@ -84,8 +90,8 @@ define('forum/category', [ }; Category.toBottom = function() { - socket.emit('categories.getTopicCount', ajaxify.variables.get('category_id'), function(err, index) { - navigator.scrollBottom(index); + socket.emit('categories.getTopicCount', ajaxify.variables.get('category_id'), function(err, count) { + navigator.scrollBottom(count - 1); }); }; @@ -94,7 +100,7 @@ define('forum/category', [ }; $(window).on('action:popstate', function(ev, data) { - if(data.url.indexOf('category/') === 0) { + if (data.url.indexOf('category/') === 0) { var cid = data.url.match(/^category\/(\d+)/); if (cid && cid[1]) { cid = cid[1]; @@ -103,52 +109,44 @@ define('forum/category', [ return; } - var bookmark = localStorage.getItem('category:' + cid + ':bookmark'); - var clicked = localStorage.getItem('category:' + cid + ':bookmark:clicked'); + var bookmarkIndex = localStorage.getItem('category:' + cid + ':bookmark'); + var clickedIndex = localStorage.getItem('category:' + cid + ':bookmark:clicked'); - if (!bookmark) { + if (!bookmarkIndex) { return; } - if(config.usePagination) { - socket.emit('topics.getTidPage', bookmark, function(err, page) { - if (err) { - return; - } - if(parseInt(page, 10) !== pagination.currentPage) { - pagination.loadPage(page); - } else { - Category.scrollToTopic(bookmark, clicked, 400); - } - }); + if (config.usePagination) { + var page = Math.ceil((parseInt(bookmarkIndex, 10) + 1) / config.topicsPerPage); + if (parseInt(page, 10) !== pagination.currentPage) { + pagination.loadPage(page, function() { + Category.scrollToTopic(bookmarkIndex, clickedIndex, 400); + }); + } else { + Category.scrollToTopic(bookmarkIndex, clickedIndex, 400); + } } else { - socket.emit('topics.getTidIndex', bookmark, function(err, index) { - if (err) { - return; - } - - if (index === 0) { - Category.highlightTopic(clicked); - return; - } + if (bookmarkIndex === 0) { + Category.highlightTopic(clickedIndex); + return; + } - if (index < 0) { - index = 0; - } + if (bookmarkIndex < 0) { + bookmarkIndex = 0; + } - $('#topics-container').empty(); + $('#topics-container').empty(); - loadTopicsAfter(index, function() { - Category.scrollToTopic(bookmark, clicked, 0); - }); + loadTopicsAfter(bookmarkIndex, function() { + Category.scrollToTopic(bookmarkIndex, clickedIndex, 0); }); } } }); - Category.highlightTopic = function(tid) { - var highlight = $('#topics-container li.category-item[data-tid="' + tid + '"]'); - if(highlight.length && !highlight.hasClass('highlight')) { + Category.highlightTopic = function(topicIndex) { + var highlight = $('#topics-container [data-index="' + topicIndex + '"]'); + if (highlight.length && !highlight.hasClass('highlight')) { highlight.addClass('highlight'); setTimeout(function() { highlight.removeClass('highlight'); @@ -156,27 +154,24 @@ define('forum/category', [ } }; - Category.scrollToTopic = function(tid, clickedTid, duration, offset) { - if(!tid) { + Category.scrollToTopic = function(bookmarkIndex, clickedIndex, duration, offset) { + if (!bookmarkIndex) { return; } - if(!offset) { + if (!offset) { offset = 0; } - if($('#topics-container li.category-item[data-tid="' + tid + '"]').length) { - var cid = ajaxify.variables.get('category_id'); - var scrollTo = $('#topics-container li.category-item[data-tid="' + tid + '"]'); - - if (cid && scrollTo.length) { - $('html, body').animate({ - scrollTop: (scrollTo.offset().top - $('#header-menu').height() - offset) + 'px' - }, duration !== undefined ? duration : 400, function() { - Category.highlightTopic(clickedTid); - navigator.update(); - }); - } + var scrollTo = $('#topics-container [data-index="' + bookmarkIndex + '"]'); + var cid = ajaxify.variables.get('category_id'); + if (scrollTo.length && cid) { + $('html, body').animate({ + scrollTop: (scrollTo.offset().top - $('#header-menu').height() - offset) + 'px' + }, duration !== undefined ? duration : 400, function() { + Category.highlightTopic(clickedIndex); + navigator.update(); + }); } }; @@ -191,7 +186,7 @@ define('forum/category', [ Category.onNewTopic = function(topic) { var cid = ajaxify.variables.get('category_id'); - if(!topic || parseInt(topic.cid, 10) !== parseInt(cid, 10)) { + if (!topic || parseInt(topic.cid, 10) !== parseInt(cid, 10)) { return; } @@ -324,7 +319,7 @@ define('forum/category', [ infinitescroll.calculateAfter(direction, '#topics-container .category-item[data-tid]', config.topicsPerPage, false, function(after, offset, el) { loadTopicsAfter(after, function() { if (direction < 0 && el) { - Category.scrollToTopic(el.attr('data-tid'), null, 0, offset); + Category.scrollToTopic(el.attr('data-index'), null, 0, offset); } }); }); diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 994ddeb47a..020b0915ef 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, app, ajaxify, utils, socket, templates */ +/* globals define, app, ajaxify, utils, socket, templates, translator */ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S, sounds, infinitescroll) { var Chats = { diff --git a/public/src/client/footer.js b/public/src/client/footer.js index ff44f25e1e..6462e3e39a 100644 --- a/public/src/client/footer.js +++ b/public/src/client/footer.js @@ -1,3 +1,6 @@ +"use strict"; +/*globals define, app, translator, socket*/ + define('forum/footer', ['notifications', 'chat'], function(Notifications, Chat) { Notifications.prepareDOM(); @@ -9,7 +12,7 @@ define('forum/footer', ['notifications', 'chat'], function(Notifications, Chat) return console.warn('Error updating unread count', err); } - $('#unread-count') + $('#unread-count i') .toggleClass('unread-count', count > 0) .attr('data-content', count > 20 ? '20+' : count); } @@ -40,7 +43,7 @@ define('forum/footer', ['notifications', 'chat'], function(Notifications, Chat) } function increaseUnreadCount() { - var count = parseInt($('#unread-count').attr('data-content'), 10) + 1; + var count = parseInt($('#unread-count i').attr('data-content'), 10) + 1; updateUnreadTopicCount(null, count); } diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index f4f56a686e..bc1534f051 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -88,7 +88,9 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', iconBtn = settingsFormEl.find('[data-action="icon-select"]'), previewEl = settingsFormEl.find('.label'), previewIcon = previewEl.find('i'), - previewValueEl = settingsFormEl.find('[name="icon"]'); + userTitleEl = settingsFormEl.find('[name="userTitle"]'), + userTitleEnabledEl = settingsFormEl.find('[name="userTitleEnabled"]'), + iconValueEl = settingsFormEl.find('[name="icon"]'); // Add color picker to settings form colorBtn.ColorPicker({ @@ -105,9 +107,29 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', // Add icon selection interface iconBtn.on('click', function() { iconSelect.init(previewIcon, function() { - previewValueEl.val(previewIcon.val()); + iconValueEl.val(previewIcon.val()); }); }); + + // If the user title changes, update that too + userTitleEl.on('keyup', function() { + var icon = previewIcon.detach(); + previewEl.text(' ' + (this.value || settingsFormEl.find('#name').val())); + previewEl.prepend(icon); + }); + + // Disable user title customisation options if the the user title itself is disabled + userTitleEnabledEl.on('change', function() { + var customOpts = $('.user-title-option input, .user-title-option button'); + + if (this.checked) { + customOpts.removeAttr('disabled'); + previewEl.removeClass('hide'); + } else { + customOpts.attr('disabled', 'disabled'); + previewEl.addClass('hide'); + } + }); }; Details.update = function() { diff --git a/public/src/client/infinitescroll.js b/public/src/client/infinitescroll.js index e600d16fbe..ba3385d92f 100644 --- a/public/src/client/infinitescroll.js +++ b/public/src/client/infinitescroll.js @@ -14,10 +14,6 @@ define('forum/infinitescroll', function() { callback = cb; topOffset = _topOffest || 0; $(window).off('scroll', onScroll).on('scroll', onScroll); - - // if ($(document).height() === $(window).height()) { - // callback(1); - // } }; function onScroll() { diff --git a/public/src/client/login.js b/public/src/client/login.js index 22f1dca9eb..dc199f3d2f 100644 --- a/public/src/client/login.js +++ b/public/src/client/login.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, app, RELATIVE_PATH */ +/* global define, app, translator, config, RELATIVE_PATH */ define('forum/login', ['csrf'], function(csrf) { var Login = {}; @@ -31,7 +31,7 @@ define('forum/login', ['csrf'], function(csrf) { }, error: function(data, status) { translator.translate(data.responseText, config.defaultLang, function(translated) { - errorEl.find('p').text(translated) + errorEl.find('p').text(translated); errorEl.show(); submitEl.removeClass('disabled'); }); diff --git a/public/src/client/recent.js b/public/src/client/recent.js index 9bc840d125..bdf8897151 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -9,7 +9,7 @@ define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) { newPostCount = 0; $(window).on('action:ajaxify.start', function(ev, data) { - if (data.tpl_url !== 'recent') { + if (ajaxify.currentPage !== data.url) { Recent.removeListeners(); } }); diff --git a/public/src/client/reset.js b/public/src/client/reset.js index 2cbad172ae..7e272c3284 100644 --- a/public/src/client/reset.js +++ b/public/src/client/reset.js @@ -1,3 +1,6 @@ +"use strict"; +/*globals define, app, socket*/ + define('forum/reset', function() { var ResetPassword = {}; diff --git a/public/src/client/reset_code.js b/public/src/client/reset_code.js index f690a2b152..c0f46dc356 100644 --- a/public/src/client/reset_code.js +++ b/public/src/client/reset_code.js @@ -1,3 +1,6 @@ +"use strict"; +/*globals define, app, ajaxify, socket, RELATIVE_PATH*/ + define('forum/reset_code', function() { var ResetCode = {}; diff --git a/public/src/client/search.js b/public/src/client/search.js index 56bdaf6dca..44477cd06d 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -116,7 +116,7 @@ define('forum/search', ['search', 'autocomplete'], function(searchModule, autoco if (!searchQuery) { return; } - var searchTerms = searchQuery.split(' '); + var searchTerms = searchQuery.trim().split(' '); var regexes = []; for (var i=0; i'); + if (category.icon) { link.append(' ' + category.name); } else { link.append(category.name); } - $('') .append(link) .appendTo($('.markread .dropdown-menu')); diff --git a/public/src/client/users.js b/public/src/client/users.js index c3f374c4ff..6b08f05cdd 100644 --- a/public/src/client/users.js +++ b/public/src/client/users.js @@ -103,7 +103,7 @@ define('forum/users', function() { $('.users').on('click', '.pagination a', function() { doSearch($(this).attr('data-page')); return false; - }) + }); } function doSearch(page) { @@ -147,7 +147,7 @@ define('forum/users', function() { templates.parse('partials/paginator', {pagination: data.pagination}, function(html) { $('.pagination-container').replaceWith(html); - }) + }); templates.parse('users', 'users', data, function(html) { translator.translate(html, function(translated) { diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js index 4db3a1d9ab..15f592720e 100644 --- a/public/src/modules/alerts.js +++ b/public/src/modules/alerts.js @@ -77,6 +77,19 @@ define('alerts', function() { alert.children().fadeIn(100); alert.html(translatedHTML); }); + + // Handle changes in the clickfn + alert.off('click').removeClass('pointer'); + if (typeof params.clickfn === 'function') { + alert + .addClass('pointer') + .on('click', function (e) { + if(!$(e.target).is('.close')) { + params.clickfn(); + } + fadeOut(alert); + }); + } } function fadeOut(alert) { diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 06e8c75c7d..5d60f2d411 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -52,18 +52,9 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, } else { ajaxify.go('chats/' + utils.slugify(userObj.username)); } - /*javascript:app.openChat(\'' + - userObj.username + - '\', ' + userObj.uid + - ');*/ }); })(userObj); } - - var seeAll = '
  • [[modules:chat.see_all]]
    • '; - translator.translate(seeAll, function(translated) { - $(translated).appendTo(chatsListEl); - }); }); }); @@ -211,13 +202,8 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, if (ui.originalSize.height === ui.size.height) { return; } - var totalHeight = chatModal.find('.modal-content').outerHeight() - chatModal.find('.modal-header').outerHeight(); - var padding = parseInt(chatModal.find('.modal-body').css('padding-top'), 10) + parseInt(chatModal.find('.modal-body').css('padding-bottom'), 10); - var contentMargin = parseInt(chatModal.find('#chat-content').css('margin-top'), 10) + parseInt(chatModal.find('#chat-content').css('margin-bottom'), 10); - var sinceHeight = chatModal.find('.since-bar').outerHeight(true); - var inputGroupHeight = chatModal.find('.input-group').outerHeight(); - chatModal.find('#chat-content').css('height', totalHeight - padding - contentMargin - sinceHeight - inputGroupHeight); + chatModal.find('#chat-content').css('height', module.calculateChatListHeight(chatModal)); }); chatModal.find('#chat-with-name').html(username); @@ -304,6 +290,10 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, chatModal.data('modal', null); taskbar.discard('chat', chatModal.attr('UUID')); Chats.notifyTyping(chatModal.attr('touid'), false); + + if (chatModal.attr('data-mobile')) { + module.disableMobileBehaviour(chatModal); + } }; module.center = function(chatModal) { @@ -330,6 +320,36 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, module.bringModalToTop(chatModal); module.focusInput(chatModal); socket.emit('modules.chats.markRead', chatModal.attr('touid')); + + var env = utils.findBootstrapEnvironment(); + if (env === 'xs' || env === 'sm') { + module.enableMobileBehaviour(chatModal); + } + }; + + module.enableMobileBehaviour = function(modalEl) { + app.toggleNavbar(false); + modalEl.attr('data-mobile', '1'); + var messagesEl = modalEl.find('#chat-content'); + messagesEl.css('height', module.calculateChatListHeight(modalEl)); + + $(window).on('resize', function() { + messagesEl.css('height', module.calculateChatListHeight(modalEl)); + }); + }; + + module.disableMobileBehaviour = function(modalEl) { + app.toggleNavbar(true); + }; + + module.calculateChatListHeight = function(modalEl) { + var totalHeight = modalEl.find('.modal-content').outerHeight() - modalEl.find('.modal-header').outerHeight(), + padding = parseInt(modalEl.find('.modal-body').css('padding-top'), 10) + parseInt(modalEl.find('.modal-body').css('padding-bottom'), 10), + contentMargin = parseInt(modalEl.find('#chat-content').css('margin-top'), 10) + parseInt(modalEl.find('#chat-content').css('margin-bottom'), 10), + sinceHeight = modalEl.find('.since-bar').outerHeight(true), + inputGroupHeight = modalEl.find('.input-group').outerHeight(); + + return totalHeight - padding - contentMargin - sinceHeight - inputGroupHeight; }; module.minimize = function(uuid) { diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 84c4c4e9dd..50a729bb54 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -22,6 +22,14 @@ define('composer', [ $(window).off('resize', onWindowResize).on('resize', onWindowResize); + $(window).on('action:popstate', function(ev, data) { + var env = utils.findBootstrapEnvironment(); + + if (composer.active && (env === 'xs' || env ==='sm')) { + discard(composer.active); + } + }); + // Query server for formatting options socket.emit('modules.composer.getFormattingOptions', function(err, options) { composer.formatting = options; @@ -432,13 +440,7 @@ define('composer', [ }; action = 'topics.post'; - socket.emit(action, composerData, function(err, topic) { - done(err); - - if (!err) { - ajaxify.go('topic/' + topic.slug); - } - }); + socket.emit(action, composerData, done); } else if (parseInt(postData.tid, 10) > 0) { composerData = { tid: postData.tid, @@ -463,7 +465,7 @@ define('composer', [ socket.emit(action, composerData, done); } - function done(err) { + function done(err, data) { $('.action-bar button').removeAttr('disabled'); if (err) { if (err.message === '[[error:email-not-confirmed]]') { @@ -476,7 +478,7 @@ define('composer', [ discard(post_uuid); drafts.removeDraft(postData.save_id); - $(window).trigger('action:composer.' + action, composerData); + $(window).trigger('action:composer.' + action, {composerData: composerData, data: data}); } } diff --git a/public/src/modules/composer/categoryList.js b/public/src/modules/composer/categoryList.js index 30ece1875a..f246b9ac50 100644 --- a/public/src/modules/composer/categoryList.js +++ b/public/src/modules/composer/categoryList.js @@ -19,7 +19,7 @@ define('composer/categoryList', function() { // Remove categories that are just external links categories = categories.filter(function(category) { - return !category.link + return !category.link; }); categories.forEach(function(category) { diff --git a/public/src/modules/composer/formatting.js b/public/src/modules/composer/formatting.js index 03fb05730e..071c0ca2e7 100644 --- a/public/src/modules/composer/formatting.js +++ b/public/src/modules/composer/formatting.js @@ -7,7 +7,7 @@ define('composer/formatting', ['composer/controls', 'composer/preview'], functio var formatting = {}; var formattingDispatchTable = { - 'picture-o': function(){ + 'picture': function(){ $('#files').click(); }, diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 20048eb7e6..9d5d303df9 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -25,7 +25,7 @@ define('composer/resize', function() { } } - if (env === 'sm' || env === 'xs') { + if (env === 'sm' || env === 'xs' || window.innerHeight < 480) { app.toggleNavbar(false); postContainer.css('height', $(window).height()); } diff --git a/public/src/modules/composer/uploads.js b/public/src/modules/composer/uploads.js index 2a6833c604..e9d7bfa3c3 100644 --- a/public/src/modules/composer/uploads.js +++ b/public/src/modules/composer/uploads.js @@ -202,7 +202,7 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf) function insertText(str, index, insert) { return str.slice(0, index) + insert + str.slice(index); - }; + } function uploadContentFiles(params) { var files = params.files, diff --git a/public/src/modules/csrf.js b/public/src/modules/csrf.js index 0329a42917..10a9b002f0 100644 --- a/public/src/modules/csrf.js +++ b/public/src/modules/csrf.js @@ -1,11 +1,13 @@ +"use strict"; +/*globals define*/ + define('csrf', function() { - "use strict"; var csrf = {}, _data = {}; csrf.get = function() { return _data.token; - } + }; csrf.set = function(token) { _data.token = token; diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index c4676a0e37..9f643d8736 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -9,8 +9,25 @@ var helpers = {}; - helpers.displayUsersLink = function(config) { - return (config.loggedIn || !config.privateUserInfo); + helpers.displayMenuItem = function(data, index) { + var item = data.navigation[index], + properties = item.properties; + + if (properties) { + if (properties.loggedIn && !data.loggedIn || + properties.adminOnly && !data.isAdmin || + properties.installed && properties.installed.search && !data.searchEnabled) { + return false; + } + } + + if (item.route.match('/users')) { + if (data.privateUserInfo && !data.isAdmin) { + return false; + } + } + + return true; }; helpers.buildMetaTag = function(tag) { diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 1b039d9b60..e7f78c980f 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -138,7 +138,7 @@ define('navigator', ['forum/pagination'], function(pagination) { if ($('li[data-index="' + index + '"]').length) { navigator.scrollToPost(index, true); } else { - index = parseInt(index, 10); + index = parseInt(index, 10) + 1; ajaxify.go(generateUrl(index)); } }; diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index 6e36cf7296..52e4c42c8c 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, socket, translator, utils, config, app, ajaxify, Tinycon*/ +/* globals define, socket, translator, utils, config, app, ajaxify, templates, Tinycon*/ define('notifications', ['sounds'], function(sound) { var Notifications = {}; @@ -22,7 +22,9 @@ define('notifications', ['sounds'], function(sound) { return app.alertError(err.message); } - var notifs = data.unread.concat(data.read); + var notifs = data.unread.concat(data.read).sort(function(a, b) { + return parseInt(a.datetime, 10) > parseInt(b.datetime, 10) ? -1 : 1; + }); translator.toggleTimeagoShorthand(); for(var i=0; i 20 ? '20+' : count); Tinycon.setBubble(count); - }; + } function increaseNotifCount(delta) { var count = parseInt(notifIcon.attr('data-content'), 10) + delta; diff --git a/public/src/modules/sort.js b/public/src/modules/sort.js index 8d1559d4da..3aad14dc44 100644 --- a/public/src/modules/sort.js +++ b/public/src/modules/sort.js @@ -1,5 +1,5 @@ 'use strict'; -/* globals define, translator, templates */ +/* globals define, config, socket, app, ajaxify, translator, templates */ define('sort', function() { var module = {}; diff --git a/public/src/modules/sounds.js b/public/src/modules/sounds.js index 5dfac33613..fa0eade2b5 100644 --- a/public/src/modules/sounds.js +++ b/public/src/modules/sounds.js @@ -57,7 +57,9 @@ define('sounds', ['buzz'], function(buzz) { }; Sounds.playFile = function(fileName) { - if (!fileName) return; + if (!fileName) { + return; + } function play() { if (loadedSounds[fileName]) { diff --git a/public/src/modules/templates.js b/public/src/modules/templates.js deleted file mode 100644 index 2c25dbdb64..0000000000 --- a/public/src/modules/templates.js +++ /dev/null @@ -1,14 +0,0 @@ -define('templates', function() { - var Templates = {}; - - Templates.refresh = function(callback) { - $.getJSON(RELATIVE_PATH + '/api/get_templates_listing', function (data) { - Templates.config = data.templatesConfig; - Templates.available = data.availableTemplates; - - if (callback) callback(); - }); - }; - - return Templates; -}); \ No newline at end of file diff --git a/public/src/overrides.js b/public/src/overrides.js index 913a5abf3f..afe5003b3c 100644 --- a/public/src/overrides.js +++ b/public/src/overrides.js @@ -1,5 +1,7 @@ 'use strict'; +/*globals translator*/ + if ('undefined' !== typeof window) { @@ -92,7 +94,8 @@ if ('undefined' !== typeof window) { .off('click.data-api.dropdown', _clearMenus) .on('click.data-api.dropdown', function (e) { // call the handler only when not right-click - e.button === 2 || _clearMenus(); + if (e.button !== 2) { + _clearMenus(); + } }); - } diff --git a/public/src/translator.js b/public/src/translator.js index 5b052af216..a6f4027faf 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -29,7 +29,15 @@ callback(languages[language].loaded[filename]); }); } - } + }; + + translator.escape = function(text) { + return typeof text === 'string' ? text.replace(/\[\[([\S]*?)\]\]/g, '\\[\\[$1\\]\\]') : text; + }; + + translator.unescape = function(text) { + return typeof text === 'string' ? text.replace(/\\\[\\\[([\S]*?)\\\]\\\]/g, '[[$1]]') : text; + }; translator.getLanguage = function() { return config.defaultLang; diff --git a/public/src/utils.js b/public/src/utils.js index 1521d53e28..4efad224fd 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -74,7 +74,7 @@ languageKeyRegex: /\[\[[\w]+:.+\]\]/, //http://dense13.com/blog/2009/05/03/converting-string-to-slug-javascript/ - slugify: function(str) { + slugify: function(str, preserveCase) { if (!str) { str = ''; } str = str.replace(utils.trimRegex, ''); if(utils.isLatin.test(str)) { @@ -82,7 +82,7 @@ } else { str = XRegExp.replace(str, utils.invalidUnicodeChars, '-'); } - str = str.toLocaleLowerCase(); + str = !preserveCase ? str.toLocaleLowerCase() : str; str = str.replace(utils.collapseWhitespace, '-'); str = str.replace(utils.collapseDash, '-'); str = str.replace(utils.trimTrailingDash, ''); diff --git a/public/uploads/system/.gitignore b/public/uploads/system/.gitignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/categories.js b/src/categories.js index a4b6ce2092..87c540aaf1 100644 --- a/src/categories.js +++ b/src/categories.js @@ -121,13 +121,7 @@ var async = require('async'), }, function(cids, next) { Categories.getCategories(cids, uid, next); - }, - function(categories, next) { - categories = categories.filter(function(category) { - return !category.disabled; - }); - next(null, categories); - } + } ], callback); }; @@ -286,10 +280,9 @@ var async = require('async'), Categories.getCategoriesData(cids, next); }, function (categories, next) { - // Filter categories to isolate children, and remove disabled categories async.map(cids, function(cid, next) { next(null, categories.filter(function(category) { - return category && parseInt(category.parentCid, 10) === parseInt(cid, 10) && !category.disabled; + return category && parseInt(category.parentCid, 10) === parseInt(cid, 10); })); }, next); } diff --git a/src/categories/create.js b/src/categories/create.js index af9598866b..a8bfaeb6fc 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -13,7 +13,8 @@ module.exports = function(Categories) { return callback(err); } - var slug = cid + '/' + utils.slugify(data.name); + var slug = cid + '/' + utils.slugify(data.name), + order = data.order || cid; // If no order provided, place it at the end var category = { cid: cid, @@ -27,7 +28,7 @@ module.exports = function(Categories) { topic_count: 0, post_count: 0, disabled: 0, - order: data.order, + order: order, link: '', numRecentReplies: 1, class: 'col-md-3 col-xs-6', @@ -38,7 +39,7 @@ module.exports = function(Categories) { async.series([ async.apply(db.setObject, 'category:' + cid, category), - async.apply(db.sortedSetAdd, 'categories:cid', data.order, cid), + async.apply(db.sortedSetAdd, 'categories:cid', order, cid), async.apply(privileges.categories.give, defaultPrivileges, cid, 'administrators'), async.apply(privileges.categories.give, defaultPrivileges, cid, 'registered-users'), async.apply(privileges.categories.give, ['find', 'read'], cid, 'guests') diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index eb78226145..8b966fbd26 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -235,7 +235,7 @@ accountsController.getTopics = function(req, res, next) { accountsController.getGroups = function(req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - getBaseUser(req.params.userslug, callerUID, function(err, userData) { + accountsController.getBaseUser(req.params.userslug, callerUID, function(err, userData) { if (err) { return next(err); } @@ -259,7 +259,7 @@ accountsController.getGroups = function(req, res, next) { function getFromUserSet(tpl, set, method, type, req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - getBaseUser(req.params.userslug, callerUID, function(err, userData) { + accountsController.getBaseUser(req.params.userslug, callerUID, function(err, userData) { if (err) { return next(err); } @@ -281,7 +281,7 @@ function getFromUserSet(tpl, set, method, type, req, res, next) { }); } -function getBaseUser(userslug, callerUID, callback) { +accountsController.getBaseUser = function(userslug, callerUID, callback) { user.getUidByUserslug(userslug, function (err, uid) { if (err || !uid) { return callback(err); @@ -314,7 +314,7 @@ function getBaseUser(userslug, callerUID, callback) { callback(null, results.user); }); }); -} +}; accountsController.accountEdit = function(req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; @@ -341,7 +341,7 @@ accountsController.accountEdit = function(req, res, next) { accountsController.accountSettings = function(req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - getBaseUser(req.params.userslug, callerUID, function(err, userData) { + accountsController.getBaseUser(req.params.userslug, callerUID, function(err, userData) { if (err) { return next(err); } @@ -354,6 +354,9 @@ accountsController.accountSettings = function(req, res, next) { settings: function(next) { plugins.fireHook('filter:user.settings', [], next); }, + userGroups: function(next) { + groups.getUserGroups([userData.uid], next); + }, languages: function(next) { languages.list(next); } @@ -364,6 +367,7 @@ accountsController.accountSettings = function(req, res, next) { userData.settings = results.settings; userData.languages = results.languages; + userData.userGroups = results.userGroups[0]; userData.disableEmailSubscriptions = parseInt(meta.config.disableEmailSubscriptions, 10) === 1; diff --git a/src/controllers/admin.js b/src/controllers/admin.js index 33e86a383a..e0912a668c 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -37,6 +37,8 @@ var adminController = { settings: {}, logger: {}, sounds: {}, + homepage: {}, + navigation: {}, themes: {}, users: require('./admin/users'), uploads: require('./admin/uploads') @@ -230,6 +232,49 @@ adminController.languages.get = function(req, res, next) { }); }; +adminController.sounds.get = function(req, res, next) { + meta.sounds.getFiles(function(err, sounds) { + sounds = Object.keys(sounds).map(function(name) { + return { + name: name + }; + }); + + res.render('admin/general/sounds', { + sounds: sounds + }); + }); +}; + +adminController.navigation.get = function(req, res, next) { + require('../navigation/admin').getAdmin(function(err, data) { + if (err) { + return next(err); + } + + res.render('admin/general/navigation', data); + }); +}; + +adminController.homepage.get = function(req, res, next) { + plugins.fireHook('filter:homepage.get', {routes: [ + { + route: 'categories', + name: 'Categories' + }, + { + route: 'recent', + name: 'Recent' + }, + { + route: 'popular', + name: 'Popular' + } + ]}, function(err, data) { + res.render('admin/general/homepage', data); + }); +}; + adminController.settings.get = function(req, res, next) { var term = req.params.term ? req.params.term : 'general'; @@ -328,10 +373,11 @@ adminController.groups.get = function(req, res, next) { groups.list({ expand: true, truncateUserList: true, - isAdmin: true + isAdmin: true, + showSystemGroups: true }, function(err, groups) { groups = groups.filter(function(group) { - return group.name !== 'registered-users' && group.name !== 'guests'; + return group.name !== 'registered-users' && group.name !== 'guests' && group.name.indexOf(':privileges:') === -1; }); res.render('admin/manage/groups', { groups: groups, @@ -340,20 +386,6 @@ adminController.groups.get = function(req, res, next) { }); }; -adminController.sounds.get = function(req, res, next) { - meta.sounds.getFiles(function(err, sounds) { - sounds = Object.keys(sounds).map(function(name) { - return { - name: name - }; - }); - - res.render('admin/general/sounds', { - sounds: sounds - }); - }); -}; - adminController.themes.get = function(req, res, next) { var themeDir = path.join(__dirname, '../../node_modules/' + req.params.theme); fs.exists(themeDir, function(exists) { diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js index 81a98ed151..193b20b6d5 100644 --- a/src/controllers/admin/uploads.js +++ b/src/controllers/admin/uploads.js @@ -31,7 +31,7 @@ uploadsController.uploadFavicon = function(req, res, next) { var allowedTypes = ['image/x-icon', 'image/vnd.microsoft.icon']; if (validateUpload(req, res, next, uploadedFile, allowedTypes)) { - file.saveFileToLocal('favicon.ico', 'files', uploadedFile.path, function(err, image) { + file.saveFileToLocal('favicon.ico', 'system', uploadedFile.path, function(err, image) { fs.unlink(uploadedFile.path); if (err) { return next(err); @@ -55,7 +55,7 @@ function upload(name, req, res, next) { var allowedTypes = ['image/png', 'image/jpeg', 'image/pjpeg', 'image/jpg', 'image/gif']; if (validateUpload(req, res, next, uploadedFile, allowedTypes)) { var filename = name + path.extname(uploadedFile.name); - uploadImage(filename, 'files', uploadedFile, req, res, next); + uploadImage(filename, 'system', uploadedFile, req, res, next); } } diff --git a/src/controllers/api.js b/src/controllers/api.js index c335cdf272..c98fd79e0c 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -12,6 +12,16 @@ var pkg = require('./../../package.json'), var apiController = {}; apiController.getConfig = function(req, res, next) { + function filterConfig() { + plugins.fireHook('filter:config.get', config, function(err, config) { + if (res.locals.isAPI) { + res.status(200).json(config); + } else { + next(err, config); + } + }); + } + var config = {}; config.relative_path = nconf.get('relative_path'); config.socketioTransports = nconf.get('socket.io:transports') || ['polling', 'websocket']; @@ -63,12 +73,7 @@ apiController.getConfig = function(req, res, next) { config.searchEnabled = plugins.hasListeners('filter:search.query'); if (!req.user) { - if (res.locals.isAPI) { - res.status(200).json(config); - } else { - next(null, config); - } - return; + return filterConfig(); } user.getSettings(req.user.uid, function(err, settings) { @@ -80,19 +85,14 @@ apiController.getConfig = function(req, res, next) { config.topicsPerPage = settings.topicsPerPage; config.postsPerPage = settings.postsPerPage; config.notificationSounds = settings.notificationSounds; - config.userLang = settings.language || config.defaultLang; + config.userLang = settings.userLang || config.defaultLang; config.openOutgoingLinksInNewTab = settings.openOutgoingLinksInNewTab; config.topicPostSort = settings.topicPostSort || config.topicPostSort; config.categoryTopicSort = settings.categoryTopicSort || config.categoryTopicSort; config.topicSearchEnabled = settings.topicSearchEnabled || false; - if (res.locals.isAPI) { - res.status(200).json(config); - } else { - next(err, config); - } + filterConfig(); }); - }; diff --git a/src/controllers/categories.js b/src/controllers/categories.js index d5cfda79c8..1ec014240b 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -121,40 +121,37 @@ categoriesController.list = function(req, res, next) { }, categories: function (next) { var uid = req.user ? req.user.uid : 0; - categories.getCategoriesByPrivilege(uid, 'find', function (err, categoryData) { - if (err) { - return next(err); - } - var childCategories = []; - - for(var i=categoryData.length - 1; i>=0; --i) { - - if (Array.isArray(categoryData[i].children) && categoryData[i].children.length) { - childCategories.push.apply(childCategories, categoryData[i].children); - } - - if (categoryData[i].parent && categoryData[i].parent.cid) { - categoryData.splice(i, 1); - } + var categoryData; + async.waterfall([ + function(next) { + categories.getCategoriesByPrivilege(uid, 'find', next); + }, + function(_categoryData, next) { + categoryData = _categoryData; + var allCategories = []; + + categoryData = categoryData.filter(function(category) { + if (!category.parent) { + allCategories.push(category); + } + + if (Array.isArray(category.children) && category.children.length) { + allCategories.push.apply(allCategories, category.children); + } + return category && !category.parent; + }); + + categories.getRecentTopicReplies(allCategories, uid, next); } - - async.parallel([ - function(next) { - categories.getRecentTopicReplies(categoryData, uid, next); - }, - function(next) { - categories.getRecentTopicReplies(childCategories, uid, next); - } - ], function(err) { - next(err, categoryData); - }); + ], function(err) { + next(err, categoryData); }); } }, function (err, data) { if (err) { return next(err); } - + res.render('categories', data); }); }; diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index 7958ace2df..dd5961839b 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -6,12 +6,19 @@ var nconf = require('nconf'), translator = require('../../public/src/translator'), categories = require('../categories'), + plugins = require('../plugins'), meta = require('../meta'); var helpers = {}; helpers.notFound = function(req, res, error) { - if (res.locals.isAPI) { + 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}); } else { res.status(404).render('404', {path: req.path, error: error}); diff --git a/src/controllers/index.js b/src/controllers/index.js index d8ddf81735..6aba26bb1f 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -31,15 +31,21 @@ var Controllers = { Controllers.home = function(req, res, next) { - var route = meta.config.homePageRoute || 'categories'; - if (route === 'categories') { - return Controllers.categories.list(req, res, next); - } else if (route === 'recent') { - Controllers.categories.recent(req, res, next); - } else if (route === 'popular') { - Controllers.categories.popular(req, res, next); + var route = meta.config.homePageRoute || 'categories', + hook = 'action:homepage.get:' + route; + + if (plugins.hasListeners(hook)) { + plugins.fireHook(hook, {req: req, res: res, next: next}); } else { - next(); + if (route === 'categories') { + Controllers.categories.list(req, res, next); + } else if (route === 'recent') { + Controllers.categories.recent(req, res, next); + } else if (route === 'popular') { + Controllers.categories.popular(req, res, next); + } else { + next(); + } } }; @@ -119,9 +125,10 @@ Controllers.register = function(req, res, next) { Controllers.confirmEmail = function(req, res, next) { - user.email.confirm(req.params.code, function (data) { - data.status = data.status === 'ok'; - res.render('confirm', data); + user.email.confirm(req.params.code, function (err) { + res.render('confirm', { + error: err ? err.message : '' + }); }); }; diff --git a/src/controllers/templates.js b/src/controllers/templates.js deleted file mode 100644 index dbf0be4870..0000000000 --- a/src/controllers/templates.js +++ /dev/null @@ -1,90 +0,0 @@ -"use strict"; - -var async = require('async'), - nconf = require('nconf'), - fs = require('fs'), - path = require('path'), - meta = require('../meta'), - plugins = require('../plugins'), - utils = require('../../public/src/utils'), - templatesController = {}; - - -var availableTemplatesCache = null; -var configCache = null; - -templatesController.getTemplatesListing = function(req, res, next) { - async.parallel({ - availableTemplates: function(next) { - getAvailableTemplates(next); - }, - templatesConfig: function(next) { - async.waterfall([ - function(next) { - readConfigFile(next); - }, - function(config, next) { - config.custom_mapping['^/?$'] = meta.config.homePageRoute || 'categories'; - - plugins.fireHook('filter:templates.get_config', config, next); - } - ], next); - }, - }, function(err, results) { - if (err) { - return next(err); - } - - res.json(results); - }); -}; - -function readConfigFile(callback) { - if (configCache) { - return callback(null, configCache); - } - fs.readFile(path.join(nconf.get('views_dir'), 'config.json'), function(err, config) { - if (err) { - return callback(err); - } - try { - config = JSON.parse(config.toString()); - } catch (err) { - return callback(err); - } - configCache = config; - callback(null, config); - }); -} - -function getAvailableTemplates(callback) { - if (availableTemplatesCache) { - return callback(null, availableTemplatesCache); - } - - async.parallel({ - views: function(next) { - utils.walk(nconf.get('views_dir'), next); - }, - extended: function(next) { - plugins.fireHook('filter:templates.get_virtual', [], next); - } - }, function(err, results) { - if (err) { - return callback(err); - } - var availableTemplates = results.views.filter(function(value, index, self) { - return value && self.indexOf(value) === index; - }).map(function(el) { - return el && el.replace(nconf.get('views_dir') + '/', ''); - }); - - availableTemplatesCache = availableTemplates.concat(results.extended); - callback(null, availableTemplatesCache); - }); - -} - - - -module.exports = templatesController; diff --git a/src/database/mongo/sets.js b/src/database/mongo/sets.js index 2868a04c0b..69dfa020a0 100644 --- a/src/database/mongo/sets.js +++ b/src/database/mongo/sets.js @@ -201,7 +201,7 @@ module.exports = function(db, module) { }); callback(null, counts); }); - } + }; module.setRemoveRandom = function(key, callback) { callback = callback || function() {}; diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js index 565189dd8f..5b06e22cfb 100644 --- a/src/database/mongo/sorted.js +++ b/src/database/mongo/sorted.js @@ -204,14 +204,17 @@ module.exports = function(db, module) { if (!key) { return callback(); } - var scoreQuery = {}; + + var query = {_key: key}; if (min !== '-inf') { - scoreQuery.$gte = min; + query.score = {$gte: min}; } if (max !== '+inf') { - scoreQuery.$lte = max; + query.score = query.score || {}; + query.score.$lte = max; } - db.collection('objects').count({_key: key, score: scoreQuery}, function(err, count) { + + db.collection('objects').count(query, function(err, count) { callback(err, count ? count : 0); }); }; diff --git a/src/database/redis/helpers.js b/src/database/redis/helpers.js index 26e2169c57..f1fe02b3be 100644 --- a/src/database/redis/helpers.js +++ b/src/database/redis/helpers.js @@ -34,6 +34,6 @@ helpers.resultsToBool = function(results) { results[i] = results[i] === 1; } return results; -} +}; module.exports = helpers; \ No newline at end of file diff --git a/src/emailer.js b/src/emailer.js index 557de96f6e..b358e170fb 100644 --- a/src/emailer.js +++ b/src/emailer.js @@ -41,7 +41,7 @@ var fs = require('fs'), return callback(err); } async.map([results.html, results.plaintext, params.subject], function(raw, next) { - translator.translate(raw, results.settings.language || meta.config.defaultLang || 'en_GB', function(translated) { + translator.translate(raw, results.settings.userLang || meta.config.defaultLang || 'en_GB', function(translated) { next(undefined, translated); }); }, function(err, translated) { diff --git a/src/file.js b/src/file.js index a3b594f326..543c5011fa 100644 --- a/src/file.js +++ b/src/file.js @@ -27,10 +27,7 @@ file.saveFileToLocal = function(filename, folder, tempPath, callback) { }); }); - os.on('error', function (err) { - winston.error(err.message); - callback(err); - }); + os.on('error', callback); is.pipe(os); }; diff --git a/src/groups.js b/src/groups.js index 54ff60a195..452b47d56c 100644 --- a/src/groups.js +++ b/src/groups.js @@ -135,7 +135,19 @@ var async = require('async'), userObj.isOwner = isOwner; next(null, userObj); }); - }, next); + }, function(err, users) { + if (err) { + return next(); + } + + next(null, users.sort(function(a, b) { + if (a.isOwner === b.isOwner) { + return 0; + } else { + return a.isOwner && !b.isOwner ? -1 : 1; + } + })); + }); } ], next); } else { @@ -212,10 +224,11 @@ var async = require('async'), if (err) { return callback(err); } - results.base.name = validator.escape(results.base.name); - results.base.description = validator.escape(results.base.description); + results.base.name = !options.unescape ? validator.escape(results.base.name) : results.base.name; + results.base.description = options.unescape ? validator.escape(results.base.description) : results.base.description; results.base.descriptionParsed = descriptionParsed; - results.base.userTitle = validator.escape(results.base.userTitle); + results.base.userTitle = options.unescape ? validator.escape(results.base.userTitle) : results.base.userTitle; + results.base.userTitleEnabled = results.base.userTitleEnabled ? !!parseInt(results.base.userTitleEnabled, 10) : true; results.base.createtimeISO = utils.toISOString(results.base.createtime); results.base.members = results.users.filter(Boolean); results.base.pending = results.pending.filter(Boolean); @@ -235,8 +248,8 @@ var async = require('async'), plugins.fireHook('filter:group.get', {group: results.base}, function(err, data) { callback(err, data ? data.group : null); - }); - }); + }); + }); }); }; @@ -525,6 +538,7 @@ var async = require('async'), var payload = { userTitle: values.userTitle || '', + userTitleEnabled: values.userTitleEnabled === true ? '1' : '0', description: values.description || '', icon: values.icon || '', labelColor: values.labelColor || '#000000', @@ -651,7 +665,14 @@ var async = require('async'), } Groups.destroy = function(groupName, callback) { - Groups.get(groupName, {}, function(err, groupObj) { + Groups.getGroupsData([groupName], function(err, groupsData) { + if (err) { + return callback(err); + } + if (!Array.isArray(groupsData) || !groupsData[0]) { + return callback(); + } + var groupObj = groupsData[0]; plugins.fireHook('action:group.destroy', groupObj); async.parallel([ @@ -879,6 +900,8 @@ var async = require('async'), } groupData = groupData.map(function(group) { if (group) { + group.userTitle = validator.escape(group.userTitle) || validator.escape(group.name); + group.userTitleEnabled = group.userTitleEnabled ? parseInt(group.userTitleEnabled, 10) === 1 : true; group.labelColor = group.labelColor || '#000000'; group.createtimeISO = utils.toISOString(group.createtime); group.hidden = parseInt(group.hidden, 10) === 1; @@ -890,10 +913,10 @@ var async = require('async'), } return group; }); - + plugins.fireHook('filter:groups.get', {groups: groupData}, function(err, data) { - callback(err, data ? data.groups : null); - }); + callback(err, data ? data.groups : null); + }); }); }; @@ -913,7 +936,7 @@ var async = require('async'), } groupData = groupData.filter(function(group) { - return group && parseInt(group.hidden, 10) !== 1 && !!group.userTitle; + return group && !group.hidden; }); var groupSets = groupData.map(function(group) { diff --git a/src/install.js b/src/install.js index d3df90b267..b696c5cdf8 100644 --- a/src/install.js +++ b/src/install.js @@ -385,6 +385,13 @@ function createCategories(next) { }); } +function createMenuItems(next) { + var navigation = require('./navigation/admin'), + data = require('../install/data/navigation.json'); + + navigation.save(data, next); +} + function createWelcomePost(next) { var db = require('./database'), Topics = require('./topics'); @@ -463,6 +470,7 @@ install.setup = function (callback) { enableDefaultTheme, createAdministrator, createCategories, + createMenuItems, createWelcomePost, enableDefaultPlugins, setCopyrightWidget, diff --git a/src/meta/logs.js b/src/meta/logs.js index 01ee677887..0b38b61a34 100644 --- a/src/meta/logs.js +++ b/src/meta/logs.js @@ -20,9 +20,9 @@ module.exports = function(Meta) { callback(undefined, logs || ''); }); - } + }; Meta.logs.clear = function(callback) { fs.truncate(this.path, 0, callback); - } + }; }; \ No newline at end of file diff --git a/src/meta/templates.js b/src/meta/templates.js index af2f8664a6..78596d59a4 100644 --- a/src/meta/templates.js +++ b/src/meta/templates.js @@ -99,7 +99,7 @@ Templates.compile = function(callback) { matches = null, regex = /[ \t]*[ \t]*/; - while(matches = file.match(regex)) { + while((matches = file.match(regex)) !== null) { var partial = "/" + matches[1]; if (paths[partial] && relativePath !== partial) { diff --git a/src/middleware/admin.js b/src/middleware/admin.js index a23781fdef..1d6c0dae6a 100644 --- a/src/middleware/admin.js +++ b/src/middleware/admin.js @@ -32,77 +32,86 @@ middleware.isAdmin = function(req, res, next) { }; middleware.buildHeader = function(req, res, next) { + res.locals.renderAdminHeader = true; + + async.parallel({ + config: function(next) { + controllers.api.getConfig(req, res, next); + }, + footer: function(next) { + app.render('admin/footer', {}, next); + } + }, function(err, results) { + if (err) { + return next(err); + } + + res.locals.config = results.config; + res.locals.adminFooter = results.footer; + next(); + }); +}; + +middleware.renderHeader = function(req, res, next) { var uid = req.user ? req.user.uid : 0; - async.parallel([ - function(next) { - var custom_header = { - 'plugins': [], - 'authentication': [] - }; - user.getUserFields(uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed'], function(err, userData) { - if (err) { - return next(err); - } - - userData.uid = uid; - userData['email:confirmed'] = parseInt(userData['email:confirmed'], 10) === 1; - - async.parallel({ - scripts: function(next) { - plugins.fireHook('filter:admin.scripts.get', [], function(err, scripts) { - if (err) { - return next(err); - } - var arr = []; - scripts.forEach(function(script) { - arr.push({src: nconf.get('url') + script}); - }); - - next(null, arr); - }); - }, - custom_header: function(next) { - plugins.fireHook('filter:admin.header.build', custom_header, next); - }, - config: function(next) { - controllers.api.getConfig(req, res, next); - } - }, function(err, results) { + var custom_header = { + 'plugins': [], + 'authentication': [] + }; + + user.getUserFields(uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed'], function(err, userData) { + if (err) { + return next(err); + } + + userData.uid = uid; + userData['email:confirmed'] = parseInt(userData['email:confirmed'], 10) === 1; + + async.parallel({ + scripts: function(next) { + plugins.fireHook('filter:admin.scripts.get', [], function(err, scripts) { if (err) { return next(err); } - res.locals.config = results.config; - - var data = { - relative_path: nconf.get('relative_path'), - configJSON: JSON.stringify(results.config), - user: userData, - userJSON: JSON.stringify(userData), - 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 - }; - - app.render('admin/header', data, function(err, template) { - if (err) { - return next(err); - } - res.locals.adminHeader = template; - next(); + var arr = []; + scripts.forEach(function(script) { + arr.push({src: nconf.get('url') + script}); }); + + next(null, arr); }); - }); - }, - function(next) { - app.render('admin/footer', {}, function(err, template) { - res.locals.adminFooter = template; - next(err); - }); - } - ], next); + }, + custom_header: function(next) { + plugins.fireHook('filter:admin.header.build', custom_header, next); + }, + config: function(next) { + controllers.api.getConfig(req, res, next); + } + }, function(err, results) { + if (err) { + return next(err); + } + res.locals.config = results.config; + + var data = { + relative_path: nconf.get('relative_path'), + configJSON: JSON.stringify(results.config), + user: userData, + userJSON: JSON.stringify(userData), + 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, + }; + + data.template = {name: res.locals.template}; + data.template[res.locals.template] = true; + + app.render('admin/header', data, next); + }); + }); }; module.exports = function(webserver) { diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 349a227215..85cc10c908 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -12,6 +12,7 @@ var app, nconf = require('nconf'), plugins = require('./../plugins'), + navigation = require('./../navigation'), meta = require('./../meta'), translator = require('./../../public/src/translator'), user = require('./../user'), @@ -215,12 +216,7 @@ middleware.buildHeader = function(req, res, next) { middleware.renderHeader = function(req, res, callback) { var uid = req.user ? parseInt(req.user.uid, 10) : 0; - var custom_header = { - uid: uid, - 'navigation': [] - }; - - plugins.fireHook('filter:header.build', custom_header, function(err, custom_header) { + navigation.get(function(err, menuItems) { if (err) { return callback(err); } @@ -258,7 +254,7 @@ middleware.renderHeader = function(req, res, callback) { 'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '', 'brand:logo': meta.config['brand:logo'] || '', 'brand:logo:display': meta.config['brand:logo']?'':'hide', - navigation: custom_header.navigation, + navigation: menuItems, allowRegistration: meta.config.allowRegistration === undefined || parseInt(meta.config.allowRegistration, 10) === 1, searchEnabled: plugins.hasListeners('filter:search.query') }; @@ -288,7 +284,6 @@ middleware.renderHeader = function(req, res, callback) { href: nconf.get('relative_path') + '/favicon.ico' }); - async.parallel({ customCSS: function(next) { templateValues.useCustomCSS = parseInt(meta.config.useCustomCSS, 10) === 1; @@ -307,7 +302,7 @@ middleware.renderHeader = function(req, res, callback) { if (err) { return next(err); } - meta.title.build(req.url.slice(1), settings.language, res.locals, next); + meta.title.build(req.url.slice(1), settings.userLang, res.locals, next); }); } else { meta.title.build(req.url.slice(1), meta.config.defaultLang, res.locals, next); @@ -343,7 +338,7 @@ middleware.renderHeader = function(req, res, callback) { results.user.isAdmin = results.isAdmin || false; results.user.uid = parseInt(results.user.uid, 10); results.user['email:confirmed'] = parseInt(results.user['email:confirmed'], 10) === 1; - + templateValues.browserTitle = results.title; templateValues.isAdmin = results.user.isAdmin; templateValues.user = results.user; @@ -352,6 +347,9 @@ middleware.renderHeader = function(req, res, callback) { templateValues.customJS = results.customJS; templateValues.maintenanceHeader = parseInt(meta.config.maintenanceMode, 10) === 1 && !results.isAdmin; + templateValues.template = {name: res.locals.template}; + templateValues.template[res.locals.template] = true; + app.render('header', templateValues, callback); }); }); @@ -380,8 +378,9 @@ middleware.processRender = function(req, res, next) { } options.loggedIn = req.user ? parseInt(req.user.uid, 10) !== 0 : false; - options.template = {}; + options.template = {name: template}; options.template[template] = true; + res.locals.template = template; if ('function' !== typeof fn) { fn = defaultFn; @@ -401,20 +400,18 @@ middleware.processRender = function(req, res, next) { str = str + res.locals.adminFooter; } - if (res.locals.renderHeader) { - middleware.renderHeader(req, res, function(err, template) { + if (res.locals.renderHeader || res.locals.renderAdminHeader) { + var method = res.locals.renderHeader ? middleware.renderHeader : middleware.admin.renderHeader; + method(req, res, function(err, template) { + if (err) { + return fn(err); + } str = template + str; var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB'; translator.translate(str, language, function(translated) { fn(err, translated); }); }); - } else if (res.locals.adminHeader) { - str = res.locals.adminHeader + str; - var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB'; - translator.translate(str, language, function(translated) { - fn(err, translated); - }); } else { fn(err, str); } @@ -457,7 +454,6 @@ middleware.maintenanceMode = function(req, res, next) { '/nodebb.min.js', '/vendor/fontawesome/fonts/fontawesome-webfont.woff', '/src/modules/[\\w]+\.js', - '/api/get_templates_listing', '/api/login', '/api/?', '/language/.+' diff --git a/src/navigation/admin.js b/src/navigation/admin.js new file mode 100644 index 0000000000..a0f62035b4 --- /dev/null +++ b/src/navigation/admin.js @@ -0,0 +1,65 @@ +"use strict"; + + +var admin = {}, + async = require('async'), + plugins = require('../plugins'), + db = require('../database'), + translator = require('../../public/src/translator'); + + +admin.save = function(data, callback) { + var order = Object.keys(data), + items = data.map(function(item, idx) { + var data = {}; + + for (var i in item) { + if (item.hasOwnProperty(i)) { + item[i] = typeof item[i] === 'string' ? translator.escape(item[i]) : item[i]; + } + } + + data[idx] = item; + return JSON.stringify(data); + }); + + async.waterfall([ + function(next) { + db.delete('navigation:enabled', next); + }, + function(next) { + db.sortedSetAdd('navigation:enabled', order, items, next); + } + ], callback); +}; + +admin.getAdmin = function(callback) { + async.parallel({ + enabled: admin.get, + available: getAvailable + }, callback); +}; + +admin.get = function(callback) { + db.getSortedSetRange('navigation:enabled', 0, -1, function(err, data) { + callback(err, data.map(function(item, idx) { + return JSON.parse(item)[idx]; + })); + }); +}; + +function getAvailable(callback) { + var core = require('../../install/data/navigation.json').map(function(item) { + item.core = true; + return item; + }); + + // DEPRECATION: backwards compatibility for filter:header.build, will be removed soon. + plugins.fireHook('filter:header.build', {navigation: []}, function(err, data) { + core = core.concat(data.navigation); + + plugins.fireHook('filter:navigation.available', core, callback); + }); +} + +module.exports = admin; \ No newline at end of file diff --git a/src/navigation/index.js b/src/navigation/index.js new file mode 100644 index 0000000000..98d575a261 --- /dev/null +++ b/src/navigation/index.js @@ -0,0 +1,30 @@ +"use strict"; + + +var navigation = {}, + plugins = require('../plugins'), + db = require('../database'), + admin = require('./admin'), + translator = require('../../public/src/translator'); + + +navigation.get = function(callback) { + admin.get(function(err, data) { + callback(err, data + .filter(function(item) { + return item.enabled; + }) + .map(function(item) { + for (var i in item) { + if (item.hasOwnProperty(i)) { + item[i] = translator.unescape(item[i]); + } + } + + return item; + })); + }); +}; + + +module.exports = navigation; \ No newline at end of file diff --git a/src/plugins.js b/src/plugins.js index cb67084b28..4d384f3714 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -209,6 +209,7 @@ var fs = require('fs'), pluginMap[plugin.id].description = plugin.description; pluginMap[plugin.id].url = pluginMap[plugin.id].url || plugin.url; pluginMap[plugin.id].installed = true; + pluginMap[plugin.id].isTheme = !!plugin.id.match('nodebb-theme-'); pluginMap[plugin.id].error = plugin.error || false; pluginMap[plugin.id].active = plugin.active; pluginMap[plugin.id].version = plugin.version; diff --git a/src/plugins/install.js b/src/plugins/install.js index 6d6865301a..5185d38a70 100644 --- a/src/plugins/install.js +++ b/src/plugins/install.js @@ -113,7 +113,16 @@ module.exports = function(Plugins) { require('npm').load({}, next); }, function(res, next) { - require('npm').commands.install([id + '@' + (version || 'latest')], next); + require('npm').commands.install([id + '@' + (version || 'latest')], function(err, a, b) { + next(err); + }); + }, + function(next) { + Plugins.isActive(id, next); + }, + function(isActive, next) { + meta.reloadRequired = isActive; + next(null, isActive); } ], callback); } diff --git a/src/plugins/load.js b/src/plugins/load.js index 4bd432f582..89b38fdc64 100644 --- a/src/plugins/load.js +++ b/src/plugins/load.js @@ -22,15 +22,7 @@ module.exports = function(Plugins) { return callback(); } - if (pluginData.compatibility && semver.validRange(pluginData.compatibility)) { - if (!semver.gtr(pkg.version, pluginData.compatibility)) { - // NodeBB may not be new enough to run this plugin - process.stdout.write('\n'); - winston.warn('[plugins/' + pluginData.id + '] This plugin may not be compatible with your version of NodeBB. This may cause unintended behaviour or crashing.'); - winston.warn('[plugins/' + pluginData.id + '] In the event of an unresponsive NodeBB caused by this plugin, run ./nodebb reset plugin="' + pluginData.id + '".'); - process.stdout.write('\n'); - } - } + versionWarning(pluginData); async.parallel([ function(next) { @@ -63,6 +55,23 @@ module.exports = function(Plugins) { }); }; + function versionWarning(pluginData) { + function display() { + process.stdout.write('\n'); + winston.warn('[plugins/' + pluginData.id + '] This plugin may not be compatible with your version of NodeBB. This may cause unintended behaviour or crashing.'); + winston.warn('[plugins/' + pluginData.id + '] In the event of an unresponsive NodeBB caused by this plugin, run ./nodebb reset plugin="' + pluginData.id + '".'); + process.stdout.write('\n'); + } + + if (pluginData.nbbpm && pluginData.nbbpm.compatibility && semver.validRange(pluginData.nbbpm.compatibility)) { + if (!semver.gtr(pkg.version, pluginData.nbbpm.compatibility)) { + display(); + } + } else { + display(); + } + } + function registerHooks(pluginData, pluginPath, callback) { function libraryNotFound() { winston.warn('[plugins.reload] Library not found for plugin: ' + pluginData.id); diff --git a/src/posts/user.js b/src/posts/user.js index 02b7816ed9..de563d86b5 100644 --- a/src/posts/user.js +++ b/src/posts/user.js @@ -17,6 +17,9 @@ module.exports = function(Posts) { groups: function(next) { groups.getUserGroups(uids, next); }, + userSettings: function(next){ + user.getMultipleUserSettings(uids, next); + }, userData: function(next) { user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned', 'status'], next); }, @@ -29,10 +32,14 @@ module.exports = function(Posts) { } var userData = results.userData; - for(var i=0; i postEditDuration * 1000) { + return callback(null, {isEditExpired: true}); + } + topics.isLocked(postData.tid, next); + }, + function(isLocked, next) { + if (isLocked) { + return callback(null, {isLocked: true}); + } + helpers.some([ + function(next) { + posts.isOwner(pid, uid, next); + }, + function(next) { + helpers.hasEnoughReputationFor(['privileges:manage_content', 'privileges:manage_topic'], uid, next); + } + ], function(err, editable) { + next(err, {editable: editable}); + }); + } + ], callback); + } + function isPostTopicLocked(pid, callback) { posts.getPostField(pid, 'tid', function(err, tid) { if (err) { diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 6136e4f4b3..30bed9e0e8 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -15,7 +15,7 @@ rewards.save = function(data, callback) { data.id = id; - async.parallel([ + async.waterfall([ function(next) { rewards.delete(data, next); }, diff --git a/src/routes/admin.js b/src/routes/admin.js index 5175059493..4a7e7ef460 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -3,19 +3,18 @@ var express = require('express'); -function apiRoutes(app, middleware, controllers) { - // todo, needs to be in api namespace - app.get('/users/csv', middleware.authenticate, controllers.admin.users.getCSV); +function apiRoutes(router, middleware, controllers) { + router.get('/users/csv', middleware.authenticate, controllers.admin.users.getCSV); var multipart = require('connect-multiparty'); var multipartMiddleware = multipart(); var middlewares = [multipartMiddleware, middleware.validateFiles, middleware.applyCSRF, middleware.authenticate]; - app.post('/category/uploadpicture', middlewares, controllers.admin.uploads.uploadCategoryPicture); - app.post('/uploadfavicon', middlewares, controllers.admin.uploads.uploadFavicon); - app.post('/uploadlogo', middlewares, controllers.admin.uploads.uploadLogo); - app.post('/uploadgravatardefault', middlewares, controllers.admin.uploads.uploadGravatarDefault); + router.post('/category/uploadpicture', middlewares, controllers.admin.uploads.uploadCategoryPicture); + router.post('/uploadfavicon', middlewares, controllers.admin.uploads.uploadFavicon); + router.post('/uploadlogo', middlewares, controllers.admin.uploads.uploadLogo); + router.post('/uploadgravatardefault', middlewares, controllers.admin.uploads.uploadGravatarDefault); } function adminRouter(middleware, controllers) { @@ -25,8 +24,6 @@ function adminRouter(middleware, controllers) { addRoutes(router, middleware, controllers); - apiRoutes(router, middleware, controllers); - return router; } @@ -35,6 +32,8 @@ function apiRouter(middleware, controllers) { addRoutes(router, middleware, controllers); + apiRoutes(router, middleware, controllers); + return router; } @@ -43,6 +42,8 @@ function addRoutes(router, middleware, controllers) { router.get('/general/dashboard', controllers.admin.home); router.get('/general/languages', controllers.admin.languages.get); router.get('/general/sounds', controllers.admin.sounds.get); + router.get('/general/navigation', controllers.admin.navigation.get); + router.get('/general/homepage', controllers.admin.homepage.get); router.get('/manage/categories', controllers.admin.categories.active); router.get('/manage/categories/active', controllers.admin.categories.active); diff --git a/src/routes/api.js b/src/routes/api.js index ef1c297e49..88c3686850 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -4,8 +4,7 @@ var express = require('express'), posts = require('../posts'), categories = require('../categories'), - uploadsController = require('../controllers/uploads'), - templatesController = require('../controllers/templates'); + uploadsController = require('../controllers/uploads'); module.exports = function(app, middleware, controllers) { @@ -17,7 +16,6 @@ module.exports = function(app, middleware, controllers) { router.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID); router.get('/post/:pid', controllers.posts.getPost); - router.get('/get_templates_listing', templatesController.getTemplatesListing); router.get('/categories/:cid/moderators', getModerators); router.get('/recent/posts/:term?', getRecentPosts); diff --git a/src/routes/authentication.js b/src/routes/authentication.js index 5b8a3ffe5f..6a5bc87723 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -38,6 +38,13 @@ plugins.ready(function() { loginStrategies.length = 0; + if (plugins.hasListeners('action:auth.overrideLogin')) { + winston.warn('[authentication] Login override detected, skipping local login strategy.'); + plugins.fireHook('action:auth.overrideLogin'); + } else { + passport.use(new passportLocal({passReqToCallback: true}, Auth.login)); + } + plugins.fireHook('filter:auth.init', loginStrategies, function(err) { if (err) { winston.error('filter:auth.init - plugin failure'); @@ -110,8 +117,6 @@ ], next); }; - passport.use(new passportLocal({passReqToCallback: true}, Auth.login)); - passport.serializeUser(function(user, done) { done(null, user.uid); }); @@ -132,6 +137,10 @@ req.session.returnTo = req.body.returnTo; } + if (plugins.hasListeners('action:auth.overrideLogin')) { + return Auth.continueLogin(req, res, next); + }; + var loginWith = meta.config.allowLoginWith || 'username-email'; if (req.body.username && utils.isEmailValid(req.body.username) && loginWith.indexOf('email') !== -1) { @@ -140,16 +149,16 @@ return next(err); } req.body.username = username ? username : req.body.username; - continueLogin(req, res, next); + Auth.continueLogin(req, res, next); }); } else if (loginWith.indexOf('username') !== -1 && !validator.isEmail(req.body.username)) { - continueLogin(req, res, next); + Auth.continueLogin(req, res, next); } else { res.status(500).send('[[error:wrong-login-type-' + loginWith + ']]'); } } - function continueLogin(req, res, next) { + Auth.continueLogin = function(req, res, next) { passport.authenticate('local', function(err, userData, info) { if (err) { return res.status(403).send(err.message); @@ -196,7 +205,7 @@ } }); })(req, res, next); - } + }; function register(req, res) { if (parseInt(meta.config.allowRegistration, 10) === 0) { diff --git a/src/routes/helpers.js b/src/routes/helpers.js new file mode 100644 index 0000000000..31f3ece5b2 --- /dev/null +++ b/src/routes/helpers.js @@ -0,0 +1,12 @@ +'use strict'; + +var helpers = {}; + +helpers.setupPageRoute = function(router, name, middleware, middlewares, controller) { + middlewares = middlewares.concat([middleware.pageView]); + + router.get(name, middleware.buildHeader, middlewares, controller); + router.get('/api' + name, middlewares, controller); +}; + +module.exports = helpers; \ No newline at end of file diff --git a/src/routes/index.js b/src/routes/index.js index 6bb83ee556..a6c51b17c9 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -13,9 +13,10 @@ var nconf = require('nconf'), adminRoutes = require('./admin'), feedRoutes = require('./feeds'), pluginRoutes = require('./plugins'), - authRoutes = require('./authentication'); - + authRoutes = require('./authentication'), + helpers = require('./helpers'); +var setupPageRoute = helpers.setupPageRoute; function mainRoutes(app, middleware, controllers) { setupPageRoute(app, '/', middleware, [], controllers.home); @@ -99,13 +100,6 @@ function groupRoutes(app, middleware, controllers) { setupPageRoute(app, '/groups/:slug/members', middleware, middlewares, controllers.groups.members); } -function setupPageRoute(router, name, middleware, middlewares, controller) { - middlewares = middlewares.concat([middleware.pageView]); - - router.get(name, middleware.buildHeader, middlewares, controller); - router.get('/api' + name, middlewares, controller); -} - module.exports = function(app, middleware) { var router = express.Router(), pluginRouter = express.Router(), @@ -179,30 +173,38 @@ module.exports = function(app, middleware) { function handle404(app, middleware) { app.use(function(req, res, next) { - var relativePath = nconf.get('relative_path'); - var isLanguage = new RegExp('^' + relativePath + '/language/[\\w]{2,}/.*.json'), - isClientScript = new RegExp('^' + relativePath + '\\/src\\/.+\\.js'); - - if (isClientScript.test(req.url)) { - res.type('text/javascript').status(200).send(''); - } else if (isLanguage.test(req.url)) { - res.status(200).json({}); - } else if (req.accepts('html')) { - if (process.env.NODE_ENV === 'development') { - winston.warn('Route requested but not found: ' + req.url); + if (!plugins.hasListeners('action:meta.override404')) { + var relativePath = nconf.get('relative_path'); + var isLanguage = new RegExp('^' + relativePath + '/language/[\\w]{2,}/.*.json'), + isClientScript = new RegExp('^' + relativePath + '\\/src\\/.+\\.js'); + + if (isClientScript.test(req.url)) { + res.type('text/javascript').status(200).send(''); + } else if (isLanguage.test(req.url)) { + res.status(200).json({}); + } else if (req.accepts('html')) { + if (process.env.NODE_ENV === 'development') { + winston.warn('Route requested but not found: ' + req.url); + } + + res.status(404); + + if (res.locals.isAPI) { + return res.json({path: req.path, error: 'not-found'}); + } + + middleware.buildHeader(req, res, function() { + res.render('404', {path: req.path}); + }); + } else { + res.status(404).type('txt').send('Not found'); } - - res.status(404); - - if (res.locals.isAPI) { - return res.json({path: req.path, error: 'not-found'}); - } - - middleware.buildHeader(req, res, function() { - res.render('404', {path: req.path}); - }); } else { - res.status(404).type('txt').send('Not found'); + plugins.fireHook('action:meta.override404', { + req: req, + res: res, + error: {} + }); } }); } diff --git a/src/search.js b/src/search.js index 190a764bf2..8ccdf77d78 100644 --- a/src/search.js +++ b/src/search.js @@ -58,14 +58,14 @@ function searchInContent(query, data, callback) { async.parallel({ pids: function(next) { if (data.searchIn === 'posts' || data.searchIn === 'titlesposts') { - searchQuery('post', query, next); + search.searchQuery('post', query, next); } else { next(null, []); } }, tids: function(next) { if (data.searchIn === 'titles' || data.searchIn === 'titlesposts') { - searchQuery('topic', query, next); + search.searchQuery('topic', query, next); } else { next(null, []); } @@ -93,6 +93,7 @@ function searchInContent(query, data, callback) { mainPids.push(pid); } }); + privileges.posts.filter('read', mainPids, data.uid, next); }, function(pids, next) { @@ -475,10 +476,10 @@ function getMainPids(tids, callback) { }); } -function searchQuery(index, query, callback) { +search.searchQuery = function(index, query, callback) { plugins.fireHook('filter:search.query', { index: index, query: query }, callback); -} +}; diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js index 30782f4d6e..dcbda783aa 100644 --- a/src/socket.io/admin.js +++ b/src/socket.io/admin.js @@ -26,6 +26,7 @@ var async = require('async'), groups: require('./admin/groups'), tags: require('./admin/tags'), rewards: require('./admin/rewards'), + navigation: require('./admin/navigation'), themes: {}, plugins: {}, widgets: {}, diff --git a/src/socket.io/admin/categories.js b/src/socket.io/admin/categories.js index 55d8300819..5659b8aca9 100644 --- a/src/socket.io/admin/categories.js +++ b/src/socket.io/admin/categories.js @@ -68,7 +68,7 @@ Categories.getPrivilegeSettings = function(socket, cid, callback) { async.reduce(privileges, [], function(members, privilege, next) { groups.get('cid:' + cid + ':privileges:' + privilege, { expand: true }, function(err, groupObj) { if (err || !groupObj) { - return next(err, members); + return next(null, members); } members = members.concat(groupObj.members); diff --git a/src/socket.io/admin/groups.js b/src/socket.io/admin/groups.js index 9700bee3ca..12dae2ceb4 100644 --- a/src/socket.io/admin/groups.js +++ b/src/socket.io/admin/groups.js @@ -17,7 +17,8 @@ Groups.create = function(socket, data, callback) { Groups.get = function(socket, groupName, callback) { groups.get(groupName, { - expand: true + expand: true, + unescape: true }, callback); }; diff --git a/src/socket.io/admin/navigation.js b/src/socket.io/admin/navigation.js new file mode 100644 index 0000000000..0f3f7c168e --- /dev/null +++ b/src/socket.io/admin/navigation.js @@ -0,0 +1,10 @@ +"use strict"; + +var navigationAdmin = require('../../navigation/admin'), + SocketNavigation = {}; + +SocketNavigation.save = function(socket, data, callback) { + navigationAdmin.save(data, callback); +}; + +module.exports = SocketNavigation; \ No newline at end of file diff --git a/src/socket.io/index.js b/src/socket.io/index.js index aed324d520..337320e226 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -70,7 +70,7 @@ function onConnect(socket) { if (err || !userData) { return; } - + socket.emit('event:connect'); if (userData.status !== 'offline') { socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.status || 'online'}); @@ -163,34 +163,31 @@ function requireModules() { }); } -function authorize(socket, next) { - var handshake = socket.request, - sessionID; +function authorize(socket, callback) { + var handshake = socket.request; if (!handshake) { - return next(new Error('[[error:not-authorized]]')); + return callback(new Error('[[error:not-authorized]]')); } - cookieParser(handshake, {}, function(err) { - if (err) { - return next(err); + async.waterfall([ + function(next) { + cookieParser(handshake, {}, next); + }, + function(next) { + db.sessionStore.get(handshake.signedCookies['express.sid'], function(err, sessionData) { + if (err) { + return next(err); + } + if (sessionData && sessionData.passport && sessionData.passport.user) { + socket.uid = parseInt(sessionData.passport.user, 10); + } else { + socket.uid = 0; + } + next(); + }); } - - var sessionID = handshake.signedCookies['express.sid']; - - db.sessionStore.get(sessionID, function(err, sessionData) { - if (err) { - return next(err); - } - - if (sessionData && sessionData.passport && sessionData.passport.user) { - socket.uid = parseInt(sessionData.passport.user, 10); - } else { - socket.uid = 0; - } - next(); - }); - }); + ], callback); } function addRedisAdapter(io) { @@ -201,7 +198,7 @@ function addRedisAdapter(io) { var sub = redis.connect({return_buffers: true}); io.adapter(redisAdapter({pubClient: pub, subClient: sub})); - } else { + } else if (nconf.get('isCluster') === 'true') { winston.warn('[socket.io] Clustering detected, you are advised to configure Redis as a websocket store.'); } } diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js index 331678473e..c801381a1f 100644 --- a/src/socket.io/meta.js +++ b/src/socket.io/meta.js @@ -40,7 +40,7 @@ SocketMeta.buildTitle = function(socket, text, callback) { if (err) { return callback(err); } - meta.title.build(text, settings.language, {}, callback); + meta.title.build(text, settings.userLang, {}, callback); }); } else { meta.title.build(text, meta.config.defaultLang, {}, callback); diff --git a/src/socket.io/plugins.js b/src/socket.io/plugins.js index 52dfeecc69..a4ee9bbe89 100644 --- a/src/socket.io/plugins.js +++ b/src/socket.io/plugins.js @@ -7,7 +7,7 @@ var SocketPlugins = {}; How? From your plugin: - var SocketPlugins = module.parent.require('./socket.io/plugins'); + var SocketPlugins = require.main.require('./src/socket.io/modules'); SocketPlugins.myPlugin = {}; SocketPlugins.myPlugin.myMethod = function() { ... }; diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index 5cc6cb3bad..a4ee937429 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -518,14 +518,6 @@ SocketTopics.getPageCount = function(socket, tid, callback) { topics.getPageCount(tid, socket.uid, callback); }; -SocketTopics.getTidPage = function(socket, tid, callback) { - topics.getTidPage(tid, socket.uid, callback); -}; - -SocketTopics.getTidIndex = function(socket, tid, callback) { - categories.getTopicIndex(tid, callback); -}; - SocketTopics.searchTags = function(socket, data, callback) { topics.searchTags(data, callback); }; diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 15aa0e2ba6..7170cf27d0 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -282,28 +282,24 @@ SocketUser.follow = function(socket, data, callback) { return; } - toggleFollow('follow', socket.uid, data.uid, function(err) { - if (err) { - return callback(err); - } - - user.getUserFields(socket.uid, ['username', 'userslug'], function(err, userData) { - if (err) { - return callback(err); - } - + async.waterfall([ + function(next) { + toggleFollow('follow', socket.uid, data.uid, next); + }, + function(next) { + user.getUserFields(socket.uid, ['username', 'userslug'], next); + }, + function(userData, next) { notifications.create({ bodyShort: '[[notifications:user_started_following_you, ' + userData.username + ']]', nid: 'follow:' + data.uid + ':uid:' + socket.uid, from: socket.uid - }, function(err, notification) { - if (!err && notification) { - notifications.push(notification, [data.uid]); - } - callback(err); - }); - }); - }); + }, next); + }, + function(notification, next) { + notifications.push(notification, [data.uid], next); + } + ], callback); }; SocketUser.unfollow = function(socket, data, callback) { diff --git a/src/topics.js b/src/topics.js index a9514dabba..274ffbcf70 100644 --- a/src/topics.js +++ b/src/topics.js @@ -25,6 +25,7 @@ var async = require('async'), require('./topics/follow')(Topics); require('./topics/tags')(Topics); require('./topics/teaser')(Topics); + require('./topics/suggested')(Topics); Topics.exists = function(tid, callback) { db.isSortedSetMember('topics:tid', tid, callback); diff --git a/src/topics/suggested.js b/src/topics/suggested.js new file mode 100644 index 0000000000..ff6e16aada --- /dev/null +++ b/src/topics/suggested.js @@ -0,0 +1,74 @@ + +'use strict'; + +var async = require('async'), + _ = require('underscore'), + + categories = require('../categories'), + search = require('../search'), + db = require('../database'); + + +module.exports = function(Topics) { + + Topics.getSuggestedTopics = function(tid, uid, start, end, callback) { + async.parallel({ + tagTids: function(next) { + getTidsWithSameTags(tid, next); + }, + searchTids: function(next) { + getSearchTids(tid, next); + }, + categoryTids: function(next) { + getCategoryTids(tid, next); + } + }, function(err, results) { + if (err) { + return callback(err); + } + var tids = results.tagTids.concat(results.searchTids).concat(results.categoryTids); + tids = tids.filter(function(_tid, index, array) { + return parseInt(_tid, 10) !== parseInt(tid, 10) && array.indexOf(_tid) === index; + }).slice(start, end + 1); + + Topics.getTopics(tids, uid, callback); + }); + }; + + function getTidsWithSameTags(tid, callback) { + async.waterfall([ + function(next) { + Topics.getTopicTags(tid, next); + }, + function(tags, next) { + async.map(tags, function(tag, next) { + Topics.getTagTids(tag, 0, -1, next); + }, next); + }, + function(data, next) { + next(null, _.unique(_.flatten(data))); + } + ], callback); + } + + function getSearchTids(tid, callback) { + async.waterfall([ + function(next) { + Topics.getTopicField(tid, 'title', next); + }, + function(title, next) { + search.searchQuery('topic', title, next); + } + ], callback); + } + + function getCategoryTids(tid, callback) { + Topics.getTopicField(tid, 'cid', function(err, cid) { + if (err || !cid) { + return callback(err, []); + } + categories.getTopicIds('cid:' + cid + ':tids', true, 0, 9, callback); + }); + } + +}; \ No newline at end of file diff --git a/src/topics/unread.js b/src/topics/unread.js index a12f1c4d77..e6910b9b5a 100644 --- a/src/topics/unread.js +++ b/src/topics/unread.js @@ -6,7 +6,6 @@ var async = require('async'), db = require('../database'), user = require('../user'), - meta = require('../meta'), notifications = require('../notifications'), categories = require('../categories'), privileges = require('../privileges'); diff --git a/src/upgrade.js b/src/upgrade.js index 13484b124e..3a52020ca5 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -21,7 +21,7 @@ var db = require('./database'), schemaDate, thisSchemaDate, // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema - latestSchema = Date.UTC(2015, 1, 24, 1); + latestSchema = Date.UTC(2015, 1, 25, 6); Upgrade.check = function(callback) { db.get('schemaDate', function(err, value) { @@ -941,6 +941,25 @@ Upgrade.upgrade = function(callback) { winston.info('[2015/02/24] Upgrading privilege groups to system groups skipped'); next(); } + }, + function(next) { + thisSchemaDate = Date.UTC(2015, 1, 25, 6); + if (schemaDate < thisSchemaDate) { + updatesMade = true; + winston.info('[2015/02/25] Upgrading menu items to dynamic navigation system'); + + require('./navigation/admin').save(require('../install/data/navigation.json'), function(err) { + if (err) { + return next(err); + } + + winston.info('[2015/02/25] Upgrading menu items to dynamic navigation system done'); + Upgrade.update(thisSchemaDate, next); + }); + } else { + winston.info('[2015/02/25] Upgrading menu items to dynamic navigation system skipped'); + next(); + } } // Add new schema updates here diff --git a/src/user/email.js b/src/user/email.js index 74b86c0cfe..e7f56ed21a 100644 --- a/src/user/email.js +++ b/src/user/email.js @@ -87,21 +87,18 @@ var async = require('async'), UserEmail.confirm = function(code, callback) { db.getObject('confirm:' + code, function(err, confirmObj) { if (err) { - return callback({ - status:'error' - }); + return callback(new Error('[[error:parse-error]]')); } if (confirmObj && confirmObj.uid && confirmObj.email) { - user.setUserField(confirmObj.uid, 'email:confirmed', 1, function() { - callback({ - status: 'ok' - }); + async.series([ + async.apply(user.setUserField, confirmObj.uid, 'email:confirmed', 1), + async.apply(db.delete, 'confirm:' + code) + ], function(err) { + callback(err ? new Error('[[error:email-confirm-failed]]') : null); }); } else { - callback({ - status: 'not_ok' - }); + callback(new Error('[[error:invalid-data]]')); } }); }; diff --git a/src/user/follow.js b/src/user/follow.js index 6b0c0a3973..b7bda96903 100644 --- a/src/user/follow.js +++ b/src/user/follow.js @@ -23,22 +23,34 @@ module.exports = function(User) { return callback(new Error('[[error:you-cant-follow-yourself]]')); } - if (type === 'follow') { - var now = Date.now(); - async.parallel([ - async.apply(db.sortedSetAdd, 'following:' + uid, now, theiruid), - async.apply(db.sortedSetAdd, 'followers:' + theiruid, now, uid), - async.apply(User.incrementUserFieldBy, uid, 'followingCount', 1), - async.apply(User.incrementUserFieldBy, theiruid, 'followerCount', 1) - ], callback); - } else { - async.parallel([ - async.apply(db.sortedSetRemove, 'following:' + uid, theiruid), - async.apply(db.sortedSetRemove, 'followers:' + theiruid, uid), - async.apply(User.decrementUserFieldBy, uid, 'followingCount', 1), - async.apply(User.decrementUserFieldBy, theiruid, 'followerCount', 1) - ], callback); - } + User.isFollowing(uid, theiruid, function(err, isFollowing) { + if (err) { + return callback(err); + } + + if (type === 'follow') { + if (isFollowing) { + return callback(new Error('[[error:already-following]]')); + } + var now = Date.now(); + async.parallel([ + async.apply(db.sortedSetAdd, 'following:' + uid, now, theiruid), + async.apply(db.sortedSetAdd, 'followers:' + theiruid, now, uid), + async.apply(User.incrementUserFieldBy, uid, 'followingCount', 1), + async.apply(User.incrementUserFieldBy, theiruid, 'followerCount', 1) + ], callback); + } else { + if (!isFollowing) { + return callback(new Error('[[error:not-following]]')); + } + async.parallel([ + async.apply(db.sortedSetRemove, 'following:' + uid, theiruid), + async.apply(db.sortedSetRemove, 'followers:' + theiruid, uid), + async.apply(User.decrementUserFieldBy, uid, 'followingCount', 1), + async.apply(User.decrementUserFieldBy, theiruid, 'followerCount', 1) + ], callback); + } + }); } User.getFollowing = function(uid, start, end, callback) { diff --git a/src/user/notifications.js b/src/user/notifications.js index 706c227097..c3ea4b9c23 100644 --- a/src/user/notifications.js +++ b/src/user/notifications.js @@ -39,6 +39,20 @@ var async = require('async'), }); }; + UserNotifications.getAll = function(uid, count, callback) { + getNotifications(uid, count, function(err, notifs) { + if (err) { + return callback(err); + } + notifs = notifs.unread.concat(notifs.read); + notifs = notifs.filter(Boolean).sort(function(a, b) { + return b.datetime - a.datetime; + }); + + callback(null, notifs); + }); + }; + function getNotifications(uid, count, callback) { async.parallel({ unread: function(next) { @@ -89,20 +103,6 @@ var async = require('async'), }); } - UserNotifications.getAll = function(uid, count, callback) { - getNotifications(uid, count, function(err, notifs) { - if (err) { - return callback(err); - } - notifs = notifs.unread.concat(notifs.read); - notifs = notifs.filter(Boolean).sort(function(a, b) { - return b.datetime - a.datetime; - }); - - callback(null, notifs); - }); - }; - UserNotifications.getNotifications = function(nids, uid, callback) { notifications.getMultiple(nids, function(err, notifications) { if (err) { diff --git a/src/user/settings.js b/src/user/settings.js index 3daa3db869..20c16fceb8 100644 --- a/src/user/settings.js +++ b/src/user/settings.js @@ -63,7 +63,7 @@ module.exports = function(User) { settings.topicsPerPage = Math.min(settings.topicsPerPage ? parseInt(settings.topicsPerPage, 10) : parseInt(meta.config.topicsPerPage, 10) || 20, 20); settings.postsPerPage = Math.min(settings.postsPerPage ? parseInt(settings.postsPerPage, 10) : parseInt(meta.config.postsPerPage, 10) || 10, 20); settings.notificationSounds = parseInt(settings.notificationSounds, 10) === 1; - settings.language = settings.language || meta.config.defaultLang || 'en_GB'; + settings.userLang = settings.userLang || meta.config.defaultLang || 'en_GB'; settings.topicPostSort = settings.topicPostSort || meta.config.topicPostSort || 'oldest_to_newest'; settings.categoryTopicSort = settings.categoryTopicSort || meta.config.categoryTopicSort || 'newest_to_oldest'; settings.followTopicsOnCreate = (settings.followTopicsOnCreate === null || settings.followTopicsOnCreate === undefined) ? true : parseInt(settings.followTopicsOnCreate, 10) === 1; @@ -82,7 +82,7 @@ module.exports = function(User) { return callback(new Error('[[error:invalid-pagination-value]]')); } - data.language = data.language || meta.config.defaultLang; + data.userLang = data.userLang || meta.config.defaultLang; plugins.fireHook('action:user.saveSettings', {uid: uid, settings: data}); @@ -97,13 +97,14 @@ module.exports = function(User) { topicsPerPage: Math.min(data.topicsPerPage, 20), postsPerPage: Math.min(data.postsPerPage, 20), notificationSounds: data.notificationSounds, - language: data.language || meta.config.defaultLang, + userLang: data.userLang || meta.config.defaultLang, followTopicsOnCreate: data.followTopicsOnCreate, followTopicsOnReply: data.followTopicsOnReply, sendChatNotifications: data.sendChatNotifications, sendPostNotifications: data.sendPostNotifications, restrictChat: data.restrictChat, - topicSearchEnabled: data.topicSearchEnabled + topicSearchEnabled: data.topicSearchEnabled, + groupTitle: data.groupTitle }, next); }, function(next) { diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl index 2fdccebfdd..dc39b80103 100644 --- a/src/views/admin/extend/plugins.tpl +++ b/src/views/admin/extend/plugins.tpl @@ -9,7 +9,11 @@
  • + + Themes + +
    @@ -84,7 +88,16 @@
    Plugin Search

    - +
    + + +
    +
    Re-order Plugins
    +
    + +

    + Certain plugins work ideally when they are initialised before/after other plugins. You can alter this loading behaviour here. +

    diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index f083200b98..d2aca20177 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -72,18 +72,18 @@
    None
    -
    +
    Well
    -
    +
    Jumbotron
    -
    +
    Panel
    -
    +
    Panel Header
    @@ -100,7 +100,7 @@
    -
    +
    Alert
    diff --git a/src/views/admin/general/homepage.tpl b/src/views/admin/general/homepage.tpl new file mode 100644 index 0000000000..d17593f15a --- /dev/null +++ b/src/views/admin/general/homepage.tpl @@ -0,0 +1,31 @@ +
    +
    +
    Home Page
    +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    Save Settings
    +
    + + +
    +
    +
    + + diff --git a/src/views/admin/general/navigation.tpl b/src/views/admin/general/navigation.tpl new file mode 100644 index 0000000000..fe956cc5bc --- /dev/null +++ b/src/views/admin/general/navigation.tpl @@ -0,0 +1,72 @@ + \ No newline at end of file diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index 4193857410..a2b3a4c8e7 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -11,7 +11,9 @@ diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl index 711cdbce72..8d4367bb2e 100644 --- a/src/views/admin/manage/categories.tpl +++ b/src/views/admin/manage/categories.tpl @@ -48,6 +48,7 @@
  • Purge
    • +
  • Duplicate
    • diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index a4997c49e0..37b993dba7 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -129,7 +129,7 @@
    Users Control Panel
    - Download CSV + Download CSV
    diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl index 597173be2e..dcf28ba45e 100644 --- a/src/views/admin/partials/menu.tpl +++ b/src/views/admin/partials/menu.tpl @@ -2,6 +2,8 @@ diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl index b403835994..65039333ee 100644 --- a/src/views/admin/settings/general.tpl +++ b/src/views/admin/settings/general.tpl @@ -28,28 +28,13 @@ -
    -
    Home Page
    -
    -
    - - -
    -
    -
    - -
    Site Logo

    - +
    @@ -60,7 +45,7 @@


    - +
    diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl index 98b99f3973..2ec28c23a1 100644 --- a/src/views/admin/settings/post.tpl +++ b/src/views/admin/settings/post.tpl @@ -37,6 +37,10 @@ +
    + + +
    diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl index cc11b93727..c0c1ca8ab3 100644 --- a/src/views/admin/settings/user.tpl +++ b/src/views/admin/settings/user.tpl @@ -67,7 +67,7 @@

    - +
    diff --git a/src/views/config.json b/src/views/config.json deleted file mode 100644 index f8a04fa620..0000000000 --- a/src/views/config.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "custom_mapping": { - "^\/?$": "categories", - "^admin?$": "admin/general/dashboard", - "^users/sort-posts": "users", - "^users/latest": "users", - "^users/sort-reputation": "users", - "^users/search": "users", - "^user/.*/edit": "account/edit", - "^user/.*/following": "account/following", - "^user/.*/followers": "account/followers", - "^user/.*/settings": "account/settings", - "^user/.*/favourites": "account/favourites", - "^user/.*/watched": "account/watched", - "^user/.*/posts": "account/posts", - "^user/.*/topics": "account/topics", - "^user/.*/groups": "account/groups", - "^user/[^\/]+": "account/profile", - "^reset/.*": "reset_code", - "^tags/.*": "tag", - "^groups/?$": "groups/list", - "^groups/.*": "groups/details" - }, - "force_refresh": { - "logout": true - } -} diff --git a/tests/database/hash.js b/tests/database/hash.js index 5e294f3c4b..469172ce70 100644 --- a/tests/database/hash.js +++ b/tests/database/hash.js @@ -12,7 +12,7 @@ describe('Hash methods', function() { age: 99 }; - before(function(done) { + beforeEach(function(done) { db.setObject('hashTestObject', testData, done); }); diff --git a/tests/database/sorted.js b/tests/database/sorted.js index 68e6f587da..6680ee8716 100644 --- a/tests/database/sorted.js +++ b/tests/database/sorted.js @@ -173,6 +173,15 @@ describe('Sorted Set methods', function() { done(); }); }); + + it('should return number of elements between scores -inf +inf inclusive', function(done) { + db.sortedSetCount('sortedSetTest1', '-inf', '+inf', function(err, count) { + assert.equal(err, null); + assert.equal(arguments.length, 2); + assert.equal(count, 3); + done(); + }); + }); }); describe('sortedSetCard()', function() {