diff --git a/public/language/ar/category.json b/public/language/ar/category.json
index 77dc9decd9..ab98dae089 100644
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -10,6 +10,10 @@
"share_this_category": "انشر هذه الفئة",
"watch": "متابعة",
"ignore": "تجاهل",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "أنت اﻷن متابع لتحديثات هذه الفئة",
"ignore.message": "أنت اﻷن تتجاهل تحديثات هذه الفئة",
"watched-categories": "الفئات المراقبه"
diff --git a/public/language/ar/global.json b/public/language/ar/global.json
index e0a2d51643..75516c6d09 100644
--- a/public/language/ar/global.json
+++ b/public/language/ar/global.json
@@ -50,7 +50,9 @@
"topics": "المواضيع",
"posts": "المشاركات",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "المشاهدات",
"reputation": "السمعة",
diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json
index 81733db21e..9df1e7e355 100644
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 أشعَرَ بمشاركة مخلة في %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/ar/pages.json b/public/language/ar/pages.json
index 56c759fb09..d8fe437fad 100644
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/ar/register.json b/public/language/ar/register.json
index 9960bcace0..3c61bf8b34 100644
--- a/public/language/ar/register.json
+++ b/public/language/ar/register.json
@@ -1,5 +1,6 @@
{
"register": "تسجيل",
+ "cancel_registration": "Cancel Registration",
"help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من العامة.",
"help.username_restrictions": "اسم مستخدم فريدة من نوعها بين1% و2% حرفا. يمكن للآخرين ذكرك @ <'span id='your-username> اسم المستخدم .",
"help.minimum_password_length": "كلمة المرور يجب أن تكون على الأقل بها 1% أحرف",
@@ -15,5 +16,8 @@
"alternative_registration": "طريقة تسجيل بديلة",
"terms_of_use": "شروط الاستخدام",
"agree_to_terms_of_use": "أوافق على شروط الاستخدام",
- "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json
index 3cb68415e1..e0dacb7e32 100644
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -31,7 +31,7 @@
"flag_success": "تم الإشعار بهذه المشاركة على أنها مخلة",
"deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
"following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
- "not_following_topic.message": "لن تستلم أي تنبيه بخصوص عذا الموضوع بعد الآن.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "المرجو إنشاء حساب أو تسجيل الدخول حتى يمكنك متابعة هذا الموضوع.",
"markAsUnreadForAll.success": "تم تحديد الموضوع على أنه غير مقروء.",
diff --git a/public/language/ar/user.json b/public/language/ar/user.json
index 50938b7178..6d6b236865 100644
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -6,6 +6,7 @@
"postcount": "عدد المشاركات",
"email": "البريد الإلكتروني",
"confirm_email": "تأكيد عنوان البريد الإلكتروني",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "هل تريد حقاً حظر هاذا العضو؟",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/bg/category.json b/public/language/bg/category.json
index ace3e651d1..156d31b3aa 100644
--- a/public/language/bg/category.json
+++ b/public/language/bg/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Споделяне на тази категория",
"watch": "Следене",
"ignore": "Игнориране",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Вече следите обновленията в тази категория",
"ignore.message": "Вече не следите обновленията в тази категория",
"watched-categories": "Следени категории"
diff --git a/public/language/bg/global.json b/public/language/bg/global.json
index 3236a43698..2929cadd43 100644
--- a/public/language/bg/global.json
+++ b/public/language/bg/global.json
@@ -50,7 +50,9 @@
"topics": "Теми",
"posts": "Публ.",
"best": "Най-добри",
+ "upvoters": "Upvoters",
"upvoted": "С положителни гласове",
+ "downvoters": "Downvoters",
"downvoted": "С отрицателни гласове",
"views": "Прегл.",
"reputation": "Репутация",
diff --git a/public/language/bg/notifications.json b/public/language/bg/notifications.json
index d621942a50..22d1b170ff 100644
--- a/public/language/bg/notifications.json
+++ b/public/language/bg/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 и %2 други гласуваха положително за Ваша публикация в %3.",
"moved_your_post": "%1 премести публикацията Ви в %2",
"moved_your_topic": "%1 премести %2",
- "favourited_your_post_in": "%1 си запази отметка към Ваша публикация в %2.",
- "favourited_your_post_in_dual": "%1 и %2 си запазиха отметки към Ваша публикация в %3.",
- "favourited_your_post_in_multiple": "%1 и %2 други си запазиха отметки към Ваша публикация в %3.",
"user_flagged_post_in": "%1 докладва Ваша публикация в %2",
"user_flagged_post_in_dual": "%1 и %2 докладваха Ваша публикация в %3",
"user_flagged_post_in_multiple": "%1 и %2 други докладваха Ваша публикация в %3",
diff --git a/public/language/bg/pages.json b/public/language/bg/pages.json
index 6ad263bdf2..6c9f5ef61d 100644
--- a/public/language/bg/pages.json
+++ b/public/language/bg/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Редактиране на паролата на „%1“",
"account/edit/username": "Редактиране на потребителското име на „%1“",
"account/edit/email": "Редактиране на е-пощата на „%1“",
+ "account/info": "Account Info",
"account/following": "Хора, които %1 следва",
"account/followers": "Хора, които следват %1",
"account/posts": "Публикации от %1",
diff --git a/public/language/bg/register.json b/public/language/bg/register.json
index c62a14b3e9..f929f7ba0b 100644
--- a/public/language/bg/register.json
+++ b/public/language/bg/register.json
@@ -1,5 +1,6 @@
{
"register": "Регистрация",
+ "cancel_registration": "Cancel Registration",
"help.email": "По подразбиране, Вашата е-поща ще бъде скрита за останалите.",
"help.username_restrictions": "Уникално потребителско име с дължина между %1 и %2 символа. Другите ще могат да Ви споменават чрез @потребител.",
"help.minimum_password_length": "Дължината на паролата Ви трябва да е поне %1 символа.",
@@ -15,5 +16,8 @@
"alternative_registration": "Друг начин за регистриране",
"terms_of_use": "Условия за ползване",
"agree_to_terms_of_use": "Съгласен съм с условията за ползване",
- "registration-added-to-queue": "Вашата регистрация беше добавена в опашката за одобрение. Ще получите е-писмо, когато тя бъде одобрена от администратор."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Вашата регистрация беше добавена в опашката за одобрение. Ще получите е-писмо, когато тя бъде одобрена от администратор.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json
index 640b8a4eaa..48ff37bdac 100644
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Тази публикация е била докладвана до модератор.",
"deleted_message": "Тази тема е била изтрита. Само потребители с права за управление на темите могат да я видят.",
"following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.",
- "not_following_topic.message": "Вече няма да получавате известия за тази тема.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Вече няма да виждате тази тема в списъка с непрочетени теми. Ще получите известие, когато някой Ви спомене или гласува положително за Ваша публикация.",
"login_to_subscribe": "Моля, регистрирайте се или влезте, за да се абонирате за тази тема.",
"markAsUnreadForAll.success": "Темата е отбелязана като непрочетена за всички.",
diff --git a/public/language/bg/user.json b/public/language/bg/user.json
index 286380f71b..b7377ff811 100644
--- a/public/language/bg/user.json
+++ b/public/language/bg/user.json
@@ -6,6 +6,7 @@
"postcount": "Брой публикации",
"email": "Е-поща",
"confirm_email": "Потвърдете е-пощата",
+ "account_info": "Account Info",
"ban_account": "Блокиране на акаунта",
"ban_account_confirm": "Наистина ли искате да блокирате този потребител?",
"unban_account": "Отблокиране на акаунта",
@@ -107,5 +108,11 @@
"custom_route_help": "Въведете името на пътя тук, без наклонена черта пред него (пример: „recent“ или „popular“)",
"sso.title": "Услуги за еднократно вписване",
"sso.associated": "Свързан с",
- "sso.not-associated": "Натиснете тук, за да свържете с"
+ "sso.not-associated": "Натиснете тук, за да свържете с",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/bn/category.json b/public/language/bn/category.json
index b76b0724d2..3023c8c3ee 100644
--- a/public/language/bn/category.json
+++ b/public/language/bn/category.json
@@ -10,6 +10,10 @@
"share_this_category": "এই বিভাগটি অন্যের সাথে ভাগাভাগি করুন",
"watch": "নজর রাখুন",
"ignore": "উপেক্ষা করুন",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "আপনি এই বিভাগটিতে নজর রাখছেন",
"ignore.message": "আপনি এই বিভাগটির উপেক্ষা করছেন ",
"watched-categories": "প্রেক্ষিত বিভাগসমূহ"
diff --git a/public/language/bn/global.json b/public/language/bn/global.json
index 9eb59053b1..abc0e8cda4 100644
--- a/public/language/bn/global.json
+++ b/public/language/bn/global.json
@@ -50,7 +50,9 @@
"topics": "টপিক",
"posts": "পোস্টগুলি",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "দেখেছেন",
"reputation": "সন্মাননা",
diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json
index 497492e0db..f139fe03fc 100644
--- a/public/language/bn/notifications.json
+++ b/public/language/bn/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 flagged a post in %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/bn/pages.json b/public/language/bn/pages.json
index fa4488b73e..42e731c384 100644
--- a/public/language/bn/pages.json
+++ b/public/language/bn/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/bn/register.json b/public/language/bn/register.json
index 5e2340227f..b8f4eebafd 100644
--- a/public/language/bn/register.json
+++ b/public/language/bn/register.json
@@ -1,5 +1,6 @@
{
"register": "নিবন্ধন",
+ "cancel_registration": "Cancel Registration",
"help.email": "ডিফল্টভাবে, আপনার ইমেইল সর্বসাধারণ থেকে লুকানো থাকবে।",
"help.username_restrictions": "%1 এবং %2 অক্ষরের মাঝে একটি অনন্য সদস্য নাম। বাকিরা আপনাকে @নাম দিয়ে উল্লেখ করতে পারবেন।",
"help.minimum_password_length": "আপনার পাসওয়ার্ড এর দৈর্ঘ্য অন্তত %1 অক্ষরের হতে হবে।",
@@ -15,5 +16,8 @@
"alternative_registration": "বিকল্প নিবন্ধন",
"terms_of_use": "নিয়মাবলী",
"agree_to_terms_of_use": "আমি নিয়মাবলী মেনে চলতে সম্মতি জানালাম",
- "registration-added-to-queue": "আপনার নিবন্ধনটি এ্যাপ্লুভাল তালিকায় যুক্ত হয়েছে। একজন এডমিনিস্ট্রেটর কর্তৃক নিবন্ধন গৃহীত হলে আপনি একটি মেইল পাবেন। "
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "আপনার নিবন্ধনটি এ্যাপ্লুভাল তালিকায় যুক্ত হয়েছে। একজন এডমিনিস্ট্রেটর কর্তৃক নিবন্ধন গৃহীত হলে আপনি একটি মেইল পাবেন। ",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json
index 29cb9dec7a..4a099bf546 100644
--- a/public/language/bn/topic.json
+++ b/public/language/bn/topic.json
@@ -31,7 +31,7 @@
"flag_success": "এই পোস্টটি মডারেশনের জন্য ফ্ল্যাগ করা হয়েছে।",
"deleted_message": "এই টপিকটি মুছে ফেলা হয়েছে। শুধুমাত্র টপিক ব্যবস্থাপনার ক্ষমতাপ্রাপ্ত সদস্যগণ এটি দেখতে পারবেন।",
"following_topic.message": "এখন থেকে এই টপিকে অন্যকেউ পোস্ট করলে আপনি নোটিফিকেশন পাবেন।",
- "not_following_topic.message": "এই টপিক থেকে আপনি আর নোটিফিকেশন পাবেন না।",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "এই টপিকে সাবস্ক্রাইব করতে চাইলে অনুগ্রহ করে নিবন্ধণ করুন অথবা প্রবেশ করুন।",
"markAsUnreadForAll.success": "টপিকটি সবার জন্য অপঠিত হিসাবে মার্ক করুন।",
diff --git a/public/language/bn/user.json b/public/language/bn/user.json
index b53b04b5c4..c7edda527f 100644
--- a/public/language/bn/user.json
+++ b/public/language/bn/user.json
@@ -6,6 +6,7 @@
"postcount": "সর্বমোট পোষ্ট",
"email": "ইমেইল",
"confirm_email": "ইমেইল নিশ্চিত করুন",
+ "account_info": "Account Info",
"ban_account": "একাউন্ট নিষিদ্ধ করুন",
"ban_account_confirm": "আপনি কি নিশ্চিত যে এই সদস্যকে নিষিদ্ধ করতে চান ?",
"unban_account": "নিষেদ্ধাজ্ঞা তুলে নিন",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/cs/category.json b/public/language/cs/category.json
index 4df50da536..604f8bba0e 100644
--- a/public/language/cs/category.json
+++ b/public/language/cs/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Share this category",
"watch": "Sledovat",
"ignore": "Ignorovat",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Nyní sledujete aktualizace ve skupině",
"ignore.message": "Nyní ignorujete aktualizace ve skupině ",
"watched-categories": "Sledované kategorie"
diff --git a/public/language/cs/global.json b/public/language/cs/global.json
index 20163c921d..83860b52cc 100644
--- a/public/language/cs/global.json
+++ b/public/language/cs/global.json
@@ -50,7 +50,9 @@
"topics": "Témata",
"posts": "Příspěvky",
"best": "Nejlepší",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Zobrazení",
"reputation": "Reputace",
diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json
index 8c6e418638..631bdfd5e0 100644
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 flagged a post in %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/cs/pages.json b/public/language/cs/pages.json
index efd3e8001f..22739e22a5 100644
--- a/public/language/cs/pages.json
+++ b/public/language/cs/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "Lidé kteří sledují %1",
"account/posts": "Příspěvky od %1",
diff --git a/public/language/cs/register.json b/public/language/cs/register.json
index c6d339688a..6aa6c9d5b9 100644
--- a/public/language/cs/register.json
+++ b/public/language/cs/register.json
@@ -1,5 +1,6 @@
{
"register": "Registrace",
+ "cancel_registration": "Cancel Registration",
"help.email": "Váš email nebude bez vašeho svolení zveřejněn.",
"help.username_restrictions": "Jedinečné uživatelské jméno dlouhé %1 až %2 znaků. Ostatní uživatelé Vás mohou zmínit jako @uživatelské-jméno.",
"help.minimum_password_length": "Délka vašeho hesla musí být alespoň %1 znaků.",
@@ -15,5 +16,8 @@
"alternative_registration": "Jiný způsob registrace",
"terms_of_use": "Podmínky",
"agree_to_terms_of_use": "Souhlasím s Podmínkami",
- "registration-added-to-queue": "Vaše registrace byla přidána do fronty. Obdržíte e-mail až ji správce schválí."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Vaše registrace byla přidána do fronty. Obdržíte e-mail až ji správce schválí.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json
index 6d30b3ea98..104b9aa379 100644
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -31,7 +31,7 @@
"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.",
"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
- "not_following_topic.message": "You will no longer receive notifications from this topic.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
"markAsUnreadForAll.success": "Topic marked as unread for all.",
diff --git a/public/language/cs/user.json b/public/language/cs/user.json
index 7fb371137c..82809507c9 100644
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -6,6 +6,7 @@
"postcount": "Počet příspěvků",
"email": "Email",
"confirm_email": "Potvrdit email",
+ "account_info": "Account Info",
"ban_account": "Zablokovat účet",
"ban_account_confirm": "Opravdu chcete zablokovat tohoto uživatele?",
"unban_account": "Odblokovat účet",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/da/category.json b/public/language/da/category.json
index 96579ce8a3..7c28d42ac3 100644
--- a/public/language/da/category.json
+++ b/public/language/da/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Del denne kategori",
"watch": "Overvåg",
"ignore": "Ignorer",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Du overvåger nu opdateringer fra denne kategori",
"ignore.message": "Du ignorere nu opdateringer fra denne kategori",
"watched-categories": "Fulgte kategorier"
diff --git a/public/language/da/global.json b/public/language/da/global.json
index 5990eb4da5..b918c4d51c 100644
--- a/public/language/da/global.json
+++ b/public/language/da/global.json
@@ -50,7 +50,9 @@
"topics": "Emner",
"posts": "Indlæg",
"best": "Bedste",
+ "upvoters": "Upvoters",
"upvoted": "Syntes godt om",
+ "downvoters": "Downvoters",
"downvoted": "Syntes ikke godt om",
"views": "Visninger",
"reputation": "Omdømme",
diff --git a/public/language/da/notifications.json b/public/language/da/notifications.json
index 0e36cb2149..d05a19fa4b 100644
--- a/public/language/da/notifications.json
+++ b/public/language/da/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 og %2 andre har syntes godt om dit indlæg i%3.",
"moved_your_post": "%1 har flyttet dit indlæg til %2",
"moved_your_topic": "%1 har flyttet %2",
- "favourited_your_post_in": "%1 har bogmærket dit indlæg i %2.",
- "favourited_your_post_in_dual": "%1 og %2 har bogmærket dit indlæg i %3.",
- "favourited_your_post_in_multiple": "%1 og %2 andre har bogmærket dit indlæg i %3.",
"user_flagged_post_in": "%1 har anmeldt et indlæg i %2",
"user_flagged_post_in_dual": "%1 og %2 har anmeldt et indlæg i %3",
"user_flagged_post_in_multiple": "%1 og %2 andre har anmeldt et indlæg i %3",
diff --git a/public/language/da/pages.json b/public/language/da/pages.json
index 0d4fbde6c3..1d231fefa3 100644
--- a/public/language/da/pages.json
+++ b/public/language/da/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Redigerer adgangskode for \"%1\"",
"account/edit/username": "Redigerer brugernavn for \"%1\"",
"account/edit/email": "Redigerer email for \"%1\"",
+ "account/info": "Account Info",
"account/following": "Personer som %1 følger",
"account/followers": "Personer som følger %1",
"account/posts": "Indlæg oprettet af %1",
diff --git a/public/language/da/register.json b/public/language/da/register.json
index b1f69c4245..a63dae03aa 100644
--- a/public/language/da/register.json
+++ b/public/language/da/register.json
@@ -1,5 +1,6 @@
{
"register": "Tilmeld",
+ "cancel_registration": "Cancel Registration",
"help.email": "Den email er skjult som standard.",
"help.username_restrictions": "Et unikt brugernavn mellem %1 og %2 karakterer. Andre kan nævne dig med @brugernavn.",
"help.minimum_password_length": "Din adgangskode skal være på mindst %1 karakterer.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternativ registrering",
"terms_of_use": "Betingelser for brug",
"agree_to_terms_of_use": "Jeg acceptere betingelserne for brug",
- "registration-added-to-queue": "Din registrering er blevet tilføjet til godkendelses køen. Du vil mostage en email når du er blevet accepteret af en administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Din registrering er blevet tilføjet til godkendelses køen. Du vil mostage en email når du er blevet accepteret af en administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/da/topic.json b/public/language/da/topic.json
index afa21d92a2..2a3653db8c 100644
--- a/public/language/da/topic.json
+++ b/public/language/da/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Dette indlæg er blevet meldt til moderation.",
"deleted_message": "Denne tråd er blevet slettet. Kun brugere med emne behandlings privilegier kan se den.",
"following_topic.message": "Du vil nu modtage notifikationer når nogle skriver et indlæg i dette emne.",
- "not_following_topic.message": "Du vil ikke længere modtage notifikationer fra dette emne.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Venligt registrer eller login for at abbonere på dette emne.",
"markAsUnreadForAll.success": "Emnet er market ulæst for alle.",
diff --git a/public/language/da/user.json b/public/language/da/user.json
index c409da0009..ddc063914a 100644
--- a/public/language/da/user.json
+++ b/public/language/da/user.json
@@ -6,6 +6,7 @@
"postcount": "Antal indlæg",
"email": "Email",
"confirm_email": "Bekræft email",
+ "account_info": "Account Info",
"ban_account": "Ban Konto",
"ban_account_confirm": "Ønsker du virkelig at banne denne konto?",
"unban_account": "Afban Konto",
@@ -107,5 +108,11 @@
"custom_route_help": "Indtast et rute navn her, uden nogle foregående skråstreg (f.eks. \"nyligt\" eller \"populært\")",
"sso.title": "Enkeltgangs Sign-on Servicer",
"sso.associated": "Forbundet med",
- "sso.not-associated": "Klik her for at forbinde med"
+ "sso.not-associated": "Klik her for at forbinde med",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/de/category.json b/public/language/de/category.json
index 3ca129e561..6ce06deed2 100644
--- a/public/language/de/category.json
+++ b/public/language/de/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Teile diese Kategorie",
"watch": "Beobachten",
"ignore": "Ignorieren",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Du beobachtest jetzt Änderungen in dieser Kategorie",
"ignore.message": "Du ignorierst jetzt Änderungen in dieser Kategorie",
"watched-categories": "Zuletzt angesehen Kategorien"
diff --git a/public/language/de/global.json b/public/language/de/global.json
index 82179436b4..cddeca336f 100644
--- a/public/language/de/global.json
+++ b/public/language/de/global.json
@@ -50,7 +50,9 @@
"topics": "Themen",
"posts": "Beiträge",
"best": "Bestbewertet",
+ "upvoters": "Upvoters",
"upvoted": "Positiv bewertet",
+ "downvoters": "Downvoters",
"downvoted": "Negativ bewertet",
"views": "Aufrufe",
"reputation": "Ansehen",
diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json
index 51cb09b719..18cc3b5e77 100644
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 und %2 andere Nutzer haben deinen Beitrag in %3 positiv bewertet.",
"moved_your_post": "%1 hat deinen Beitrag nach %2 verschoben.",
"moved_your_topic": "%1 hat %2 verschoben.",
- "favourited_your_post_in": "%1 hat deinen Beitrag in %2 als Lesezeichen gespeichert.",
- "favourited_your_post_in_dual": "%1 und %2 haben deinen Beitrag in %3 als Lesezeichen gespeichert.",
- "favourited_your_post_in_multiple": "%1 und %2 andere Nutzer haben deinen Beitrag in %3 als Lesezeichen gespeichert.",
"user_flagged_post_in": "%1 hat einen Beitrag in %2 gemeldet",
"user_flagged_post_in_dual": "%1 und %2 haben einen Beitrag in %3 gemeldet",
"user_flagged_post_in_multiple": "%1 und %2 andere Nutzer haben einen Beitrag in %3 gemeldet",
diff --git a/public/language/de/pages.json b/public/language/de/pages.json
index 9bb4b009c5..899af940dc 100644
--- a/public/language/de/pages.json
+++ b/public/language/de/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Bearbeite Passwort von \"%1\"",
"account/edit/username": "Bearbeite Benutzernamen von \"%1\"",
"account/edit/email": "Bearbeite E-Mail von \"%1\"",
+ "account/info": "Account Info",
"account/following": "Nutzer, denen %1 folgt",
"account/followers": "Nutzer, die %1 folgen",
"account/posts": "Beiträge von %1",
diff --git a/public/language/de/register.json b/public/language/de/register.json
index 9314539d46..41998933f1 100644
--- a/public/language/de/register.json
+++ b/public/language/de/register.json
@@ -1,5 +1,6 @@
{
"register": "Registrieren",
+ "cancel_registration": "Cancel Registration",
"help.email": "Deine E-Mail Adresse ist standardmäßig nicht öffentlich sichtbar.",
"help.username_restrictions": "Einen einmaligen Benutzernamen. %1-%2 Zeichen. Andere Benutzer können dich mit @Benutzername anschreiben.",
"help.minimum_password_length": "Dein Passwort muss mindestens %1 Zeichen lang sein.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternative Registrierung",
"terms_of_use": "Nutzungsbedingungen",
"agree_to_terms_of_use": "Ich stimme den Nutzungsbedingungen zu",
- "registration-added-to-queue": "Deine Registration wurde abgeschickt. Du wirst eine E-Mail erhalten, sobald sie von einem Administrator akzeptiert wird."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Deine Registration wurde abgeschickt. Du wirst eine E-Mail erhalten, sobald sie von einem Administrator akzeptiert wird.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/de/topic.json b/public/language/de/topic.json
index f58a51013f..bb94283e65 100644
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Dieser Beitrag wurde erfolgreich für die Moderation markiert.",
"deleted_message": "Dieses Thema wurde gelöscht. Nur Nutzer mit entsprechenden Rechten können es sehen.",
"following_topic.message": "Du erhälst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",
- "not_following_topic.message": "Du erhälst keine weiteren Benachrichtigungen zu diesem Thema mehr.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Ungelesene Beiträge in diesem Thema werden nicht mehr angezeigt. Du erhältst eine Benachrichtigung wenn du in diesem Thema erwähnt wirst oder deine Beiträge positiv bewertet werden.",
"login_to_subscribe": "Bitte registrieren oder einloggen um dieses Thema zu abonnieren",
"markAsUnreadForAll.success": "Thema für Alle als ungelesen markiert.",
diff --git a/public/language/de/user.json b/public/language/de/user.json
index 2a07d53cd3..acfe2516d6 100644
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -6,6 +6,7 @@
"postcount": "Beiträge",
"email": "E-Mail",
"confirm_email": "E-Mail bestätigen",
+ "account_info": "Account Info",
"ban_account": "Konto sperren",
"ban_account_confirm": "Bist du sicher, dass du diesen Benutzer sperren möchtest?",
"unban_account": "Konto entsperren",
@@ -107,5 +108,11 @@
"custom_route_help": "Gib hier einen Pfadnamen ohne vorangehenden Slash ein (z.B. \"recent\" oder \"popular\")",
"sso.title": "Single Sign-on Dienste",
"sso.associated": "Verbunden mit",
- "sso.not-associated": "Verbinde dich mit"
+ "sso.not-associated": "Verbinde dich mit",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/el/category.json b/public/language/el/category.json
index 261edb2541..023e79f554 100644
--- a/public/language/el/category.json
+++ b/public/language/el/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Μοιράσου αυτή την κατηγορία",
"watch": "Watch",
"ignore": "Αγνόηση",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "You are now watching updates from this category",
"ignore.message": "You are now ignoring updates from this category",
"watched-categories": "Watched categories"
diff --git a/public/language/el/global.json b/public/language/el/global.json
index d8be67df72..e8b8255a1a 100644
--- a/public/language/el/global.json
+++ b/public/language/el/global.json
@@ -50,7 +50,9 @@
"topics": "Θέματα",
"posts": "Δημοσιεύσεις",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Εμφανίσεις",
"reputation": "Φήμη",
diff --git a/public/language/el/notifications.json b/public/language/el/notifications.json
index 53cc1e7fce..00903465f5 100644
--- a/public/language/el/notifications.json
+++ b/public/language/el/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "Ο/Η %1 επεσήμανε μια δημοσίευσή σου στο %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/el/pages.json b/public/language/el/pages.json
index a6ac3ea6ee..8ca2f9cc36 100644
--- a/public/language/el/pages.json
+++ b/public/language/el/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/el/register.json b/public/language/el/register.json
index 875a507d52..9de3dacaaa 100644
--- a/public/language/el/register.json
+++ b/public/language/el/register.json
@@ -1,5 +1,6 @@
{
"register": "Εγγραφή",
+ "cancel_registration": "Cancel Registration",
"help.email": "Από προεπιλογή, το email σου θα είναι κρυμμένο από την κοινή θέα.",
"help.username_restrictions": "Ένα μοναδικό όνομα χρήστη μεταξύ %1 και %2 χαρακτήρων. Άλλα άτομα μπορούν να σε αναφέρουν με το @username σου.",
"help.minimum_password_length": "Το μήκος του κωδικού σου πρέπει να είναι τουλάχιστον %1 χαρακτήρες.",
@@ -15,5 +16,8 @@
"alternative_registration": "Εναλλακτική Εγγραφή",
"terms_of_use": "Όροι Χρήσης",
"agree_to_terms_of_use": "Συμφωνώ με τους Όρους Χρήσης",
- "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/el/topic.json b/public/language/el/topic.json
index 868cb0f650..965c3e70ad 100644
--- a/public/language/el/topic.json
+++ b/public/language/el/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Αυτή η δημοσίευση έχει επισημανθεί για συντονισμό.",
"deleted_message": "Το θέμα αυτό έχει διαγραφεί. Μόνο οι χρήστες με δικαιώματα διαχειριστή θεμάτων μπορούν να το δουν.",
"following_topic.message": "Θα λαμβάνεις ειδοποιήσεις όποτε κάποιος δημοσιεύει κάτι σε αυτό το θέμα.",
- "not_following_topic.message": "Δεν θα λαμβάνεις άλλες ειδοποιήσεις από αυτό το θέμα.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Παρακαλώ εγγράψου ή συνδέσου για για γραφτείς σε αυτό το θέμα.",
"markAsUnreadForAll.success": "Το θέμα σημειώθηκε ως μη αναγνωσμένο για όλους.",
diff --git a/public/language/el/user.json b/public/language/el/user.json
index 5a4c0c3649..d9b4bdbb78 100644
--- a/public/language/el/user.json
+++ b/public/language/el/user.json
@@ -6,6 +6,7 @@
"postcount": "Post Count",
"email": "Emai",
"confirm_email": "Επιβεβαίωση Email",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/en@pirate/category.json b/public/language/en@pirate/category.json
index 77f9fdcb92..d437e642c4 100644
--- a/public/language/en@pirate/category.json
+++ b/public/language/en@pirate/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Share 'tis category",
"watch": "Be watchin'",
"ignore": "Be ignorin'",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Ye now be watchin' updates from 'tis category",
"ignore.message": "Ye now be ignorin' updates from 'tis category",
"watched-categories": "Categories ye be watchin'"
diff --git a/public/language/en@pirate/global.json b/public/language/en@pirate/global.json
index 58eba7f42d..1b78cd651b 100644
--- a/public/language/en@pirate/global.json
+++ b/public/language/en@pirate/global.json
@@ -50,7 +50,9 @@
"topics": "Topics",
"posts": "Messages",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Views",
"reputation": "Reputation",
diff --git a/public/language/en@pirate/notifications.json b/public/language/en@pirate/notifications.json
index cee3aa994b..c6dedd3eb0 100644
--- a/public/language/en@pirate/notifications.json
+++ b/public/language/en@pirate/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 flagged a post in %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/en@pirate/pages.json b/public/language/en@pirate/pages.json
index 3309d4ced7..0fd86ae295 100644
--- a/public/language/en@pirate/pages.json
+++ b/public/language/en@pirate/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/en@pirate/register.json b/public/language/en@pirate/register.json
index 381aaef8b5..45217b265c 100644
--- a/public/language/en@pirate/register.json
+++ b/public/language/en@pirate/register.json
@@ -1,5 +1,6 @@
{
"register": "Board the ship",
+ "cancel_registration": "Cancel Registration",
"help.email": "By default, your email will be hidden from the public.",
"help.username_restrictions": "A unique username between %1 and %2 characters. Others can mention you with @username.",
"help.minimum_password_length": "Your password's length must be at least %1 characters.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternative Registration",
"terms_of_use": "Terms of Use",
"agree_to_terms_of_use": "I agree to the Terms of Use",
- "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/en@pirate/topic.json b/public/language/en@pirate/topic.json
index ab97715c5b..613efb2d0a 100644
--- a/public/language/en@pirate/topic.json
+++ b/public/language/en@pirate/topic.json
@@ -31,7 +31,7 @@
"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.",
"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
- "not_following_topic.message": "You will no longer receive notifications from this topic.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
"markAsUnreadForAll.success": "Topic marked as unread for all.",
diff --git a/public/language/en@pirate/user.json b/public/language/en@pirate/user.json
index d2f9fa0707..812cc2d946 100644
--- a/public/language/en@pirate/user.json
+++ b/public/language/en@pirate/user.json
@@ -6,6 +6,7 @@
"postcount": "Post Count",
"email": "Email",
"confirm_email": "Confirm Email",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/en_US/category.json b/public/language/en_US/category.json
index 81ef13b626..827564deca 100644
--- a/public/language/en_US/category.json
+++ b/public/language/en_US/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Share this category",
"watch": "Watch",
"ignore": "Ignore",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "You are now watching updates from this category",
"ignore.message": "You are now ignoring updates from this category",
"watched-categories": "Watched categories"
diff --git a/public/language/en_US/global.json b/public/language/en_US/global.json
index a206afd7cf..802a81d4bb 100644
--- a/public/language/en_US/global.json
+++ b/public/language/en_US/global.json
@@ -50,7 +50,9 @@
"topics": "Topics",
"posts": "Posts",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Views",
"reputation": "Reputation",
diff --git a/public/language/en_US/notifications.json b/public/language/en_US/notifications.json
index 28d35e65fa..580e697548 100644
--- a/public/language/en_US/notifications.json
+++ b/public/language/en_US/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 flagged a post in %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/en_US/pages.json b/public/language/en_US/pages.json
index 3309d4ced7..0fd86ae295 100644
--- a/public/language/en_US/pages.json
+++ b/public/language/en_US/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/en_US/register.json b/public/language/en_US/register.json
index 72cd580910..e58d572e5c 100644
--- a/public/language/en_US/register.json
+++ b/public/language/en_US/register.json
@@ -1,5 +1,6 @@
{
"register": "Register",
+ "cancel_registration": "Cancel Registration",
"help.email": "By default, your email will be hidden from the public.",
"help.username_restrictions": "A unique username between %1 and %2 characters. Others can mention you with @username.",
"help.minimum_password_length": "Your password's length must be at least %1 characters.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternative Registration",
"terms_of_use": "Terms of Use",
"agree_to_terms_of_use": "I agree to the Terms of Use",
- "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/en_US/topic.json b/public/language/en_US/topic.json
index ab97715c5b..613efb2d0a 100644
--- a/public/language/en_US/topic.json
+++ b/public/language/en_US/topic.json
@@ -31,7 +31,7 @@
"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.",
"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
- "not_following_topic.message": "You will no longer receive notifications from this topic.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
"markAsUnreadForAll.success": "Topic marked as unread for all.",
diff --git a/public/language/en_US/user.json b/public/language/en_US/user.json
index 50e52efa5c..b2c183e3a2 100644
--- a/public/language/en_US/user.json
+++ b/public/language/en_US/user.json
@@ -6,6 +6,7 @@
"postcount": "Post Count",
"email": "Email",
"confirm_email": "Confirm Email",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/es/category.json b/public/language/es/category.json
index 608bf7c75a..1b8a605ef7 100644
--- a/public/language/es/category.json
+++ b/public/language/es/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Compartir esta categoría",
"watch": "Siguiendo",
"ignore": "Ignorando",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Ahora estás viendo actualizaciones de esta categoría",
"ignore.message": "Ahora estás ignorando las actualizaciones de esta categoría",
"watched-categories": "Categorías seguidas"
diff --git a/public/language/es/global.json b/public/language/es/global.json
index f91bbda9b4..d3ca7da211 100644
--- a/public/language/es/global.json
+++ b/public/language/es/global.json
@@ -50,7 +50,9 @@
"topics": "Temas",
"posts": "Posts",
"best": "Mejor valorados",
+ "upvoters": "Upvoters",
"upvoted": "Votado positivamente",
+ "downvoters": "Downvoters",
"downvoted": "Votado negativamente",
"views": "Visitas",
"reputation": "Reputación",
diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json
index 1effb38fee..aaab0f7d10 100644
--- a/public/language/es/notifications.json
+++ b/public/language/es/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 y otras %2 personas han votado positivamente tu respuesta en %3.",
"moved_your_post": "%1 su tema ha sido movido a %2",
"moved_your_topic": "%1 se ha movido %2",
- "favourited_your_post_in": "%1 se ha guardado su post en %2.",
- "favourited_your_post_in_dual": "%1 y %2 se han guardado su post en %3.",
- "favourited_your_post_in_multiple": "%1 y otros %2 usuarios se han guardado su post en %3.",
"user_flagged_post_in": "%1 ha reportado una respuesta en %2",
"user_flagged_post_in_dual": "%1 y %2 han reportado un post en %3",
"user_flagged_post_in_multiple": "%1 y otras %2 personas han reportado un post en %3",
diff --git a/public/language/es/pages.json b/public/language/es/pages.json
index 2d62269b35..a093c5f548 100644
--- a/public/language/es/pages.json
+++ b/public/language/es/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editar contraseña de \"%1\"",
"account/edit/username": "Editar nombre de usuario de \"%1\"",
"account/edit/email": "Editar email \"%1\"",
+ "account/info": "Account Info",
"account/following": "Gente que sigue %1",
"account/followers": "Seguidores de %1",
"account/posts": "Publicados por %1",
diff --git a/public/language/es/register.json b/public/language/es/register.json
index ef1102ea8a..9916a0de52 100644
--- a/public/language/es/register.json
+++ b/public/language/es/register.json
@@ -1,5 +1,6 @@
{
"register": "Registrarse",
+ "cancel_registration": "Cancel Registration",
"help.email": "Por defecto, tu cuenta de correo electrónico estará oculta al publico.",
"help.username_restrictions": "El nombre de usuario debe tener entre %1 y %2 carácteres. Los miembros pueden responderte escribiendo @usuario.",
"help.minimum_password_length": "Tu contraseña debe tener al menos %1 carácteres.",
@@ -15,5 +16,8 @@
"alternative_registration": "Métodos de registro alternativos",
"terms_of_use": "Términos y Condiciones de uso",
"agree_to_terms_of_use": "Acepto los Términos y Condiciones de uso",
- "registration-added-to-queue": "Tu registro se ha añadido a la cola de aprobación,. Recibirás un correo cuando este sea aceptado por un administrador. "
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Tu registro se ha añadido a la cola de aprobación,. Recibirás un correo cuando este sea aceptado por un administrador. ",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/es/topic.json b/public/language/es/topic.json
index 37a417cd42..50af3004ce 100644
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Este mensaje ha sido reportado para moderación.",
"deleted_message": "Este tema ha sido borrado. Solo los usuarios que tengan privilegios de administración de temas pueden verlo.",
"following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.",
- "not_following_topic.message": "No recibiras notificaciones de este tema.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Ya no verás este tema en no leídos. Serás notificado si te mencionan o te votan.",
"login_to_subscribe": "Por favor, conéctate para subscribirte a este tema.",
"markAsUnreadForAll.success": "Publicación marcada como no leída para todos.",
diff --git a/public/language/es/user.json b/public/language/es/user.json
index cce042ed7a..7146e46611 100644
--- a/public/language/es/user.json
+++ b/public/language/es/user.json
@@ -6,6 +6,7 @@
"postcount": "Número De Publicaciones",
"email": "Correo electrónico",
"confirm_email": "Confirmar correo electrónico",
+ "account_info": "Account Info",
"ban_account": "Banear cuenta",
"ban_account_confirm": "Quieres confirmar el baneo de este usuario?",
"unban_account": "Desbanear cuenta",
@@ -107,5 +108,11 @@
"custom_route_help": "Introduzca un nombre de ruta aquí, sin ninguna barra anterior (por ejemplo, \"reciente\", o \"popular\")",
"sso.title": "Servicios de Inicio de sesión Único",
"sso.associated": "Asociado con",
- "sso.not-associated": "Da clic aquí para asociarse con"
+ "sso.not-associated": "Da clic aquí para asociarse con",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/et/category.json b/public/language/et/category.json
index e5ffefd5d1..cdb197eb48 100644
--- a/public/language/et/category.json
+++ b/public/language/et/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Jaga seda kategooriat",
"watch": "Vaata",
"ignore": "Ignoreeri",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Jälgid nüüdsest teateid sellest kategooriast",
"ignore.message": "Ignoreerid nüüdsest teateid sellest kategooriast",
"watched-categories": "Jälgitavad kategooriad"
diff --git a/public/language/et/global.json b/public/language/et/global.json
index 93fdfd9a16..0735277f4d 100644
--- a/public/language/et/global.json
+++ b/public/language/et/global.json
@@ -50,7 +50,9 @@
"topics": "Teemat",
"posts": "Postitust",
"best": "Parim",
+ "upvoters": "Upvoters",
"upvoted": "Kiideti heaks",
+ "downvoters": "Downvoters",
"downvoted": "Hääletas vastu",
"views": "Vaatamist",
"reputation": "Reputatsioon",
diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json
index 52319818af..c804914ee1 100644
--- a/public/language/et/notifications.json
+++ b/public/language/et/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 ja %2 teist on kiitnud sinu postituse heaks: %3.",
"moved_your_post": "%1 liigutas sinu postituse %2 'sse",
"moved_your_topic": "%1 liigutas %2",
- "favourited_your_post_in": "%1 pani Sinu postituse %2 järjehoidjatesse.",
- "favourited_your_post_in_dual": "%1 ja %2 panid Sinu postituse %3 enda järjehoidjatesse.",
- "favourited_your_post_in_multiple": "%1 ja %2 teist on Sinu postitust %3 järjehoidjasse lisanud.",
"user_flagged_post_in": "%1 raporteeris postitust %2",
"user_flagged_post_in_dual": "%1 ja %2 märgistasid postituse: %3",
"user_flagged_post_in_multiple": "%1 ja %2 teist märgistasid postituse: %3",
diff --git a/public/language/et/pages.json b/public/language/et/pages.json
index fef1836725..22015dadab 100644
--- a/public/language/et/pages.json
+++ b/public/language/et/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Redigeerid \"%1\" parooli",
"account/edit/username": "Redigeerid \"%1\" kasutajanime",
"account/edit/email": "Redigeerid \"%1\" emaili",
+ "account/info": "Account Info",
"account/following": "Kasutaja %1 jälgib",
"account/followers": "Kasutajad, kes jälgivad %1",
"account/posts": "Postitused, mis on tehtud kasutaja %1 poolt",
diff --git a/public/language/et/register.json b/public/language/et/register.json
index cbd042fb68..c0b7442158 100644
--- a/public/language/et/register.json
+++ b/public/language/et/register.json
@@ -1,5 +1,6 @@
{
"register": "Registreeri",
+ "cancel_registration": "Cancel Registration",
"help.email": "Algsättena peidetakse sinu e-mail avalikuse eest.",
"help.username_restrictions": "Unikaalne kasutajanimi, mis on %1 - %2 tähemärki pikk. Teised saavad sind postitustes mainida kasutades @kasutajanime.",
"help.minimum_password_length": "Sinu parooli pikkus peab olema vähemalt %1 tähemärki pikk.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternatiivne registreerimismeetod",
"terms_of_use": "Foorumi reeglid",
"agree_to_terms_of_use": "Nõustun foorumi reeglitega",
- "registration-added-to-queue": "Teie registreerimine vaadatakse üle. Te saate e-kirja kui administraator on aktsepteerinud registreermimise."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Teie registreerimine vaadatakse üle. Te saate e-kirja kui administraator on aktsepteerinud registreermimise.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/et/topic.json b/public/language/et/topic.json
index 998356d44a..ecd8e893b3 100644
--- a/public/language/et/topic.json
+++ b/public/language/et/topic.json
@@ -31,7 +31,7 @@
"flag_success": "See postitus on nüüd märgistatud modereerimiseks.",
"deleted_message": "See teema on kustutatud. Ainult kasutajad kellel on piisavalt õigusi saavad seda näha.",
"following_topic.message": "Sulle ei edastata enam teateid uutest postitustest kui keegi postitab siia teemasse.",
- "not_following_topic.message": "Sulle ei edastata enam teateid uutest postitustest siin teemas.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Sa ei näe seda teemat enam lugemata teemade nimekirjas. Sind teavitatakse, kui Sind mainitakse või Sinu postitust kiidetakse heaks.",
"login_to_subscribe": "Palun registreeru kasutajaks või logi sisse, et tellida teateid selle postituse kohta.",
"markAsUnreadForAll.success": "Teema märgitud mitte-loetuks kõikidele.",
diff --git a/public/language/et/user.json b/public/language/et/user.json
index c6d779d569..81b9f5b22b 100644
--- a/public/language/et/user.json
+++ b/public/language/et/user.json
@@ -6,6 +6,7 @@
"postcount": "Postitusi",
"email": "Email",
"confirm_email": "Kinnita email",
+ "account_info": "Account Info",
"ban_account": "Bannige kasutaja",
"ban_account_confirm": "Kas te tõesti soovite antud kasutajat bannida?",
"unban_account": "Eemaldage kontolt ban",
@@ -107,5 +108,11 @@
"custom_route_help": "Sisestage tee nimi siia, ilma eelnevate kaldkriipsudeta (nt. \"recent\", või \"popular\")",
"sso.title": "Ühekordse sisselogimisega teenused",
"sso.associated": "Seotud koos",
- "sso.not-associated": "Kliki siia, et siduda koos"
+ "sso.not-associated": "Kliki siia, et siduda koos",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/category.json b/public/language/fa_IR/category.json
index 3706ca7af4..aa80f9faf2 100644
--- a/public/language/fa_IR/category.json
+++ b/public/language/fa_IR/category.json
@@ -10,6 +10,10 @@
"share_this_category": "به اشتراکگذاری این دسته بندی",
"watch": "پیگیری",
"ignore": "نادیده گرفتن",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "در حال حاضر شما به روز رسانی های این دسته بندی را دنبال می کنید",
"ignore.message": "در حال حاضر شما به روز رسانی های این دسته بندی را نادیده میگیرد",
"watched-categories": "دسته بندی های پیگیری شده"
diff --git a/public/language/fa_IR/global.json b/public/language/fa_IR/global.json
index 7681ad9bea..be2aa36df5 100644
--- a/public/language/fa_IR/global.json
+++ b/public/language/fa_IR/global.json
@@ -50,7 +50,9 @@
"topics": "موضوع ها",
"posts": "دیدگاهها",
"best": "بهترین",
+ "upvoters": "Upvoters",
"upvoted": "رای مثبت",
+ "downvoters": "Downvoters",
"downvoted": "رای منفی",
"views": "بازدیدها",
"reputation": "اعتبار",
diff --git a/public/language/fa_IR/notifications.json b/public/language/fa_IR/notifications.json
index cfcf1c270d..81b46f4c21 100644
--- a/public/language/fa_IR/notifications.json
+++ b/public/language/fa_IR/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1و %2 دیگران به پست شما رای مثبت دادن در %3.",
"moved_your_post": "%1 پست شما را به %2 انتقال داده است",
"moved_your_topic": "%2 %1 را منتقل کرده است",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 پست شما را در %2 علامتدار کرده",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/fa_IR/pages.json b/public/language/fa_IR/pages.json
index 1172c2e624..1b0e272d7e 100644
--- a/public/language/fa_IR/pages.json
+++ b/public/language/fa_IR/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "ویرایش کلمه ی عبورِ \"%1\"",
"account/edit/username": "ویرایش نام کاربریِ \"%1\"",
"account/edit/email": "ویرایش ایمیلِ \"%1\"",
+ "account/info": "Account Info",
"account/following": "کاربرانی که %1 دنبال میکند",
"account/followers": "کاربرانی که %1 را دنبال میکنند",
"account/posts": "پستهای %1",
diff --git a/public/language/fa_IR/register.json b/public/language/fa_IR/register.json
index 6ece75479c..915801b6ab 100644
--- a/public/language/fa_IR/register.json
+++ b/public/language/fa_IR/register.json
@@ -1,5 +1,6 @@
{
"register": "نامنویسی",
+ "cancel_registration": "Cancel Registration",
"help.email": "به طور پیشفرض، ایمیلی شما از دید همگان پنهان میشود.",
"help.username_restrictions": "یک نام کاربری یکتا بین %1 و %2 نویسه. دیگران میتوانند با @نامکاربری به شما اشاره کنند.",
"help.minimum_password_length": "کلمه عبور شما باید دستکم %1 کاراکتر داشته باشد.",
@@ -15,5 +16,8 @@
"alternative_registration": "روش ثبت نام جایگزین",
"terms_of_use": "شرایط استفاده",
"agree_to_terms_of_use": "با شرایط استفاده موافقم",
- "registration-added-to-queue": "ثبت نام شما به صف تایید اضافه شد. وقتی توسط یک مدیر تایید شد شما ایمیلی دریافت خواهید کرد."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "ثبت نام شما به صف تایید اضافه شد. وقتی توسط یک مدیر تایید شد شما ایمیلی دریافت خواهید کرد.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json
index a4c0951b5a..84ffd07982 100644
--- a/public/language/fa_IR/topic.json
+++ b/public/language/fa_IR/topic.json
@@ -31,7 +31,7 @@
"flag_success": "این موضوع برای بررسی ناظران پرچم گذاشته شد.",
"deleted_message": "این موضوع پاک شده است. تنها کاربرانِ با حق مدیریت موضوع میتوانند آن را ببینند.",
"following_topic.message": "از این پس اگر کسی در این موضوع پست بگذارد، شما آگاه خواهید شد.",
- "not_following_topic.message": "شما دیگر اطلاعیه های این موضوع را دریافت نخواهید کرد.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "شما دیگر نمی خواهید این تاپیک را در فهرست عنوان های خوانده نشده ببینید. به شما اطلاع داده خواهد شد زمانی که به پست شما کسی رای بدهد.",
"login_to_subscribe": "برای دنبال کردن این موضوع، لطفا ثبت نام کنید و یا با نام کاربری خود وارد شوید",
"markAsUnreadForAll.success": "موضوع برای همگان نخوانده در نظر گرفته شد.",
diff --git a/public/language/fa_IR/user.json b/public/language/fa_IR/user.json
index 2fb8fe00c7..99c9cda0a4 100644
--- a/public/language/fa_IR/user.json
+++ b/public/language/fa_IR/user.json
@@ -6,6 +6,7 @@
"postcount": "تعداد پست ها",
"email": "رایانامه",
"confirm_email": "تأیید ایمیل",
+ "account_info": "Account Info",
"ban_account": "مسدود کردن حساب کاربری",
"ban_account_confirm": "از مسدود کردن این کاربر اطمینان دارید؟",
"unban_account": "آزاد کردن حساب کاربری",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/fi/category.json b/public/language/fi/category.json
index 0083f12e8b..822b7f7372 100644
--- a/public/language/fi/category.json
+++ b/public/language/fi/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Jaa tämä kategoria",
"watch": "Watch",
"ignore": "Sivuuta",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "You are now watching updates from this category",
"ignore.message": "You are now ignoring updates from this category",
"watched-categories": "Watched categories"
diff --git a/public/language/fi/global.json b/public/language/fi/global.json
index 94d68b78fb..1a9176b1be 100644
--- a/public/language/fi/global.json
+++ b/public/language/fi/global.json
@@ -50,7 +50,9 @@
"topics": "Aiheet",
"posts": "Viestit",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Katsottu",
"reputation": "Maine",
diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json
index 427e04311e..b10e43729c 100644
--- a/public/language/fi/notifications.json
+++ b/public/language/fi/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 flagged a post in %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/fi/pages.json b/public/language/fi/pages.json
index 66c6fdfe34..fa8f12c926 100644
--- a/public/language/fi/pages.json
+++ b/public/language/fi/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "Ihmiset, jota %1 seuraa",
"account/followers": "Ihmiset, jotka seuraavat %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/fi/register.json b/public/language/fi/register.json
index f7d7ab7e08..f0b78c94a1 100644
--- a/public/language/fi/register.json
+++ b/public/language/fi/register.json
@@ -1,5 +1,6 @@
{
"register": "Rekisteröidy",
+ "cancel_registration": "Cancel Registration",
"help.email": "Oletuksena sähköpostiosoitettasi ei näytetä muille.",
"help.username_restrictions": "Yksilöllisen käyttäjätunnuksen pitää olla %1-%2 merkkiä pitkä. Toiset voivat mainita sinut @username.",
"help.minimum_password_length": "Salasanasi pitää olla vähintään %1 merkin mittainen.",
@@ -15,5 +16,8 @@
"alternative_registration": "Vaihtoehtoiset rekisteröitymistavat",
"terms_of_use": "Käyttöehdot",
"agree_to_terms_of_use": "Hyväksyn käyttöehdot",
- "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json
index 9136073cab..016faa3d38 100644
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -31,7 +31,7 @@
"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.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Ole hyvä ja rekisteröidy tai kirjaudu sisään tilataksesi tämän aiheen.",
"markAsUnreadForAll.success": "Aihe merkitty lukemattomaksi kaikille.",
diff --git a/public/language/fi/user.json b/public/language/fi/user.json
index 46ac2e314d..37eb67c338 100644
--- a/public/language/fi/user.json
+++ b/public/language/fi/user.json
@@ -6,6 +6,7 @@
"postcount": "Viestien määrä",
"email": "Sähköposti",
"confirm_email": "Vahvista sähköpostiosoite",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/fr/category.json b/public/language/fr/category.json
index a44eb21efe..21cddfc7e3 100644
--- a/public/language/fr/category.json
+++ b/public/language/fr/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Partager cette catégorie",
"watch": "S'abonner",
"ignore": "Ne plus surveiller",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Vous êtes désormais abonné aux mises à jour de cette catégorie.",
"ignore.message": "Vous ne surveillez plus les mises jour de cette catégorie.",
"watched-categories": "Abonnements"
diff --git a/public/language/fr/global.json b/public/language/fr/global.json
index 647e78ca5c..c64c828e00 100644
--- a/public/language/fr/global.json
+++ b/public/language/fr/global.json
@@ -50,7 +50,9 @@
"topics": "Sujets",
"posts": "Messages",
"best": "Meilleurs",
+ "upvoters": "Upvoters",
"upvoted": "Votes pour",
+ "downvoters": "Downvoters",
"downvoted": "Votes contre",
"views": "Vues",
"reputation": "Réputation",
diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json
index c5ce2c609a..e13aba7ee4 100644
--- a/public/language/fr/notifications.json
+++ b/public/language/fr/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 et %2 autres on voté pour votre message dans %3.",
"moved_your_post": "%1 a déplacé votre message vers %2",
"moved_your_topic": "%1 a déplacé %2.",
- "favourited_your_post_in": "%1 a enregistré votre message dans %2.",
- "favourited_your_post_in_dual": "%1 et %2 autres ont enregistré votre message dans %3.",
- "favourited_your_post_in_multiple": "%1 et %2 autres ont enregistré votre message dans %3.",
"user_flagged_post_in": "%1 a signalé un message dans %2.",
"user_flagged_post_in_dual": "%1 et %2 ont signalé un message dans %3",
"user_flagged_post_in_multiple": "%1 et %2 autres on signalé un message dans %3",
diff --git a/public/language/fr/pages.json b/public/language/fr/pages.json
index 4b1aeadc51..af89d4d674 100644
--- a/public/language/fr/pages.json
+++ b/public/language/fr/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Édition du mot de passe de \"%1\"",
"account/edit/username": "Édition du nom d'utilisateur de \"%1\"",
"account/edit/email": "Édition de l'e-mail de \"%1\"",
+ "account/info": "Account Info",
"account/following": "Les personnes auxquelles %1 est abonné",
"account/followers": "Les personnes abonnées à %1",
"account/posts": "Messages postés par %1",
diff --git a/public/language/fr/register.json b/public/language/fr/register.json
index 82a8eb27f5..50349dbfc3 100644
--- a/public/language/fr/register.json
+++ b/public/language/fr/register.json
@@ -1,5 +1,6 @@
{
"register": "S'inscrire",
+ "cancel_registration": "Cancel Registration",
"help.email": "Par défaut, votre email est cachée du public.",
"help.username_restrictions": "Un nom d'utilisateur est unique et a entre %1 et %2 charactères. Les autres utilisateurs peuvent vous mentionner avec @nom_d'utilisateur.",
"help.minimum_password_length": "Votre mot de passe doit avoir au moins %1 charactères.",
@@ -15,5 +16,8 @@
"alternative_registration": "Autres méthodes d'inscription",
"terms_of_use": "Conditions d'utilisation",
"agree_to_terms_of_use": "J'accepte les Conditions d'utilisation",
- "registration-added-to-queue": "Votre inscription a été ajoutée à la liste d'approbation. Vous recevrez un email quand celle-ci sera acceptée par un administrateur."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Votre inscription a été ajoutée à la liste d'approbation. Vous recevrez un email quand celle-ci sera acceptée par un administrateur.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json
index 247410d7e3..07542617c1 100644
--- a/public/language/fr/topic.json
+++ b/public/language/fr/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Ce message a bien été signalé aux modérateurs.",
"deleted_message": "Ce sujet a été supprimé. Seuls les utilisateurs avec les droits d'administration peuvent le voir.",
"following_topic.message": "Vous recevrez désormais des notifications lorsque quelqu'un postera dans ce sujet.",
- "not_following_topic.message": "Vous ne recevrez plus de notifications pour ce sujet.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Vous ne verrez plus ce sujet dans la liste des sujets non lus. Vous serez notifié lorsque vous serez mentionné ou que quelqu'un votera pour votre message.",
"login_to_subscribe": "Veuillez vous enregistrer ou vous connecter afin de vous abonner à ce sujet.",
"markAsUnreadForAll.success": "Sujet marqué comme non lu pour tout le monde.",
diff --git a/public/language/fr/user.json b/public/language/fr/user.json
index 278d6dfe10..95aa9484f3 100644
--- a/public/language/fr/user.json
+++ b/public/language/fr/user.json
@@ -6,6 +6,7 @@
"postcount": "Nombre de messages",
"email": "Email",
"confirm_email": "Confirmer l'adresse email",
+ "account_info": "Account Info",
"ban_account": "Bannir",
"ban_account_confirm": "Êtes-vous sûr de bien vouloir bannir cet utilisateur ?",
"unban_account": "Restaurer le Compte",
@@ -107,5 +108,11 @@
"custom_route_help": "Entrez le nom d'une route ici, sans slash au début (par exemple \"recent\" ou \"popular\")",
"sso.title": "Services d'authentification unique",
"sso.associated": "Associé avec",
- "sso.not-associated": "Cliquez ici pour associer"
+ "sso.not-associated": "Cliquez ici pour associer",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/gl/category.json b/public/language/gl/category.json
index 920cb96b4a..3d15c82ad9 100644
--- a/public/language/gl/category.json
+++ b/public/language/gl/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Comparte esta categoría",
"watch": "Vixiar",
"ignore": "Ignorar",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Agora vixías as novidades desta categoría",
"ignore.message": "Agora ignoras as novidades nesta categoría",
"watched-categories": "Categorías vixiadas"
diff --git a/public/language/gl/global.json b/public/language/gl/global.json
index f2398c524c..dda1922aa1 100644
--- a/public/language/gl/global.json
+++ b/public/language/gl/global.json
@@ -50,7 +50,9 @@
"topics": "Temas",
"posts": "Publicacións",
"best": "Mellor",
+ "upvoters": "Upvoters",
"upvoted": "Votado positivamente",
+ "downvoters": "Downvoters",
"downvoted": "Votado negativamente",
"views": "Vistas",
"reputation": "Reputación",
diff --git a/public/language/gl/notifications.json b/public/language/gl/notifications.json
index c13bca0593..deeb2835a5 100644
--- a/public/language/gl/notifications.json
+++ b/public/language/gl/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 e %2 máis votaron positivamente a túa mensaxe en %3.",
"moved_your_post": "%1 moveu a túa publicación a%2",
"moved_your_topic": "%1 foi movido %2",
- "favourited_your_post_in": "%1 gardouse a súa publicación en%2.",
- "favourited_your_post_in_dual": "%1 y %2 gardaron a súa publicación en%3.",
- "favourited_your_post_in_multiple": "%1 e outros %2 usuarios gardaron a súa publicación en %3.",
"user_flagged_post_in": "%1 reportou unha mensaxe en %2",
"user_flagged_post_in_dual": "%1 e %2 reportaron a túa mensaxe en %3",
"user_flagged_post_in_multiple": "%1 e outras %2 persoas reportaron unha mensaxe en %3",
diff --git a/public/language/gl/pages.json b/public/language/gl/pages.json
index e14eb65e85..aaba7c2c49 100644
--- a/public/language/gl/pages.json
+++ b/public/language/gl/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editando contrasinal \"%1\"",
"account/edit/username": "Editando nome de usuario \"%1\"",
"account/edit/email": "Editando o correo \"%1\"",
+ "account/info": "Account Info",
"account/following": "Xente %1 seguindo",
"account/followers": "Xente a quen segues %1",
"account/posts": "Publicación de %1",
diff --git a/public/language/gl/register.json b/public/language/gl/register.json
index 305528f442..eb043f652d 100644
--- a/public/language/gl/register.json
+++ b/public/language/gl/register.json
@@ -1,5 +1,6 @@
{
"register": "Rexistrarse",
+ "cancel_registration": "Cancel Registration",
"help.email": "Por defecto, o teu correo electrónico está oculto ao público.",
"help.username_restrictions": "O nome de usuario debe ter entre %1 e %2 caracteres. Os outros usuarios poden mencionarte escribindo @usuario.",
"help.minimum_password_length": "O teu contrasinal debe ter polo menos %1 caracteres.",
@@ -15,5 +16,8 @@
"alternative_registration": "Métodos de rexistro alternativos",
"terms_of_use": "Termos e Condicións de Uso",
"agree_to_terms_of_use": "Acepto os Termos e Condicións de Uso",
- "registration-added-to-queue": "O teu rexistro foi engadido á cola de aprobación. Recibirás un correo electrónico cando sexa aceptado por un administrador."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "O teu rexistro foi engadido á cola de aprobación. Recibirás un correo electrónico cando sexa aceptado por un administrador.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json
index 24004ac1fd..f5a27bf8d2 100644
--- a/public/language/gl/topic.json
+++ b/public/language/gl/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Esta mensaxe foi reportada para moderación.",
"deleted_message": "Este tema foi borrado. Só os usuarios con privilexios administrativos poden velo.",
"following_topic.message": "Agora recibirás notificacións cando alguén publique neste tema.",
- "not_following_topic.message": "Non recibirás notificacións deste tema.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Xa non verás este fío na lista de fíos non lidos. Serás notificado cando sexas mencionado ou a túa publicación sexa votada.",
"login_to_subscribe": "Por favor, identifícate para subscribirte a este tema.",
"markAsUnreadForAll.success": "Publicación marcada como non lida para todos.",
diff --git a/public/language/gl/user.json b/public/language/gl/user.json
index 96d1a465a3..597d84536d 100644
--- a/public/language/gl/user.json
+++ b/public/language/gl/user.json
@@ -6,6 +6,7 @@
"postcount": "Reconto de mensaxes",
"email": "Correo Electrónico",
"confirm_email": "Confirma o teu correo electrónico",
+ "account_info": "Account Info",
"ban_account": "Suspender conta",
"ban_account_confirm": "Estás seguro de que desexas expulsar a este usuario?",
"unban_account": "Readmitir conta",
@@ -107,5 +108,11 @@
"custom_route_help": "Introduza o nome de ruta aquí, sen ningunha barra (por exemplo, \"recente\", ou \"popular\")",
"sso.title": "Servizos de Inicio de Sesión Único",
"sso.associated": "Asociado con",
- "sso.not-associated": "Pica aquí para asociarte con"
+ "sso.not-associated": "Pica aquí para asociarte con",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/he/category.json b/public/language/he/category.json
index ed3cef9f98..5a5a8365b3 100644
--- a/public/language/he/category.json
+++ b/public/language/he/category.json
@@ -10,6 +10,10 @@
"share_this_category": "שתף קטגוריה זו",
"watch": "עקוב",
"ignore": "התעלם",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "אתה עכשיו עוקב אחרי עדכונים מקטגוריה זו",
"ignore.message": "אתה עכשיו מתעלם מעדכונים מקטגוריה זו",
"watched-categories": "קטגוריות נעקבות"
diff --git a/public/language/he/global.json b/public/language/he/global.json
index f4b966429e..2d1d55a783 100644
--- a/public/language/he/global.json
+++ b/public/language/he/global.json
@@ -50,7 +50,9 @@
"topics": "נושאים",
"posts": "פוסטים",
"best": "הגבוה ביותר",
+ "upvoters": "Upvoters",
"upvoted": "הוצבע בעד",
+ "downvoters": "Downvoters",
"downvoted": "הוצבע נגד",
"views": "צפיות",
"reputation": "מוניטין",
diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json
index 30255302fc..134b173de0 100644
--- a/public/language/he/notifications.json
+++ b/public/language/he/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 ו%2 אחרים הצביעו לפוסט שלך ב%3.",
"moved_your_post": "%1 העביר את הפוסט שלך ל%2",
"moved_your_topic": "%1 הוזז ל%2",
- "favourited_your_post_in": "%1 סימן את הפוסט שלך ב%2.",
- "favourited_your_post_in_dual": "%1 ו%2 סימנו את הפוסט שלך ב%3.",
- "favourited_your_post_in_multiple": "%1 ו-%2 אחרים סימנו את הפוסט שלך ב%3.",
"user_flagged_post_in": "%1 דיווח על פוסט ב %2",
"user_flagged_post_in_dual": "%1 ו%2 סימנו פוסט ב%3",
"user_flagged_post_in_multiple": "%1 ו%2 נוספים סימנו פוסט ב%3",
diff --git a/public/language/he/pages.json b/public/language/he/pages.json
index e939b0b589..b8a6049f8c 100644
--- a/public/language/he/pages.json
+++ b/public/language/he/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "עורך את הסיסמה של \"%1\"",
"account/edit/username": "עורך את שם המשתמש של \"%1\"",
"account/edit/email": "עורך את כתובת המייל של \"%1\"",
+ "account/info": "Account Info",
"account/following": "אנשים ש%1 עוקב אחריהם",
"account/followers": "אנשים שעוקבים אחרי %1",
"account/posts": "הודעות שפורסמו על ידי %1",
diff --git a/public/language/he/register.json b/public/language/he/register.json
index 752a5f85e7..777e83302c 100644
--- a/public/language/he/register.json
+++ b/public/language/he/register.json
@@ -1,5 +1,6 @@
{
"register": "הרשם",
+ "cancel_registration": "Cancel Registration",
"help.email": "כברירת מחדל, כתובת האימייל שלך אינה חשופה למשתמשים אחרים",
"help.username_restrictions": "שם משתמש ייחודי בין %1 ל %2 תווים. משתמשים אחרים יכולים לציין את שמך באמצעות @שם המשתמש שלך.",
"help.minimum_password_length": "סיסמתך חייבת להיות לפחות באורך של %1 תווים.",
@@ -15,5 +16,8 @@
"alternative_registration": "הרשם באמצעות...",
"terms_of_use": "תנאי שימוש",
"agree_to_terms_of_use": "אני מסכים לתנאי השימוש",
- "registration-added-to-queue": "הבקשה שלך להרשמה נשלחה. תקבל בקרוב מייל אישור לכתובת האימייל שהכנסת כשמנהל יאשר את הבקשה."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "הבקשה שלך להרשמה נשלחה. תקבל בקרוב מייל אישור לכתובת האימייל שהכנסת כשמנהל יאשר את הבקשה.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/he/topic.json b/public/language/he/topic.json
index d1b892a460..778d419d16 100644
--- a/public/language/he/topic.json
+++ b/public/language/he/topic.json
@@ -31,7 +31,7 @@
"flag_success": "התקבל דיווח על פוסט זה.",
"deleted_message": "נושא זה נמחק. רק משתמשים עם ההרשאות המתאימות יכולים לצפות בו.",
"following_topic.message": "מעתה, תקבל הודעות כאשר מישהו יעלה פוסט לנושא זה.",
- "not_following_topic.message": "לא תקבל הודעות נוספות בנושא זה.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "אנא הרשם או התחבר על-מנת לעקוב אחר נושא זה.",
"markAsUnreadForAll.success": "נושא זה סומן כלא נקרא לכולם.",
diff --git a/public/language/he/user.json b/public/language/he/user.json
index 79296e8215..7311867da8 100644
--- a/public/language/he/user.json
+++ b/public/language/he/user.json
@@ -6,6 +6,7 @@
"postcount": "כמות פוסטים",
"email": "כתובת אימייל",
"confirm_email": "אשר מייל",
+ "account_info": "Account Info",
"ban_account": "הרחק חשבון",
"ban_account_confirm": "אתה בטוח שברצונך להרחיק את המשתמש הזה?",
"unban_account": "בטל את הרחקת החשבון",
@@ -107,5 +108,11 @@
"custom_route_help": "הכנס שם נתיב כאן, ללא לוכסן לפני (לדוגמא \"אחרונים\", או \"פופולארי\")",
"sso.title": "שירות יחיד להתחברות",
"sso.associated": "משוייך עם",
- "sso.not-associated": "לחץ כאן כדי לשייך"
+ "sso.not-associated": "לחץ כאן כדי לשייך",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/hu/category.json b/public/language/hu/category.json
index 6bbcf00519..497cdbe8ec 100644
--- a/public/language/hu/category.json
+++ b/public/language/hu/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Kategória megosztása",
"watch": "Watch",
"ignore": "Ignorálás",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "You are now watching updates from this category",
"ignore.message": "You are now ignoring updates from this category",
"watched-categories": "Watched categories"
diff --git a/public/language/hu/global.json b/public/language/hu/global.json
index 63ad09e507..116730ac61 100644
--- a/public/language/hu/global.json
+++ b/public/language/hu/global.json
@@ -50,7 +50,9 @@
"topics": "Témák",
"posts": "Hozzászólások",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Megtekintések",
"reputation": "Hírnév",
diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json
index b1b09a5dd7..81f6ed12ed 100644
--- a/public/language/hu/notifications.json
+++ b/public/language/hu/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 flagged a post in %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/hu/pages.json b/public/language/hu/pages.json
index 9ae7887b0e..ebd6c51e3a 100644
--- a/public/language/hu/pages.json
+++ b/public/language/hu/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/hu/register.json b/public/language/hu/register.json
index a14ce476ca..041b12c0c4 100644
--- a/public/language/hu/register.json
+++ b/public/language/hu/register.json
@@ -1,5 +1,6 @@
{
"register": "Regisztráció",
+ "cancel_registration": "Cancel Registration",
"help.email": "Az e-mail cím nem lesz közzétéve.",
"help.username_restrictions": "Egyedi felhasználói név %1 és %2 karakterek között. A többiek megemlíthetnek az alábbi módon @nicknév.",
"help.minimum_password_length": "A jelszónak legalább %1 karakter hosszúnak kell lennie.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternatív Regisztráció",
"terms_of_use": "Használtai feltételek",
"agree_to_terms_of_use": "Egyetértek a Használtai Feltételekkel",
- "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json
index d96b4b61a8..c9b31ccec1 100644
--- a/public/language/hu/topic.json
+++ b/public/language/hu/topic.json
@@ -31,7 +31,7 @@
"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.",
"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
- "not_following_topic.message": "You will no longer receive notifications from this topic.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
"markAsUnreadForAll.success": "Topic marked as unread for all.",
diff --git a/public/language/hu/user.json b/public/language/hu/user.json
index dc8c9969d3..86e8a6a79f 100644
--- a/public/language/hu/user.json
+++ b/public/language/hu/user.json
@@ -6,6 +6,7 @@
"postcount": "Bejegyzés megtekintés",
"email": "E-mail",
"confirm_email": "E-mail megerősítése",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/id/category.json b/public/language/id/category.json
index ac3493acb0..fed1ba2ef9 100644
--- a/public/language/id/category.json
+++ b/public/language/id/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Bagikan kategori ini",
"watch": "Watch",
"ignore": "Abaikan",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "You are now watching updates from this category",
"ignore.message": "You are now ignoring updates from this category",
"watched-categories": "Watched categories"
diff --git a/public/language/id/global.json b/public/language/id/global.json
index c488a606a9..8ef7a1d220 100644
--- a/public/language/id/global.json
+++ b/public/language/id/global.json
@@ -50,7 +50,9 @@
"topics": "Topik",
"posts": "Post",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Views",
"reputation": "Reputasi",
diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json
index e4290a117d..f0d1954715 100644
--- a/public/language/id/notifications.json
+++ b/public/language/id/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 menandai sebuah posting di %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/id/pages.json b/public/language/id/pages.json
index 2d5d418547..f6802ec0a2 100644
--- a/public/language/id/pages.json
+++ b/public/language/id/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/id/register.json b/public/language/id/register.json
index 305cb2c19f..62a5a15ee2 100644
--- a/public/language/id/register.json
+++ b/public/language/id/register.json
@@ -1,5 +1,6 @@
{
"register": "Daftar",
+ "cancel_registration": "Cancel Registration",
"help.email": "Secara default, emailmu akan disembunyikan dari publik.",
"help.username_restrictions": "Nama Pengguna yang unik antara %1 dan %2 karakter. Pengguna lain dapat menyebutmu dengan menggunakan @nama pengguna.",
"help.minimum_password_length": "Panjang password harus setidaknya %1 karakter.",
@@ -15,5 +16,8 @@
"alternative_registration": "Pendaftaran Alternatif",
"terms_of_use": "Aturan Penggunaan",
"agree_to_terms_of_use": "Saya menyetujui Aturan Penggunaan",
- "registration-added-to-queue": "Pendaftaranmu telah ditambahkan dalam daftar persetujuan. Kamu akan menerima email ketika pendaftaranmu disetujui oleh administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Pendaftaranmu telah ditambahkan dalam daftar persetujuan. Kamu akan menerima email ketika pendaftaranmu disetujui oleh administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/id/topic.json b/public/language/id/topic.json
index b1cf656bcc..799c6b7c67 100644
--- a/public/language/id/topic.json
+++ b/public/language/id/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Posting ini telah ditandai untuk moderasi",
"deleted_message": "Topik ini telah dihapus. Hanya pengguna dengan hak manajemen topik yang dapat melihatnya.",
"following_topic.message": "Saat ini kamu akan menerima pemberitahuan saat seseorang membuat posting di dalam topik ini.",
- "not_following_topic.message": "Kamu tidak lagi menerima notiifikasi dari topik ini.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Daftar atau login untuk berlangganan topik ini.",
"markAsUnreadForAll.success": "Topik ditandai Belum Dibaca seluruhnya",
diff --git a/public/language/id/user.json b/public/language/id/user.json
index 4acdc89f51..4a93ced3ed 100644
--- a/public/language/id/user.json
+++ b/public/language/id/user.json
@@ -6,6 +6,7 @@
"postcount": "Post Count",
"email": "Email",
"confirm_email": "Konfirmasi Email",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/it/category.json b/public/language/it/category.json
index 2b41032053..27c6ff7e94 100644
--- a/public/language/it/category.json
+++ b/public/language/it/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Condividi questa Categoria",
"watch": "Osserva",
"ignore": "Ignora",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Non stai seguendo gli aggiornamenti di questa categoria",
"ignore.message": "Da ora saranno ignorati gli aggiornamenti di questa categoria",
"watched-categories": "Categorie osservate"
diff --git a/public/language/it/global.json b/public/language/it/global.json
index 3e19f1688b..e63dceae07 100644
--- a/public/language/it/global.json
+++ b/public/language/it/global.json
@@ -50,7 +50,9 @@
"topics": "Discussioni",
"posts": "Post",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Visualizzazioni",
"reputation": "Reputazione",
diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json
index fc8f3bccc8..bd224b2cea 100644
--- a/public/language/it/notifications.json
+++ b/public/language/it/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 ha segnalato un post in %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/it/pages.json b/public/language/it/pages.json
index 477782d3c8..da115161ee 100644
--- a/public/language/it/pages.json
+++ b/public/language/it/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "Persone seguite da %1",
"account/followers": "Persone che seguono %1",
"account/posts": "Post creati da %1",
diff --git a/public/language/it/register.json b/public/language/it/register.json
index 373ca07801..58a04bf477 100644
--- a/public/language/it/register.json
+++ b/public/language/it/register.json
@@ -1,5 +1,6 @@
{
"register": "Registrazione",
+ "cancel_registration": "Cancel Registration",
"help.email": "Come opzione predefinita, il tuo indirizzo email non verrà reso pubblico.",
"help.username_restrictions": "Un nome utente unico, di almeno %1 caratteri e al massimo di %2. Gli altri utenti ti possono menzionare usando @username.",
"help.minimum_password_length": "La lunghezza della password deve essere di almeno %1 caratteri.",
@@ -15,5 +16,8 @@
"alternative_registration": "Altri metodi di registrazione",
"terms_of_use": "Termini di Utilizzo",
"agree_to_terms_of_use": "Accetto i Termini di Utilizzo",
- "registration-added-to-queue": "La tua registrazione è stata aggiunta alla coda di moderazione. Riceverai una mail quando verrà accettata da un amministratore."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "La tua registrazione è stata aggiunta alla coda di moderazione. Riceverai una mail quando verrà accettata da un amministratore.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/it/topic.json b/public/language/it/topic.json
index c8ec24ade8..0d71337cca 100644
--- a/public/language/it/topic.json
+++ b/public/language/it/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Questo post è stato contrassegnato per la moderazione.",
"deleted_message": "Questa discussione è stata cancellata. Solo gli utenti con diritti di gestione possono vederla.",
"following_topic.message": "Da ora riceverai notifiche quando qualcuno posterà in questa discussione.",
- "not_following_topic.message": "Non riceverai più notifiche da questa discussione.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Si prega di accedere o registrarsi per potersi iscrivere a questa discussione.",
"markAsUnreadForAll.success": "Discussione segnata come non letta per tutti.",
diff --git a/public/language/it/user.json b/public/language/it/user.json
index 2ef72244b7..1c864d034b 100644
--- a/public/language/it/user.json
+++ b/public/language/it/user.json
@@ -6,6 +6,7 @@
"postcount": "Numero post",
"email": "Email",
"confirm_email": "Conferma Email",
+ "account_info": "Account Info",
"ban_account": "BAN dell'account",
"ban_account_confirm": "Sei sicuro di voler bannare questo utente?",
"unban_account": "Togli il BAN",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Servizi Single-Sign-On",
"sso.associated": "Associa con",
- "sso.not-associated": "Clicca qui per associare con"
+ "sso.not-associated": "Clicca qui per associare con",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/ja/category.json b/public/language/ja/category.json
index 33cf774f14..b9de9f4f98 100644
--- a/public/language/ja/category.json
+++ b/public/language/ja/category.json
@@ -10,6 +10,10 @@
"share_this_category": "このカテゴリを共有する",
"watch": "ウォッチする",
"ignore": "無視する",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "このカテゴリの更新をウォッチする",
"ignore.message": "このカテゴリの更新を無視する",
"watched-categories": "ウォッチ中のカテゴリ"
diff --git a/public/language/ja/global.json b/public/language/ja/global.json
index 82cc2ea677..2d2ce15b92 100644
--- a/public/language/ja/global.json
+++ b/public/language/ja/global.json
@@ -50,7 +50,9 @@
"topics": "スレッド",
"posts": "ポスト",
"best": "最高",
+ "upvoters": "Upvoters",
"upvoted": "投票増加",
+ "downvoters": "Downvoters",
"downvoted": "投票減少",
"views": "閲覧数",
"reputation": "評価",
diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json
index 5fff05542b..6af28822d1 100644
--- a/public/language/ja/notifications.json
+++ b/public/language/ja/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 flagged a post in %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json
index 037ef853f4..83efe5e886 100644
--- a/public/language/ja/pages.json
+++ b/public/language/ja/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/ja/register.json b/public/language/ja/register.json
index a19fd68a34..3d300df3d4 100644
--- a/public/language/ja/register.json
+++ b/public/language/ja/register.json
@@ -1,5 +1,6 @@
{
"register": "登録",
+ "cancel_registration": "Cancel Registration",
"help.email": "初期設定ではメールアドレスは公開されません。",
"help.username_restrictions": "%1から%2 文字までのユニークなユーザー名.ツイッター（twitter）の@username 方式でメンションすることができます。",
"help.minimum_password_length": "パスワードには最小 %1 文字が必要です。",
@@ -15,5 +16,8 @@
"alternative_registration": "ほかの登録方法",
"terms_of_use": "利用規約",
"agree_to_terms_of_use": "利用規約に同意する",
- "registration-added-to-queue": "あなたの登録申請は承認キューに追加されました。管理者によって受け入れられた時に、メールを受信します。"
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "あなたの登録申請は承認キューに追加されました。管理者によって受け入れられた時に、メールを受信します。",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json
index 2428021556..2da568248e 100644
--- a/public/language/ja/topic.json
+++ b/public/language/ja/topic.json
@@ -31,7 +31,7 @@
"flag_success": "このポストをリポートしました。",
"deleted_message": "このトピックが削除されました。トピック管理権を持っているユーザーにしか読めません。",
"following_topic.message": "このスレッドが更新された際に通知を受け取ります。",
- "not_following_topic.message": "このスレッドの更新通知を停止しました。",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "このスレッドを購読するためにログインが必要です。",
"markAsUnreadForAll.success": "すべてのスレッドを未読にしました。",
diff --git a/public/language/ja/user.json b/public/language/ja/user.json
index a205a6d4d1..20ad10041f 100644
--- a/public/language/ja/user.json
+++ b/public/language/ja/user.json
@@ -6,6 +6,7 @@
"postcount": "投稿数",
"email": "メール",
"confirm_email": "メールアドレスを確認",
+ "account_info": "Account Info",
"ban_account": "BANアカウント",
"ban_account_confirm": "本当にこのユーザーをBANしますか？",
"unban_account": "禁止アカウント解除します",
@@ -107,5 +108,11 @@
"custom_route_help": "ここにルート名を入れます。手前にスラッシュを入れないこと（例：\"recent\"、\"popular\"など)",
"sso.title": "シングルサインオンサービス",
"sso.associated": "関連付けられています",
- "sso.not-associated": "ここを押して、関連付けられています"
+ "sso.not-associated": "ここを押して、関連付けられています",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/ko/category.json b/public/language/ko/category.json
index 6670e7b9c7..5fe7e96cde 100644
--- a/public/language/ko/category.json
+++ b/public/language/ko/category.json
@@ -10,6 +10,10 @@
"share_this_category": "이 카테고리를 공유",
"watch": "관심 주제",
"ignore": "관심 해제",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "이 카테고리에 올라오는 글을 주시하고 있습니다.",
"ignore.message": "이 카테고리에 올라오는 글을 무시합니다.",
"watched-categories": "관심 카테고리"
diff --git a/public/language/ko/global.json b/public/language/ko/global.json
index 9669750309..b8c38121d1 100644
--- a/public/language/ko/global.json
+++ b/public/language/ko/global.json
@@ -50,7 +50,9 @@
"topics": "주제",
"posts": "게시물",
"best": "베스트",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "비추됨",
"views": "조회 수",
"reputation": "인기도",
diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json
index cf7b14f2b0..a6c9dd68e6 100644
--- a/public/language/ko/notifications.json
+++ b/public/language/ko/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 님과 다른 %2 명이 %3의 내 게시물을 추천했습니다.",
"moved_your_post": "%1님이 귀하의 게시물을 %2로 옮겼습니다.",
"moved_your_topic": "%1 이 %2 로 옮겨졌습니다.",
- "favourited_your_post_in": "%1님이 %2의 내 게시물을 북마크 했습니다.",
- "favourited_your_post_in_dual": "%1 님과 %2 님이 %3의 내 게시물을 북마크 했습니다.",
- "favourited_your_post_in_multiple": "%1 님과 다른 %2 명이 %3의 내 게시물을 북마크 했습니다.",
"user_flagged_post_in": "%1님이 %2의 게시물을 신고했습니다.",
"user_flagged_post_in_dual": "%1 님과 %2 님이 %3 안의 게시물에 플래그를 세웠습니다.",
"user_flagged_post_in_multiple": "%1 님과 %2 명의 다른 유저들이 %3 안의 게시물에 플래그를 세웠습니다.",
diff --git a/public/language/ko/pages.json b/public/language/ko/pages.json
index d7c47cd17d..2558ee5d94 100644
--- a/public/language/ko/pages.json
+++ b/public/language/ko/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "\"%1\" 의 패스워드 변경",
"account/edit/username": "\"%1\" 의 사용자명 변경",
"account/edit/email": "\"%1\" 의 이메일 변경",
+ "account/info": "Account Info",
"account/following": "%1 명이 팔로우",
"account/followers": "%1 명을 팔로우",
"account/posts": "%1 님이 작성한 게시물",
diff --git a/public/language/ko/register.json b/public/language/ko/register.json
index b02a35f48e..a2be020b58 100644
--- a/public/language/ko/register.json
+++ b/public/language/ko/register.json
@@ -1,5 +1,6 @@
{
"register": "회원가입",
+ "cancel_registration": "Cancel Registration",
"help.email": "입력하신 이메일 주소는 공개되지 않으며, 설정을 통해 공개하실 수 있습니다.",
"help.username_restrictions": "%1자 이상 %2자 이하의 고유한 이름을 입력하세요. @username 같은 방식으로 다른 사람들을 언급할 수 있습니다.",
"help.minimum_password_length": "비밀번호는 최소 %1자로 제한됩니다.",
@@ -15,5 +16,8 @@
"alternative_registration": "다른 방법으로 회원가입",
"terms_of_use": "이용약관",
"agree_to_terms_of_use": "이용약관에 동의합니다.",
- "registration-added-to-queue": "회원가입이 요청되었습니다. 관리자의 승인 후 메일이 발송됩니다."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "회원가입이 요청되었습니다. 관리자의 승인 후 메일이 발송됩니다.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json
index cc156f3114..3b09e7efb7 100644
--- a/public/language/ko/topic.json
+++ b/public/language/ko/topic.json
@@ -31,7 +31,7 @@
"flag_success": "이 게시물은 신고되었습니다.",
"deleted_message": "이 주제는 삭제되었습니다. 주제 관리 권한이 있는 사용자만 볼 수 있습니다.",
"following_topic.message": "이제 이 주제에 새 답글이 달리면 알림을 받습니다.",
- "not_following_topic.message": "더 이상 이 주제의 새 답글을 알리지 않습니다.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "이 주제의 알림을 받기 위해서는 로그인해야 합니다.",
"markAsUnreadForAll.success": "모든 사용자에 대해 읽지 않음으로 표시했습니다.",
diff --git a/public/language/ko/user.json b/public/language/ko/user.json
index eb6c5e0b71..fa6b28d31b 100644
--- a/public/language/ko/user.json
+++ b/public/language/ko/user.json
@@ -6,6 +6,7 @@
"postcount": "게시물 작성 수",
"email": "이메일",
"confirm_email": "이메일 확인",
+ "account_info": "Account Info",
"ban_account": "차단된 계정",
"ban_account_confirm": "이 사용자를 차단하시겠습니까?",
"unban_account": "차단 해제",
@@ -107,5 +108,11 @@
"custom_route_help": "라우팅 이름을 앞쪽 '/' 없이 입력해주세요 (예: \"최근 목록\", \"인기 게시물\")",
"sso.title": "통합 인증 서비스",
"sso.associated": "연관짓기 - ",
- "sso.not-associated": "이 곳을 클리하여 연관지으세요."
+ "sso.not-associated": "이 곳을 클리하여 연관지으세요.",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/lt/category.json b/public/language/lt/category.json
index f93c1a5a90..8c909bae42 100644
--- a/public/language/lt/category.json
+++ b/public/language/lt/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Pasidalinti šią kategoriją",
"watch": "Stebėti",
"ignore": "Nepaisyti",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Jūs dabar stebite atnaujinimus iš šios kategorijos",
"ignore.message": "Jūs dabar ignoruojate atnaujinimus iš šios kategorijos",
"watched-categories": "Watched categories"
diff --git a/public/language/lt/global.json b/public/language/lt/global.json
index 5ecfc4b4ab..3368f99fe2 100644
--- a/public/language/lt/global.json
+++ b/public/language/lt/global.json
@@ -50,7 +50,9 @@
"topics": "Temos",
"posts": "Pranešimai",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Peržiūros",
"reputation": "Reputacija",
diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json
index 640f9bde08..1e8f1b20bf 100644
--- a/public/language/lt/notifications.json
+++ b/public/language/lt/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1pagrįso nuomone čia %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/lt/pages.json b/public/language/lt/pages.json
index 949e4c3eb2..4fccb071b6 100644
--- a/public/language/lt/pages.json
+++ b/public/language/lt/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/lt/register.json b/public/language/lt/register.json
index 52cf32608c..193d745318 100644
--- a/public/language/lt/register.json
+++ b/public/language/lt/register.json
@@ -1,5 +1,6 @@
{
"register": "Registruotis",
+ "cancel_registration": "Cancel Registration",
"help.email": "Pagal nutylėjimą, jūsų el. paštas nebus viešai matomas.",
"help.username_restrictions": "Unikalus vartotojo vardas %1-%2 simbolių ilgio. Kiti vartotojai galės jus minėti @vartotojas.",
"help.minimum_password_length": "Jūsų slaptažodis turi būti mažiausiai %1 simbolių.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternatyvūs registracijos būdai",
"terms_of_use": "Naudojimo sąlygos",
"agree_to_terms_of_use": "Aš sutinku su vartojimo sąlygomis",
- "registration-added-to-queue": "Jūsų registracijos prašymas buvo pridėtas į laukiančiųjų sąrašą. Jūs gausite el.paštu laišką kada administratorius patvirtins jus"
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Jūsų registracijos prašymas buvo pridėtas į laukiančiųjų sąrašą. Jūs gausite el.paštu laišką kada administratorius patvirtins jus",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json
index e2e85315f5..e30d9b0f65 100644
--- a/public/language/lt/topic.json
+++ b/public/language/lt/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Šis pranešimas buvo pažymėtas moderatorių patikrinimui.",
"deleted_message": "Ši tema buvo ištrinta. Tik Vartotojai su temos redagavimo privilegijomis gali matyti ja",
"following_topic.message": "Dabar jūs gausite pranešimus kai kas nors atrašys šioje temoje.",
- "not_following_topic.message": "Jūs daugiau negausite pranešimų iš šios temos.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Norėdami prenumeruoti šią temą, prašome prisiregistruoti arba prisijungti.",
"markAsUnreadForAll.success": "Tema visiems vartotojams pažymėta kaip neskaityta.",
diff --git a/public/language/lt/user.json b/public/language/lt/user.json
index 51671a2486..3fbd891809 100644
--- a/public/language/lt/user.json
+++ b/public/language/lt/user.json
@@ -6,6 +6,7 @@
"postcount": "Įrašų kiekis",
"email": "El. paštas",
"confirm_email": "Patvirtinti el. paštą",
+ "account_info": "Account Info",
"ban_account": "Užblokuoti Paskyrą",
"ban_account_confirm": "Jūs tikrai norite užblokuoti šį vartotoją?",
"unban_account": "Atblokuoti Paskyrą",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/ms/category.json b/public/language/ms/category.json
index e345d4b65f..d683056b87 100644
--- a/public/language/ms/category.json
+++ b/public/language/ms/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Kongsi kategori ini",
"watch": "Melihat",
"ignore": "Abai",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Anda sedang melihat kemaskini dari kategori ini",
"ignore.message": "Anda sedang mengabaikan kemaskini dari kategori ini",
"watched-categories": "Kategori Dilihat"
diff --git a/public/language/ms/global.json b/public/language/ms/global.json
index 4e71e55dfa..20bfd41623 100644
--- a/public/language/ms/global.json
+++ b/public/language/ms/global.json
@@ -50,7 +50,9 @@
"topics": "Topik",
"posts": "Kiriman",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Lihat",
"reputation": "Reputasi",
diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json
index 51291962f1..722b7f3482 100644
--- a/public/language/ms/notifications.json
+++ b/public/language/ms/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 dan %2 lagi telah menambah undi pada kiriman anda di %3.",
"moved_your_post": "%1 telah memindahkan kiriman anda ke %2",
"moved_your_topic": "%1 telah memindahkan %2",
- "favourited_your_post_in": "%1 telah menyukai kiriman anda di %2.",
- "favourited_your_post_in_dual": "%1 dan %2 telah menyukai kiriman anda di %3.",
- "favourited_your_post_in_multiple": "%1 dan %2 yang lain, telah menyukai kiriman anda di %3.",
"user_flagged_post_in": "%1 menanda kiriman anda di %2",
"user_flagged_post_in_dual": "%1 dan %2 telah menanda kiriman anda pada %3",
"user_flagged_post_in_multiple": "%1 dan %2 lagi telah menanda kiriman anda pada %3",
diff --git a/public/language/ms/pages.json b/public/language/ms/pages.json
index d6134a2dd5..de883b3683 100644
--- a/public/language/ms/pages.json
+++ b/public/language/ms/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Mengemaskini kata laluan \"%1\"",
"account/edit/username": "Mengemaskini nama pengguna \"%1\"",
"account/edit/email": "Mengemaskini email \"%1\"",
+ "account/info": "Account Info",
"account/following": "Mengikut %1 orang",
"account/followers": "Diikuti oleh %1",
"account/posts": "Kiriman oleh %1",
diff --git a/public/language/ms/register.json b/public/language/ms/register.json
index b0a6d79507..9079daca41 100644
--- a/public/language/ms/register.json
+++ b/public/language/ms/register.json
@@ -1,5 +1,6 @@
{
"register": "Mendaftar",
+ "cancel_registration": "Cancel Registration",
"help.email": "E-mel akan disembunyikan daripada orang ramai.",
"help.username_restrictions": "Cuba satu nama pengguna yang unik di antara %1 dan %2 aksara. Orang lain boleh menyebut anda dengan @nama pengguna.",
"help.minimum_password_length": "Panjang kata laluan anda hendaklah sekurang-kurangnya %1 aksara.",
@@ -15,5 +16,8 @@
"alternative_registration": "Pendaftaran Alternatif",
"terms_of_use": "Terma Penggunaan",
"agree_to_terms_of_use": "Saya bersetuju dengan Terma Penggunaan",
- "registration-added-to-queue": "Pendaftaran anda sedang dimasukkan ke barisan pengesahan. Anda akan menerima emel setelah diterima oleh pentadbir."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Pendaftaran anda sedang dimasukkan ke barisan pengesahan. Anda akan menerima emel setelah diterima oleh pentadbir.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json
index cb75bb32bc..691530a81e 100644
--- a/public/language/ms/topic.json
+++ b/public/language/ms/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Kiriman ini telah ditandakan untuk diselia",
"deleted_message": "Topik ini telah dipadam. Hanya pengguna dengan kuasa pengurusan boleh melihatnya.",
"following_topic.message": "Anda akan menerima makluman apabila ada kiriman ke dalam topik ini",
- "not_following_topic.message": "Anda tidak lagi akan menerima makluman daripada topik ini",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Sila daftar atau log masuk untuk melanggani topik ini",
"markAsUnreadForAll.success": "Topik ditanda sebagai belum dibaca untuk semua",
diff --git a/public/language/ms/user.json b/public/language/ms/user.json
index 0a9449ec31..a1940e57cf 100644
--- a/public/language/ms/user.json
+++ b/public/language/ms/user.json
@@ -6,6 +6,7 @@
"postcount": "Jumlah Kiriman",
"email": "Emel",
"confirm_email": "Pastikan Emel",
+ "account_info": "Account Info",
"ban_account": "Haramkan Akaun",
"ban_account_confirm": "Adakah anda pasti ingin menyekat pengguna ini?",
"unban_account": "Buang Sekatan Akaun",
@@ -107,5 +108,11 @@
"custom_route_help": "Masukkan nama laluan disini, tanpa garis miring (cth: \"terkini\", atau \"popular\")",
"sso.title": "Servis Satu Log Masuk",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/nb/category.json b/public/language/nb/category.json
index a0c1922641..7d885ac0b7 100644
--- a/public/language/nb/category.json
+++ b/public/language/nb/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Del denne kategorien",
"watch": "Overvåk",
"ignore": "Ignorer",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Du overvåker nå oppdateringer fra denne kategorien",
"ignore.message": "Du ignorerer nå oppdateringer fra denne kategorien",
"watched-categories": "Overvåkede kategorier"
diff --git a/public/language/nb/global.json b/public/language/nb/global.json
index 6a7e5f4165..9f24bcd29e 100644
--- a/public/language/nb/global.json
+++ b/public/language/nb/global.json
@@ -50,7 +50,9 @@
"topics": "Emner",
"posts": "Innlegg",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Visninger",
"reputation": "Rykte",
diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json
index f532425c00..f9580f623c 100644
--- a/public/language/nb/notifications.json
+++ b/public/language/nb/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 har flagget et innlegg i %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/nb/pages.json b/public/language/nb/pages.json
index 224d00b617..18aa026b01 100644
--- a/public/language/nb/pages.json
+++ b/public/language/nb/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "Personer %1 følger",
"account/followers": "Personer som følger %1",
"account/posts": "Innlegg opprettet av %1",
diff --git a/public/language/nb/register.json b/public/language/nb/register.json
index fe42138403..56735e0762 100644
--- a/public/language/nb/register.json
+++ b/public/language/nb/register.json
@@ -1,5 +1,6 @@
{
"register": "Registrer",
+ "cancel_registration": "Cancel Registration",
"help.email": "Som standard, holdes din e-post skjult for offentligheten.",
"help.username_restrictions": "Et unikt brukernavn mellom %1 og %2 tegn. Andre kan nevne deg med @brukernavn.",
"help.minimum_password_length": "Ditt passord må være minst %1 tegn.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternativ registrering",
"terms_of_use": "Vilkårene for bruk",
"agree_to_terms_of_use": "Jeg godtar vilkårene for bruk",
- "registration-added-to-queue": "Din registrering har blitt lagt til i godkjenningskøen. Du vil motta en e-post når denne blir akseptert av en administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Din registrering har blitt lagt til i godkjenningskøen. Du vil motta en e-post når denne blir akseptert av en administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json
index f214fd1bd7..c6233247c4 100644
--- a/public/language/nb/topic.json
+++ b/public/language/nb/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Dette innlegget har blitt rapportert.",
"deleted_message": "Dette emnet har blitt slettet. Bare brukere med emnehåndterings-privilegier kan se den.",
"following_topic.message": "Du vil nå motta varsler når noen skriver i denne tråden.",
- "not_following_topic.message": "Du vil ikke lenger motta varsler fra denne tråden.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Vennligst registrer deg eller logg inn for å abonnere på denne tråden.",
"markAsUnreadForAll.success": "Tråd markert som ulest for alle.",
diff --git a/public/language/nb/user.json b/public/language/nb/user.json
index 3082f7ef9f..238f6da595 100644
--- a/public/language/nb/user.json
+++ b/public/language/nb/user.json
@@ -6,6 +6,7 @@
"postcount": "Antall innlegg",
"email": "E-post",
"confirm_email": "Bekfreft e-post",
+ "account_info": "Account Info",
"ban_account": "Utesteng kont",
"ban_account_confirm": "Vil du virkelig utestenge denne brukeren?",
"unban_account": "Opphev utestenging",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Assosiert med",
- "sso.not-associated": "Klikk her for å assosiere med"
+ "sso.not-associated": "Klikk her for å assosiere med",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/nl/category.json b/public/language/nl/category.json
index c65576b9dd..8c9caafa53 100644
--- a/public/language/nl/category.json
+++ b/public/language/nl/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Deel deze categorie",
"watch": "Volgen",
"ignore": "Negeren",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Van deze categorie worden nu meldingen ontvangen",
"ignore.message": "Er worden geen meldingen van deze categorie ontvangen",
"watched-categories": "Categorieën die bekeken zijn."
diff --git a/public/language/nl/global.json b/public/language/nl/global.json
index dfa27b416f..e29bf66a53 100644
--- a/public/language/nl/global.json
+++ b/public/language/nl/global.json
@@ -50,7 +50,9 @@
"topics": "Onderwerpen",
"posts": "Berichten",
"best": "Beste",
+ "upvoters": "Upvoters",
"upvoted": "Omhoog gestemd",
+ "downvoters": "Downvoters",
"downvoted": "Omlaag gestemd",
"views": "Weergaven",
"reputation": "Reputatie",
diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json
index a3917e238e..c1efb52f43 100644
--- a/public/language/nl/notifications.json
+++ b/public/language/nl/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 en %2 andere hebben in gestemd in %3.",
"moved_your_post": "%1 heeft je bericht verplaatst naar %2",
"moved_your_topic": "%1 heeft %2 verplaatst",
- "favourited_your_post_in": "%1 heeft je bericht in %2 aan zijn/haar favorieten toegevoegd.",
- "favourited_your_post_in_dual": "%1 en %2 hebben je bericht in %3 aan hun favorieten toegevoegd.",
- "favourited_your_post_in_multiple": "%1 en %2 anderen hebben je bericht in %3 aan hun favorieten toegevoegd.",
"user_flagged_post_in": "%1 rapporteerde een bericht in %2",
"user_flagged_post_in_dual": "%1 en %2 rapporteerde een bericht in %3",
"user_flagged_post_in_multiple": "%1 en %2 andere rapporteede een bericht in %3",
diff --git a/public/language/nl/pages.json b/public/language/nl/pages.json
index 8be4008d95..4232f44276 100644
--- a/public/language/nl/pages.json
+++ b/public/language/nl/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Wachtwoord van \"%1\" aanpassen",
"account/edit/username": "Gebruikersnaam van \"%1\" aanpassen",
"account/edit/email": "Email van \"%1\" aanpassen",
+ "account/info": "Account Info",
"account/following": "Door %1 gevolgd",
"account/followers": "Die %1 volgen",
"account/posts": "Berichten geplaatst door %1",
diff --git a/public/language/nl/register.json b/public/language/nl/register.json
index 70d1f69af3..15c4262854 100644
--- a/public/language/nl/register.json
+++ b/public/language/nl/register.json
@@ -1,5 +1,6 @@
{
"register": "Registreren",
+ "cancel_registration": "Cancel Registration",
"help.email": "E-mailadressen zijn standaard verborgen voor andere gebruikers.",
"help.username_restrictions": "Een unieke gebruikersnaam tussen %1 en %2 karakters. Anderen kunnen je vermelden met @gebruikersnaam.",
"help.minimum_password_length": "Je wachtwoord moet tenminste %1 karakters lang zijn.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternatieve registratie",
"terms_of_use": "Gebruiksvoorwaarden",
"agree_to_terms_of_use": "Ik ga akkoord met de gebruiksvoorwaarden",
- "registration-added-to-queue": "Het registratieverzoek is toegevoegd aan de wachtrij. Een bericht wordt naar het opgegeven emailadres gestuurd wanneer de registratie is goedgekeurd."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Het registratieverzoek is toegevoegd aan de wachtrij. Een bericht wordt naar het opgegeven emailadres gestuurd wanneer de registratie is goedgekeurd.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json
index a680adcb46..2baaccfceb 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Dit bericht is gerapporteerd aan de beheerder.",
"deleted_message": "Dit onderwerp is verwijderd. Alleen gebruikers met beheerrechten op onderwerpniveau kunnen dit inzien.",
"following_topic.message": "Vanaf nu worden meldingen ontvangen zodra iemand een reactie op dit onderwerp geeft.",
- "not_following_topic.message": "Je ontvangt geen notificaties meer over dit onderwerp.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Log in or registreer om dit onderwerp te volgen.",
"markAsUnreadForAll.success": "Onderwerp is voor iedereen als ongelezen gemarkeerd.",
diff --git a/public/language/nl/user.json b/public/language/nl/user.json
index cba88cc077..e34960226b 100644
--- a/public/language/nl/user.json
+++ b/public/language/nl/user.json
@@ -6,6 +6,7 @@
"postcount": "Aantal geplaatste berichten",
"email": "E-mail",
"confirm_email": "Bevestig e-mail",
+ "account_info": "Account Info",
"ban_account": "Verban gebruiker",
"ban_account_confirm": "Weet u zeker dat u deze gebruiker wilt verbannen?",
"unban_account": "Verbanning intrekken",
@@ -107,5 +108,11 @@
"custom_route_help": "Voer een route naam hier, zonder enige voorafgaande schuine streep (zoals, \"recente\" of \"populaire\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Geassocieerd met",
- "sso.not-associated": "Klik hier om geassocieerd te worden met"
+ "sso.not-associated": "Klik hier om geassocieerd te worden met",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/pl/category.json b/public/language/pl/category.json
index 7519a5060c..e4053aa931 100644
--- a/public/language/pl/category.json
+++ b/public/language/pl/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Udostępnij tę kategorię",
"watch": "Obserwuj",
"ignore": "Ignoruj",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Obserwujesz teraz uaktualnienia z tej kategorii",
"ignore.message": "Ignorujesz teraz uaktualnienia z tej kategorii",
"watched-categories": "Obserwowane kategorie"
diff --git a/public/language/pl/global.json b/public/language/pl/global.json
index 24825d2e75..bd9821c5b0 100644
--- a/public/language/pl/global.json
+++ b/public/language/pl/global.json
@@ -50,7 +50,9 @@
"topics": "Tematy",
"posts": "Posty",
"best": "Najlepsze",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "wyświetleń",
"reputation": "Punkty reputacji",
diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json
index e049560a7d..1285c2dd83 100644
--- a/public/language/pl/notifications.json
+++ b/public/language/pl/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 przeniósł twoj post do %2",
"moved_your_topic": "%1 przeniósł %2",
- "favourited_your_post_in": "%1 dodał do ulubionych twoj post w %2.",
- "favourited_your_post_in_dual": "%1 oraz %2 dodali do ulubionych twój post w %3.",
- "favourited_your_post_in_multiple": "%1 oraz %2 innych dodali do ulubionych twój post w %3.",
"user_flagged_post_in": "%1 oflagował Twój post w %2",
"user_flagged_post_in_dual": "%1 oraz %2 oflagowali post w %3",
"user_flagged_post_in_multiple": "%1 oraz %2 innych oflagowali post w %3",
diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json
index 5ea253c797..9e11cb4c57 100644
--- a/public/language/pl/pages.json
+++ b/public/language/pl/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "Obserwowani przez %1",
"account/followers": "Obserwujący %1",
"account/posts": "Posty napisane przez %1",
diff --git a/public/language/pl/register.json b/public/language/pl/register.json
index 84c0430d87..fee052540f 100644
--- a/public/language/pl/register.json
+++ b/public/language/pl/register.json
@@ -1,5 +1,6 @@
{
"register": "Rejestracja",
+ "cancel_registration": "Cancel Registration",
"help.email": "Domyślnie twój adres e-mail będzie ukryty.",
"help.username_restrictions": "Unikalna nazwa użytkownika z min. %1 i maks. %2 znaków. Inni użytkownicy mogą ciebie zawołać pisząc @nazwa użytkownika.",
"help.minimum_password_length": "Hasło musi mieć co najmniej %1 znaków.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternatywna rejestracja",
"terms_of_use": "Warunki korzystania z serwisu",
"agree_to_terms_of_use": "Zgadzam się na powyższe warunki",
- "registration-added-to-queue": "Twoja rejestracja została dodana do kolejki oczekujących na akceptację. Otrzymasz email, kiedy zostanie zatwierdzona przez administratora."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Twoja rejestracja została dodana do kolejki oczekujących na akceptację. Otrzymasz email, kiedy zostanie zatwierdzona przez administratora.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json
index 9aa7ce3929..92e2ef9459 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Ten post został oznaczony do moderacji.",
"deleted_message": "Ten temat został skasowany. Tylko użytkownicy z uprawnieniami do zarządzania mogą go zobaczyć.",
"following_topic.message": "Będziesz od teraz otrzymywał powiadomienia, gdy ktoś odpowie w tym temacie.",
- "not_following_topic.message": "Nie będziesz już otrzymywał powiadomień z tego tematu.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Nie zobaczysz już tego tematu na liście nieprzeczytanych. Otrzymasz powiadomienie, kiedy zostaniesz wspomniany lub ktoś odda głos na twój post.",
"login_to_subscribe": "Zaloguj się, aby subskrybować ten temat.",
"markAsUnreadForAll.success": "Temat oznaczony jako nieprzeczytany dla wszystkich.",
diff --git a/public/language/pl/user.json b/public/language/pl/user.json
index 3dff926b77..807f9b6bd4 100644
--- a/public/language/pl/user.json
+++ b/public/language/pl/user.json
@@ -6,6 +6,7 @@
"postcount": "Liczba postów",
"email": "Adres e-mail",
"confirm_email": "Potwierdź e-mail",
+ "account_info": "Account Info",
"ban_account": "Zbanuj Konto",
"ban_account_confirm": "Na pewno chcesz zbanować tego użytkownika?",
"unban_account": "Odbanuj Konto",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Usługi Pojedynczego Logowania",
"sso.associated": "Powiązane z",
- "sso.not-associated": "Kliknij tutaj, aby powiązać z"
+ "sso.not-associated": "Kliknij tutaj, aby powiązać z",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/pt_BR/category.json b/public/language/pt_BR/category.json
index 02ce999999..9de5c610a7 100644
--- a/public/language/pt_BR/category.json
+++ b/public/language/pt_BR/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Compartilhar esta categoria",
"watch": "Acompanhar",
"ignore": "Ignorar",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Agora você está acompanhando as atualizações desta categoria",
"ignore.message": "Agora você está ignorando as atualizações desta categoria",
"watched-categories": "Categorias acompanhadas"
diff --git a/public/language/pt_BR/global.json b/public/language/pt_BR/global.json
index 89778c07ef..21a3afd2e4 100644
--- a/public/language/pt_BR/global.json
+++ b/public/language/pt_BR/global.json
@@ -50,7 +50,9 @@
"topics": "Tópicos",
"posts": "Posts",
"best": "Melhor",
+ "upvoters": "Upvoters",
"upvoted": "Votado positivamente",
+ "downvoters": "Downvoters",
"downvoted": "Votado negativamente",
"views": "Visualizações",
"reputation": "Reputação",
diff --git a/public/language/pt_BR/notifications.json b/public/language/pt_BR/notifications.json
index ae335eca3a..2ef1d95178 100644
--- a/public/language/pt_BR/notifications.json
+++ b/public/language/pt_BR/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 e %2 outros deram voto positivo ao seu post em %3.",
"moved_your_post": "%1 moveu seu post para %2",
"moved_your_topic": "%1 se mudou %2",
- "favourited_your_post_in": "%1 favoritou o teu post em %2.",
- "favourited_your_post_in_dual": "%1 e %2 favoritaram o teu post em %3.",
- "favourited_your_post_in_multiple": "%1 e %2 outros favoritaram o teu post em %3.",
"user_flagged_post_in": "%1 sinalizou um post em %2",
"user_flagged_post_in_dual": "%1 e %2 sinalizaram um post em %3",
"user_flagged_post_in_multiple": "%1 e %2 outros sinalizaram um post em %3",
diff --git a/public/language/pt_BR/pages.json b/public/language/pt_BR/pages.json
index b2d2f1e277..aef2f3ea5e 100644
--- a/public/language/pt_BR/pages.json
+++ b/public/language/pt_BR/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editando senha de \"%1\"",
"account/edit/username": "Editando nome de usuário de \"%1\"",
"account/edit/email": "Editando email de \"%1\"",
+ "account/info": "Account Info",
"account/following": "Pessoas que %1 segue",
"account/followers": "Pessoas que seguem %1",
"account/posts": "Posts feitos por %1",
diff --git a/public/language/pt_BR/register.json b/public/language/pt_BR/register.json
index e641a7a791..85ac0ffec0 100644
--- a/public/language/pt_BR/register.json
+++ b/public/language/pt_BR/register.json
@@ -1,5 +1,6 @@
{
"register": "Cadastrar",
+ "cancel_registration": "Cancel Registration",
"help.email": "Por padrão seu email ficará invisível para o publico.",
"help.username_restrictions": "Um nome de usuário único entre %1 e %2 caracteres. Os outros poderão te mencionar digitando @usuário.",
"help.minimum_password_length": "Sua senha tem que ter no mínimo %1 caracteres.",
@@ -15,5 +16,8 @@
"alternative_registration": "Cadastro Alternativo",
"terms_of_use": "Termos de Uso",
"agree_to_terms_of_use": "Eu concordo com os Termos de Uso",
- "registration-added-to-queue": "O seu cadastro foi adicionado à fila de aprovação. Você receberá um email quando ele for aceito por um administrador."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "O seu cadastro foi adicionado à fila de aprovação. Você receberá um email quando ele for aceito por um administrador.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json
index e1dc6bffd7..0a90dec961 100644
--- a/public/language/pt_BR/topic.json
+++ b/public/language/pt_BR/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Este post foi sinalizado para ser moderado.",
"deleted_message": "Este tópico foi deletado. Apenas usuários com privilégios de moderação de tópico podem vê-lo.",
"following_topic.message": "Agora você receberá notificações quando alguém responder este tópico.",
- "not_following_topic.message": "Você não receberá mais notificações sobre este tópico.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Você não verá mais este tópico na lista de tópicos não lidos. Você será notificado quando você for mencionado ou sua postagem for votada positivamente.",
"login_to_subscribe": "Por favor se cadastre ou entre para assinar à este tópico.",
"markAsUnreadForAll.success": "Tópico marcado como não lido para todos.",
diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json
index 6d8c1545fb..c8b17f7799 100644
--- a/public/language/pt_BR/user.json
+++ b/public/language/pt_BR/user.json
@@ -6,6 +6,7 @@
"postcount": "Número de Posts",
"email": "Email",
"confirm_email": "Confirmar Email",
+ "account_info": "Account Info",
"ban_account": "Banir Conta",
"ban_account_confirm": "Você realmente quer banir esse usuario?",
"unban_account": "Desbanir Conta",
@@ -107,5 +108,11 @@
"custom_route_help": "Entre com o nome da rota aqui, sem nenhuma barra anterior (por exemplo, \"recente\", ou \"popular\")",
"sso.title": "Logar por outros Serviços",
"sso.associated": "Associado com",
- "sso.not-associated": "Clique aqui para associar com"
+ "sso.not-associated": "Clique aqui para associar com",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/ro/category.json b/public/language/ro/category.json
index 1c3fe61fec..2f8542557c 100644
--- a/public/language/ro/category.json
+++ b/public/language/ro/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Distribuie această categorie",
"watch": "Urmărește",
"ignore": "Ignoră",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Urmăriți acum actualizări din această categorie",
"ignore.message": "Ignorați acum actualizări din această categorie",
"watched-categories": "Categorii urmărite"
diff --git a/public/language/ro/global.json b/public/language/ro/global.json
index b79039789b..3b8a7bed12 100644
--- a/public/language/ro/global.json
+++ b/public/language/ro/global.json
@@ -50,7 +50,9 @@
"topics": "Subiecte",
"posts": "Mesaje",
"best": "Cel mai bun",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Vizualizări",
"reputation": "Reputație",
diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json
index ef01014715..ea8a0d2b06 100644
--- a/public/language/ro/notifications.json
+++ b/public/language/ro/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 a semnalizat un mesaj în %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/ro/pages.json b/public/language/ro/pages.json
index 29cd26e889..bfce4e0d50 100644
--- a/public/language/ro/pages.json
+++ b/public/language/ro/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/ro/register.json b/public/language/ro/register.json
index 99b423716d..60ad1513bf 100644
--- a/public/language/ro/register.json
+++ b/public/language/ro/register.json
@@ -1,5 +1,6 @@
{
"register": "Înregistrare",
+ "cancel_registration": "Cancel Registration",
"help.email": "Implicit, adresa ta de email va fi ascunsă.",
"help.username_restrictions": "Un nume de utilizator între %1 și %2 caractere. Alți utilizatori te pot menționa cu @utilizator.",
"help.minimum_password_length": "Lungimea parolei trebuie sa fie mai mare de %1 caractere.",
@@ -15,5 +16,8 @@
"alternative_registration": "Înregistrare Alternativă",
"terms_of_use": "Termeni de utilizare",
"agree_to_terms_of_use": "Sunt de acord cu termenii de utilizare",
- "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json
index 764d203e19..4c94d218ef 100644
--- a/public/language/ro/topic.json
+++ b/public/language/ro/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Acest mesaj a fost semnalizat pentru moderare.",
"deleted_message": "Acest subiect a fost șters. Doar utilizatorii cu privilegii pentru moderarea subiectelor îl poate vedea.",
"following_topic.message": "Vei primi notificări când cineva va posta un nou mesaj in acest subiect.",
- "not_following_topic.message": "Nu vei mai primi notificări legate de acest subiect.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Te rugăm să te înregistrezi sau să te autentifici ca să te poți abona la acest subiect.",
"markAsUnreadForAll.success": "Subiect marcat ca citit pentru toți.",
diff --git a/public/language/ro/user.json b/public/language/ro/user.json
index cb7b5c6bab..ed81fcea63 100644
--- a/public/language/ro/user.json
+++ b/public/language/ro/user.json
@@ -6,6 +6,7 @@
"postcount": "Post Count",
"email": "Adresă Email",
"confirm_email": "Confirmă Email",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/ru/category.json b/public/language/ru/category.json
index 2d4aeb0dc3..4055265e6e 100644
--- a/public/language/ru/category.json
+++ b/public/language/ru/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Поделиться этой категорией",
"watch": "Следить",
"ignore": "Игнорировать",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Вы теперь следите за обновлениями из этой категории",
"ignore.message": "Вы теперь игнорируете обновления из этой категории",
"watched-categories": "Наблюдаемые категории"
diff --git a/public/language/ru/global.json b/public/language/ru/global.json
index 5f45c17a34..291cc69983 100644
--- a/public/language/ru/global.json
+++ b/public/language/ru/global.json
@@ -50,7 +50,9 @@
"topics": "Темы",
"posts": "Сообщения",
"best": "Лучшие",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Просмотры",
"reputation": "Репутация",
diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json
index eae90894d7..0a289efe57 100644
--- a/public/language/ru/notifications.json
+++ b/public/language/ru/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 и %2 другие проголосовали за ваше сообщение в %3",
"moved_your_post": "%1 переместил Ваше сообщение в %2",
"moved_your_topic": "%1 переместил %2",
- "favourited_your_post_in": "%1 сделал закладкой Ваш пост в %2.",
- "favourited_your_post_in_dual": "%1 и %2 добавили в закладки Ваш пост в %3.",
- "favourited_your_post_in_multiple": "%1 и %2 добавили в закладки Ваш пост в %3.",
"user_flagged_post_in": "%1 пометил сообщение в %2",
"user_flagged_post_in_dual": "%1 и %2 пометили ваше сообщение в %3",
"user_flagged_post_in_multiple": "%1 и %2 другие пометили ваше сообщение %3",
diff --git a/public/language/ru/pages.json b/public/language/ru/pages.json
index 811c051bc3..e19002ae46 100644
--- a/public/language/ru/pages.json
+++ b/public/language/ru/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Редактирование пароля \"%1\"",
"account/edit/username": "Редактирование имени пользователя \"%1\"",
"account/edit/email": "Редактирование email \"%1\"",
+ "account/info": "Account Info",
"account/following": "Наблюдают %1",
"account/followers": "Кто наблюдает %1",
"account/posts": "Сообщение от %1",
diff --git a/public/language/ru/register.json b/public/language/ru/register.json
index 6d01b59e1c..dc6ed3f4b7 100644
--- a/public/language/ru/register.json
+++ b/public/language/ru/register.json
@@ -1,5 +1,6 @@
{
"register": "Регистрация",
+ "cancel_registration": "Cancel Registration",
"help.email": "По умолчанию, ваш email будет скрыт.",
"help.username_restrictions": "Уникальное Имя между %1 и %2 символов. Другие пользователи смогут упоминать вас по @Имени.",
"help.minimum_password_length": "Длина вашего пароля должна быть минимум %1 символов.",
@@ -15,5 +16,8 @@
"alternative_registration": "Альтернативная регистрация",
"terms_of_use": "Условия использования",
"agree_to_terms_of_use": "Я согласен с условиями",
- "registration-added-to-queue": "Ваша регистрация была добавлена в очередь на утверждение. Вы получите уведомление по электронной почте, когда она будет одобрена администратором."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Ваша регистрация была добавлена в очередь на утверждение. Вы получите уведомление по электронной почте, когда она будет одобрена администратором.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json
index 5c882e2719..a484e415dd 100644
--- a/public/language/ru/topic.json
+++ b/public/language/ru/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Это сообщение было помечено для модерации",
"deleted_message": "Эта тема была удалена. Только пользователи с правами управления темами могут ее видеть.",
"following_topic.message": "Теперь вы будете получать уведомления при обновлении этой темы.",
- "not_following_topic.message": "Вы больше не будете получать уведомления из этой темы.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Вы больше не будете видеть эту тему в списке непрочитанных тем. Вас уведомят, когда Вас упомянут или проголосуют за Ваш пост.",
"login_to_subscribe": "Пожалуйста зарегистрируйтесь, или войдите под своим аккаунтом, чтобы подписаться на эту тему.",
"markAsUnreadForAll.success": "Тема помечена как непрочитанная для всех.",
diff --git a/public/language/ru/user.json b/public/language/ru/user.json
index ec6d071c53..98d1bb1b8f 100644
--- a/public/language/ru/user.json
+++ b/public/language/ru/user.json
@@ -6,6 +6,7 @@
"postcount": "Сообщений",
"email": "Email",
"confirm_email": "Подтвердить Email",
+ "account_info": "Account Info",
"ban_account": "Заблокировать учетную запись",
"ban_account_confirm": "Вы действительно хотите заблокировать этого пользователя?",
"unban_account": "Разблокировать учетную запись",
@@ -107,5 +108,11 @@
"custom_route_help": "Введите название маршрута здесь, без слешей (например, \\\"recent\\\", или \\\"popular\\\")",
"sso.title": "Сервис единого входа",
"sso.associated": "Связан с",
- "sso.not-associated": "Нажмите здесь, что бы связать себя с"
+ "sso.not-associated": "Нажмите здесь, что бы связать себя с",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/rw/category.json b/public/language/rw/category.json
index 5bfd9286eb..34d2f03283 100644
--- a/public/language/rw/category.json
+++ b/public/language/rw/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Sangiza iki cyiciro",
"watch": "Kurikirana",
"ignore": "Ihorere",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Uzajya ubu ukurikirana ibishya byongewe muri iki cyiciro",
"ignore.message": "Ubu urekeye aho kuzajya ubona ibishya byongewe muri iki cyiciro",
"watched-categories": "Ibyiciro Bikurikirwa"
diff --git a/public/language/rw/global.json b/public/language/rw/global.json
index aecc3f305e..cc17af95c4 100644
--- a/public/language/rw/global.json
+++ b/public/language/rw/global.json
@@ -50,7 +50,9 @@
"topics": "Ibiganiro",
"posts": "Ibyashyizweho",
"best": "Byiza",
+ "upvoters": "Upvoters",
"upvoted": "Byakunzwe",
+ "downvoters": "Downvoters",
"downvoted": "Byagawe",
"views": "Byarebwe",
"reputation": "Amanota",
diff --git a/public/language/rw/notifications.json b/public/language/rw/notifications.json
index 60fa3be43d..26e3343ad1 100644
--- a/public/language/rw/notifications.json
+++ b/public/language/rw/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 yatambikanye ikintu muri %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/rw/pages.json b/public/language/rw/pages.json
index d5b70c7ba0..7fd3b0b5a7 100644
--- a/public/language/rw/pages.json
+++ b/public/language/rw/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Uguhindura ijambobanga rya \"%1\"",
"account/edit/username": "Uguhindura izina rya \"%1\"",
"account/edit/email": "Uguhindura email ya \"%1\"",
+ "account/info": "Account Info",
"account/following": "Abantu %1 akurikira",
"account/followers": "Abantu bakurikira %1",
"account/posts": "Ibyashyizweho na %1",
diff --git a/public/language/rw/register.json b/public/language/rw/register.json
index 332517de87..aaf97ccaa4 100644
--- a/public/language/rw/register.json
+++ b/public/language/rw/register.json
@@ -1,5 +1,6 @@
{
"register": "Iyandike",
+ "cancel_registration": "Cancel Registration",
"help.email": "Ubusanzwe, email yawe ntabwo iba ibonwa na bose",
"help.username_restrictions": "Izina rigomba kuba ryihariye kuri uru rubuga kandi rikaba rifite uburebure bw'inyuguti buva kuri %1 kugera kuri %2. Iryo zina ni ryo abantu bazajya bifashisha nka @username mu gihe bakoresheje izina ryawe mu byo banditse. ",
"help.minimum_password_length": "Umubare w'inyuguti n'ibimenyetso bigize ijambobanga ryawe ugomba kuba nibura %1.",
@@ -15,5 +16,8 @@
"alternative_registration": "Ukundi Wakwiyandika",
"terms_of_use": "Amategeko n'Amabwiriza",
"agree_to_terms_of_use": "Nzakurikiza Amategeko n'Amabwiriza",
- "registration-added-to-queue": "Icyifuzo cy'iyandikwa ryawe cyakiriwe ariko gitegereje isuzuma. Uzabimenyeshwa biciye muri email niba ubuyobozi bwakwemereye kwandikwa. "
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Icyifuzo cy'iyandikwa ryawe cyakiriwe ariko gitegereje isuzuma. Uzabimenyeshwa biciye muri email niba ubuyobozi bwakwemereye kwandikwa. ",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json
index 261758b052..3539e02af9 100644
--- a/public/language/rw/topic.json
+++ b/public/language/rw/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Bimaze kumenyeshwa ubuyobozi ngo bikurikiranwe. ",
"deleted_message": "Iki kiganiro cyamaze gukurwaho. Abantu babifitiye uburenganzira ni bo bonyine bashobora kukibona. ",
"following_topic.message": "Ntabwo uzongera kubimenyeshwa nihagira umuntu ugira icyo yandika kuri iki kiganiro. ",
- "not_following_topic.message": "Ntabwo uzongera kujya umenyeshwa ku bibera muri iki kiganiro. ",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Ba umunyamuryango cyangwa winjiremo niba ushaka kwiyandikisha kuri iki kiganiro. ",
"markAsUnreadForAll.success": "Ikiganiro kigizwe nk'icyasomwe na bose",
diff --git a/public/language/rw/user.json b/public/language/rw/user.json
index 7b92f9a676..415be0e49c 100644
--- a/public/language/rw/user.json
+++ b/public/language/rw/user.json
@@ -6,6 +6,7 @@
"postcount": "Ingano y'ibyo Yashyizeho",
"email": "Email",
"confirm_email": "Emeza Email",
+ "account_info": "Account Info",
"ban_account": "Irukana",
"ban_account_confirm": "Wiringiye neza ko ushaka kwirukana uyu muntu?",
"unban_account": "Garura iyi Konte",
@@ -107,5 +108,11 @@
"custom_route_help": "Shyiramo izina ry'inzira, utiriwe ushyiraho akarongo (ni ukuvuga ni nko kwandika gusa \"ibiheruka\" cyangwa \"ibikunzwe\")",
"sso.title": "Kwinjiramo ukoreshe serivisi za SSO",
"sso.associated": "Bisanishijwe na",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/sc/category.json b/public/language/sc/category.json
index f9c527ad17..37ada291fb 100644
--- a/public/language/sc/category.json
+++ b/public/language/sc/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Share this category",
"watch": "Watch",
"ignore": "Ignore",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "You are now watching updates from this category",
"ignore.message": "You are now ignoring updates from this category",
"watched-categories": "Watched categories"
diff --git a/public/language/sc/global.json b/public/language/sc/global.json
index 586d9340bf..61ba71763c 100644
--- a/public/language/sc/global.json
+++ b/public/language/sc/global.json
@@ -50,7 +50,9 @@
"topics": "Topics",
"posts": "Arresonos",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Bìsitas",
"reputation": "Reputation",
diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json
index 5f7fd03816..d92a4638cc 100644
--- a/public/language/sc/notifications.json
+++ b/public/language/sc/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 flagged a post in %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/sc/pages.json b/public/language/sc/pages.json
index 51b098ff88..1e2b75ba52 100644
--- a/public/language/sc/pages.json
+++ b/public/language/sc/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/sc/register.json b/public/language/sc/register.json
index 7b4bb97cd7..1588a83ad5 100644
--- a/public/language/sc/register.json
+++ b/public/language/sc/register.json
@@ -1,5 +1,6 @@
{
"register": "Registra·ti",
+ "cancel_registration": "Cancel Registration",
"help.email": "S'email tua est cuada pro su pùblicu in manera predefinida.",
"help.username_restrictions": "Unu nùmene de impitadore ùnicu intre %1 e %2 caràtere. Is àteros t'ant a pòdere mentovare cun @nùmeneimpitadore.",
"help.minimum_password_length": "Sa password depet èssere a su mancu de %1 caràteres.",
@@ -15,5 +16,8 @@
"alternative_registration": "Registratziones Alternativas",
"terms_of_use": "Tèrmines de Impreu",
"agree_to_terms_of_use": "So de acòrdiu cun is Tèrmines de Impreu",
- "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json
index cae1e2843e..5f03e99223 100644
--- a/public/language/sc/topic.json
+++ b/public/language/sc/topic.json
@@ -31,7 +31,7 @@
"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.",
"following_topic.message": "As a retzire notìficas si calincunu pùblica in custa arresonada.",
- "not_following_topic.message": "No as a retzire prus notìficas pro custa arresonada.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Pro praghere registra·ti o intra pro sutascrìere custa arresonada.",
"markAsUnreadForAll.success": "Arresonada marcada comente de lèghere pro totus.",
diff --git a/public/language/sc/user.json b/public/language/sc/user.json
index f88e8ce20e..580e37ad0d 100644
--- a/public/language/sc/user.json
+++ b/public/language/sc/user.json
@@ -6,6 +6,7 @@
"postcount": "Post Count",
"email": "Email",
"confirm_email": "Confirm Email",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/sk/category.json b/public/language/sk/category.json
index a700fc155c..7e11cb72d7 100644
--- a/public/language/sk/category.json
+++ b/public/language/sk/category.json
@@ -10,6 +10,10 @@
"share_this_category": "zdielaj túto kategóriu",
"watch": "Watch",
"ignore": "Ignoruj",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "You are now watching updates from this category",
"ignore.message": "You are now ignoring updates from this category",
"watched-categories": "Watched categories"
diff --git a/public/language/sk/global.json b/public/language/sk/global.json
index 652bb0e62a..5772ec7ef2 100644
--- a/public/language/sk/global.json
+++ b/public/language/sk/global.json
@@ -50,7 +50,9 @@
"topics": "Tém",
"posts": "Príspevkov",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Zhliadnutí",
"reputation": "Reputácia",
diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json
index 160a4d9e86..6092fb256b 100644
--- a/public/language/sk/notifications.json
+++ b/public/language/sk/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 flagged a post in %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/sk/pages.json b/public/language/sk/pages.json
index 2774eebd05..f627a21bf8 100644
--- a/public/language/sk/pages.json
+++ b/public/language/sk/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/sk/register.json b/public/language/sk/register.json
index f3d6e5db2e..38d97f6fcc 100644
--- a/public/language/sk/register.json
+++ b/public/language/sk/register.json
@@ -1,5 +1,6 @@
{
"register": "Registrácia",
+ "cancel_registration": "Cancel Registration",
"help.email": "Váš email nebude bez vašeho povolenia zverejnený.",
"help.username_restrictions": "Jedinečné užívateľské meno dlhé %1 až %2 znakov. Ostatní užívatelia Vás môžu spomenúť ako @užívateľské-meno.",
"help.minimum_password_length": "Dĺžka vašeho hesla musí byť aspoň %1 znakov.",
@@ -15,5 +16,8 @@
"alternative_registration": "Iný spôsob registrácie",
"terms_of_use": "Podmienky používania",
"agree_to_terms_of_use": "Súhlasím s podmienkami používania",
- "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json
index 8db00e4e56..d14a0a3d81 100644
--- a/public/language/sk/topic.json
+++ b/public/language/sk/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Tento príspevok bol označený na úpravu. ",
"deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
"following_topic.message": "Budete teraz príjimať notifikácie, ked niekto prispeje do témy.",
- "not_following_topic.message": "Nebudete už dostávať notifikácie z tejto Témy",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Prosím Zaregistrujte sa alebo sa Prihláste, aby ste mohli odoberať túto Tému",
"markAsUnreadForAll.success": "Téma označená ako neprečítaná pre všetkých.",
diff --git a/public/language/sk/user.json b/public/language/sk/user.json
index 7571caab77..0395219cb8 100644
--- a/public/language/sk/user.json
+++ b/public/language/sk/user.json
@@ -6,6 +6,7 @@
"postcount": "Počet príspevkov",
"email": "Email",
"confirm_email": "Confirm Email",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/sl/category.json b/public/language/sl/category.json
index eee12f8c27..f2c156394d 100644
--- a/public/language/sl/category.json
+++ b/public/language/sl/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Deli to kategorijo",
"watch": "Spremljaj",
"ignore": "Ne spremljaj",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Trenutno spremljaš nove objave v tej kategoriji",
"ignore.message": "Ne spremljaš novih objav v tej kategoriji",
"watched-categories": "Watched categories"
diff --git a/public/language/sl/global.json b/public/language/sl/global.json
index c8ba8fe3d2..f26add34d6 100644
--- a/public/language/sl/global.json
+++ b/public/language/sl/global.json
@@ -50,7 +50,9 @@
"topics": "Teme",
"posts": "Objave",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Ogledi",
"reputation": "Ugled",
diff --git a/public/language/sl/notifications.json b/public/language/sl/notifications.json
index 37711ea13d..29a711605c 100644
--- a/public/language/sl/notifications.json
+++ b/public/language/sl/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1je prijavil vašo objavo v %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/sl/pages.json b/public/language/sl/pages.json
index 118bb4201a..27eebd626a 100644
--- a/public/language/sl/pages.json
+++ b/public/language/sl/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "Ljudje, ki jih sledi %1",
"account/followers": "Ljudje, ki sledijo %1",
"account/posts": "Objave uporabnika %1",
diff --git a/public/language/sl/register.json b/public/language/sl/register.json
index e2dcbfb0f6..15931e266d 100644
--- a/public/language/sl/register.json
+++ b/public/language/sl/register.json
@@ -1,5 +1,6 @@
{
"register": "Registracija",
+ "cancel_registration": "Cancel Registration",
"help.email": "Tvoj e-poštni naslov bo skrit po privzetih nastavitvah.",
"help.username_restrictions": "Unikatno uporabniško ime med %1 in %2 znakov. Drugi vas lahko omenijo v objavi z @Uporabnik.",
"help.minimum_password_length": "Tvoje geslo mora vsebovati najmanj %1 znakov.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternativna registracija",
"terms_of_use": "Pogoji uporabe",
"agree_to_terms_of_use": "Strinjam se s pogoji uporabe",
- "registration-added-to-queue": "Registracija uporabniškega profila je v postopku. Ob potrditvi s strani administratorja boste prejeli sporočilo v vaš e-poštni predal."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Registracija uporabniškega profila je v postopku. Ob potrditvi s strani administratorja boste prejeli sporočilo v vaš e-poštni predal.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json
index 00eadc76e0..9593d6d0cf 100644
--- a/public/language/sl/topic.json
+++ b/public/language/sl/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Ta objava je bila prijavljena v pregled administratorju.",
"deleted_message": "Ta tema je bila izbrisana. Le uporabniki s pravicami teme jo lahko vidijo.",
"following_topic.message": "Sedaj boste dobili obvestila, ko bo nekdo objavil v to temo.",
- "not_following_topic.message": "Ne boste več prejemali obvestil s te teme.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Prosimo prijavite ali registrirajte se za naročanje o tej temi.",
"markAsUnreadForAll.success": "Tema označena kot neprebrana za vse.",
diff --git a/public/language/sl/user.json b/public/language/sl/user.json
index 25e97a8ef3..57a2b00c47 100644
--- a/public/language/sl/user.json
+++ b/public/language/sl/user.json
@@ -6,6 +6,7 @@
"postcount": "Število objav",
"email": "E-pošta",
"confirm_email": "Potrdi e-poštni naslov",
+ "account_info": "Account Info",
"ban_account": "Blokiraj račun",
"ban_account_confirm": "Ali želiš blokirati uporabnika?",
"unban_account": "Odblokiraj račun",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/sr/category.json b/public/language/sr/category.json
index 574ab2a529..61bde8e12e 100644
--- a/public/language/sr/category.json
+++ b/public/language/sr/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Podeli ovu kategoriju",
"watch": "Прати",
"ignore": "Игнориши",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Сада пратите ажурирања ове категорије",
"ignore.message": "Сада игноришете ажурирања ове категорије",
"watched-categories": "Гледане категорије"
diff --git a/public/language/sr/global.json b/public/language/sr/global.json
index 1891007d72..556cdb029f 100644
--- a/public/language/sr/global.json
+++ b/public/language/sr/global.json
@@ -50,7 +50,9 @@
"topics": "Теме",
"posts": "Поруке",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "Прегледи",
"reputation": "Репутација",
diff --git a/public/language/sr/notifications.json b/public/language/sr/notifications.json
index 52a2b2d949..e8f4a719c4 100644
--- a/public/language/sr/notifications.json
+++ b/public/language/sr/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 и %2 осталих су гласали за вашу поруку у %3.",
"moved_your_post": "%1 је померио вашу поруку у %2",
"moved_your_topic": "%1 је померио %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 означи поруку у %2",
"user_flagged_post_in_dual": "%1 и %2 су означили поруку у %3",
"user_flagged_post_in_multiple": "%1 и осталих %2 су означили поруку у %3",
diff --git a/public/language/sr/pages.json b/public/language/sr/pages.json
index f9b4a45f87..92e6caf93d 100644
--- a/public/language/sr/pages.json
+++ b/public/language/sr/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/sr/register.json b/public/language/sr/register.json
index dbc57e60da..17da5279f4 100644
--- a/public/language/sr/register.json
+++ b/public/language/sr/register.json
@@ -1,5 +1,6 @@
{
"register": "Регистрација",
+ "cancel_registration": "Cancel Registration",
"help.email": "Ваша е-пошта ће подразумевано бити скривена од јавности.",
"help.username_restrictions": "Јединствено корисничко име између %1 и %2 знакова. Остали вас могу спомињати путем @username.",
"help.minimum_password_length": "Ваша лозинке мора имати најмање %1 знакова.",
@@ -15,5 +16,8 @@
"alternative_registration": "Алтернативно регистровање",
"terms_of_use": "Услови коришћења",
"agree_to_terms_of_use": "Слажем се са условима коришћења",
- "registration-added-to-queue": "Ваша регистрација је додата у ред одобравања. Добићете меијл када администратор прихвати вашу регистрацију."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Ваша регистрација је додата у ред одобравања. Добићете меијл када администратор прихвати вашу регистрацију.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json
index 18b2227b96..1e6b5a8cca 100644
--- a/public/language/sr/topic.json
+++ b/public/language/sr/topic.json
@@ -31,7 +31,7 @@
"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.",
"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
- "not_following_topic.message": "You will no longer receive notifications from this topic.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
"markAsUnreadForAll.success": "Topic marked as unread for all.",
diff --git a/public/language/sr/user.json b/public/language/sr/user.json
index 4cd8f93f74..19dae33163 100644
--- a/public/language/sr/user.json
+++ b/public/language/sr/user.json
@@ -6,6 +6,7 @@
"postcount": "Број порука",
"email": "Е-пошта",
"confirm_email": "Потврда е-поште",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/sv/category.json b/public/language/sv/category.json
index 6736de62eb..4fbee91261 100644
--- a/public/language/sv/category.json
+++ b/public/language/sv/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Dela den här kategorin",
"watch": "Bevaka",
"ignore": "Ignorera",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Du bevakar nu uppdateringar ifrån denna kategori",
"ignore.message": "Du ignorerar nu uppdateringar ifrån denna kategori",
"watched-categories": "Bevakade kategorier"
diff --git a/public/language/sv/global.json b/public/language/sv/global.json
index d6f66b4dab..c175e75cd7 100644
--- a/public/language/sv/global.json
+++ b/public/language/sv/global.json
@@ -50,7 +50,9 @@
"topics": "Ämnen",
"posts": "Inlägg",
"best": "Bästa",
+ "upvoters": "Upvoters",
"upvoted": "Uppröstad",
+ "downvoters": "Downvoters",
"downvoted": "Nedröstad",
"views": "Visningar",
"reputation": "Rykte",
diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json
index df0b331ac3..53f94b6b3a 100644
--- a/public/language/sv/notifications.json
+++ b/public/language/sv/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 och %2 andra har röstat upp ditt inlägg i %3.",
"moved_your_post": "%1 har flyttat ditt inlägg till %2",
"moved_your_topic": "%1 har flyttat %2",
- "favourited_your_post_in": "%1 har lagt till bokmärke på ditt inlägg i %2.",
- "favourited_your_post_in_dual": "%1 och %2 har lagt till bokmärke på ditt inlägg i %3.",
- "favourited_your_post_in_multiple": "%1 och %2 andra har lagt till bokmärke på ditt inlägg i %3.",
"user_flagged_post_in": "%1 flaggade ett inlägg i %2",
"user_flagged_post_in_dual": "%1 och %2 rapporterade ett inlägg i %3",
"user_flagged_post_in_multiple": "%1 och %2 andra rapporterade ett inlägg i %3",
diff --git a/public/language/sv/pages.json b/public/language/sv/pages.json
index 0b6ff875ea..ddcb33fe96 100644
--- a/public/language/sv/pages.json
+++ b/public/language/sv/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Redigerar lösenord för \"%1\"",
"account/edit/username": "Redigerar användarnamn för \"%1\"",
"account/edit/email": "Redigerar e-postadress för \"%1\"",
+ "account/info": "Account Info",
"account/following": "Användare som %1 följer",
"account/followers": "Användare som följer %1",
"account/posts": "Inlägg skapade av %1",
diff --git a/public/language/sv/register.json b/public/language/sv/register.json
index 1ada86d0ba..f888963295 100644
--- a/public/language/sv/register.json
+++ b/public/language/sv/register.json
@@ -1,5 +1,6 @@
{
"register": "Registrera",
+ "cancel_registration": "Cancel Registration",
"help.email": "Som standard, är din e-postadress dold för allmänheten.",
"help.username_restrictions": "Ett unikt användarnamn mellan %1 och %2 bokstäver. Andra kan nämna dig med @användarnamn.",
"help.minimum_password_length": "Ditt lösenord måste vara minst %1 bokstäver.",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternativ registrering",
"terms_of_use": "Användarvillkor",
"agree_to_terms_of_use": "Jag godkänner användarvillkoren",
- "registration-added-to-queue": "Din registrering har lagts till i kön. Du kommer att få ett mail när den accepteras av en administratör."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Din registrering har lagts till i kön. Du kommer att få ett mail när den accepteras av en administratör.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json
index 6cb0d01710..49e1088f7b 100644
--- a/public/language/sv/topic.json
+++ b/public/language/sv/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Det här inlägget har flaggats för moderering.",
"deleted_message": "Det här ämnet har raderats. Endast användare med ämneshanterings-privilegier kan se det.",
"following_topic.message": "Du kommer nu få notiser när någon gör inlägg i detta ämne.",
- "not_following_topic.message": "Du kommer inte längre få notiser från detta ämne.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Du kommer inte längre se detta ämne i listan olästa ämnen. Du kommer att meddelas när du nämns eller ditt inlägg är upp röstat.",
"login_to_subscribe": "Var god registrera eller logga in för att kunna prenumerera på detta ämne.",
"markAsUnreadForAll.success": "Ämne markerat som oläst av alla.",
diff --git a/public/language/sv/user.json b/public/language/sv/user.json
index 34aa2dd96e..b8d8a1a2bb 100644
--- a/public/language/sv/user.json
+++ b/public/language/sv/user.json
@@ -6,6 +6,7 @@
"postcount": "Antal inlägg",
"email": "E-post",
"confirm_email": "Bekräfta e-postadress ",
+ "account_info": "Account Info",
"ban_account": "Bannlys konto",
"ban_account_confirm": "Vill du verkligen bannlysa den här användaren?",
"unban_account": "Ta bort bannlysning",
@@ -107,5 +108,11 @@
"custom_route_help": "Skriv in ett sökvägsnamn här, utan föregående slash. (tex \"recent\" eller \"popular\")",
"sso.title": "Single Sign-on-tjänster",
"sso.associated": "Associerad med",
- "sso.not-associated": "Klicka här för att associera med"
+ "sso.not-associated": "Klicka här för att associera med",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/th/category.json b/public/language/th/category.json
index f8dcbeb3d8..ece99b838a 100644
--- a/public/language/th/category.json
+++ b/public/language/th/category.json
@@ -10,6 +10,10 @@
"share_this_category": "แชร์ Category นี้",
"watch": "Watch",
"ignore": "ไม่ต้องสนใจอีก",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "You are now watching updates from this category",
"ignore.message": "You are now ignoring updates from this category",
"watched-categories": "Watched categories"
diff --git a/public/language/th/global.json b/public/language/th/global.json
index 36acafc94d..b280237529 100644
--- a/public/language/th/global.json
+++ b/public/language/th/global.json
@@ -50,7 +50,9 @@
"topics": "Topics",
"posts": "กระทู้",
"best": "Best",
+ "upvoters": "Upvoters",
"upvoted": "Upvoted",
+ "downvoters": "Downvoters",
"downvoted": "Downvoted",
"views": "ดู",
"reputation": "Reputation",
diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json
index dd81dfdb7e..3d1e6d9866 100644
--- a/public/language/th/notifications.json
+++ b/public/language/th/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 has moved your post to %2",
"moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1 has bookmarked your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have bookmarked your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have bookmarked your post in %3.",
"user_flagged_post_in": "%1 flagged a post in %2",
"user_flagged_post_in_dual": "%1 and %2 flagged a post in %3",
"user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
diff --git a/public/language/th/pages.json b/public/language/th/pages.json
index 238e31cb5a..08000c4ec4 100644
--- a/public/language/th/pages.json
+++ b/public/language/th/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Editing password of \"%1\"",
"account/edit/username": "Editing username of \"%1\"",
"account/edit/email": "Editing email of \"%1\"",
+ "account/info": "Account Info",
"account/following": "People %1 follows",
"account/followers": "People who follow %1",
"account/posts": "Posts made by %1",
diff --git a/public/language/th/register.json b/public/language/th/register.json
index 333898d689..191d023847 100644
--- a/public/language/th/register.json
+++ b/public/language/th/register.json
@@ -1,5 +1,6 @@
{
"register": "ลงทะเบียน",
+ "cancel_registration": "Cancel Registration",
"help.email": "ผู้ใช้อื่น ๆ จะไม่สามารถมองเห็นอีเมลของคุณโดยดีฟอลต์",
"help.username_restrictions": "ชื่อผู้ใช้ที่ไม่ซ้ำกับผู้อื่น จะต้องมีความยาวระหว่าง% 1% และ %2 ตัวอักษร ผู้ใช้อื่นๆ สามารถพูดถึงคุณโดย @ชื่อผู้ใช้",
"help.minimum_password_length": "ความยาวรหัสผ่านของคุณต้องมีอย่างน้อย %1 ตัวอักษร",
@@ -15,5 +16,8 @@
"alternative_registration": "เข้าสู่ระบบโดยทางอื่น",
"terms_of_use": "เงื่อนไขการใช้งาน",
"agree_to_terms_of_use": "ยอมรับข้อตกลงในการใช้งาน",
- "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/th/topic.json b/public/language/th/topic.json
index ee282402b0..3fdc2aa0ce 100644
--- a/public/language/th/topic.json
+++ b/public/language/th/topic.json
@@ -31,7 +31,7 @@
"flag_success": "This post has been flagged for moderation.",
"deleted_message": "Topic นี้ถูกลบไปแล้ว เฉพาะผู้ใช้งานที่มีสิทธิ์ในการจัดการ Topic เท่านั้นที่จะมีสิทธิ์ในการเข้าชม",
"following_topic.message": "คุณจะได้รับการแจ้งเตือนเมื่อมีคนโพสต์ในกระทู้นี้",
- "not_following_topic.message": "คุณจะไม่รับการแจ้งเตือนจากกระทู้นี้",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.",
"login_to_subscribe": "กรุณาลงทะเบียนหรือเข้าสู่ระบบเพื่อที่จะติดตามกระทู้นี้",
"markAsUnreadForAll.success": "ทำเครื่องหมายว่ายังไม่ได้อ่านทั้งหมด",
diff --git a/public/language/th/user.json b/public/language/th/user.json
index 6b6d4c453a..1819833562 100644
--- a/public/language/th/user.json
+++ b/public/language/th/user.json
@@ -6,6 +6,7 @@
"postcount": "จำนวนโพส",
"email": "อีเมล์",
"confirm_email": "ยืนยันอีเมล",
+ "account_info": "Account Info",
"ban_account": "Ban Account",
"ban_account_confirm": "Do you really want to ban this user?",
"unban_account": "Unban Account",
@@ -107,5 +108,11 @@
"custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
"sso.title": "Single Sign-on Services",
"sso.associated": "Associated with",
- "sso.not-associated": "Click here to associate with"
+ "sso.not-associated": "Click here to associate with",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/tr/category.json b/public/language/tr/category.json
index 836f7a2113..921003afaa 100644
--- a/public/language/tr/category.json
+++ b/public/language/tr/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Bu kategoriyi paylaş",
"watch": "İzle",
"ignore": "Yoksay",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Şuan bu kategorideki güncellemeleri izliyorsunuz",
"ignore.message": "Şuan bu kategoriden güncellemeleri gizliyorsunuz",
"watched-categories": "Takip edilen kategoriler"
diff --git a/public/language/tr/global.json b/public/language/tr/global.json
index 2cf32930e5..3aafe7ce99 100644
--- a/public/language/tr/global.json
+++ b/public/language/tr/global.json
@@ -50,7 +50,9 @@
"topics": "Başlık",
"posts": "İleti",
"best": "En İyi",
+ "upvoters": "Upvoters",
"upvoted": "Artı",
+ "downvoters": "Downvoters",
"downvoted": "Eksi",
"views": "Görünüm",
"reputation": "Saygınlık",
diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json
index c4e7a2276b..5474cc8872 100644
--- a/public/language/tr/notifications.json
+++ b/public/language/tr/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 ve %2 iki kişi daha %3 içindeki gönderini beğendi.",
"moved_your_post": "%1 senin iletin %2 taşındı",
"moved_your_topic": "%1 taşındı %2",
- "favourited_your_post_in": "%1 %2 içindeki gönderini yer imlerine ekledi.",
- "favourited_your_post_in_dual": "%1 ve %2 %3 gönderini yer imlerine ekledi.",
- "favourited_your_post_in_multiple": "%1 ve %2 kişi daha %3 gönderini yer imlerine ekledi.",
"user_flagged_post_in": "%1 bir iletiyi bayrakladı. %2",
"user_flagged_post_in_dual": " %1 ve %2 %3 gönderini bayrakladı",
"user_flagged_post_in_multiple": "%1 ve %2 kişi daha %3 gönderini bayrakladı",
diff --git a/public/language/tr/pages.json b/public/language/tr/pages.json
index a23ef6844d..e801393479 100644
--- a/public/language/tr/pages.json
+++ b/public/language/tr/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "\"%1\" parolayı düzenliyor",
"account/edit/username": "\"%1\" kullanıcı adını düzenliyor",
"account/edit/email": "\"%1\" email adresini düzenliyor",
+ "account/info": "Account Info",
"account/following": "%1 tarafından takip edilenler",
"account/followers": "%1 takip edenler",
"account/posts": "%1 tarafından gönderilen iletiler",
diff --git a/public/language/tr/register.json b/public/language/tr/register.json
index c46c27ad32..36e7b75786 100644
--- a/public/language/tr/register.json
+++ b/public/language/tr/register.json
@@ -1,5 +1,6 @@
{
"register": "Kayıt Ol",
+ "cancel_registration": "Cancel Registration",
"help.email": "E-posta adresiniz varsayılan olarak topluluktan gizlidir.",
"help.username_restrictions": "%1 ve %2 karakter arası bir kullanıcı ismi. Başkaları sizden @isim kullanarak bahsedebilir.",
"help.minimum_password_length": "Şifreniz en az %1 karakter olmalı",
@@ -15,5 +16,8 @@
"alternative_registration": "Alternatif Kayıt",
"terms_of_use": "Kullanım Şartları",
"agree_to_terms_of_use": "Kullanım Şartlarını kabul ediyorum",
- "registration-added-to-queue": "Kayıt olma isteğiniz kabul listesine eklenmiştir. Yönetici tarafından kabul edildiğinizde mail alacaksınız."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Kayıt olma isteğiniz kabul listesine eklenmiştir. Yönetici tarafından kabul edildiğinizde mail alacaksınız.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json
index e79c6c3d4e..2bfdee81c0 100644
--- a/public/language/tr/topic.json
+++ b/public/language/tr/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Bu ileti yöneticilere bildirildi.",
"deleted_message": "Bu başlık silindi. Sadece başlık düzenleme yetkisi olan kullanıcılar görebilir.",
"following_topic.message": "Artık bir kullanıcı bu başlığa ileti gönderdiğinde bildirim alacaksınız.",
- "not_following_topic.message": "Artık bu başlık için bildirim almayacaksınız.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Bu başlığı okunmamış başlıklar alanında görmeyeceksin. Eğer bir iletide bahsedilirsen veya iletin oylanırsa bildiri alacaksın.",
"login_to_subscribe": "Lütfen bu iletiyi başlığa üye olmak için giriş yapın.",
"markAsUnreadForAll.success": "Başlık herkes için okunmadı olarak işaretlendi.",
diff --git a/public/language/tr/user.json b/public/language/tr/user.json
index c697e9adda..8d2955e313 100644
--- a/public/language/tr/user.json
+++ b/public/language/tr/user.json
@@ -6,6 +6,7 @@
"postcount": "Yayın Sayısı",
"email": "E-posta",
"confirm_email": "E-posta onayla",
+ "account_info": "Account Info",
"ban_account": "Hesabı Dondur",
"ban_account_confirm": "Hesabı dondurmak istediğinizden emin misiniz!",
"unban_account": "Hesabı Kullanıma Aç",
@@ -107,5 +108,11 @@
"custom_route_help": "Herhangi bir eğik çizgi olmadan, burada bir yol adını girin (örneğin \"yeniler\" veya \"popüler\")",
"sso.title": "Tek giriş servisleri",
"sso.associated": "Birleştirilmiş",
- "sso.not-associated": "Birleştirmek için buraya tıklayın"
+ "sso.not-associated": "Birleştirmek için buraya tıklayın",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/vi/category.json b/public/language/vi/category.json
index 77836d6492..aef6916936 100644
--- a/public/language/vi/category.json
+++ b/public/language/vi/category.json
@@ -10,6 +10,10 @@
"share_this_category": "Chia sẻ chuyên mục này",
"watch": "Theo dõi",
"ignore": "Bỏ qua",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "Bạn đang theo dõi các cập nhật của danh mục này",
"ignore.message": "Bạn đã tắt cập nhật từ chuyên mục này",
"watched-categories": "Chuyên mục đang theo dõi"
diff --git a/public/language/vi/global.json b/public/language/vi/global.json
index ffd5490c4b..7eb329ec13 100644
--- a/public/language/vi/global.json
+++ b/public/language/vi/global.json
@@ -50,7 +50,9 @@
"topics": "Số Chủ đề",
"posts": "Số bài viết",
"best": "Hay nhất",
+ "upvoters": "Upvoters",
"upvoted": "Tán thành",
+ "downvoters": "Downvoters",
"downvoted": "Phản đối",
"views": "Lượt xem",
"reputation": "Điểm tín nhiệm",
diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json
index c6f06e5b9e..8433a1353d 100644
--- a/public/language/vi/notifications.json
+++ b/public/language/vi/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 và %2 others đã tán thành với bài viết của bạn trong %3.",
"moved_your_post": "%1 đã chuyển bài viết của bạn tới %2",
"moved_your_topic": "%1 đã chuyển %2",
- "favourited_your_post_in": "%1 đã đánh dấu bài viết của bạn tại %2.",
- "favourited_your_post_in_dual": "%1 và %2 đã đánh dấu bài viết của bạn tại %3.",
- "favourited_your_post_in_multiple": "%1 và %2 người khác đã đánh dấu bài viết của bạn tại %3.",
"user_flagged_post_in": "%1 gắn cờ 1 bài trong %2",
"user_flagged_post_in_dual": "%1 và %2 đã gắn cờ một bài viết trong %3",
"user_flagged_post_in_multiple": "%1 và %2 người khác đã gắn cờ bài viết của bạn trong %3",
diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json
index 7cd685507a..295939c137 100644
--- a/public/language/vi/pages.json
+++ b/public/language/vi/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "Chỉnh sửa mật khẩu của \"%1\"",
"account/edit/username": "Chỉnh sửa tên đăng nhập của \"%1\"",
"account/edit/email": "Chỉnh sửa email của \"%1\"",
+ "account/info": "Account Info",
"account/following": "Thành viên %1 đang theo dõi",
"account/followers": "Thành viên đang theo dõi %1",
"account/posts": "Bài viết được đăng bởi %1",
diff --git a/public/language/vi/register.json b/public/language/vi/register.json
index 91e70a7d0b..c58165735e 100644
--- a/public/language/vi/register.json
+++ b/public/language/vi/register.json
@@ -1,5 +1,6 @@
{
"register": "Đăng ký",
+ "cancel_registration": "Cancel Registration",
"help.email": "Theo mặc định, Email của bạn sẽ được ẩn và public sẽ không thấy được",
"help.username_restrictions": "Một tên truy cập duy nhất có từ %1 đến %2 ký tự. Những người khác có thể nhắc đến bạn bằng @tên truy cập.",
"help.minimum_password_length": "Mật khẩu của bạn phải có ít nhất %1 ký tự",
@@ -15,5 +16,8 @@
"alternative_registration": "Đăng ký tài khoản khác",
"terms_of_use": "Điều khoản sử dụng",
"agree_to_terms_of_use": "Tôi đồng ý với các điều khoản sử dụng",
- "registration-added-to-queue": "Yêu cầu đăng ký của bạn đang chờ được chấp thuận. Bạn sẽ nhận được email khi tài khoản của bạn đã được chấp thuận bởi quản trị viên."
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "Yêu cầu đăng ký của bạn đang chờ được chấp thuận. Bạn sẽ nhận được email khi tài khoản của bạn đã được chấp thuận bởi quản trị viên.",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json
index e44b46ce5a..830773342b 100644
--- a/public/language/vi/topic.json
+++ b/public/language/vi/topic.json
@@ -31,7 +31,7 @@
"flag_success": "Chủ đề này đã được flag để chỉnh sửa",
"deleted_message": "Chủ đề này đã bị xóa. Chỉ ban quản trị mới xem được.",
"following_topic.message": "Từ giờ bạn sẽ nhận được thông báo khi có ai đó gửi bài viết trong chủ đề này",
- "not_following_topic.message": "Bạn sẽ không còn nhận được thông báo từ chủ đề này",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "Bạn sẽ không còn xem được chủ đề này trong danh sách các chủ đề chưa đọc nữa. Bạn sẽ nhận được thông báo khi bạn được đề cập tới hoặc bài viết của bạn được bỏ phiếu.",
"login_to_subscribe": "Xin hãy đăng ký hoặc đăng nhập để theo dõi topic này",
"markAsUnreadForAll.success": "Chủ đề đã được đánh dấu là chưa đọc toàn bộ",
diff --git a/public/language/vi/user.json b/public/language/vi/user.json
index 1e185f18c5..6af0f62719 100644
--- a/public/language/vi/user.json
+++ b/public/language/vi/user.json
@@ -6,6 +6,7 @@
"postcount": "Số bài viết",
"email": "Email",
"confirm_email": "Xác nhận email",
+ "account_info": "Account Info",
"ban_account": "Cấm thành viên",
"ban_account_confirm": "Bạn có chắc bạn muốn cấm thành viên này?",
"unban_account": "Bỏ cấm thành viên",
@@ -107,5 +108,11 @@
"custom_route_help": "Nhập đường dẫn ở đây, mà không có dấu gạch chéo ở trước (chẳng hạn \"recent\" hoặc \"popular)",
"sso.title": "Đăng nhập một lần",
"sso.associated": "Đã liên kết với",
- "sso.not-associated": "Nhấn vào đây để liên kết với"
+ "sso.not-associated": "Nhấn vào đây để liên kết với",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/category.json b/public/language/zh_CN/category.json
index 6023490c13..a6d949e0d7 100644
--- a/public/language/zh_CN/category.json
+++ b/public/language/zh_CN/category.json
@@ -10,6 +10,10 @@
"share_this_category": "分享此版块",
"watch": "关注",
"ignore": "忽略",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "您现在已经关注了此版块",
"ignore.message": "您现在已经取消了此版块的关注",
"watched-categories": "已关注的版块"
diff --git a/public/language/zh_CN/global.json b/public/language/zh_CN/global.json
index d6a10e614c..d4bbf64ca2 100644
--- a/public/language/zh_CN/global.json
+++ b/public/language/zh_CN/global.json
@@ -50,7 +50,9 @@
"topics": "主题",
"posts": "帖子",
"best": "最佳",
+ "upvoters": "Upvoters",
"upvoted": "顶",
+ "downvoters": "Downvoters",
"downvoted": "踩",
"views": "浏览",
"reputation": "威望",
diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json
index 6d45be4d19..30dc07854d 100644
--- a/public/language/zh_CN/notifications.json
+++ b/public/language/zh_CN/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 和 %2 个其他人在 %3 赞了您的帖子。",
"moved_your_post": "您的帖子已被 %1 移动到了 %2",
"moved_your_topic": "%1 移动到了 %2",
- "favourited_your_post_in": "%1 将您在 %2 的帖子添加到了书签",
- "favourited_your_post_in_dual": "%1 和 %2 将您在 %3 的帖子添加到了书签",
- "favourited_your_post_in_multiple": "%1 和其他 %2 人 将您在 %2 的帖子添加到了书签",
"user_flagged_post_in": "%1 在 %2 标记了一个帖子",
"user_flagged_post_in_dual": "%1 和 %2 在 %3 标记了一个帖子",
"user_flagged_post_in_multiple": "%1 和 %2 个其他人在 %3 标记了一个帖子",
diff --git a/public/language/zh_CN/pages.json b/public/language/zh_CN/pages.json
index c35e09991d..81162a4fe1 100644
--- a/public/language/zh_CN/pages.json
+++ b/public/language/zh_CN/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "正在编辑 \"%1\" 的密码",
"account/edit/username": "正在编辑 \"%1\" 的用户名",
"account/edit/email": "正在编辑 \"%1\" 的电子邮箱",
+ "account/info": "Account Info",
"account/following": "%1 关注",
"account/followers": "关注 %1 的人",
"account/posts": "%1 发布的帖子",
diff --git a/public/language/zh_CN/register.json b/public/language/zh_CN/register.json
index f7ed01d784..b5a50ad56d 100644
--- a/public/language/zh_CN/register.json
+++ b/public/language/zh_CN/register.json
@@ -1,5 +1,6 @@
{
"register": "注册",
+ "cancel_registration": "Cancel Registration",
"help.email": "默认情况下，您的电子邮箱不会公开。",
"help.username_restrictions": "全局唯一的用户名，长度 %1 到 %2 个字。其他人可以使用 @用户名 提及您。",
"help.minimum_password_length": "您的密码长度必须不少于 %1 个字。",
@@ -15,5 +16,8 @@
"alternative_registration": "其他方式注册",
"terms_of_use": "使用条款",
"agree_to_terms_of_use": "我同意使用条款",
- "registration-added-to-queue": "您的注册正在等待批准。一旦通过，管理员会发送邮件通知您。"
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "您的注册正在等待批准。一旦通过，管理员会发送邮件通知您。",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json
index a7c0b74f52..0b34b8de84 100644
--- a/public/language/zh_CN/topic.json
+++ b/public/language/zh_CN/topic.json
@@ -31,7 +31,7 @@
"flag_success": "已举报此回帖。",
"deleted_message": "此主题已被删除。只有拥有主题管理权限的用户可以查看。",
"following_topic.message": "当有人回复此主题时，您会收到通知。",
- "not_following_topic.message": "您已停止接收此主题的通知。",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "您将不会在未读主题列表里看到这个主题，但在被提到以及帖子被顶时仍将收到通知。",
"login_to_subscribe": "请注册或登录后，再订阅此主题。",
"markAsUnreadForAll.success": "将全部主题标为未读。",
diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json
index 1f8575b9be..a9a5af62ab 100644
--- a/public/language/zh_CN/user.json
+++ b/public/language/zh_CN/user.json
@@ -6,6 +6,7 @@
"postcount": "发帖数",
"email": "电子邮件",
"confirm_email": "确认电子邮箱",
+ "account_info": "Account Info",
"ban_account": "禁止账户",
"ban_account_confirm": "您确定禁止这位用户吗？",
"unban_account": "解禁账户",
@@ -107,5 +108,11 @@
"custom_route_help": "输入路由名称，前面不需要斜杠 ( 例如, \"recent\" 或 \"popular\" )",
"sso.title": "单点登录服务",
"sso.associated": "关联到",
- "sso.not-associated": "点击这里关联"
+ "sso.not-associated": "点击这里关联",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/category.json b/public/language/zh_TW/category.json
index fa2e367ae2..5e83953d6c 100644
--- a/public/language/zh_TW/category.json
+++ b/public/language/zh_TW/category.json
@@ -10,6 +10,10 @@
"share_this_category": "分享這類別",
"watch": "關注",
"ignore": "忽略",
+ "watching": "Watching",
+ "ignoring": "Ignoring",
+ "watching.description": "Show topics in unread",
+ "ignoring.description": "Do not show topics in unread",
"watch.message": "你正關注此類別的更新",
"ignore.message": "你已忽略此類別的更新",
"watched-categories": "關注的類別"
diff --git a/public/language/zh_TW/global.json b/public/language/zh_TW/global.json
index 85c0b4edd5..4533cbfc62 100644
--- a/public/language/zh_TW/global.json
+++ b/public/language/zh_TW/global.json
@@ -50,7 +50,9 @@
"topics": "主題",
"posts": "張貼",
"best": "最棒",
+ "upvoters": "Upvoters",
"upvoted": "正向投票",
+ "downvoters": "Downvoters",
"downvoted": "負向投票",
"views": "瀏覽",
"reputation": "聲望",
diff --git a/public/language/zh_TW/notifications.json b/public/language/zh_TW/notifications.json
index da335d908b..6028595b2f 100644
--- a/public/language/zh_TW/notifications.json
+++ b/public/language/zh_TW/notifications.json
@@ -16,9 +16,6 @@
"upvoted_your_post_in_multiple": "%1 與 %2 其他人已經對你在%3正向投票。",
"moved_your_post": "%1 已經移動你的張貼到 %2",
"moved_your_topic": "%1 已經移動到 %2",
- "favourited_your_post_in": "%1 已經把你在 %2 的張貼加入書籤。",
- "favourited_your_post_in_dual": "%1 與 %2 已經把你在%3的張貼加入書籤。",
- "favourited_your_post_in_multiple": "%1 與 %2 其他人已經把你在 %3 的張貼加入書籤。",
"user_flagged_post_in": "%1 標記了 %2裡的一個張貼。",
"user_flagged_post_in_dual": "%1 與 %2 標記一個張貼在 %3",
"user_flagged_post_in_multiple": "%1 與 %2 其他人標記一個張貼在 %3",
diff --git a/public/language/zh_TW/pages.json b/public/language/zh_TW/pages.json
index 71c0bbc9aa..7c73caae1f 100644
--- a/public/language/zh_TW/pages.json
+++ b/public/language/zh_TW/pages.json
@@ -29,6 +29,7 @@
"account/edit/password": "編輯 \"%1\" 的密碼",
"account/edit/username": "編輯\"%1\"的帳號",
"account/edit/email": "編輯\"%1\"的電子郵件",
+ "account/info": "Account Info",
"account/following": "使用者 %1 跟隨",
"account/followers": "跟隨 %1 的使用者",
"account/posts": "由 %1 發表的張貼",
diff --git a/public/language/zh_TW/register.json b/public/language/zh_TW/register.json
index a48bfa98f7..9a85faff98 100644
--- a/public/language/zh_TW/register.json
+++ b/public/language/zh_TW/register.json
@@ -1,5 +1,6 @@
{
"register": "註冊",
+ "cancel_registration": "Cancel Registration",
"help.email": "默認情況下，你的郵箱不會公開。",
"help.username_restrictions": "獨立的帳號由 %1 到 %2 個字元組成。其他人可以通過 @帳號 提及你。",
"help.minimum_password_length": "密碼必須至少包含 %1 個字元。",
@@ -15,5 +16,8 @@
"alternative_registration": "其他註冊方式",
"terms_of_use": "使用條款",
"agree_to_terms_of_use": "同意遵守使用條款",
- "registration-added-to-queue": "你的註冊已經被加入到審核序列中。你將會在管理者批準後收到一封電子郵件。"
+ "terms_of_use_error": "You must agree to the Terms of Use",
+ "registration-added-to-queue": "你的註冊已經被加入到審核序列中。你將會在管理者批準後收到一封電子郵件。",
+ "interstitial.intro": "We require some additional information before we can create your account.",
+ "interstitial.errors-found": "We could not complete your registration:"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json
index 4719cd6fd1..6bb424475a 100644
--- a/public/language/zh_TW/topic.json
+++ b/public/language/zh_TW/topic.json
@@ -31,7 +31,7 @@
"flag_success": "這文章已經被檢舉要求仲裁.",
"deleted_message": "此主題已被刪除。只有具有主題管理權限的用戶才能看到它。",
"following_topic.message": "有人貼文回覆主題時, 你將會收到新通知.",
- "not_following_topic.message": "有人貼文回覆主題時, 你將不會收到通知.",
+ "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
"ignoring_topic.message": "你將不會再未讀主題列表中看到這個主題。當你被提及或你的張貼被正向投票時，你會被通知。",
"login_to_subscribe": "請先註冊或登錄, 才可訂閱此主題.",
"markAsUnreadForAll.success": "將全部的主題設為未讀.",
diff --git a/public/language/zh_TW/user.json b/public/language/zh_TW/user.json
index 6e8e500786..053ec41d09 100644
--- a/public/language/zh_TW/user.json
+++ b/public/language/zh_TW/user.json
@@ -6,6 +6,7 @@
"postcount": "文章數量",
"email": "電子郵件",
"confirm_email": "確認電子郵件",
+ "account_info": "Account Info",
"ban_account": "禁用帳號",
"ban_account_confirm": "你確定要禁用這個使用者?",
"unban_account": "取消禁用帳號",
@@ -107,5 +108,11 @@
"custom_route_help": "在這裡輸入路由名稱，不需要在前面的斜線(例如recent或popular)",
"sso.title": "單一簽入SSO服務",
"sso.associated": "關連於",
- "sso.not-associated": "點擊這裡進行關連於"
+ "sso.not-associated": "點擊這裡進行關連於",
+ "info.latest-flags": "Latest Flags",
+ "info.no-flags": "No Flagged Posts Found",
+ "info.ban-history": "Recent Ban History",
+ "info.no-ban-history": "This user has never been banned",
+ "info.banned-until": "Banned until %1",
+ "info.banned-permanently": "Banned permanently"
}
\ No newline at end of file