diff --git a/package.json b/package.json
index 8774b80911..862fb7558d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPL-3.0",
"description": "NodeBB Forum",
- "version": "0.9.4",
+ "version": "1.0.0",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",
@@ -52,8 +52,8 @@
"nodebb-plugin-spam-be-gone": "0.4.5",
"nodebb-rewards-essentials": "0.0.6",
"nodebb-theme-lavender": "3.0.8",
- "nodebb-theme-persona": "4.0.87",
- "nodebb-theme-vanilla": "5.0.52",
+ "nodebb-theme-persona": "4.0.88",
+ "nodebb-theme-vanilla": "5.0.53",
"nodebb-widget-essentials": "2.0.6",
"nodemailer": "2.0.0",
"nodemailer-sendmail-transport": "1.0.0",
@@ -77,7 +77,7 @@
"templates.js": "0.3.1",
"toobusy-js": "^0.4.2",
"uglify-js": "^2.6.0",
- "underscore": "~1.8.3",
+ "underscore": "^1.8.3",
"underscore.deep": "^0.5.1",
"validator": "^5.0.0",
"winston": "^2.1.0",
diff --git a/public/language/ar/error.json b/public/language/ar/error.json
index d4c19bc98a..cd567d1636 100644
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -50,8 +50,8 @@
"still-uploading": "الرجاء انتظار الرفع",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "لقد سبق وأضفت هذا الرد إلى المفضلة",
- "already-unfavourited": "لقد سبق وحذفت هذا الرد من المفضلة",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "الرجاء استعمال اسم المستخدم الخاص بك للدخول",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/ar/global.json b/public/language/ar/global.json
index 6a40d450e3..e0a2d51643 100644
--- a/public/language/ar/global.json
+++ b/public/language/ar/global.json
@@ -86,5 +86,9 @@
"delete_all": "حذف الكل",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/ar/groups.json b/public/language/ar/groups.json
index a76ac459b4..61c95d5799 100644
--- a/public/language/ar/groups.json
+++ b/public/language/ar/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "انظم للمجموعة",
"membership.leave-group": "غادر المجموعة",
"membership.reject": "رفض",
- "new-group.group_name": "اسم المجموعة"
+ "new-group.group_name": "اسم المجموعة",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json
index 83c54e683b..52b338e7fa 100644
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -16,9 +16,9 @@
"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 أضاف مشاركتك في %2 إلى مفضلته.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 eb40c3e50a..74170e7af3 100644
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
"maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json
index f83c82c767..1e66ad91eb 100644
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "الفئات المعطلة رمادية",
"confirm_move": "انقل",
"confirm_fork": "فرع",
- "favourite": "إضافة إلى المفضلة",
- "favourites": "المفضلة",
- "favourites.has_no_favourites": "ليس لديك أي ردود مفضلة. أضف بعض المشاركات إلى المفضلة لرؤيتهم هنا",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "تحميل المزيد من المشاركات",
"move_topic": "نقل الموضوع",
"move_topics": "نقل المواضيع",
diff --git a/public/language/ar/user.json b/public/language/ar/user.json
index 577b3e0e25..e3c9502a93 100644
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -22,7 +22,7 @@
"profile": "الملف الشخصي",
"profile_views": "عدد المشاهدات",
"reputation": "السمعة",
- "favourites": "التفضيلات",
+ "favourites": "Bookmarks",
"watched": "متابع",
"followers": "المتابعون",
"following": "يتابع",
@@ -55,10 +55,11 @@
"password": "كلمة السر",
"username_taken_workaround": "اسم المستخدم الذي اخترته سبق أخذه، لذا تم تغييره قليلا. أن الآن مسجل تحت الاسم %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "ارفع الصورة",
"upload_a_picture": "رفع صورة",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "خيارات",
"show_email": "أظهر بريدي الإلكتروني",
"show_fullname": "أظهر اسمي الكامل",
diff --git a/public/language/bg/error.json b/public/language/bg/error.json
index 7c91315b51..c23fbe0c12 100644
--- a/public/language/bg/error.json
+++ b/public/language/bg/error.json
@@ -14,7 +14,7 @@
"invalid-password": "Невалидна парола",
"invalid-username-or-password": "Моля, посочете потребителско име и парола",
"invalid-search-term": "Невалиден текст за търсене",
- "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+ "invalid-pagination-value": "Грешен номер на страница, трябва да бъде между %1 и %2",
"username-taken": "Потребителското име е заето",
"email-taken": "Е-пощата е заета",
"email-not-confirmed": "Вашата е-поща все още не е потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
@@ -50,8 +50,8 @@
"still-uploading": "Моля, изчакайте качването да приключи.",
"file-too-big": "Максималният разрешен размер на файл е %1 КБ – моля, качете по-малък файл",
"guest-upload-disabled": "Качването не е разрешено за гости",
- "already-favourited": "Вече сте отбелязали тази публикация като любима",
- "already-unfavourited": "Вече сте премахнали тази публикация от любимите си",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Не можете да блокирате другите администратори!",
"cant-remove-last-admin": "Вие сте единственият администратор. Добавете друг потребител като администратор, преди да премахнете себе си като администратор",
"invalid-image-type": "Грешен тип на изображение. Позволените типове са: %1",
@@ -83,7 +83,7 @@
"chat-message-too-long": "Съобщението е твърде дълго",
"cant-edit-chat-message": "Нямате право да редактирате това съобщение",
"cant-remove-last-user": "Не можете да премахнете последния потребител",
- "cant-delete-chat-message": "You are not allowed to delete this message",
+ "cant-delete-chat-message": "Нямате право да изтриете това съобщение",
"reputation-system-disabled": "Системата за репутация е изключена.",
"downvoting-disabled": "Отрицателното гласуване е изключено",
"not-enough-reputation-to-downvote": "Нямате достатъчно репутация, за да гласувате отрицателно за тази публикация",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Моля, използвайте потребителското си име, за да влезете",
"invite-maximum-met": "Вие сте поканили максимално позволения брой хора (%1 от %2).",
"no-session-found": "Не е открита сесия за вход!",
- "not-in-room": "User not in room"
+ "not-in-room": "Потребителят не е в стаята",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/bg/global.json b/public/language/bg/global.json
index 547ae7e519..a1a940c50a 100644
--- a/public/language/bg/global.json
+++ b/public/language/bg/global.json
@@ -65,7 +65,7 @@
"posted_in_ago_by": "публикувано в %1 %2 от %3",
"user_posted_ago": "%1 публикува %2",
"guest_posted_ago": "гост публикува %1",
- "last_edited_by": "last edited by %1",
+ "last_edited_by": "последно редактирано от %1",
"norecentposts": "Няма скорошни публикации",
"norecenttopics": "Няма скорошни теми",
"recentposts": "Скорошни публикации",
@@ -86,5 +86,9 @@
"delete_all": "Изтриване на всичко",
"map": "Карта",
"sessions": "Сесии за вход",
- "ip_address": "IP адрес"
+ "ip_address": "IP адрес",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/bg/groups.json b/public/language/bg/groups.json
index 75870b4fdd..92ba6a905f 100644
--- a/public/language/bg/groups.json
+++ b/public/language/bg/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Присъединяване към групата",
"membership.leave-group": "Напускане на групата",
"membership.reject": "Отхвърляне",
- "new-group.group_name": "Име на групата:"
+ "new-group.group_name": "Име на групата:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/bg/notifications.json b/public/language/bg/notifications.json
index 89a389d387..f47c4b8340 100644
--- a/public/language/bg/notifications.json
+++ b/public/language/bg/notifications.json
@@ -16,9 +16,9 @@
"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 като любима.",
+ "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/bg/pages.json b/public/language/bg/pages.json
index 90685e0bef..3403d7f897 100644
--- a/public/language/bg/pages.json
+++ b/public/language/bg/pages.json
@@ -6,12 +6,12 @@
"popular-month": "Популярните теми този месец",
"popular-alltime": "Популярните теми за всички времена",
"recent": "Скорошни теми",
- "flagged-posts": "Flagged Posts",
+ "flagged-posts": "Докладвани публикации",
"users/online": "Потребители на линия",
"users/latest": "Последни потребители",
"users/sort-posts": "Потребители с най-много публикации",
"users/sort-reputation": "Потребители с най-висока репутация",
- "users/banned": "Banned Users",
+ "users/banned": "Блокирани потребители",
"users/search": "Търсене на потребители",
"notifications": "Известия",
"tags": "Етикети",
@@ -33,12 +33,13 @@
"account/posts": "Публикации от %1",
"account/topics": "Теми, създадени от %1",
"account/groups": "Групите на %1",
- "account/favourites": "Любимите публикации на %1",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Потребителски настройки",
"account/watched": "Теми, следени от %1",
"account/upvoted": "Публикации, получили положителен глас от %1",
"account/downvoted": "Публикации, получили отрицателен глас от %1",
"account/best": "Най-добрите публикации от %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 в момента е в профилактика. Моля, върнете се по-късно.",
"maintenance.messageIntro": "В допълнение, администраторът е оставил това съобщение:",
"throttled.text": "%1 в момента е недостъпен, поради прекомерно натоварване. Моля, върнете се отново по-късно."
diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json
index e96fb796b9..b59e34c52b 100644
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -35,7 +35,7 @@
"login_to_subscribe": "Моля, регистрирайте се или влезте, за да се абонирате за тази тема.",
"markAsUnreadForAll.success": "Темата е отбелязана като непрочетена за всички.",
"mark_unread": "Отбелязване като непрочетена",
- "mark_unread.success": "Topic marked as unread.",
+ "mark_unread.success": "Темата е отбелязана като непрочетена.",
"watch": "Наблюдаване",
"unwatch": "Спиране на наблюдаването",
"watch.title": "Получавайте известия за новите отговори в тази тема",
@@ -65,9 +65,9 @@
"disabled_categories_note": "Изключените категории са засивени",
"confirm_move": "Преместване",
"confirm_fork": "Разделяне",
- "favourite": "Любима",
- "favourites": "Любими",
- "favourites.has_no_favourites": "Нямате любими, отбележете няколко публикации, за да ги видите тук!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Зареждане на още публикации",
"move_topic": "Преместване на темата",
"move_topics": "Преместване на темите",
@@ -105,7 +105,7 @@
"stale.warning": "Темата, в която отговаряте, е доста стара. Искате ли вместо това да създадете нова и да направите препратка към тази в отговора си?",
"stale.create": "Създаване на нова тема",
"stale.reply_anyway": "Отговаряне в тази тема въпреки това",
- "link_back": "Re: [%1](%2)",
+ "link_back": "Отговор: [%1](%2)",
"spam": "Спам",
"offensive": "Обидно",
"custom-flag-reason": "Изберете причина за докладване"
diff --git a/public/language/bg/user.json b/public/language/bg/user.json
index 01ee3779ae..53e2eebda7 100644
--- a/public/language/bg/user.json
+++ b/public/language/bg/user.json
@@ -22,7 +22,7 @@
"profile": "Профил",
"profile_views": "Преглеждания на профила",
"reputation": "Репутация",
- "favourites": "Любими",
+ "favourites": "Bookmarks",
"watched": "Наблюдавани",
"followers": "Последователи",
"following": "Следва",
@@ -55,10 +55,11 @@
"password": "Парола",
"username_taken_workaround": "Потребителското име, което искате, е заето и затова ние го променихме малко. Вие ще се наричате %1",
"password_same_as_username": "Паролата е същата като потребителското Ви име. Моля, изберете друга парола.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Качване на снимка",
"upload_a_picture": "Качване на снимка",
"remove_uploaded_picture": "Премахване на качената снимка",
- "image_spec": "Можете да качвате само файлове във форматите PNG, JPG или BMP",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Настройки",
"show_email": "Да се показва е-пощата ми",
"show_fullname": "Да се показва цялото ми име",
diff --git a/public/language/bg/users.json b/public/language/bg/users.json
index 4a3a288614..3addffa9d9 100644
--- a/public/language/bg/users.json
+++ b/public/language/bg/users.json
@@ -16,5 +16,5 @@
"unread_topics": "Непрочетени теми",
"categories": "Категории",
"tags": "Етикети",
- "no-users-found": "No users found!"
+ "no-users-found": "Няма открити потребители!"
}
\ No newline at end of file
diff --git a/public/language/bn/error.json b/public/language/bn/error.json
index ca60095dd2..bb003ce9a0 100644
--- a/public/language/bn/error.json
+++ b/public/language/bn/error.json
@@ -50,8 +50,8 @@
"still-uploading": "আপলোড সম্পূর্ণ জন্য অনুগ্রহ করে অপেক্ষা করুন",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "আপনি ইতিমধ্যে এই পোষ্টটি পছন্দের তালিকায় যোগ করেছেন",
- "already-unfavourited": "আপনি ইতিমধ্যে এই পোষ্টটি আপনার পছন্দের তালিকা থেকে সরিয়ে ফেলেছেন",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "আপনি অন্য এ্যাডমিনদের নিষিদ্ধ করতে পারেন না!",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/bn/global.json b/public/language/bn/global.json
index da099cd8e3..9eb59053b1 100644
--- a/public/language/bn/global.json
+++ b/public/language/bn/global.json
@@ -86,5 +86,9 @@
"delete_all": "সব মুছে ফেলুন",
"map": "ম্যাপ",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/bn/groups.json b/public/language/bn/groups.json
index 7f95a0e59c..92cb098261 100644
--- a/public/language/bn/groups.json
+++ b/public/language/bn/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json
index 1411c3b429..591abc3c4d 100644
--- a/public/language/bn/notifications.json
+++ b/public/language/bn/notifications.json
@@ -16,9 +16,9 @@
"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 favourited your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 f59157d907..d7d56d0e4a 100644
--- a/public/language/bn/pages.json
+++ b/public/language/bn/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
"maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json
index 0c7eedeb73..9fea972e71 100644
--- a/public/language/bn/topic.json
+++ b/public/language/bn/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "নিস্ক্রীয় ক্যাটাগরীসমূহ ধূসর কালিতে লেখা রয়েছে। ",
"confirm_move": "সরান",
"confirm_fork": "ফর্ক",
- "favourite": "পছন্দ",
- "favourites": "পছন্দতালিকা",
- "favourites.has_no_favourites": "আপনার যদি কোন পছন্দের পোষ্ট না থেকে থাকে তাহলে কিছু পোষ্ট ফেভারিট করা হলে সেগুলো এখানে দেখতে পাবেন।",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "আরো পোষ্ট লোড করা হচ্ছে",
"move_topic": "টপিক সরান",
"move_topics": "টপিক সমূহ সরান",
diff --git a/public/language/bn/user.json b/public/language/bn/user.json
index 9972d6bbf6..b4e66060e5 100644
--- a/public/language/bn/user.json
+++ b/public/language/bn/user.json
@@ -22,7 +22,7 @@
"profile": "প্রোফাইল",
"profile_views": "প্রোফাইল দেখেছেন",
"reputation": "সন্মাননা",
- "favourites": "পছন্দের তালিকা",
+ "favourites": "Bookmarks",
"watched": "দেখা হয়েছে",
"followers": "যাদের অনুসরণ করছেন",
"following": "যারা আপনাকে অনুসরণ করছে",
@@ -55,10 +55,11 @@
"password": "পাসওয়ার্ড",
"username_taken_workaround": "আপনি যে ইউজারনেম চাচ্ছিলেন সেটি ইতিমধ্যে নেয়া হয়ে গেছে, কাজেই আমরা এটি কিঞ্চিং পরিবর্তন করেছি। আপনি এখন %1 হিসেবে পরিচিত",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "ছবি আপলোড করুন",
"upload_a_picture": "ছবি (একটি) আপলোড করুন",
"remove_uploaded_picture": "আপলোড করা ছবিটি সরিয়ে নাও",
- "image_spec": "আপনি শুধুমাত্র PNG, JPG অথবা BMP ফাইল আপলোড করতে পারবেন",
+ "upload_cover_picture": "Upload cover picture",
"settings": "সেটিংস",
"show_email": "আমার ইমেইল দেখাও",
"show_fullname": "আমার সম্পূর্ণ নাম দেখাও",
diff --git a/public/language/cs/error.json b/public/language/cs/error.json
index d3e6559a65..2bf902b874 100644
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Vyčkejte, prosím, nežli se vše kompletně nahraje.",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "You have already favourited this post",
- "already-unfavourited": "You have already unfavourited this post",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Nemůžete zakazovat ostatní administrátory!",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/cs/global.json b/public/language/cs/global.json
index 6b0d59a86a..1f1900a0f6 100644
--- a/public/language/cs/global.json
+++ b/public/language/cs/global.json
@@ -86,5 +86,9 @@
"delete_all": "Vymazat vše",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/cs/groups.json b/public/language/cs/groups.json
index d86c1e52f1..2cffe0b3b0 100644
--- a/public/language/cs/groups.json
+++ b/public/language/cs/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json
index 3a869b923e..4e29676790 100644
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -16,9 +16,9 @@
"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 favourited your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 bcae168282..285aa30017 100644
--- a/public/language/cs/pages.json
+++ b/public/language/cs/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
"maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json
index e6da76341e..3bced7f182 100644
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Vypnuté (disabled) kategorie jsou šedé.",
"confirm_move": "Přesunout",
"confirm_fork": "Rozdělit",
- "favourite": "Oblíbené",
- "favourites": "Oblíbené",
- "favourites.has_no_favourites": "Nemáte žádné oblíbené příspěvky, přidejte některý příspěvek k oblíbeným a uvidíte ho zde!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Načítání více příspěvků",
"move_topic": "Přesunout téma",
"move_topics": "Move Topics",
diff --git a/public/language/cs/user.json b/public/language/cs/user.json
index 0c52c28cc8..9222a733e2 100644
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Zobrazení profilu",
"reputation": "Reputace",
- "favourites": "Oblíbené",
+ "favourites": "Bookmarks",
"watched": "Sledován",
"followers": "Sledují ho",
"following": "Sleduje",
@@ -55,10 +55,11 @@
"password": "Heslo",
"username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Nahrát obrázek",
"upload_a_picture": "Nahrát obrázek",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Nastavení",
"show_email": "Zobrazovat můj email v profilu",
"show_fullname": "Zobrazovat celé jméno",
diff --git a/public/language/da/error.json b/public/language/da/error.json
index fb66628ba2..4041a7fc2b 100644
--- a/public/language/da/error.json
+++ b/public/language/da/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Venligst vent til overførslen er færdig",
"file-too-big": "Maksimum filstørrelse er %1 kB - venligst overfør en mindre fil",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "Du har allerede føjet dette indlæg til dine favoritter",
- "already-unfavourited": "Du har allerede fjernet dette indlæg fra dine favoritter",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Du kan ikke udlukke andre administatrorer!",
"cant-remove-last-admin": "Du er den eneste administrator. Tilføj en anden bruger som administrator før du fjerner dig selv som administrator",
"invalid-image-type": "Invalid billed type. De tilladte typer er: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Brug venligt dit brugernavn til login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/da/global.json b/public/language/da/global.json
index a6a29873ab..ef47f75ec9 100644
--- a/public/language/da/global.json
+++ b/public/language/da/global.json
@@ -86,5 +86,9 @@
"delete_all": "Slet alt",
"map": "Kort",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/da/groups.json b/public/language/da/groups.json
index eda84cdb9e..6e97812359 100644
--- a/public/language/da/groups.json
+++ b/public/language/da/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Bliv medlem af gruppe",
"membership.leave-group": "Forlad Gruppe",
"membership.reject": "Afvis",
- "new-group.group_name": "Gruppe Navn:"
+ "new-group.group_name": "Gruppe Navn:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/da/notifications.json b/public/language/da/notifications.json
index 077e72b553..7a7d49655f 100644
--- a/public/language/da/notifications.json
+++ b/public/language/da/notifications.json
@@ -16,9 +16,9 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %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 favoriseret dit indlæg i %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 anmeldt et indlæg 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/da/pages.json b/public/language/da/pages.json
index 11409c5109..076ff501d2 100644
--- a/public/language/da/pages.json
+++ b/public/language/da/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Indlæg oprettet af %1",
"account/topics": "Tråde lavet af %1",
"account/groups": "%1s grupper",
- "account/favourites": "&1s favorit indlæg",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Bruger instillinger",
"account/watched": "Tråde fulgt af %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 er under vedligeholdelse. Kom venligst tilbage senere.",
"maintenance.messageIntro": "Administratoren har yderligere vedlagt denne besked:",
"throttled.text": "%1 er ikke tilgængelig på grund af overbelastning. Venligst kom tilbage senere."
diff --git a/public/language/da/topic.json b/public/language/da/topic.json
index 3ad278b495..a19e01b272 100644
--- a/public/language/da/topic.json
+++ b/public/language/da/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Deaktiverede kategorier er nedtonede",
"confirm_move": "Flyt",
"confirm_fork": "Fraskil",
- "favourite": "Favoriser",
- "favourites": "Favoritter",
- "favourites.has_no_favourites": "Du har ingen favoritter, favoriser nogle indlæg for at se dem her!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Indlæser flere indlæg",
"move_topic": "Flyt tråd",
"move_topics": "Flyt tråde",
diff --git a/public/language/da/user.json b/public/language/da/user.json
index edd05211e1..04f90e9066 100644
--- a/public/language/da/user.json
+++ b/public/language/da/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Profil visninger",
"reputation": "Omdømme",
- "favourites": "Favoritter",
+ "favourites": "Bookmarks",
"watched": "Set",
"followers": "Followers",
"following": "Følger",
@@ -55,10 +55,11 @@
"password": "Kodeord",
"username_taken_workaround": "Det valgte brugernavn er allerede taget, så vi har ændret det en smule. Du hedder nu %1",
"password_same_as_username": "Din adgangskode er det samme som dit brugernavn, vælg venligst en anden adgangskode.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Upload billede",
"upload_a_picture": "Upload et billede",
"remove_uploaded_picture": "Fjern uploaded billede",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Indstillinger",
"show_email": "Vis min emailaddresse",
"show_fullname": "Vis mit fulde navn",
diff --git a/public/language/de/error.json b/public/language/de/error.json
index 32a56b5d64..6f053540f2 100644
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.",
"file-too-big": "Die maximale Dateigröße ist %1 kB, bitte lade eine kleinere Datei hoch.",
"guest-upload-disabled": "Uploads für Gäste wurden deaktiviert.",
- "already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten",
- "already-unfavourited": "Du hast diesen Beitrag bereits aus deinen Favoriten entfernt",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!",
"cant-remove-last-admin": "Du bist der einzige Administrator. Füge zuerst einen anderen Administrator hinzu, bevor du dich selbst als Administrator entfernst",
"invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Bitte nutze deinen Benutzernamen zum einloggen",
"invite-maximum-met": "Du hast bereits die maximale Anzahl an Personen eingeladen (%1 von %2).",
"no-session-found": "Keine Login-Sitzung gefunden!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/de/global.json b/public/language/de/global.json
index 0cd14600ce..b46bf4fcbe 100644
--- a/public/language/de/global.json
+++ b/public/language/de/global.json
@@ -65,7 +65,7 @@
"posted_in_ago_by": "Verfasst in %1 %2 von %3",
"user_posted_ago": "%1 schrieb %2",
"guest_posted_ago": "Gast schrieb %1",
- "last_edited_by": "last edited by %1",
+ "last_edited_by": "zuletzt editiert von %1",
"norecentposts": "Keine aktuellen Beiträge",
"norecenttopics": "Keine aktuellen Themen",
"recentposts": "Aktuelle Beiträge",
@@ -86,5 +86,9 @@
"delete_all": "Alles löschen",
"map": "Karte",
"sessions": "Login-Sitzungen",
- "ip_address": "IP-Adresse"
+ "ip_address": "IP-Adresse",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/de/groups.json b/public/language/de/groups.json
index c85d80412e..db26671315 100644
--- a/public/language/de/groups.json
+++ b/public/language/de/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Gruppe beitreten",
"membership.leave-group": "Gruppe verlassen",
"membership.reject": "Ablehnen",
- "new-group.group_name": "Gruppenname:"
+ "new-group.group_name": "Gruppenname:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json
index 1657269f9a..438d6abadc 100644
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -16,9 +16,9 @@
"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 favorisiert.",
- "favourited_your_post_in_dual": "%1 und %2 haben deinen Beitrag in %3 favorisiert.",
- "favourited_your_post_in_multiple": "%1 und %2 andere Nutzer haben deinen Beitrag in %3 favorisiert.",
+ "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 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 42fc17b802..0844e4d18d 100644
--- a/public/language/de/pages.json
+++ b/public/language/de/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Beiträge von %1",
"account/topics": "Themen verfasst von %1",
"account/groups": "Gruppen von %1",
- "account/favourites": "Von %1 favorisierte Beiträge",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Benutzer-Einstellungen",
- "account/watched": "Themen angeschaut von %1",
+ "account/watched": "Von %1 beobachtete Themen",
"account/upvoted": "Von %1 positiv bewertete Beiträge",
"account/downvoted": "Von %1 negativ bewertete Beiträge",
"account/best": "Bestbewertete Beiträge von %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komme später wieder.",
"maintenance.messageIntro": "Zusätzlich hat der Administrator diese Nachricht hinterlassen:",
"throttled.text": "%1 ist momentan aufgrund von Überlastung nicht verfügbar. Bitte komm später wieder."
diff --git a/public/language/de/topic.json b/public/language/de/topic.json
index 3e31768859..7ab5299cc8 100644
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.",
"confirm_move": "Verschieben",
"confirm_fork": "Aufspalten",
- "favourite": "Favorisieren",
- "favourites": "Favoriten",
- "favourites.has_no_favourites": "Du hast noch keine Favoriten.",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Lade mehr Beiträge",
"move_topic": "Thema verschieben",
"move_topics": "Themen verschieben",
diff --git a/public/language/de/user.json b/public/language/de/user.json
index 21456e633e..3efc474489 100644
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Profilaufrufe",
"reputation": "Ansehen",
- "favourites": "Favoriten",
+ "favourites": "Bookmarks",
"watched": "Beobachtet",
"followers": "Follower",
"following": "Folge ich",
@@ -55,10 +55,11 @@
"password": "Passwort",
"username_taken_workaround": "Der gewünschte Benutzername ist bereits vergeben, deshalb haben wir ihn ein wenig verändert. Du bist jetzt unter dem Namen %1 bekannt.",
"password_same_as_username": "Dein Passwort entspricht deinem Benutzernamen, bitte wähle ein anderes Passwort.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Bild hochladen",
"upload_a_picture": "Ein Bild hochladen",
"remove_uploaded_picture": "Hochgeladenes Bild entfernen",
- "image_spec": "Du solltest nur PNG-, JPG- oder BMP-Dateien hochladen",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Einstellungen",
"show_email": "Zeige meine E-Mail Adresse an.",
"show_fullname": "Zeige meinen kompletten Namen an",
diff --git a/public/language/el/error.json b/public/language/el/error.json
index b5d58d9eed..dc22ae8c4d 100644
--- a/public/language/el/error.json
+++ b/public/language/el/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Παρακαλώ περίμενε να τελειώσει το ανέβασμα των αρχείων.",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "You have already favourited this post",
- "already-unfavourited": "You have already unfavourited this post",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Δεν μπορείς να αποκλείσεις άλλους διαχειριστές!",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/el/global.json b/public/language/el/global.json
index debb319dfe..d8be67df72 100644
--- a/public/language/el/global.json
+++ b/public/language/el/global.json
@@ -86,5 +86,9 @@
"delete_all": "Delete All",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/el/groups.json b/public/language/el/groups.json
index 93715a4f3d..7cfcfb976f 100644
--- a/public/language/el/groups.json
+++ b/public/language/el/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/el/notifications.json b/public/language/el/notifications.json
index 1484e9b98b..eefd1ccc03 100644
--- a/public/language/el/notifications.json
+++ b/public/language/el/notifications.json
@@ -16,9 +16,9 @@
"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": "Η δημοσίευσή σου στο %2 αρέσει στον/ην %1.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 18fafd820c..092f813826 100644
--- a/public/language/el/pages.json
+++ b/public/language/el/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "Το %1 αυτή την στιγμή συντηρείται. Παρακαλώ έλα αργότερα.",
"maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/el/topic.json b/public/language/el/topic.json
index 703e1e4f57..a2f1d0fcd7 100644
--- a/public/language/el/topic.json
+++ b/public/language/el/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Οι απενεργοποιημένες κατηγορίες είναι γκριζαρισμένες",
"confirm_move": "Μετακίνηση",
"confirm_fork": "Διαχωρισμός",
- "favourite": "Αγαπημένο",
- "favourites": "Αγαπημένα",
- "favourites.has_no_favourites": "Δεν έχεις καθόλου αγαπημένα, βάλε μερικές δημοσιεύσεις στα αγαπημένα σου για να τις βλέπεις εδώ!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Φόρτωση περισσότερων δημοσιεύσεων",
"move_topic": "Μετακίνηση Θέματος",
"move_topics": "Μετακίνηση Θεμάτων",
diff --git a/public/language/el/user.json b/public/language/el/user.json
index 81f2a36740..d6959816b3 100644
--- a/public/language/el/user.json
+++ b/public/language/el/user.json
@@ -22,7 +22,7 @@
"profile": "Προφίλ",
"profile_views": "Views του προφίλ",
"reputation": "Φήμη",
- "favourites": "Αγαπημένα",
+ "favourites": "Bookmarks",
"watched": "Watched",
"followers": "Ακόλουθοι",
"following": "Ακολουθά",
@@ -55,10 +55,11 @@
"password": "Κωδικός",
"username_taken_workaround": "Το όνομα χρήστη που ζήτησες χρησιμοποιείται ήδη, οπότε το τροποποιήσαμε λίγο. Πλέον είσαι γνωστός/ή ώς %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Ανέβασμα φωτογραφίας",
"upload_a_picture": "Ανέβασε μια φωτογραφία",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Επιλογές",
"show_email": "Εμφάνιση του email μου",
"show_fullname": "Show My Full Name",
diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json
index ca4533474d..f9199f193e 100644
--- a/public/language/en@pirate/error.json
+++ b/public/language/en@pirate/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Please wait for uploads to complete.",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "You have already favourited this post",
- "already-unfavourited": "You have already unfavourited this post",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "You can't ban other admins!",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/en@pirate/global.json b/public/language/en@pirate/global.json
index 8b7fa92380..58eba7f42d 100644
--- a/public/language/en@pirate/global.json
+++ b/public/language/en@pirate/global.json
@@ -86,5 +86,9 @@
"delete_all": "Delete All",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/en@pirate/groups.json b/public/language/en@pirate/groups.json
index 2ac271a4c5..6138ea22ff 100644
--- a/public/language/en@pirate/groups.json
+++ b/public/language/en@pirate/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/en@pirate/notifications.json b/public/language/en@pirate/notifications.json
index 526e8f9a6d..b22456f660 100644
--- a/public/language/en@pirate/notifications.json
+++ b/public/language/en@pirate/notifications.json
@@ -16,9 +16,9 @@
"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 favourited your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 bcae168282..285aa30017 100644
--- a/public/language/en@pirate/pages.json
+++ b/public/language/en@pirate/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
"maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/en@pirate/topic.json b/public/language/en@pirate/topic.json
index f78f1d49bb..c7ce76e07b 100644
--- a/public/language/en@pirate/topic.json
+++ b/public/language/en@pirate/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Disabled Categories are greyed out",
"confirm_move": "Move",
"confirm_fork": "Fork",
- "favourite": "Favourite",
- "favourites": "Favourites",
- "favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Loading More Posts",
"move_topic": "Move Topic",
"move_topics": "Move Topics",
diff --git a/public/language/en@pirate/user.json b/public/language/en@pirate/user.json
index 33e7c3e222..e907bc2200 100644
--- a/public/language/en@pirate/user.json
+++ b/public/language/en@pirate/user.json
@@ -22,7 +22,7 @@
"profile": "Profile",
"profile_views": "Profile views",
"reputation": "Reputation",
- "favourites": "Favourites",
+ "favourites": "Bookmarks",
"watched": "Watched",
"followers": "Followers",
"following": "Following",
@@ -55,10 +55,11 @@
"password": "Password",
"username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Upload picture",
"upload_a_picture": "Upload a picture",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Settings",
"show_email": "Show My Email",
"show_fullname": "Show My Full Name",
diff --git a/public/language/en_GB/global.json b/public/language/en_GB/global.json
index 1b2cea5bd4..a7959aa349 100644
--- a/public/language/en_GB/global.json
+++ b/public/language/en_GB/global.json
@@ -111,5 +111,8 @@
"map": "Map",
"sessions": "Login Sessions",
"ip_address": "IP Address",
- "enter_page_number": "Enter page number"
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json
index 08982e8d29..5bade84eea 100644
--- a/public/language/en_GB/groups.json
+++ b/public/language/en_GB/groups.json
@@ -57,5 +57,6 @@
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json
index 3351e8aa23..2de2819dad 100644
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -63,7 +63,7 @@
"upload_picture": "Upload picture",
"upload_a_picture": "Upload a picture",
"remove_uploaded_picture" : "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Settings",
"show_email": "Show My Email",
diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json
index f75bdad526..f9199f193e 100644
--- a/public/language/en_US/error.json
+++ b/public/language/en_US/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Please wait for uploads to complete.",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "You have already favorited this post",
- "already-unfavourited": "You have already unfavorited this post",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "You can't ban other admins!",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/en_US/global.json b/public/language/en_US/global.json
index 7579fecc9e..a206afd7cf 100644
--- a/public/language/en_US/global.json
+++ b/public/language/en_US/global.json
@@ -86,5 +86,9 @@
"delete_all": "Delete All",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/en_US/groups.json b/public/language/en_US/groups.json
index ce19a2e4b7..f3b661977f 100644
--- a/public/language/en_US/groups.json
+++ b/public/language/en_US/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/en_US/notifications.json b/public/language/en_US/notifications.json
index 65b6dcd24b..0b1d9931a5 100644
--- a/public/language/en_US/notifications.json
+++ b/public/language/en_US/notifications.json
@@ -16,9 +16,9 @@
"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 favorited your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 48d10023a2..285aa30017 100644
--- a/public/language/en_US/pages.json
+++ b/public/language/en_US/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favorite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
"maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/en_US/topic.json b/public/language/en_US/topic.json
index b4179826fb..c7ce76e07b 100644
--- a/public/language/en_US/topic.json
+++ b/public/language/en_US/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Disabled Categories are greyed out",
"confirm_move": "Move",
"confirm_fork": "Fork",
- "favourite": "Favorite",
- "favourites": "Favorites",
- "favourites.has_no_favourites": "You don't have any favorites, favorite some posts to see them here!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Loading More Posts",
"move_topic": "Move Topic",
"move_topics": "Move Topics",
diff --git a/public/language/en_US/user.json b/public/language/en_US/user.json
index 88356e9ce8..4be38f5a9e 100644
--- a/public/language/en_US/user.json
+++ b/public/language/en_US/user.json
@@ -22,7 +22,7 @@
"profile": "Profile",
"profile_views": "Profile views",
"reputation": "Reputation",
- "favourites": "Favorites",
+ "favourites": "Bookmarks",
"watched": "Watched",
"followers": "Followers",
"following": "Following",
@@ -55,10 +55,11 @@
"password": "Password",
"username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Upload picture",
"upload_a_picture": "Upload a picture",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Settings",
"show_email": "Show My Email",
"show_fullname": "Show My Full Name",
diff --git a/public/language/es/error.json b/public/language/es/error.json
index 9251615b8d..bcf1fa0131 100644
--- a/public/language/es/error.json
+++ b/public/language/es/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Por favor, espera a que terminen las subidas.",
"file-too-big": "El tamaño de fichero máximo es de %1 kB - por favor, suba un fichero más pequeño",
"guest-upload-disabled": "Las subidas están deshabilitadas para los invitados",
- "already-favourited": "Ya ha marcado esta publicación como favorita",
- "already-unfavourited": "Ya ha desmarcado esta publicación como favorita",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "¡No puedes expulsar a otros administradores!",
"cant-remove-last-admin": "Tu eres el unico administrador. Añade otro usuario como administrador antes de eliminarte a ti mismo.",
"invalid-image-type": "Tipo de imagen inválido. Los tipos permitidos son: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Por favor introduce tu nombre de usuario para acceder",
"invite-maximum-met": "Has alcanzado el número máximo de personas invitadas (%1 de %2).",
"no-session-found": "¡No se ha encontrado ningún inicio de sesión!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/es/global.json b/public/language/es/global.json
index 83c24ff95e..6e7c532fe9 100644
--- a/public/language/es/global.json
+++ b/public/language/es/global.json
@@ -86,5 +86,9 @@
"delete_all": "Eliminar todo",
"map": "Mapa",
"sessions": "Inicios de sesión",
- "ip_address": "Direcciones IP"
+ "ip_address": "Direcciones IP",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/es/groups.json b/public/language/es/groups.json
index 28b541e573..ca0ca6e66b 100644
--- a/public/language/es/groups.json
+++ b/public/language/es/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Unirse al grupo",
"membership.leave-group": "Dejar el grupo",
"membership.reject": "Rechazar",
- "new-group.group_name": "Nombre de Grupo:"
+ "new-group.group_name": "Nombre de Grupo:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json
index 96390cb0e5..3bee47fd1a 100644
--- a/public/language/es/notifications.json
+++ b/public/language/es/notifications.json
@@ -16,9 +16,9 @@
"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 ha marcado como favorito su publicación en %2.",
- "favourited_your_post_in_dual": "%1 y %2 han marcado como favorito tu post en %3.",
- "favourited_your_post_in_multiple": "%1 y otras %2 personas han marcado como favorito tu post en %3.",
+ "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 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 a4d13047d1..b151e4cb21 100644
--- a/public/language/es/pages.json
+++ b/public/language/es/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Publicados por %1",
"account/topics": "Temas creados por %1",
"account/groups": "Grupos de %1",
- "account/favourites": "Favoritos de %1",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Preferencias",
"account/watched": "Temas seguidos por %1",
"account/upvoted": "Publicaciones votadas positivamente %1",
"account/downvoted": "Publicaciones votadas negativamente %1",
"account/best": "Mejores publicaciones hechas por %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 está en mantenimiento actualmente. Por favor vuelva en otro momento.",
"maintenance.messageIntro": "Además, la administración ha dejado este mensaje:",
"throttled.text": "%1 no está disponible debido a una carga excesiva. Por favor vuelva en otro momento"
diff --git a/public/language/es/topic.json b/public/language/es/topic.json
index 927570f32b..1f13a9e8e9 100644
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Las categorías deshabilitadas están en gris",
"confirm_move": "Mover",
"confirm_fork": "Dividir",
- "favourite": "Favorito",
- "favourites": "Favoritos",
- "favourites.has_no_favourites": "No tienes favoritos, ¡puedes agregar alguno y volver a verlos aquí!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Cargando más publicaciones",
"move_topic": "Mover tema",
"move_topics": "Mover temas",
diff --git a/public/language/es/user.json b/public/language/es/user.json
index 77f0084c52..fda1eb149b 100644
--- a/public/language/es/user.json
+++ b/public/language/es/user.json
@@ -22,7 +22,7 @@
"profile": "Perfil",
"profile_views": "Visitas",
"reputation": "Reputación",
- "favourites": "Favoritos",
+ "favourites": "Bookmarks",
"watched": "Suscritos",
"followers": "Seguidores",
"following": "Siguiendo",
@@ -55,10 +55,11 @@
"password": "Contraseña",
"username_taken_workaround": "El nombre de usuario que has solicitada ya está siendo usado, por tanto lo hemos alterado ligeramente. Ahora eres conocido como %1.",
"password_same_as_username": "Tu Constraseña es igual al nombre de Usuario, por favor seleccione otra Constraseña.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Subir foto",
"upload_a_picture": "Subir una foto",
"remove_uploaded_picture": "Borrar Imagen subida",
- "image_spec": "Sólo puedes subir imágenes en formato PNG, JPG o BMP",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Opciones",
"show_email": "Mostrar mi correo electrónico",
"show_fullname": "Mostrar mi nombre completo",
diff --git a/public/language/et/error.json b/public/language/et/error.json
index 5520d6f965..68c7a28745 100644
--- a/public/language/et/error.json
+++ b/public/language/et/error.json
@@ -14,7 +14,7 @@
"invalid-password": "Vigane parool",
"invalid-username-or-password": "Palun täpsusta kasutajanime ja parooli",
"invalid-search-term": "Vigane otsingusõna",
- "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+ "invalid-pagination-value": "Väär lehekülje numeratsioon, peab olema vähemalt %1 ja kõige rohkem %2",
"username-taken": "Kasutajanimi on juba võetud",
"email-taken": "Email on võetud",
"email-not-confirmed": "Su emaili aadress ei ole kinnitatud, vajuta siia et kinnitada.",
@@ -50,8 +50,8 @@
"still-uploading": "Palun oota, kuni üleslaadimised on laetud.",
"file-too-big": "Maksimaalne üleslaetava faili suurus on %1 kB - valige väiksema mahuga fail.",
"guest-upload-disabled": "Külaliste üleslaadimine on keelatud.",
- "already-favourited": "Sa juba märkisid selle postituse lemmikuks",
- "already-unfavourited": "Sa juba eemaldasid selle postituse lemmikute hulgast",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Sa ei saa bannida teisi administraatoreid!",
"cant-remove-last-admin": "Te olete ainus administraator. Lisage keegi teine administraatoriks, enne kui eemaldate endalt administraatori.",
"invalid-image-type": "Vigane pildi formaat. Lubatud formaadid on: %1",
@@ -83,7 +83,7 @@
"chat-message-too-long": "Vestluse sõnum on liiga pikk",
"cant-edit-chat-message": "Sul ei ole lubatud antud sõnumit muuta",
"cant-remove-last-user": "Sa ei saa viimast kasutajat eemaldada",
- "cant-delete-chat-message": "You are not allowed to delete this message",
+ "cant-delete-chat-message": "Sul ei ole lubatud antud sõnumit kustutada",
"reputation-system-disabled": "Reputatsiooni süsteem ei ole aktiveeritud",
"downvoting-disabled": "Negatiivsete häälte andmine ei ole võimaldatud",
"not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele.",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Sisse logimiseks kasuta oma kasutajanime",
"invite-maximum-met": "Sa oled kutsunud maksimaalse lubatud inimeste arvu (%1 %2 'st).",
"no-session-found": "Sisse logimis sessiooni ei leitud!",
- "not-in-room": "User not in room"
+ "not-in-room": "Kasutaja pole ruumis",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/et/global.json b/public/language/et/global.json
index 608274ff50..f43dd9007a 100644
--- a/public/language/et/global.json
+++ b/public/language/et/global.json
@@ -65,7 +65,7 @@
"posted_in_ago_by": "%3 postitas %2 kategooriasse %1",
"user_posted_ago": "%1 postitas %2",
"guest_posted_ago": "Külaline postitas %1",
- "last_edited_by": "last edited by %1",
+ "last_edited_by": "viimati muudetud %1 poolt",
"norecentposts": "Hiljutisi postitusi ei ole",
"norecenttopics": "Hiljutisi teemasid ei ole",
"recentposts": "Hiljutised postitused",
@@ -86,5 +86,9 @@
"delete_all": "Kustuta kõik",
"map": "Kaart",
"sessions": "Logitud Sessioonid",
- "ip_address": "IP Aadress"
+ "ip_address": "IP Aadress",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/et/groups.json b/public/language/et/groups.json
index 786ff6489a..fe3f83967d 100644
--- a/public/language/et/groups.json
+++ b/public/language/et/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Liitu grupiga",
"membership.leave-group": "Lahku grupist",
"membership.reject": "Lükka tagasi",
- "new-group.group_name": "Grupi nimi:"
+ "new-group.group_name": "Grupi nimi:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json
index 1dc8c61a6b..d4d28fb48a 100644
--- a/public/language/et/notifications.json
+++ b/public/language/et/notifications.json
@@ -16,9 +16,9 @@
"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 märgistas sinu postituse lemmikuks teemas %2.",
- "favourited_your_post_in_dual": "%1 'le ja %2 'le meeldis sinu postitus: %3.",
- "favourited_your_post_in_multiple": "%1 'le ja %2 'le teisele meeldis sinu postitus: %3.",
+ "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 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 6c2d826b95..f85b28ead0 100644
--- a/public/language/et/pages.json
+++ b/public/language/et/pages.json
@@ -6,12 +6,12 @@
"popular-month": "Populaarsed teemad sel kuul",
"popular-alltime": "Populaarseimad teemad üldse",
"recent": "Hiljutised teemad",
- "flagged-posts": "Flagged Posts",
+ "flagged-posts": "Märgistatud postitused",
"users/online": "Sisseloginud kasutajad",
"users/latest": "Hiljutised kasutajad",
"users/sort-posts": "Kasutajad, kel on enim postitusi",
"users/sort-reputation": "Suurima reputatsiooniga kasutajad",
- "users/banned": "Banned Users",
+ "users/banned": "Keelustatud Kasutajad",
"users/search": "Kasutajate otsing",
"notifications": "Teated",
"tags": "Märksõnad",
@@ -33,12 +33,13 @@
"account/posts": "Postitused, mis on tehtud kasutaja %1 poolt",
"account/topics": "Teemad on kirjutanud %1",
"account/groups": "Kasutaja %1 grupid",
- "account/favourites": "Kasutaja %1 lemmikud postitused",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Kasutaja sätted",
"account/watched": "Teemasid jälgib %1 kasutajat",
"account/upvoted": "Postitused %1 poolt heaks kiidetud",
"account/downvoted": "Postitused %1 poolt vastu hääletatud",
"account/best": "Parimad postitused %1 poolt",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 foorumil on käimas hooldustööd. Palun külastage meid mõne aja pärast uuesti.",
"maintenance.messageIntro": "Administraator on jätnud ka omaltpoolt sõnumi:",
"throttled.text": "%1 ei ole hetkel kättesaadav liigse koormuse tõttu. Palun tulge tagasi mõni teine kord."
diff --git a/public/language/et/topic.json b/public/language/et/topic.json
index 880709a196..d6aba7fb7a 100644
--- a/public/language/et/topic.json
+++ b/public/language/et/topic.json
@@ -35,7 +35,7 @@
"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.",
"mark_unread": "Märgi lugematuks",
- "mark_unread.success": "Topic marked as unread.",
+ "mark_unread.success": "Teema märgitud mitteloetuks.",
"watch": "Vaata",
"unwatch": "Ära järgi",
"watch.title": "Saa teateid uutest postitustest siin teemas",
@@ -65,9 +65,9 @@
"disabled_categories_note": "Kinnised kategooriad on hallid",
"confirm_move": "Liiguta",
"confirm_fork": "Fork",
- "favourite": "Märgi lemmikuks",
- "favourites": "Lemmikud ",
- "favourites.has_no_favourites": "Sul pole lemmikuid postitusi. Märgi mõned postitused lemmikuks ning need ilmuvad automaatselt siia!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Laen postitusi",
"move_topic": "Liiguta teemat",
"move_topics": "Liiguta teemasi",
diff --git a/public/language/et/user.json b/public/language/et/user.json
index 45af939288..cf81a08eda 100644
--- a/public/language/et/user.json
+++ b/public/language/et/user.json
@@ -22,7 +22,7 @@
"profile": "Profiil",
"profile_views": "Vaatamisi",
"reputation": "Reputatsioon",
- "favourites": "Lemmikud",
+ "favourites": "Bookmarks",
"watched": "Vaadatud",
"followers": "Jälgijad",
"following": "Jälgimised",
@@ -55,10 +55,11 @@
"password": "Parool",
"username_taken_workaround": "Kasutajanimi mida soovisid, ei olnud saadaval, seeg muutsime seda natukene. Sinu uus kasutajanimi on nüüd: %1",
"password_same_as_username": "Su parool kattub su kasutajanimega, palun vali mõni muu parool.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Laadi pilt",
"upload_a_picture": "Lae pilt üles",
"remove_uploaded_picture": "Eemalda üleslaetud pilt",
- "image_spec": "Sa saad üles laadida ainult PNG, JPG või BMP vormingus faile.",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Seaded",
"show_email": "Näita minu emaili",
"show_fullname": "Näita minu täisnime",
diff --git a/public/language/et/users.json b/public/language/et/users.json
index a1dd6ba266..bb377c7239 100644
--- a/public/language/et/users.json
+++ b/public/language/et/users.json
@@ -16,5 +16,5 @@
"unread_topics": "Lugemata teemad",
"categories": "Kategooriad",
"tags": "Märksõnad",
- "no-users-found": "No users found!"
+ "no-users-found": "Ühtki kasutajat ei leitud!"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json
index d1ff0894f9..a038b8fe03 100644
--- a/public/language/fa_IR/error.json
+++ b/public/language/fa_IR/error.json
@@ -50,8 +50,8 @@
"still-uploading": "خواهشمندیم تا پایان بارگذاریها شکیبا باشید.",
"file-too-big": "حداکثر مجاز حجم فایل %1 کیلوبایت می باشد - لطفا فایلی با حجم کمتر بارگذاری کنید",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "شما قبلا این پست را محبوب کرده اید",
- "already-unfavourited": "شما قبلا این پست را نامحبوب کرده اید",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "شما نمیتوانید دیگر مدیران را محروم کنید!",
"cant-remove-last-admin": "شما تنها مدیر می باشید . شما باید قبل از عزل خود از مدیریت یک کاربر دیگر را مدیر کنید",
"invalid-image-type": "نوع تصویر نامعتبر است. نوعهای قابل قبول اینها هستند: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "لطفا از نام کاربری خود برای ورود استفاده کنید",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/global.json b/public/language/fa_IR/global.json
index a11d36a14e..948145c589 100644
--- a/public/language/fa_IR/global.json
+++ b/public/language/fa_IR/global.json
@@ -86,5 +86,9 @@
"delete_all": "حذف همه",
"map": "نقشه",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/groups.json b/public/language/fa_IR/groups.json
index c3658c3425..9f4805e44a 100644
--- a/public/language/fa_IR/groups.json
+++ b/public/language/fa_IR/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "ورود به گروه",
"membership.leave-group": "خروج از گروه",
"membership.reject": "رد",
- "new-group.group_name": "نام گروه"
+ "new-group.group_name": "نام گروه",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/notifications.json b/public/language/fa_IR/notifications.json
index e5e04b6461..ec7c0dfd54 100644
--- a/public/language/fa_IR/notifications.json
+++ b/public/language/fa_IR/notifications.json
@@ -16,9 +16,9 @@
"upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
"moved_your_post": "%1 پست شما را به %2 انتقال داده است",
"moved_your_topic": "%2 %1 را منتقل کرده است",
- "favourited_your_post_in": "%1 پست شما را در %2 محبوب کرده.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 050764ba2e..06d6c1ec35 100644
--- a/public/language/fa_IR/pages.json
+++ b/public/language/fa_IR/pages.json
@@ -33,12 +33,13 @@
"account/posts": "پستهای %1",
"account/topics": "موضوع های %1",
"account/groups": "گروههای %1",
- "account/favourites": "پستهای محبوب شده %1",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "تنظیمات کاربر",
"account/watched": "موضوع های دیده شده توسط \"%1\"",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 در حال حاضر تحت تعمیر و نگهدارییست. لطفا زمان دیگری مراجعه کنید.",
"maintenance.messageIntro": "علاوه بر این، مدیر این پیام را گذاشته است:",
"throttled.text": "%1 به دلیل بارگذاری بیش از حد ، قابل دسترس نمی باشد. لطفا در زمان دیگری دوباره امتحان کنید"
diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json
index 74dabdce53..f3265b1ca9 100644
--- a/public/language/fa_IR/topic.json
+++ b/public/language/fa_IR/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "دستههای از کار افتاده به رنگ خاکستری در میآیند",
"confirm_move": "جابهجا کردن",
"confirm_fork": "شاخه ساختن",
- "favourite": "محبوب کردن",
- "favourites": "محبوبها",
- "favourites.has_no_favourites": "شماهیچ موضوع محبوبی ندارید، چندین موضوع را محبوب کنید تا آنها را در اینجا ببینید.",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "بارگذاری پستهای بیشتر",
"move_topic": "جابهجایی موضوع",
"move_topics": "انتقال موضوع",
diff --git a/public/language/fa_IR/user.json b/public/language/fa_IR/user.json
index 6905c78acd..b9fc631187 100644
--- a/public/language/fa_IR/user.json
+++ b/public/language/fa_IR/user.json
@@ -22,7 +22,7 @@
"profile": "پروفایل",
"profile_views": "بازدیدهای نمایه",
"reputation": "اعتبار",
- "favourites": "محبوبها",
+ "favourites": "Bookmarks",
"watched": "پیگیری شده",
"followers": "دنبالکنندهها",
"following": "دنبالشوندهها",
@@ -55,10 +55,11 @@
"password": "گذرواژه",
"username_taken_workaround": "نام کاربری درخواستی شما در حال حاضر گرفته شده است، بنابراین ما آن را کمی تغییر دادهایم. شما هماکنون با نام %1%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 favourited your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 e25e4f740e..9ae6d2e904 100644
--- a/public/language/fi/pages.json
+++ b/public/language/fi/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
"maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json
index 066d0256a5..37b9b98e80 100644
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Käytöstä poistetut aihealueet ovat harmaina",
"confirm_move": "Siirrä",
"confirm_fork": "Haaroita",
- "favourite": "Lisää suosikiksi",
- "favourites": "Suosikit",
- "favourites.has_no_favourites": "Sinulla ei ole yhtään suosikkiviestiä. Lisää joitakin viestejä suosikeiksi nähdäksesi ne täällä!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Ladataan lisää viestejä",
"move_topic": "Siirrä aihe",
"move_topics": "Move Topics",
diff --git a/public/language/fi/user.json b/public/language/fi/user.json
index c7e1232c35..eff54da44b 100644
--- a/public/language/fi/user.json
+++ b/public/language/fi/user.json
@@ -22,7 +22,7 @@
"profile": "Profiili",
"profile_views": "Profiilia katsottu",
"reputation": "Maine",
- "favourites": "Suosikit",
+ "favourites": "Bookmarks",
"watched": "Seurattu",
"followers": "Seuraajat",
"following": "Seuratut",
@@ -55,10 +55,11 @@
"password": "Salasana",
"username_taken_workaround": "Pyytämäsi käyttäjänimi oli jo varattu, joten muutimme sitä hieman. Käyttäjänimesi on siis nyt %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Lataa kuva",
"upload_a_picture": "Lataa kuva",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Asetukset",
"show_email": "Näytä sähköpostiosoitteeni",
"show_fullname": "Näytä koko nimeni",
diff --git a/public/language/fr/error.json b/public/language/fr/error.json
index b372224e92..f8542c3dad 100644
--- a/public/language/fr/error.json
+++ b/public/language/fr/error.json
@@ -14,7 +14,7 @@
"invalid-password": "Mot de passe invalide",
"invalid-username-or-password": "Veuillez entrer un nom d'utilisateur et un mot de passe",
"invalid-search-term": "Données de recherche invalides",
- "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+ "invalid-pagination-value": "Valeur de pagination invalide. Celle-ci doit être comprise entre %1 et %2.",
"username-taken": "Nom d’utilisateur déjà utilisé",
"email-taken": "Email déjà utilisé",
"email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquez ici pour la valider.",
@@ -50,8 +50,8 @@
"still-uploading": "Veuillez patienter pendant le téléchargement.",
"file-too-big": "La taille maximale autorisée pour un fichier est de %1 kb. Veuillez envoyer un fichier plus petit.",
"guest-upload-disabled": "Le téléversement est désactivé pour les Invités.",
- "already-favourited": "Vous avez déjà mis ce message en favoris",
- "already-unfavourited": "Vous avez déjà retiré ce message des favoris",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !",
"cant-remove-last-admin": "Vous seul êtes administrateur. Ajouter un autre utilisateur en tant qu'administrateur avant de vous en retirer.",
"invalid-image-type": "Type d'image invalide. Les types autorisés sont: %1",
@@ -83,7 +83,7 @@
"chat-message-too-long": "Le message de Chat est trop long",
"cant-edit-chat-message": "Vous n'avez pas l'autorisation de modifier ce message",
"cant-remove-last-user": "Vous ne pouvez pas supprimer le dernier utilisateur",
- "cant-delete-chat-message": "You are not allowed to delete this message",
+ "cant-delete-chat-message": "Vous n'avez pas l'autorisation de supprimer ce message",
"reputation-system-disabled": "Le système de réputation est désactivé",
"downvoting-disabled": "Les votes négatifs ne sont pas autorisés",
"not-enough-reputation-to-downvote": "Vous n'avez pas une réputation assez élevée pour noter négativement ce message",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Veuillez utiliser votre identifiant pour vous connecter",
"invite-maximum-met": "Vous avez invité la quantité maximale de personnes (%1 de %2).",
"no-session-found": "Pas de session de connexion trouvé!",
- "not-in-room": "User not in room"
+ "not-in-room": "L'utilisateur n'est pas dans cette salle",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/fr/global.json b/public/language/fr/global.json
index aaabd06939..19d556a037 100644
--- a/public/language/fr/global.json
+++ b/public/language/fr/global.json
@@ -65,7 +65,7 @@
"posted_in_ago_by": "posté dans %1 %2 par %3",
"user_posted_ago": "%1 a posté %2",
"guest_posted_ago": "Un invité a posté %1",
- "last_edited_by": "last edited by %1",
+ "last_edited_by": "dernière édition par %1",
"norecentposts": "Aucun message récent",
"norecenttopics": "Aucun sujet récent",
"recentposts": "Messages récents",
@@ -86,5 +86,9 @@
"delete_all": "Tout supprimer",
"map": "Carte",
"sessions": "Sessions de connexion",
- "ip_address": "Adresse IP"
+ "ip_address": "Adresse IP",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/fr/groups.json b/public/language/fr/groups.json
index 6ffb22ecfa..b7c0f03351 100644
--- a/public/language/fr/groups.json
+++ b/public/language/fr/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Rejoindre le groupe",
"membership.leave-group": "Quitter le groupe",
"membership.reject": "Refuser",
- "new-group.group_name": "Nom du groupe :"
+ "new-group.group_name": "Nom du groupe :",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json
index 02dbd67398..5a24d4c9eb 100644
--- a/public/language/fr/notifications.json
+++ b/public/language/fr/notifications.json
@@ -16,9 +16,9 @@
"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 mis votre message en favoris dans %2.",
- "favourited_your_post_in_dual": "%1 et %2 ont mis votre message dans %3 en favori.",
- "favourited_your_post_in_multiple": "%1 et %2 autres on mis votre message en favori %3.",
+ "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 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 5726e2d1cb..c3cdfe1f55 100644
--- a/public/language/fr/pages.json
+++ b/public/language/fr/pages.json
@@ -6,12 +6,12 @@
"popular-month": "Sujets populaires ce mois-ci",
"popular-alltime": "Sujets populaires depuis toujours",
"recent": "Sujets récents",
- "flagged-posts": "Flagged Posts",
+ "flagged-posts": "Messages signalés",
"users/online": "Utilisateurs en ligne",
"users/latest": "Derniers inscrits",
"users/sort-posts": "Utilisateurs avec le plus de messages",
"users/sort-reputation": "Utilisateurs avec la plus grande réputation",
- "users/banned": "Banned Users",
+ "users/banned": "Utilisateurs bannis",
"users/search": "Rechercher des utilisateurs",
"notifications": "Notifications",
"tags": "Mots-clés",
@@ -33,12 +33,13 @@
"account/posts": "Messages postés par %1",
"account/topics": "Sujets créés par %1",
"account/groups": "Groupes auxquels appartient %1",
- "account/favourites": "Messages favoris de %1",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Paramètres d'utilisateur",
"account/watched": "Sujets surveillés par %1",
"account/upvoted": "Messages pour lesquels %1 a voté",
"account/downvoted": "Messages contre lesquels %1 a voté",
"account/best": "Meilleurs messages postés par %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 est en maintenance. Veuillez revenir un peu plus tard.",
"maintenance.messageIntro": "De plus, l'administrateur a laissé ce message:",
"throttled.text": "%1 est actuellement indisponible en raison d'une charge excessive. Merci de réessayer plus tard."
diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json
index 318acf7f65..16a0e0628d 100644
--- a/public/language/fr/topic.json
+++ b/public/language/fr/topic.json
@@ -35,7 +35,7 @@
"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.",
"mark_unread": "Marquer comme non-lu",
- "mark_unread.success": "Topic marked as unread.",
+ "mark_unread.success": "Sujet marqué comme non lu.",
"watch": "Surveiller",
"unwatch": "Ne plus surveiller",
"watch.title": "Être notifié des nouvelles réponses dans ce sujet",
@@ -65,9 +65,9 @@
"disabled_categories_note": "Les catégories désactivées sont grisées",
"confirm_move": "Déplacer",
"confirm_fork": "Scinder",
- "favourite": "Favori",
- "favourites": "Favoris",
- "favourites.has_no_favourites": "Vous n'avez aucun favori, mettez des messages en favoris pour les voir ici !",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Charger plus de messages",
"move_topic": "Déplacer le sujet",
"move_topics": "Déplacer des sujets",
@@ -105,7 +105,7 @@
"stale.warning": "Le sujet auquel vous répondez est assez ancien. Ne voudriez-vous pas créer un nouveau sujet à la place et placer une référence vers celui-ci dans votre réponse ?",
"stale.create": "Créer un nouveau sujet",
"stale.reply_anyway": "Répondre à ce sujet quand même",
- "link_back": "Re: [%1](%2)",
+ "link_back": "Re : [%1](%2)",
"spam": "Spam",
"offensive": "Offensif",
"custom-flag-reason": "Entrez une raison pour laquelle vous signalez ce message"
diff --git a/public/language/fr/user.json b/public/language/fr/user.json
index f11322f2c9..1cb2e97861 100644
--- a/public/language/fr/user.json
+++ b/public/language/fr/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Vues",
"reputation": "Réputation",
- "favourites": "Favoris",
+ "favourites": "Bookmarks",
"watched": "Suivis",
"followers": "Abonnés",
"following": "Abonnements",
@@ -55,10 +55,11 @@
"password": "Mot de passe",
"username_taken_workaround": "Le nom d'utilisateur désiré est déjà utilisé, nous l'avons donc légèrement modifié. Vous êtes maintenant connu comme %1",
"password_same_as_username": "Votre mot de passe est identique à votre nom d'utilisateur. Veuillez en choisir un autre.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Envoyer l'image",
"upload_a_picture": "Envoyer une image",
"remove_uploaded_picture": "Supprimer l'image envoyée",
- "image_spec": "Vous ne pouvez envoyer que des fichiers PNG, JPG ou BMP",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Paramètres",
"show_email": "Afficher mon email",
"show_fullname": "Afficher mon nom complet",
diff --git a/public/language/fr/users.json b/public/language/fr/users.json
index 9a19daf831..d70a54698e 100644
--- a/public/language/fr/users.json
+++ b/public/language/fr/users.json
@@ -16,5 +16,5 @@
"unread_topics": "Sujets Non-Lus",
"categories": "Catégories",
"tags": "Mots-clés",
- "no-users-found": "No users found!"
+ "no-users-found": "Aucun utilisateur trouvé !"
}
\ No newline at end of file
diff --git a/public/language/gl/error.json b/public/language/gl/error.json
index f17f526582..480abe1f63 100644
--- a/public/language/gl/error.json
+++ b/public/language/gl/error.json
@@ -14,7 +14,7 @@
"invalid-password": "Contrasinal Inválido",
"invalid-username-or-password": "Especifica ámbolos dous por favor, nome de usuario e contrasinal",
"invalid-search-term": "Termo de búsqueda inválido",
- "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+ "invalid-pagination-value": "Valor de paxinación incorreto, ten que estar entre %1 e %2",
"username-taken": "Nome de usuario en uso",
"email-taken": "Correo en uso",
"email-not-confirmed": "O teu correo aínda non está confirmado, por favor pica aquí para confirmalo.",
@@ -50,8 +50,8 @@
"still-uploading": "Por favor, agarda a que remate a subida.",
"file-too-big": "O tamaño máximo permitido é %1 kB - por favor, sube un arquivo máis pequeno",
"guest-upload-disabled": "As subidas están deshabilitadas para os convidados",
- "already-favourited": "Marcache como favorita esta publicación",
- "already-unfavourited": "Desmarcache como favorita esta publicación",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Non podes botar outros administradores!",
"cant-remove-last-admin": "Eres o único administrador. Engade outros administradores antes de quitarte a ti mesmo como administrador.",
"invalid-image-type": "Tipo de imaxe inválida. Tipos admitidos: %1",
@@ -83,7 +83,7 @@
"chat-message-too-long": "Mensaxe moi longa",
"cant-edit-chat-message": "Non tes permitido editar esta mensaxe.",
"cant-remove-last-user": "Non podes quitar o último usuario",
- "cant-delete-chat-message": "You are not allowed to delete this message",
+ "cant-delete-chat-message": "Non tes permitido borrar esta mensaxe.",
"reputation-system-disabled": "O sistema de reputación está deshabilitado",
"downvoting-disabled": "Os votos negativos están deshabilitados",
"not-enough-reputation-to-downvote": "Non tes reputación dabonda para esta acción",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Por favor, usa o teu nome de usuario para conectarte",
"invite-maximum-met": "Convidaches á cantidade máxima de persoas (%1 de %2).",
"no-session-found": "Non se atopa ningún inicio de sesión!",
- "not-in-room": "User not in room"
+ "not-in-room": "O usuario non se encontra nesta sala",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/gl/global.json b/public/language/gl/global.json
index ccb30d5d1f..6ff44536a7 100644
--- a/public/language/gl/global.json
+++ b/public/language/gl/global.json
@@ -65,7 +65,7 @@
"posted_in_ago_by": "Publicado en %1 %2 por %3",
"user_posted_ago": "%1 publicado %2",
"guest_posted_ago": "Invitado publicou %1",
- "last_edited_by": "last edited by %1",
+ "last_edited_by": "última edición por %1",
"norecentposts": "Non hai mensaxes recentes",
"norecenttopics": "Non hai temas recentes",
"recentposts": "Mensaxes recentes",
@@ -86,5 +86,9 @@
"delete_all": "Borrar todo",
"map": "Mapa",
"sessions": "Inicios de sesión",
- "ip_address": "Enderezo IP"
+ "ip_address": "Enderezo IP",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/gl/groups.json b/public/language/gl/groups.json
index cf974c1089..f32273ce32 100644
--- a/public/language/gl/groups.json
+++ b/public/language/gl/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Unirse ao grupo",
"membership.leave-group": "Marchar do grupo",
"membership.reject": "Rexeitar",
- "new-group.group_name": "Nome do grupo:"
+ "new-group.group_name": "Nome do grupo:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/gl/notifications.json b/public/language/gl/notifications.json
index 4bc6bcc706..34829191b3 100644
--- a/public/language/gl/notifications.json
+++ b/public/language/gl/notifications.json
@@ -16,9 +16,9 @@
"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 marcou favorita a túa publicación en %2.",
- "favourited_your_post_in_dual": "%1 y %2 marcaron como favorita a túa mensaxe en %3.",
- "favourited_your_post_in_multiple": "%1 e outras %2 persoas marcaron como favorita a túa mensaxe en %3.",
+ "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 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 d9ac21ded1..b0a97d55cd 100644
--- a/public/language/gl/pages.json
+++ b/public/language/gl/pages.json
@@ -6,12 +6,12 @@
"popular-month": "Temas populares do mes",
"popular-alltime": "Temas populares de tódolos tempos",
"recent": "Temas recentes",
- "flagged-posts": "Flagged Posts",
+ "flagged-posts": "Publicacions Marcadas.",
"users/online": "Usuarios conectados",
"users/latest": "Últimos usuarios",
"users/sort-posts": "Usuarios con máis temas",
"users/sort-reputation": "Usuarios máis reputados",
- "users/banned": "Banned Users",
+ "users/banned": "Usuarios Expulsados",
"users/search": "Búsqueda de usuarios",
"notifications": "Notificacións",
"tags": "Etiquetas",
@@ -33,12 +33,13 @@
"account/posts": "Publicación de %1",
"account/topics": "Temas de %1",
"account/groups": "%1's Grupos",
- "account/favourites": "%1's Publicacións Favoritas",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Opcións de Usuario",
"account/watched": "Temas vistos por %1",
"account/upvoted": "Mensaxes votadas positivamente por %1",
"account/downvoted": "Mensaxes votadas negativamente por %1",
"account/best": "Mellores mensaxes escritas por %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 está baixo mantemento. Por favor, volve máis tarde.",
"maintenance.messageIntro": "A máis, o administrador deixou esta mensaxe: ",
"throttled.text": "&1 non está dispoñible debido a unha carga excesiva. Por favor, volva noutro momento"
diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json
index 2994d605d8..e892d34146 100644
--- a/public/language/gl/topic.json
+++ b/public/language/gl/topic.json
@@ -35,7 +35,7 @@
"login_to_subscribe": "Por favor, identifícate para subscribirte a este tema.",
"markAsUnreadForAll.success": "Publicación marcada como non lida para todos.",
"mark_unread": "Marcar coma non lido",
- "mark_unread.success": "Topic marked as unread.",
+ "mark_unread.success": "Tema marcado como non lido",
"watch": "Vixiar",
"unwatch": "Deixar de vixiar",
"watch.title": "Serás notificado canto haxa novas respostas neste tema",
@@ -65,9 +65,9 @@
"disabled_categories_note": "As categorías deshabilitadas están en gris",
"confirm_move": "Mover",
"confirm_fork": "Dividir",
- "favourite": "Favorito",
- "favourites": "Favoritos",
- "favourites.has_no_favourites": "Non tes favoritos. Podes engadir algún e velos aquí despois!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Cargando máis publicacións",
"move_topic": "Mover Tema",
"move_topics": "Mover Temas",
diff --git a/public/language/gl/user.json b/public/language/gl/user.json
index c5ffff6012..003f8ed360 100644
--- a/public/language/gl/user.json
+++ b/public/language/gl/user.json
@@ -22,7 +22,7 @@
"profile": "Perfil",
"profile_views": "Visitas ao perfil:",
"reputation": "Reputación",
- "favourites": "Favoritos",
+ "favourites": "Bookmarks",
"watched": "Visto",
"followers": "Seguidores",
"following": "Seguindo",
@@ -55,10 +55,11 @@
"password": "Contrasinal",
"username_taken_workaround": "Ese nome de usuario xa estaba collido, así que o modificamos lixeiramente. Agora o teu nome é %1 ",
"password_same_as_username": "O teu contrasinal e o teu nome de usuario son os mesmos, por favor, escolle outro contrasinal.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Subir foto",
"upload_a_picture": "Subir unha foto",
"remove_uploaded_picture": "Borrar unha foto subida",
- "image_spec": "Só podes subir imaxes en formato PNG, JPG ou BMP",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Opcións",
"show_email": "Amosa-lo meu Email",
"show_fullname": "Amosa-lo meu Nome Completo",
diff --git a/public/language/gl/users.json b/public/language/gl/users.json
index 0162c1c350..625c85f741 100644
--- a/public/language/gl/users.json
+++ b/public/language/gl/users.json
@@ -16,5 +16,5 @@
"unread_topics": "Temas non lidos",
"categories": "Categorías",
"tags": "Etiquetas",
- "no-users-found": "No users found!"
+ "no-users-found": "Non se atoparon usuarios!"
}
\ No newline at end of file
diff --git a/public/language/he/error.json b/public/language/he/error.json
index ff63886ec9..d4a969d21a 100644
--- a/public/language/he/error.json
+++ b/public/language/he/error.json
@@ -14,7 +14,7 @@
"invalid-password": "סיסמא שגויה",
"invalid-username-or-password": "אנא הגדר שם משתמש וסיסמה",
"invalid-search-term": "מילת חיפוש לא תקינה",
- "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+ "invalid-pagination-value": "ערך דף לא חוקי, חייב להיות לפחות %1 ולא מעל %2",
"username-taken": "שם משתמש תפוס",
"email-taken": "כתובת אימייל תפוסה",
"email-not-confirmed": "כתובת המייל שלך עוד לא אושרה, לחץ כאן על-מנת לאשר את המייל שלך.",
@@ -40,18 +40,18 @@
"content-too-short": "אנא הכנס פוסט ארוך יותר. פוסטים חייבים להכיל לפחות %1 תווים.",
"content-too-long": "אנא הכנס פוסט קצר יותר. פוסטים חייבים להיות קצרים יותר מ-%1 תווים.",
"title-too-short": "אנא הכנס כותרת ארוכה יותר. כותרות חייבות להכיל לפחות %1 תווים.",
- "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
- "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
- "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
- "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
- "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
- "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
- "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
+ "title-too-long": "אנא הכנס כותרת קצרה יותר. כותרות אינן יכולות להיות ארוכות מ-%1 תווים.",
+ "too-many-posts": "אתה יכול לפרסם פוסט רק פעם ב-%1 שניות - אנא המתן לפני פרסום שוב",
+ "too-many-posts-newbie": "כמשתמש חדש, אתה יכול לפרסם פוסט רק פעם ב-%1 שניות עד שיהיו לך %2 נקודות מוניטין - אנא המתן לפני פרסום שוב",
+ "tag-too-short": "אנא הכנס תגית ארוכה יותר. תגיות חייבות להכיל לפחות %1 תווים",
+ "tag-too-long": "אנא הכנס תגית קצרה יותר. תגיות אינן יכולות להיות ארוכות יותר מ-%1 תווים",
+ "not-enough-tags": "אין מספיק תגיות. לנושא חייב להיות לפחות %1 תגיות",
+ "too-many-tags": "יותר מדי תגיות. לנושאים לא יכולים להיות יותר מ-%1 תגיות",
"still-uploading": "אנא המתן לסיום ההעלאות",
- "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
+ "file-too-big": "הגודל המקסימלי של הקובץ הוא %1 קילובייט - אנא העלה קובץ קטן יותר",
"guest-upload-disabled": "העלאת אורחים אינה מאופשרת",
- "already-favourited": "כבר הוספת פוסט זה למועדפים",
- "already-unfavourited": "כבר הסרת פוסט זה מהמועדפים",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!",
"cant-remove-last-admin": "אתה המנהל היחיד. הוסף משתמש אחר לניהול לפני שאתה מוריד את עצמך מניהול",
"invalid-image-type": "פורמט תמונה לא תקין. הפורמטים המורשים הם: %1",
@@ -64,16 +64,16 @@
"group-not-member": "לא חבר בקבוצה זו",
"group-needs-owner": "קבוצה זו חייבת לפחות מנהל אחד",
"group-already-invited": "משתמש זה כבר הוזמן",
- "group-already-requested": "Your membership request has already been submitted",
+ "group-already-requested": "בקשת החברות שלך כבר נשלחה",
"post-already-deleted": "פוסט זה כבר נמחק",
"post-already-restored": "פוסט זה כבר שוחזר",
"topic-already-deleted": "נושא זה כבר נמחק",
"topic-already-restored": "נושא זה כבר שוחזר",
- "cant-purge-main-post": "You can't purge the main post, please delete the topic instead",
+ "cant-purge-main-post": "אתה לא יכול למחוק את הפוסט הראשי, אנא מחק את הנושא במקום",
"topic-thumbnails-are-disabled": "תמונות ממוזערות לנושא אינן מאופשרות.",
"invalid-file": "קובץ לא תקין",
"uploads-are-disabled": "העלאת קבצים אינה מאופשרת",
- "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "signature-too-long": "מצטערים, החתימה שלך לא יכולה להכיל יותר מ-%1 תווים.",
"about-me-too-long": "מצטערים, דף האודות שלך לא יכול להיות ארוך מ-%1 תווים.",
"cant-chat-with-yourself": "לא ניתן לעשות צ'אט עם עצמך!",
"chat-restricted": "משתמש זה חסם את הודעות הצ'אט שלו ממשתמשים זרים. המשתמש חייב לעקוב אחריך לפני שתוכל לשוחח איתו בצ'אט",
@@ -83,7 +83,7 @@
"chat-message-too-long": "הודעת הצ'אט ארוכה מדי",
"cant-edit-chat-message": "אתה לא רשאי לערוך הודעה זו",
"cant-remove-last-user": "אינך יכול למחוק את המשתמש האחרון",
- "cant-delete-chat-message": "You are not allowed to delete this message",
+ "cant-delete-chat-message": "אתה לא רשאי למחוק הודעה זו",
"reputation-system-disabled": "מערכת המוניטין לא פעילה.",
"downvoting-disabled": "היכולת להצביע נגד לא פעילה",
"not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "בבקשה השתמש בשם המשתמש שלך להתחברות",
"invite-maximum-met": "הזמנת את הכמות המירבית של אנשים (%1 מתוך %2).",
"no-session-found": "לא נמצאו סשני התחברות!",
- "not-in-room": "User not in room"
+ "not-in-room": "משתמש זה לא בצ'אט",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/he/global.json b/public/language/he/global.json
index f38444f7cc..b1ada66688 100644
--- a/public/language/he/global.json
+++ b/public/language/he/global.json
@@ -65,7 +65,7 @@
"posted_in_ago_by": "הפוסט הועלה ב %1 %2 על ידי %3",
"user_posted_ago": "%1 העלה פוסט %2",
"guest_posted_ago": "אורח העלה פוסט %1",
- "last_edited_by": "last edited by %1",
+ "last_edited_by": "נערך לאחרונה על ידי %1",
"norecentposts": "אין פוסטים מהזמן האחרון",
"norecenttopics": "אין נושאים מהזמן החרון",
"recentposts": "פוסטים אחרונים",
@@ -86,5 +86,9 @@
"delete_all": "מחק הכל",
"map": "מפה",
"sessions": "סשני התחברות",
- "ip_address": "כתובת IP"
+ "ip_address": "כתובת IP",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/he/groups.json b/public/language/he/groups.json
index 31788099a0..30ffe57467 100644
--- a/public/language/he/groups.json
+++ b/public/language/he/groups.json
@@ -25,7 +25,7 @@
"details.latest_posts": "פוסטים אחרונים",
"details.private": "פרטי",
"details.disableJoinRequests": "בטל בקשות הצטרפות",
- "details.grant": "Grant/Rescind Ownership",
+ "details.grant": "הענק/בטל בעלות",
"details.kick": "גרש",
"details.owner_options": "ניהול הקבוצה",
"details.group_name": "שם הקבוצה",
@@ -39,7 +39,7 @@
"details.userTitleEnabled": "הצג סמל",
"details.private_help": "אם מאופשר, הצטרפות לקבוצות דורשות אישור מבעל הקבוצה",
"details.hidden": "מוסתר",
- "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
+ "details.hidden_help": "אם מאופשר, הקבוצה לא תופיע ברשימת הקבוצות, ומשתמשים יצטרכו להיות מוזמנים ידנית",
"details.delete_group": "מחק קבוצה",
"event.updated": "פרטי הקבוצה עודכנו",
"event.deleted": "קבוצת \"%1\" נמחקה",
@@ -48,5 +48,6 @@
"membership.join-group": "הצטרף לקבוצה",
"membership.leave-group": "עזוב קבוצה",
"membership.reject": "דחה",
- "new-group.group_name": "שם קבוצה"
+ "new-group.group_name": "שם קבוצה",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/he/modules.json b/public/language/he/modules.json
index bf5598adf7..87b52ee8a2 100644
--- a/public/language/he/modules.json
+++ b/public/language/he/modules.json
@@ -26,7 +26,7 @@
"composer.user_said": "%1 אמר:",
"composer.discard": "האם למחוק פוסט זה?",
"composer.submit_and_lock": "אשר ונעל",
- "composer.toggle_dropdown": "Toggle Dropdown",
+ "composer.toggle_dropdown": "הדלק/כבה את התפריט הנפתח",
"composer.uploading": "העלאה %1",
"bootbox.ok": "בסדר",
"bootbox.cancel": "בטל",
diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json
index d60e3513d0..d6cddc6d7e 100644
--- a/public/language/he/notifications.json
+++ b/public/language/he/notifications.json
@@ -16,20 +16,20 @@
"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.",
+ "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",
"user_posted_to": "%1 פרסם תגובה ל: %2",
- "user_posted_to_dual": "%1 and %2 have posted replies to: %3",
- "user_posted_to_multiple": "%1 and %2 others have posted replies to: %3",
+ "user_posted_to_dual": "%1 ו%2 הגיבו ל: %3",
+ "user_posted_to_multiple": "%1 ו%2 אחרים הגיבו ל: %3",
"user_posted_topic": "%1 העלה נושא חדש: %2",
"user_started_following_you": "%1 התחיל לעקוב אחריך.",
- "user_started_following_you_dual": "%1 and %2 started following you.",
- "user_started_following_you_multiple": "%1 and %2 others started following you.",
- "new_register": "%1 sent a registration request.",
+ "user_started_following_you_dual": "%1 ו%1 התחילו לעקוב אחריך.",
+ "user_started_following_you_multiple": "%1 ו%2 התחילו לעקוב אחריך.",
+ "new_register": "%1 שלח בקשת הרשמה.",
"email-confirmed": "כתובת המייל אושרה",
"email-confirmed-message": "תודה שאישרת את כתובת המייל שלך. החשבון שלך פעיל כעת.",
"email-confirm-error-message": "אירעה שגיאה בעת אישור המייל שלך. ייתכן כי הקוד היה שגוי או פג תוקף.",
diff --git a/public/language/he/pages.json b/public/language/he/pages.json
index 8344a86f2f..de5b360411 100644
--- a/public/language/he/pages.json
+++ b/public/language/he/pages.json
@@ -6,12 +6,12 @@
"popular-month": "נושאים חמים החודש",
"popular-alltime": "הנושאים החמים בכל הזמנים",
"recent": "נושאים אחרונים",
- "flagged-posts": "Flagged Posts",
+ "flagged-posts": "פוסטים מסומנים",
"users/online": "משתמשים מחוברים",
"users/latest": "משתמשים אחרונים",
"users/sort-posts": "משתמשים עם המונה הגבוה ביותר",
"users/sort-reputation": "משתמשים עם המוניטין הגבוה ביותר",
- "users/banned": "Banned Users",
+ "users/banned": "משתמשים מורחקים",
"users/search": "חיפוש משתמשים",
"notifications": "התראות",
"tags": "תגיות",
@@ -33,12 +33,13 @@
"account/posts": "הודעות שפורסמו על ידי %1",
"account/topics": "נושאים שנוצרו על ידי %1",
"account/groups": "הקבוצות של %1",
- "account/favourites": "הנושאים האהובים על %1",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "הגדרות משתמש",
"account/watched": "נושאים שנצפו על ידי %1",
"account/upvoted": "פוסטים שהוצבעו לטובה על ידי %1",
"account/downvoted": "פוסטים שהוצבעו לרעה על ידי %1",
"account/best": "הפוסטים הטובים ביותר שנוצרו על ידי %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 כרגע תחת עבודות תחזוקה. אנא חזור בזמן מאוחר יותר.",
"maintenance.messageIntro": "בנוסף, המנהל השאיר את ההודעה הזו:",
"throttled.text": "%1 לא זמן כעת עקב טעינת יתר. אנא חזור מאוחר יותר."
diff --git a/public/language/he/topic.json b/public/language/he/topic.json
index f68e532e56..84200d1908 100644
--- a/public/language/he/topic.json
+++ b/public/language/he/topic.json
@@ -35,7 +35,7 @@
"login_to_subscribe": "אנא הרשם או התחבר על-מנת לעקוב אחר נושא זה.",
"markAsUnreadForAll.success": "נושא זה סומן כלא נקרא לכולם.",
"mark_unread": "סמן כלא נקרא",
- "mark_unread.success": "Topic marked as unread.",
+ "mark_unread.success": "הנושא סומן כלא נקרא.",
"watch": "עקוב",
"unwatch": "הפסק לעקוב",
"watch.title": "קבל התראה כאשר יש תגובות חדשות בנושא זה",
@@ -65,9 +65,9 @@
"disabled_categories_note": "קטגוריות מבוטלות צבועות באפור",
"confirm_move": "הזז",
"confirm_fork": "שכפל",
- "favourite": "מועדף",
- "favourites": "מועדפים",
- "favourites.has_no_favourites": "אין לך כרגע פוסטים מועדפים, סמן מספר פוסטים כמועדפים על מנת לראות אותם כאן!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "טוען פוסטים נוספים",
"move_topic": "הזז נושא",
"move_topics": "הזז נושאים",
@@ -105,7 +105,7 @@
"stale.warning": "הנושא בו אתה מגיב הוא דיי ישן. האם ברצונך לפתוח נושא חדש, ולהזכיר את הנושא הזה בתגובתך?",
"stale.create": "צור נושא חדש",
"stale.reply_anyway": "הגב לנושא זה בכל מקרה",
- "link_back": "Re: [%1](%2)",
+ "link_back": "תגובה: [%1](%2)",
"spam": "ספאם",
"offensive": "פוגעני",
"custom-flag-reason": "הכנס סיבה מסמנת"
diff --git a/public/language/he/user.json b/public/language/he/user.json
index f63645e7fb..ea8a1aaffd 100644
--- a/public/language/he/user.json
+++ b/public/language/he/user.json
@@ -22,7 +22,7 @@
"profile": "פרופיל",
"profile_views": "צפיות בפרופיל",
"reputation": "מוניטין",
- "favourites": "מועדפים",
+ "favourites": "Bookmarks",
"watched": "נצפה",
"followers": "עוקבים",
"following": "עוקב אחרי",
@@ -55,10 +55,11 @@
"password": "סיסמה",
"username_taken_workaround": "שם המשתמש שבחרת כבר תפוס, אז שינינו אותו מעט. שם המשתמש שלך כעת הוא %1",
"password_same_as_username": "הסיסמה שלך זהה לשם המשתמש, אנא בחר סיסמה שונה.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "העלה תמונה",
"upload_a_picture": "העלה תמונה",
"remove_uploaded_picture": "מחק את התמונה שהועלתה",
- "image_spec": "עלייך להעלות רק תמונות מפורמט PNG, JPG או BMP",
+ "upload_cover_picture": "Upload cover picture",
"settings": "הגדרות",
"show_email": "פרסם את כתובת האימייל שלי",
"show_fullname": "הצג את שמי המלא",
@@ -71,7 +72,7 @@
"digest_monthly": "חודשי",
"send_chat_notifications": "שלח לי הודעה למייל כאשר הודעת צ'אט נשלחה אלי בזמן שאיני מחובר",
"send_post_notifications": "שלח לי הודעה למייל כאשר תגובות חדשות פורסמו לנושאים שאני עוקב אחריהם",
- "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
+ "settings-require-reload": "כמה שינויים בהגדרות דורשים ריענון לדף. לחץ כאן כדי לרענן את הדף.",
"has_no_follower": "למשתמש זה אין עוקבים :(",
"follows_no_one": "משתמש זה אינו עוקב אחרי אחרים :(",
"has_no_posts": "המשתמש טרם יצר פוסטים כלשהם.",
@@ -82,14 +83,14 @@
"has_no_voted_posts": "למשתמש אין פוסטים שהוצבעו",
"email_hidden": "כתובת אימייל מוסתרת",
"hidden": "מוסתר",
- "paginate_description": "Paginate topics and posts instead of using infinite scroll",
+ "paginate_description": "הצג נושאים ופוסטים כדפים במקום כרשימת גלילה אין-סופית",
"topics_per_page": "כמות נושאים בעמוד",
"posts_per_page": "כמות פוסטים בעמוד",
"notification_sounds": "נגן סאונד כשמתקבלת התראה",
"browsing": "הגדרות צפייה",
"open_links_in_new_tab": "פתח קישורים חיצוניים בכרטיסייה חדשה",
"enable_topic_searching": "הפעל חיפוש בתוך נושא",
- "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+ "topic_search_help": "אם מאופשר, החיפוש בתוך הנושא יעקוף את שיטת החיפוש של הדפדפן, ויאפשר לך לחפש בכל הנושא - ולא רק במה שמוצג על המסך",
"follow_topics_you_reply_to": "עקוב אחרת נושאים שהגבת בהם",
"follow_topics_you_create": "עקוב אחר נושאים שיצרת",
"grouptitle": "בחר את כותרת הקבוצה שברצונך להציג",
@@ -98,9 +99,9 @@
"select-homepage": "בחר דף בית",
"homepage": "דף הבית",
"homepage_description": "בחר דף שיהיה דף הבית של הפורום או \"כלום\" על מנת להשתמש בדף הבית ברירת המחדל.",
- "custom_route": "Custom Homepage Route",
- "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\", or \"popular\")",
- "sso.title": "Single Sign-on Services",
+ "custom_route": "נתיב דף הבית המותאם-אישית",
+ "custom_route_help": "הכנס שם נתיב כאן, ללא לוכסן לפני (לדוגמא \"אחרונים\", או \"פופולארי\")",
+ "sso.title": "שירות יחיד להתחברות",
"sso.associated": "משוייך עם",
"sso.not-associated": "לחץ כאן כדי לשייך"
}
\ No newline at end of file
diff --git a/public/language/he/users.json b/public/language/he/users.json
index 30c141ca8e..7bbdc26e0b 100644
--- a/public/language/he/users.json
+++ b/public/language/he/users.json
@@ -16,5 +16,5 @@
"unread_topics": "נושאים שלא נקראו",
"categories": "קטגוריות",
"tags": "תגיות",
- "no-users-found": "No users found!"
+ "no-users-found": "לא נמצאו משתמשים!"
}
\ No newline at end of file
diff --git a/public/language/hu/error.json b/public/language/hu/error.json
index 48bc10ed16..156b9806a5 100644
--- a/public/language/hu/error.json
+++ b/public/language/hu/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Kérlek várj, amíg a feltöltés befejeződik.",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "Már bejelölted Kedvencnek ezt a hozzászólást",
- "already-unfavourited": "Már kivetted a Kedvenceid közül ezt a hozzászólást",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Nem tilthatsz ki másik adminisztrátort!",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Érvénytelen a kép típusa. Engedett kiterjesztések: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Kérlek a felhasználónevedet használd a belépéshez",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/hu/global.json b/public/language/hu/global.json
index ef85232149..63ad09e507 100644
--- a/public/language/hu/global.json
+++ b/public/language/hu/global.json
@@ -86,5 +86,9 @@
"delete_all": "Összes törlése",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/hu/groups.json b/public/language/hu/groups.json
index d62227498f..9b6032c023 100644
--- a/public/language/hu/groups.json
+++ b/public/language/hu/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json
index a9c8917764..33f71e2c35 100644
--- a/public/language/hu/notifications.json
+++ b/public/language/hu/notifications.json
@@ -16,9 +16,9 @@
"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 favourited your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 8bb9535fac..c67ccb5355 100644
--- a/public/language/hu/pages.json
+++ b/public/language/hu/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 jelenleg karbantartás alatt van. Kérlek nézz vissza késöbb!",
"maintenance.messageIntro": "Ezenkívúl, az adminisztrátor ezt az üzenetet hagyta:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json
index 504121693a..189f065bde 100644
--- a/public/language/hu/topic.json
+++ b/public/language/hu/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Kikapcsolt kategóriák kiszürkülve",
"confirm_move": "Áthelyezés",
"confirm_fork": "Szétszedés",
- "favourite": "Kedvenc",
- "favourites": "Kedvencek",
- "favourites.has_no_favourites": "Nincs egyetlen kedvenc hozzászólásod sem, jelölj meg párat hogy itt láthasd őket!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Hozzászólások betöltése",
"move_topic": "Topik áthelyezése",
"move_topics": "Move Topics",
diff --git a/public/language/hu/user.json b/public/language/hu/user.json
index 7066698025..0322d8a95d 100644
--- a/public/language/hu/user.json
+++ b/public/language/hu/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Megtekintések",
"reputation": "Hírnév",
- "favourites": "Kedvencek",
+ "favourites": "Bookmarks",
"watched": "Megfigyeli",
"followers": "Követők",
"following": "Követve",
@@ -55,10 +55,11 @@
"password": "Jelszó",
"username_taken_workaround": "A kívánt felhasználónév már foglalt, így változtatnunk kellett rajta egy kicsit. Mostantól %1 nicknév alatt vagy ismert.",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Kép feltöltése",
"upload_a_picture": "Egy kép feltöltése",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Beállítások",
"show_email": "E-mail címem mutatása",
"show_fullname": "A teljes nevem mutatása",
diff --git a/public/language/id/error.json b/public/language/id/error.json
index 2d10453279..39415ab992 100644
--- a/public/language/id/error.json
+++ b/public/language/id/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Tunggu proses upload sampai selesai",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "Post ini sudah kamu favorit",
- "already-unfavourited": "Postingan ini sudah kamu unfavorit",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Kamu tidak dapat ban admin lainnya!",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/id/global.json b/public/language/id/global.json
index 7b6b19afa8..c488a606a9 100644
--- a/public/language/id/global.json
+++ b/public/language/id/global.json
@@ -86,5 +86,9 @@
"delete_all": "Hapus Semua",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/id/groups.json b/public/language/id/groups.json
index 19d5b3d393..750914dd01 100644
--- a/public/language/id/groups.json
+++ b/public/language/id/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json
index cf4e6165f6..aeb0f894a7 100644
--- a/public/language/id/notifications.json
+++ b/public/language/id/notifications.json
@@ -16,9 +16,9 @@
"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 telah memfavoritkan posting mu di %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 3c791e897d..0ec372ded8 100644
--- a/public/language/id/pages.json
+++ b/public/language/id/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 saat ini sedang dalam masa pemeliharaan. Silahkan kembali lain waktu.",
"maintenance.messageIntro": "Tambahan, Administrator meninggalkan pesan ini:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/id/topic.json b/public/language/id/topic.json
index 8040d55ae4..6ba52cacce 100644
--- a/public/language/id/topic.json
+++ b/public/language/id/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Indikator Kategori yang Ditiadakan keabu-abuan",
"confirm_move": "Pindah",
"confirm_fork": "Cabangkan",
- "favourite": "Favorit",
- "favourites": "Beberapa Favorit",
- "favourites.has_no_favourites": "Kamu tidak memiliki favorit, favoritkan beberapa posting untuk melihatnya di sini! ",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Memuat Lebih Banyak Posting",
"move_topic": "Pindahkan Topik",
"move_topics": "Pindahkan Beberapa Topik",
diff --git a/public/language/id/user.json b/public/language/id/user.json
index 0a478472f5..c02d4258b0 100644
--- a/public/language/id/user.json
+++ b/public/language/id/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Tampilan profil",
"reputation": "Reputasi",
- "favourites": "Favorit",
+ "favourites": "Bookmarks",
"watched": "Watched",
"followers": "Pengikut",
"following": "Mengikuti",
@@ -55,10 +55,11 @@
"password": "Kata Sandi",
"username_taken_workaround": "Nama pengguna yang kamu inginkan telah diambil, jadi kami merubahnya sedikit. Kamu saat ini dikenal sebagai %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Unggah gambar/foto",
"upload_a_picture": "Unggah sebuah gambar/foto",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Pengaturan",
"show_email": "Tampilkan Email Saya",
"show_fullname": "Tampilkan Nama Lengkap Saya",
diff --git a/public/language/it/error.json b/public/language/it/error.json
index f498726867..d7be6f572b 100644
--- a/public/language/it/error.json
+++ b/public/language/it/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Per favore attendere il completamento degli uploads.",
"file-too-big": "La dimensione massima consentita è di %1 kB - si prega di caricare un file più piccolo",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "Hai già inserito tra i preferiti questo post",
- "already-unfavourited": "Hai già inserito tra i Non Preferiti questo post",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Non puoi bannare altri amministratori!",
"cant-remove-last-admin": "Sei l'unico Amministratore. Aggiungi un altro amministratore prima di rimuovere il tuo ruolo",
"invalid-image-type": "Tipo dell'immagine non valido. I tipi permessi sono: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Per favore usa il tuo nome utente per accedere",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/it/global.json b/public/language/it/global.json
index 722cad0af7..3e19f1688b 100644
--- a/public/language/it/global.json
+++ b/public/language/it/global.json
@@ -86,5 +86,9 @@
"delete_all": "Elimina Tutto",
"map": "Mappa",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/it/groups.json b/public/language/it/groups.json
index 4d03c957de..9130a2135d 100644
--- a/public/language/it/groups.json
+++ b/public/language/it/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Entra nel Gruppo",
"membership.leave-group": "Lascia il Gruppo",
"membership.reject": "Rifiuta",
- "new-group.group_name": "Nome Gruppo:"
+ "new-group.group_name": "Nome Gruppo:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json
index 0980d7b430..3addf77765 100644
--- a/public/language/it/notifications.json
+++ b/public/language/it/notifications.json
@@ -16,9 +16,9 @@
"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 ha messo nei favoriti il tuo post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 836a6d5181..dd6de7ed92 100644
--- a/public/language/it/pages.json
+++ b/public/language/it/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Post creati da %1",
"account/topics": "Discussioni create da %1",
"account/groups": "Gruppi di %1",
- "account/favourites": "Post Favoriti da %1",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Impostazioni Utente",
"account/watched": "Discussioni osservate da %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 è attualmente in manutenzione. Per favore ritorna più tardi.",
"maintenance.messageIntro": "Inoltre, l'amministratore ha lasciato questo messaggio:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/it/topic.json b/public/language/it/topic.json
index 0f7ab7fc1d..8bbcf4c4c2 100644
--- a/public/language/it/topic.json
+++ b/public/language/it/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Le Categorie disabilitate sono in grigio",
"confirm_move": "Sposta",
"confirm_fork": "Dividi",
- "favourite": "Preferito",
- "favourites": "Preferiti",
- "favourites.has_no_favourites": "Non hai ancun post preferito; aggiungi qualche post ai preferiti per vederli qui!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Caricamento altri post",
"move_topic": "Sposta Discussione",
"move_topics": "Sposta Discussioni",
diff --git a/public/language/it/user.json b/public/language/it/user.json
index ced2e232f1..a5f0447305 100644
--- a/public/language/it/user.json
+++ b/public/language/it/user.json
@@ -22,7 +22,7 @@
"profile": "Profilo",
"profile_views": "Visite al profilo",
"reputation": "Reputazione",
- "favourites": "Favoriti",
+ "favourites": "Bookmarks",
"watched": "Osservati",
"followers": "Da chi è seguito",
"following": "Chi segue",
@@ -55,10 +55,11 @@
"password": "Password",
"username_taken_workaround": "Il nome utente che hai richiesto era già stato utilizzato, quindi lo abbiamo modificato leggermente. Ora il tuo è %1",
"password_same_as_username": "La tua password è uguale al tuo username, per piacere scegli un'altra password",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Carica foto",
"upload_a_picture": "Carica una foto",
"remove_uploaded_picture": "Elimina foto caricata",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Impostazioni",
"show_email": "Mostra la mia Email",
"show_fullname": "Vedi il Mio Nome Completo",
diff --git a/public/language/ja/error.json b/public/language/ja/error.json
index 0fd0029421..8ff2746da8 100644
--- a/public/language/ja/error.json
+++ b/public/language/ja/error.json
@@ -50,8 +50,8 @@
"still-uploading": "アップロードが完成するまでお待ちください。",
"file-too-big": "%1kBより大きいサイズファイルが許されません－より小さいファイルをアップして下さい。",
"guest-upload-disabled": "ゲストさんからのアップを無効にしています",
- "already-favourited": "あなたはこの投稿をお気に入りにしました",
- "already-unfavourited": "あなたはこの投稿をお気に入り解除しました",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "ほかの管理者を停止することはできません！",
"cant-remove-last-admin": "あなたが唯一の管理者です。管理者としてあなた自身を削除する前に、管理者として別のユーザーを追加します。",
"invalid-image-type": "無効なイメージタイプです。許可された種類は: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/ja/global.json b/public/language/ja/global.json
index 97696d28b6..82cc2ea677 100644
--- a/public/language/ja/global.json
+++ b/public/language/ja/global.json
@@ -86,5 +86,9 @@
"delete_all": "Delete All",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/ja/groups.json b/public/language/ja/groups.json
index a3793e5a72..0277cc5abb 100644
--- a/public/language/ja/groups.json
+++ b/public/language/ja/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "拒否",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json
index 25cb5e89e6..9d0ca95f07 100644
--- a/public/language/ja/notifications.json
+++ b/public/language/ja/notifications.json
@@ -16,9 +16,9 @@
"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 favourited your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 63e409692c..717c66327e 100644
--- a/public/language/ja/pages.json
+++ b/public/language/ja/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
"maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json
index 746897fdeb..f24579e205 100644
--- a/public/language/ja/topic.json
+++ b/public/language/ja/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "使用不可の板はグレーに表示されます。",
"confirm_move": "移動",
"confirm_fork": "フォーク",
- "favourite": "お気に入り",
- "favourites": "お気に入り",
- "favourites.has_no_favourites": "お気に入りはまだありません！",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "もっと見る",
"move_topic": "スレッドを移動",
"move_topics": "トピックを移動する",
diff --git a/public/language/ja/user.json b/public/language/ja/user.json
index 174930b30c..50da3ac31a 100644
--- a/public/language/ja/user.json
+++ b/public/language/ja/user.json
@@ -22,7 +22,7 @@
"profile": "プロフィール",
"profile_views": "閲覧数",
"reputation": "評価",
- "favourites": "お気に入り",
+ "favourites": "Bookmarks",
"watched": "Watched",
"followers": "フォロワー",
"following": "フォロー中",
@@ -55,10 +55,11 @@
"password": "パスワード",
"username_taken_workaround": "このユーザー名はすでに使用されています。いまのユーザー名は %1 です。",
"password_same_as_username": "パスワードがユーザー名と同じですから、他のパスワードを使って下さい。",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "画像をアップロード",
"upload_a_picture": "画像をアップロード",
"remove_uploaded_picture": "アップした写真を取り消します",
- "image_spec": "PNG、JPGとBMPのファイルしかアップできません",
+ "upload_cover_picture": "Upload cover picture",
"settings": "設定",
"show_email": "メールアドレスを表示",
"show_fullname": "フルネームを示します",
diff --git a/public/language/ko/email.json b/public/language/ko/email.json
index 0474c36a09..ff07b4a927 100644
--- a/public/language/ko/email.json
+++ b/public/language/ko/email.json
@@ -21,9 +21,9 @@
"digest.cta": "%1에 방문하시려면 클릭하세요.",
"digest.unsub.info": "이 대화는 사용자의 구독 설정에 따라 전송되었습니다.",
"digest.no_topics": "%1 동안 활성화된 주제가 없습니다.",
- "digest.day": "day",
- "digest.week": "week",
- "digest.month": "month",
+ "digest.day": "일",
+ "digest.week": "주",
+ "digest.month": "월",
"notif.chat.subject": "%1님이 대화 메시지를 보냈습니다.",
"notif.chat.cta": "대화를 계속하려면 여기를 클릭하세요.",
"notif.chat.unsub.info": "이 대화 알림은 사용자의 구독 설정에 따라 전송되었습니다.",
diff --git a/public/language/ko/error.json b/public/language/ko/error.json
index cf908e8447..0bd26d9348 100644
--- a/public/language/ko/error.json
+++ b/public/language/ko/error.json
@@ -14,7 +14,7 @@
"invalid-password": "올바르지 않은 비밀번호입니다.",
"invalid-username-or-password": "사용자 이름과 패스워드를 모두 설정해주세요.",
"invalid-search-term": "올바르지 않은 검색어입니다.",
- "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+ "invalid-pagination-value": "올바르지 않은 값입니다. 최소 1%에서 최대 2%까지 설정해야 합니다.",
"username-taken": "이미 사용 중인 사용자 이름입니다.",
"email-taken": "이미 사용 중인 이메일입니다.",
"email-not-confirmed": "아직 이메일이 인증되지 않았습니다. 여기를 누르면 인증 메일을 발송할 수 있습니다.",
@@ -24,7 +24,7 @@
"confirm-email-already-sent": "인증 메일이 이미 발송되었습니다. %1 분 이후에 재 발송이 가능합니다.",
"username-too-short": "사용자 이름이 너무 짧습니다.",
"username-too-long": "사용자 이름이 너무 깁니다.",
- "password-too-long": "Password too long",
+ "password-too-long": "패스워드가 너무 깁니다.",
"user-banned": "차단된 사용자입니다.",
"user-too-new": "죄송합니다, 첫 번째 게시물은 %1 초 후에 작성할 수 있습니다.",
"no-category": "존재하지 않는 카테고리입니다.",
@@ -50,8 +50,8 @@
"still-uploading": "업로드가 끝날 때까지 기다려주세요.",
"file-too-big": "업로드 가능한 파일크기는 최대 %1 KB 입니다 - 파일의 용량을 줄이거나 압축을 활용하세요.",
"guest-upload-disabled": "손님의 파일 업로드는 제한되어 있습니다.",
- "already-favourited": "이미 이 게시물을 즐겨찾기 하셨습니다.",
- "already-unfavourited": "이미 이 게시물의 즐겨찾기를 해제하셨습니다.",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "다른 관리자를 차단할 수 없습니다.",
"cant-remove-last-admin": "귀하는 유일한 관리자입니다. 관리자를 그만두시기 전에 다른 사용자를 관리자로 선임하세요.",
"invalid-image-type": "올바르지 않은 이미지입니다. 사용가능한 유형: %1",
@@ -83,7 +83,7 @@
"chat-message-too-long": "메시지가 너무 깁니다.",
"cant-edit-chat-message": "편집 할 수 있는 권한이 없습니다.",
"cant-remove-last-user": "마지막 사용자를 삭제할 수 없습니다.",
- "cant-delete-chat-message": "You are not allowed to delete this message",
+ "cant-delete-chat-message": "메세지를 지울 권한이 없습니다.",
"reputation-system-disabled": "인지도 기능이 비활성 상태입니다.",
"downvoting-disabled": "비추천 기능이 비활성 상태입니다.",
"not-enough-reputation-to-downvote": "인지도가 낮아 이 게시물에 반대할 수 없습니다.",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "사용자명을 통해 로그인하세요.",
"invite-maximum-met": "초대가능한 사용자를 모두 초대했습니다. (%2명 중 %1을 초대)",
"no-session-found": "로그인 세션을 찾을 수 없습니다.",
- "not-in-room": "User not in room"
+ "not-in-room": "없는 유저입니다.",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/ko/global.json b/public/language/ko/global.json
index b112c196fd..4457d09311 100644
--- a/public/language/ko/global.json
+++ b/public/language/ko/global.json
@@ -3,8 +3,8 @@
"search": "검색",
"buttons.close": "닫기",
"403.title": "접근이 거부되었습니다.",
- "403.message": "You seem to have stumbled upon a page that you do not have access to.",
- "403.login": "Perhaps you should try logging in?",
+ "403.message": "접속할 수 없는 페이지에 접근하였습니다.",
+ "403.login": "로그인되어 있는지 확인해 주세요.",
"404.title": "페이지를 찾을 수 없습니다.",
"404.message": "존재하지 않는 페이지에 접근하였습니다. 홈 페이지로 이동합니다.",
"500.title": "내부 오류가 발생했습니다.",
@@ -49,7 +49,7 @@
"users": "사용자",
"topics": "주제",
"posts": "게시물",
- "best": "Best",
+ "best": "베스트",
"upvoted": "Upvoted",
"downvoted": "Downvoted",
"views": "조회 수",
@@ -59,19 +59,19 @@
"posted_ago_by_guest": "익명 사용자가 %1에 작성했습니다.",
"posted_ago_by": "%2님이 %1에 작성했습니다.",
"posted_ago": "%1에 작성되었습니다.",
- "posted_in": "posted in %1",
- "posted_in_by": "posted in %1 by %2",
+ "posted_in": "%1에 작성되었습니다.",
+ "posted_in_by": "%2님이 %1에 작성했습니다.",
"posted_in_ago": "%2 %1에 작성되었습니다. ",
"posted_in_ago_by": "%3님이 %2 %1에 작성했습니다.",
"user_posted_ago": "%1님이 %2에 작성했습니다.",
"guest_posted_ago": "익명 사용자가 %1에 작성했습니다.",
- "last_edited_by": "last edited by %1",
+ "last_edited_by": "%1님이 마지막으로 수정했습니다.",
"norecentposts": "최근 작성된 게시물이 없습니다.",
"norecenttopics": "최근 생성된 생성된 주제가 없습니다.",
"recentposts": "최근 게시물",
"recentips": "최근 로그인 IP",
"away": "자리 비움",
- "dnd": "Do not disturb",
+ "dnd": "방해 금지",
"invisible": "오프라인으로 표시",
"offline": "오프라인",
"email": "이메일",
@@ -81,10 +81,14 @@
"updated.title": "포럼이 업데이트 되었습니다.",
"updated.message": "이 포럼은 지금 최신 버전으로 업데이트 되었습니다. 여기를 누르면 페이지를 새로고침합니다.",
"privacy": "개인정보",
- "follow": "Follow",
- "unfollow": "Unfollow",
- "delete_all": "Delete All",
- "map": "Map",
- "sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "follow": "팔로우",
+ "unfollow": "언팔로우",
+ "delete_all": "모두 삭제하기",
+ "map": "맵",
+ "sessions": "로그인 세션",
+ "ip_address": "아이피 주소",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/ko/groups.json b/public/language/ko/groups.json
index 3c521d70c7..bea6c7d39c 100644
--- a/public/language/ko/groups.json
+++ b/public/language/ko/groups.json
@@ -14,7 +14,7 @@
"invited.search": "그룹에 초대할 사용자를 검색하세요.",
"invited.notification_title": "%1 그룹에 초대되었습니다.",
"request.notification_title": "%1 님으로부터 그룹 구성원 요청이 들어왔습니다.",
- "request.notification_text": "%1 has requested to become a member of %2",
+ "request.notification_text": "%1 님이 %2 의 멤버 가입을 신청했습니다.",
"cover-save": "저장",
"cover-saving": "저장 중",
"details.title": "그룹 상세정보",
@@ -24,8 +24,8 @@
"details.has_no_posts": "이 그룹의 구성원이 작성한 게시물이 없습니다.",
"details.latest_posts": "최근 게시물",
"details.private": "비공개",
- "details.disableJoinRequests": "Disable join requests",
- "details.grant": "Grant/Rescind Ownership",
+ "details.disableJoinRequests": "가입 신청 비활성화하기",
+ "details.grant": "소유권 이전/포기하기",
"details.kick": "내보내기",
"details.owner_options": "그룹 관리",
"details.group_name": "그룹명",
@@ -44,9 +44,10 @@
"event.updated": "그룹 정보가 업데이트 되었습니다.",
"event.deleted": "%1 그룹이 삭제되었습니다.",
"membership.accept-invitation": "초대 수락",
- "membership.invitation-pending": "Invitation Pending",
+ "membership.invitation-pending": "보류중인 초대 수락",
"membership.join-group": "그룹 들어가기",
"membership.leave-group": "그룹 나가기",
"membership.reject": "거절",
- "new-group.group_name": "그룹명:"
+ "new-group.group_name": "그룹명:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/ko/modules.json b/public/language/ko/modules.json
index e9b92a7110..2a11ff7ae0 100644
--- a/public/language/ko/modules.json
+++ b/public/language/ko/modules.json
@@ -18,7 +18,7 @@
"chat.three_months": "3개월",
"chat.delete_message_confirm": "이 대화를 삭제하시겠습니까?",
"chat.roomname": "%1 대화방 ",
- "chat.add-users-to-room": "Add users to room",
+ "chat.add-users-to-room": "유저 추가하기",
"composer.compose": "작성",
"composer.show_preview": "미리보기",
"composer.hide_preview": "미리보기 숨김",
@@ -26,7 +26,7 @@
"composer.user_said": "%1님의 말:",
"composer.discard": "이 게시물을 지우겠습니까?",
"composer.submit_and_lock": "잠금 상태로 작성 완료",
- "composer.toggle_dropdown": "Toggle Dropdown",
+ "composer.toggle_dropdown": "내려서 확인하기",
"composer.uploading": "%1 업로드 중",
"bootbox.ok": "확인",
"bootbox.cancel": "취소",
diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json
index 67d76f1766..910681d2fb 100644
--- a/public/language/ko/notifications.json
+++ b/public/language/ko/notifications.json
@@ -5,7 +5,7 @@
"mark_all_read": "모든 알림을 읽음 상태로 변경",
"back_to_home": "%1로 돌아가기",
"outgoing_link": "외부 링크",
- "outgoing_link_message": "You are now leaving %1",
+ "outgoing_link_message": "%1 에서 나오셨습니다.",
"continue_to": "%1 사이트로 이동",
"return_to": "%1 사이트로 돌아가기",
"new_notification": "새 알림",
@@ -13,18 +13,18 @@
"new_message_from": "%1님이 메시지를 보냈습니다.",
"upvoted_your_post_in": "%1님이 %2의 내 게시물을 추천했습니다.",
"upvoted_your_post_in_dual": "%1님과 %2님이 %3의 내 게시물을 추천했습니다.",
- "upvoted_your_post_in_multiple": "%1 and %2 others have upvoted your post in %3.",
+ "upvoted_your_post_in_multiple": "%1 님과 다른 %2 명이 %3 안의 당신의 게시물을 upvote 했습니다.",
"moved_your_post": "%1님이 귀하의 게시물을 %2로 옮겼습니다.",
- "moved_your_topic": "%1 has moved %2",
- "favourited_your_post_in": "%1님이 %2의 내 게시물을 좋아합니다.",
- "favourited_your_post_in_dual": "%1님과 %2님이 %3을 좋아합니다.",
- "favourited_your_post_in_multiple": "%1님 외 %2명이 %3을 좋아합니다.",
+ "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 and %2 flagged a post in %3",
- "user_flagged_post_in_multiple": "%1 and %2 others flagged a post in %3",
+ "user_flagged_post_in_dual": "%1 님과 %2 님이 %3 안의 게시물에 플래그를 세웠습니다.",
+ "user_flagged_post_in_multiple": "%1 님과 %2 명의 다른 유저들이 %3 안의 게시물에 플래그를 세웠습니다.",
"user_posted_to": "%1님이 %2에 답글을 작성했습니다.",
- "user_posted_to_dual": "%1 and %2 have posted replies to: %3",
- "user_posted_to_multiple": "%1 and %2 others have posted replies to: %3",
+ "user_posted_to_dual": "%1 님과 %2 님이 %3 에 답글을 달았습니다.",
+ "user_posted_to_multiple": "%1 님과 %2 명의 다른 유저들이 %3 에 답글을 달았습니다.",
"user_posted_topic": "%1님이 새 주제를 작성했습니다: %2",
"user_started_following_you": "%1님이 나를 팔로우합니다.",
"user_started_following_you_dual": "%1님과 %2님이 당신을 팔로우 시작했습니다.",
diff --git a/public/language/ko/pages.json b/public/language/ko/pages.json
index 2f9ceae518..242c610438 100644
--- a/public/language/ko/pages.json
+++ b/public/language/ko/pages.json
@@ -6,12 +6,12 @@
"popular-month": "인기있는 주제 (월간)",
"popular-alltime": "인기있는 주제",
"recent": "최근 주제",
- "flagged-posts": "Flagged Posts",
+ "flagged-posts": "플래그된 게시물",
"users/online": "온라인 사용자",
"users/latest": "최근 사용자",
"users/sort-posts": "가장 많은 게시물을 작성한 사용자",
"users/sort-reputation": "가장 높은 인지도를 가진 사용자",
- "users/banned": "Banned Users",
+ "users/banned": "차단된 유저",
"users/search": "사용자 검색",
"notifications": "알림",
"tags": "태그",
@@ -33,13 +33,14 @@
"account/posts": "%1 님이 작성한 게시물",
"account/topics": "%1 님이 생성한 주제",
"account/groups": "%1님의 그룹",
- "account/favourites": "%1님이 좋아하는 게시물",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "사용자 설정",
"account/watched": "%1님이 지켜보는 주제",
- "account/upvoted": "Posts upvoted by %1",
- "account/downvoted": "Posts downvoted by %1",
- "account/best": "Best posts made by %1",
+ "account/upvoted": "%1 님이 upvote한 게시물",
+ "account/downvoted": "%1 님에 의해 Downvote된 게시물",
+ "account/best": "%1 님 최고의 게시물",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 사이트는 현재 점검 중입니다. 나중에 다시 방문해주세요.",
"maintenance.messageIntro": "다음은 관리자가 전하는 메시지입니다.",
- "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
+ "throttled.text": "과도한 부하로 %1 를 로드할 수 없습니다. 잠시후에 다시 시도해주세요."
}
\ No newline at end of file
diff --git a/public/language/ko/search.json b/public/language/ko/search.json
index 52dbc78711..611597011a 100644
--- a/public/language/ko/search.json
+++ b/public/language/ko/search.json
@@ -2,7 +2,7 @@
"results_matching": "\"%2\"와 일치하는 %1개의 결과를 찾았습니다 (검색시간: %3초)",
"no-matches": "일치하는 결과가 없습니다.",
"advanced-search": "고급 검색",
- "in": "In",
+ "in": "안에서 검색",
"titles": "제목",
"titles-posts": "제목과 게시물",
"posted-by": "다음 사용자에 의해 작성됨",
@@ -10,10 +10,10 @@
"search-child-categories": "하위 카테고리를 검색",
"reply-count": "답변 수",
"at-least": "적어도",
- "at-most": "At most",
+ "at-most": "최대",
"post-time": "작성시간",
- "newer-than": "Newer than",
- "older-than": "Older than",
+ "newer-than": "이전",
+ "older-than": "이후",
"any-date": "모든 시간",
"yesterday": "어제",
"one-week": "일 주",
@@ -22,19 +22,19 @@
"three-months": "세 달",
"six-months": "여섯 달",
"one-year": "일 년",
- "sort-by": "Sort by",
- "last-reply-time": "Last reply time",
- "topic-title": "Topic title",
- "number-of-replies": "Number of replies",
- "number-of-views": "Number of views",
- "topic-start-date": "Topic start date",
+ "sort-by": "정렬",
+ "last-reply-time": "마지막으로 답글이 달린 시간",
+ "topic-title": "주제 제목",
+ "number-of-replies": "답글 수",
+ "number-of-views": "조회 수",
+ "topic-start-date": "주제가 게시된 날짜",
"username": "사용자명",
"category": "카테고리",
"descending": "내림차순",
"ascending": "오름차순",
"save-preferences": "설정 저장",
"clear-preferences": "설정 초기화",
- "search-preferences-saved": "Search preferences saved",
- "search-preferences-cleared": "Search preferences cleared",
- "show-results-as": "Show results as"
+ "search-preferences-saved": "검색 설정이 저장되었습니다.",
+ "search-preferences-cleared": "검색 설정이 초기화되었습니다.",
+ "show-results-as": "검색결과 정렬 - "
}
\ No newline at end of file
diff --git a/public/language/ko/tags.json b/public/language/ko/tags.json
index 8e1011bd29..d088ef7041 100644
--- a/public/language/ko/tags.json
+++ b/public/language/ko/tags.json
@@ -1,7 +1,7 @@
{
"no_tag_topics": "이 태그에 해당하는 주제가 없습니다.",
"tags": "태그",
- "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
+ "enter_tags_here": "%1 와 %2 글자 안에서 태그를 입력하세요.",
"enter_tags_here_short": "태그 입력...",
"no_tags": "아직 아무런 태그도 없습니다."
}
\ No newline at end of file
diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json
index a4110c5839..59b1ae0e47 100644
--- a/public/language/ko/topic.json
+++ b/public/language/ko/topic.json
@@ -26,7 +26,7 @@
"tools": "도구",
"flag": "신고",
"locked": "잠김",
- "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+ "bookmark_instructions": "여기를 누르면 마지막으로 읽지 않은 포스트로 이동합니다.",
"flag_title": "이 게시물을 신고",
"flag_success": "이 게시물은 신고되었습니다.",
"deleted_message": "이 주제는 삭제되었습니다. 주제 관리 권한이 있는 사용자만 볼 수 있습니다.",
@@ -35,7 +35,7 @@
"login_to_subscribe": "이 주제의 알림을 받기 위해서는 로그인해야 합니다.",
"markAsUnreadForAll.success": "모든 사용자에 대해 읽지 않음으로 표시했습니다.",
"mark_unread": "읽지 않음으로 표시",
- "mark_unread.success": "Topic marked as unread.",
+ "mark_unread.success": "성공적으로 읽지 않음으로 표시했습니다.",
"watch": "관심 주제",
"unwatch": "관심 주제 해제",
"watch.title": "이 주제의 새 답글 알리기",
@@ -51,7 +51,7 @@
"thread_tools.move_all": "모두 이동",
"thread_tools.fork": "주제 분리",
"thread_tools.delete": "삭제",
- "thread_tools.delete-posts": "Delete Posts",
+ "thread_tools.delete-posts": "게시물 삭제",
"thread_tools.delete_confirm": "이 주제를 삭제하시겠습니까?",
"thread_tools.restore": "복원",
"thread_tools.restore_confirm": "이 주제를 복원하시겠습니까?",
@@ -65,9 +65,9 @@
"disabled_categories_note": "비활성화된 카테고리는 회색으로 표시됩니다.",
"confirm_move": "이동",
"confirm_fork": "분리",
- "favourite": "좋아요",
- "favourites": "좋아요",
- "favourites.has_no_favourites": "좋아하는 게시물이 없습니다.",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "게시물을 로딩 중",
"move_topic": "주제 이동",
"move_topics": "주제 이동",
@@ -78,9 +78,9 @@
"fork_topic_instruction": "분리할 게시물을 선택하세요.",
"fork_no_pids": "게시물이 선택되지 않았습니다.",
"fork_success": "주제가 분리되었습니다! 분리된 주제를 보려면 여기를 클릭하세요.",
- "delete_posts_instruction": "Click the posts you want to delete/purge",
+ "delete_posts_instruction": "삭제할 게시물을 선택하세요.",
"composer.title_placeholder": "여기에 제목을 입력하세요.",
- "composer.handle_placeholder": "Name",
+ "composer.handle_placeholder": "이름",
"composer.discard": "취소",
"composer.submit": "등록",
"composer.replying_to": "'%1'에 대한 답글",
@@ -100,12 +100,12 @@
"oldest_to_newest": "오래된 순으로 정렬",
"newest_to_oldest": "최신 순으로 정렬",
"most_votes": "추천수 순으로 정렬",
- "most_posts": "Most posts",
- "stale.title": "Create new topic instead?",
- "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
+ "most_posts": "포스트 많은 순으로 정렬",
+ "stale.title": "새로 주제를 생성하시겠습니까?",
+ "stale.warning": "현재 답글을 작성중인 주제가 꽤 오래되었습니다. 새로 주제를 생성하시고 이글을 인용하시겠습니까?",
"stale.create": "새로운 주제를 작성",
"stale.reply_anyway": "아무튼 이 주제에 답변해주세요.",
- "link_back": "Re: [%1](%2)",
+ "link_back": "답글: [%1](%2)",
"spam": "스팸",
"offensive": "공격적인",
"custom-flag-reason": "신고 사유를 입력하세요."
diff --git a/public/language/ko/user.json b/public/language/ko/user.json
index ea5c2d9c82..592af0f1ce 100644
--- a/public/language/ko/user.json
+++ b/public/language/ko/user.json
@@ -22,8 +22,8 @@
"profile": "프로필",
"profile_views": "프로필 조회 수",
"reputation": "인기도",
- "favourites": "좋아요",
- "watched": "Watched",
+ "favourites": "Bookmarks",
+ "watched": "읽음",
"followers": "이 사용자를 팔로우",
"following": "이 사용자가 팔로우",
"aboutme": "나를 소개",
@@ -55,10 +55,11 @@
"password": "패스워드",
"username_taken_workaround": "새 사용자 이름이 이미 존재하여 %1로 저장되었습니다.",
"password_same_as_username": "패스워드가 사용자명과 동일합니다. 다시 입력하세요.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "사진 업로드",
"upload_a_picture": "사진 업로드",
"remove_uploaded_picture": "등록된 사진을 삭제",
- "image_spec": "PNG, JPG 또는 BMP 파일만 업로드 가능합니다.",
+ "upload_cover_picture": "Upload cover picture",
"settings": "설정",
"show_email": "이메일 공개",
"show_fullname": "실명 공개",
@@ -70,37 +71,37 @@
"digest_weekly": "매주",
"digest_monthly": "매월",
"send_chat_notifications": "오프라인일 때 채팅 메시지가 도착하면 알림 메일을 보냅니다.",
- "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
- "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
+ "send_post_notifications": "내가 구독한 주제에 답글이 달리면 메일 보내기.",
+ "settings-require-reload": "일부 설정 변경은 리로딩이 필요합니다. 여기를 눌러서 페이지를 리로딩 해주세요.",
"has_no_follower": "아무도 이 사용자를 팔로우하지 않습니다.",
"follows_no_one": "이 사용자는 아무도 팔로우하지 않습니다.",
"has_no_posts": "이 사용자가 생성한 게시물이 없습니다.",
"has_no_topics": "이 사용자가 생성한 주제가 없습니다.",
- "has_no_watched_topics": "This user hasn't watched any topics yet.",
- "has_no_upvoted_posts": "This user hasn't upvoted any posts yet.",
- "has_no_downvoted_posts": "This user hasn't downvoted any posts yet.",
- "has_no_voted_posts": "This user has no voted posts",
+ "has_no_watched_topics": "이 유저가 관심 목록에 추가한 주제가 없습니다.",
+ "has_no_upvoted_posts": "이 유저가 upvote한 게시물이 없습니다.",
+ "has_no_downvoted_posts": "이 유저가 downvote한 게시물이 없습니다.",
+ "has_no_voted_posts": "이 유저가 vote한 게시물이 없습니다.",
"email_hidden": "이메일 비공개",
"hidden": "비공개",
- "paginate_description": "Paginate topics and posts instead of using infinite scroll",
+ "paginate_description": "주제와 게시물을 무한 스크롤 대신 페이지뷰로 보기",
"topics_per_page": "페이지 당 주제 수",
"posts_per_page": "페이지 당 게시물 수",
"notification_sounds": "알림 수신시 소리로 알려주기",
"browsing": "페이지 열기",
"open_links_in_new_tab": "외부 링크를 새로운 탭을 사용하여 열람",
"enable_topic_searching": "주제 내 검색 허용",
- "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
- "follow_topics_you_reply_to": "Follow topics that you reply to",
- "follow_topics_you_create": "Follow topics you create",
- "grouptitle": "Select the group title you would like to display",
- "no-group-title": "No group title",
+ "topic_search_help": "활성화 된후 브라우저의 기본 페이지 검색 기능을 연관 주제 검색 기능으로 대신하고 화면에 보여지는 것 뿐만 아니라 주제와 연관된 모든것을 검색합니다.",
+ "follow_topics_you_reply_to": "답글 단 게시물을 팔로우 합니다.",
+ "follow_topics_you_create": "생성한 주제를 팔로우 합니다.",
+ "grouptitle": "표시할 그룹 이름을 선택하세요.",
+ "no-group-title": "그룹 이름이 없습니다.",
"select-skin": "스킨 선택",
"select-homepage": "홈페이지 선택",
"homepage": "홈페이지",
- "homepage_description": "Select a page to use as the forum homepage or 'None' to use the default homepage.",
+ "homepage_description": "포럼 홈페이지로 사용할 페이지를 선택하거나 'None'으로 설정하여 기본 홈페이지를 사용합니다.",
"custom_route": "홈페이지 수동 경로",
- "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"
+ "custom_route_help": "라우팅 이름을 앞쪽 '/' 없이 입력해주세요 (예: \"최근 목록\", \"인기 게시물\")",
+ "sso.title": "통합 인증 서비스",
+ "sso.associated": "연관짓기 - ",
+ "sso.not-associated": "이 곳을 클리하여 연관지으세요."
}
\ No newline at end of file
diff --git a/public/language/ko/users.json b/public/language/ko/users.json
index 4436acc08d..a3ba794ca2 100644
--- a/public/language/ko/users.json
+++ b/public/language/ko/users.json
@@ -16,5 +16,5 @@
"unread_topics": "읽지 않은 주제",
"categories": "카테고리",
"tags": "태그",
- "no-users-found": "No users found!"
+ "no-users-found": "유저를 찾을 수 없습니다!"
}
\ No newline at end of file
diff --git a/public/language/lt/error.json b/public/language/lt/error.json
index b124eff563..c587a40803 100644
--- a/public/language/lt/error.json
+++ b/public/language/lt/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Prašome palaukti kol bus baigti visi kėlimai į serverį",
"file-too-big": "Didžiausias įkelimo dydis yra %1 kB - prašome kelti mažesni failą",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "Jums jau patinka šis pranešimas",
- "already-unfavourited": "Jums jau nebepatinka šis pranešimas",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Jūs negalite užblokuoti kitų administratorių!",
"cant-remove-last-admin": "Jūs esate vienintelis administratorius. Pridėkite kitą vartotoja kaip administratorių prieš pašalindamas save",
"invalid-image-type": "Neteisingas vaizdo tipas. Leidžiami tipai :%1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Prisijungimui prašome naudoti vartotojo vardą",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/lt/global.json b/public/language/lt/global.json
index aca3f94cfe..5ecfc4b4ab 100644
--- a/public/language/lt/global.json
+++ b/public/language/lt/global.json
@@ -86,5 +86,9 @@
"delete_all": "Viską ištrinti",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/lt/groups.json b/public/language/lt/groups.json
index 5c34f449e8..982d48e853 100644
--- a/public/language/lt/groups.json
+++ b/public/language/lt/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Prisijungti Prie Grupės",
"membership.leave-group": "Palikti Grupę",
"membership.reject": "Atšaukti",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json
index 16f475d739..079591f953 100644
--- a/public/language/lt/notifications.json
+++ b/public/language/lt/notifications.json
@@ -16,9 +16,9 @@
"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 patinka jūsų pranešimas čia %2",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 7e87980eb1..9eb817a26c 100644
--- a/public/language/lt/pages.json
+++ b/public/language/lt/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 dabar atnaujinimo darbuose. Prašome grįžti vėliau",
"maintenance.messageIntro": "Be to, administratorius paliko šį pranešimą:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json
index 2972a90118..a12bdd4c4e 100644
--- a/public/language/lt/topic.json
+++ b/public/language/lt/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Neaktyvios kategorijos pažymėtos pilkai",
"confirm_move": "Perkelti",
"confirm_fork": "Išskaidyti",
- "favourite": "Mėgsta",
- "favourites": "Mėgstamiausi",
- "favourites.has_no_favourites": "Neturite jokių mėgiamų pranešimų. Įtraukite pranešimą į mėgiamų sąrašą, kad pamatytumėte juos čia!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Įkeliama daugiau įrašų",
"move_topic": "Perkelti temą",
"move_topics": "Perkelti temas",
diff --git a/public/language/lt/user.json b/public/language/lt/user.json
index 6c139be63f..9f4884f53b 100644
--- a/public/language/lt/user.json
+++ b/public/language/lt/user.json
@@ -22,7 +22,7 @@
"profile": "Profilis",
"profile_views": "Profilio peržiūros",
"reputation": "Reputacija",
- "favourites": "Mėgstamiausi",
+ "favourites": "Bookmarks",
"watched": "Peržiūrėjo",
"followers": "Sekėjai",
"following": "Seka",
@@ -55,10 +55,11 @@
"password": "Slaptažodis",
"username_taken_workaround": "Jūsų norimas vartotojo vardas jau užimtas, todėl mes jį šiek tiek pakeitėme. Dabar jūs esate žinomas kaip %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Įkelti paveikslėlį",
"upload_a_picture": "Įkelti paveikslėlį",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Nustatymai",
"show_email": "Rodyti mano el. paštą viešai",
"show_fullname": "Rodyti mano vardą ir pavardę",
diff --git a/public/language/ms/error.json b/public/language/ms/error.json
index 176782b812..13c72ed7de 100644
--- a/public/language/ms/error.json
+++ b/public/language/ms/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Sila tunggu muatnaik untuk siap.",
"file-too-big": "Maksimum saiz fail yang dibenarkan ialah %1 kB - sila muatnaik fail yang lebih kecil",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "Anda telah pun menggemari kiriman ini",
- "already-unfavourited": "Anda telah pun nyah-gemar kiriman ini",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Anda tidak boleh haramkan admin / pentadbir!",
"cant-remove-last-admin": "Anda satu-satunya pentadbir. Tambah pentadbir lain sebelum membuang diri anda sebagai pentadbir",
"invalid-image-type": "Jenis imej tak sah. Jenis yang dibenarkan ialah: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Sila guna nama pengguna anda untuk log masuk",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/ms/global.json b/public/language/ms/global.json
index 866e0f17f2..4e71e55dfa 100644
--- a/public/language/ms/global.json
+++ b/public/language/ms/global.json
@@ -86,5 +86,9 @@
"delete_all": "Padam Semua",
"map": "Peta",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/ms/groups.json b/public/language/ms/groups.json
index 876b702f74..6ddfd1c2a2 100644
--- a/public/language/ms/groups.json
+++ b/public/language/ms/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Masuk Kumpulan",
"membership.leave-group": "Keluar Kumpulan",
"membership.reject": "Tolak",
- "new-group.group_name": "Nama Kumpulan:"
+ "new-group.group_name": "Nama Kumpulan:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json
index e0900929f0..2700d7d248 100644
--- a/public/language/ms/notifications.json
+++ b/public/language/ms/notifications.json
@@ -16,9 +16,9 @@
"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 menggemari kiriman and di %2.",
- "favourited_your_post_in_dual": "%1 dan %2 telah menggemari kiriman anda di %3.",
- "favourited_your_post_in_multiple": "%1, %2 dan lain-lain telah menggemari kirimian anda pada %3.",
+ "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 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 mendanda kiriman anda pada %3",
diff --git a/public/language/ms/pages.json b/public/language/ms/pages.json
index 57368ebc06..efc15626e0 100644
--- a/public/language/ms/pages.json
+++ b/public/language/ms/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Kiriman oleh %1",
"account/topics": "Topik olej %1",
"account/groups": "Kumpulan %1",
- "account/favourites": "Kiriman Kegemaran %1",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Tetapan Pengguna",
"account/watched": "Topik Diperhati Oleh %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 sedang berada dalam mod pembaikpulihan. Sila cuba lagi nanti.",
"maintenance.messageIntro": "Tambahan, admin meninggalkan mesej ini :",
"throttled.text": "%1 tiada buat masa ini kerana permintaan yang berlebihan. Sila datang lagi lain kali."
diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json
index 057b3de204..8c12c5a409 100644
--- a/public/language/ms/topic.json
+++ b/public/language/ms/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Kategori yang disekat diwarnakan kelabu",
"confirm_move": "Pindahkan",
"confirm_fork": "Salin",
- "favourite": "Kegemaran",
- "favourites": "Kegemaran-kegemaran",
- "favourites.has_no_favourites": "Anda tiada sebarang kegemaran, tandakan kiriman yang digemari untuk dilihat disini",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Memuatkan lagi kiriman",
"move_topic": "Pindahkan topik",
"move_topics": "Pindahkan topik-topik",
diff --git a/public/language/ms/user.json b/public/language/ms/user.json
index 469bce6721..10e3082736 100644
--- a/public/language/ms/user.json
+++ b/public/language/ms/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Paparan Profil",
"reputation": "Reputasi",
- "favourites": "Kegemaran",
+ "favourites": "Bookmarks",
"watched": "Melihat",
"followers": "Pengikut",
"following": "Mengikuti",
@@ -55,10 +55,11 @@
"password": "kata laluan",
"username_taken_workaround": "Nama pengguna yang anda minta telah digunakan oleh orang lain, jadi kami telah mengubahsuaikannya sedikit. Anda kini dikenali sebagai %1",
"password_same_as_username": "Kata laluan anda adalah sama seperti nama pengguna, sila pilih kata laluan yang lain",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Muatnaik gambar",
"upload_a_picture": "Muatnaik sekeping gambar",
"remove_uploaded_picture": "Buang Gambar Yang Dimuatnaik",
- "image_spec": "Anda hanya boleh muatnaik fail PNG, JPG atau BMP sahaja",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Tetapan",
"show_email": "Tunjukkan emel saya",
"show_fullname": "Tunjukkan Nama Penuh",
diff --git a/public/language/nb/error.json b/public/language/nb/error.json
index 400ac52998..bf16914921 100644
--- a/public/language/nb/error.json
+++ b/public/language/nb/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Vennligst vent til opplastingene er fullført.",
"file-too-big": "Største tillatte filstørrelse er %1 kB – vennligst last opp en mindre fil",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "Du har allerede favorittmerket dette innlegget",
- "already-unfavourited": "Du har allerede avfavorisert dette innlegget",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Du kan ikke utestenge andre administratorer!",
"cant-remove-last-admin": "Du er den eneste administratoren. Legg til en annen bruker som administrator før du fjerner deg selv.",
"invalid-image-type": "Ugyldig bildetype. Tilatte typer er: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Vennligst benytt brukernavnet ditt for å logge inn",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/nb/global.json b/public/language/nb/global.json
index d2b6a90c7d..6a7e5f4165 100644
--- a/public/language/nb/global.json
+++ b/public/language/nb/global.json
@@ -86,5 +86,9 @@
"delete_all": "Slett alle",
"map": "Kart",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/nb/groups.json b/public/language/nb/groups.json
index 7378fdf292..62da7c12aa 100644
--- a/public/language/nb/groups.json
+++ b/public/language/nb/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Bli med i gruppe",
"membership.leave-group": "Forlat gruppe",
"membership.reject": "Avslå",
- "new-group.group_name": "Gruppenavn:"
+ "new-group.group_name": "Gruppenavn:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json
index 4329e4e661..927f144414 100644
--- a/public/language/nb/notifications.json
+++ b/public/language/nb/notifications.json
@@ -16,9 +16,9 @@
"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 har favorittmerket innlegget ditt i %2",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 a586c6d11f..cda5867418 100644
--- a/public/language/nb/pages.json
+++ b/public/language/nb/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Innlegg opprettet av %1",
"account/topics": "Emner opprettet av %1",
"account/groups": "%1 sine grupper",
- "account/favourites": "%1 sine favoritt-innlegg",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Brukerinnstillinger",
"account/watched": "Innlegg overvåket av %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 er for tiden under vedlikehold. Kom tilbake en annen gang.",
"maintenance.messageIntro": "I tillegg har administratoren skrevet denne meldingen:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json
index 5a31251834..3e37dc2ba7 100644
--- a/public/language/nb/topic.json
+++ b/public/language/nb/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Deaktiverte kategorier er grået ut",
"confirm_move": "Flytt",
"confirm_fork": "Forgren",
- "favourite": "Favoritt",
- "favourites": "Favoritter",
- "favourites.has_no_favourites": "Du har ingen favoritter, marker noen innlegg som favoritt for å se dem her!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Laster flere innlegg",
"move_topic": "Flytt emne",
"move_topics": "Flytt emner",
diff --git a/public/language/nb/user.json b/public/language/nb/user.json
index e28bcf8eea..a39a1787db 100644
--- a/public/language/nb/user.json
+++ b/public/language/nb/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Profilvisninger",
"reputation": "Rykte",
- "favourites": "Favoritter",
+ "favourites": "Bookmarks",
"watched": "Overvåkede",
"followers": "Følgere",
"following": "Følger",
@@ -55,10 +55,11 @@
"password": "Passord",
"username_taken_workaround": "Brukernavnet du ønsket er opptatt, så vi har endret ditt litt. Du er nå kjent som %1",
"password_same_as_username": "Ditt passord er det samme som ditt brukernavn, vennligst velg et annet passord.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Last opp bilde",
"upload_a_picture": "Last opp et bilde",
"remove_uploaded_picture": "Fjern Opplastet Bilde",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Innstillinger",
"show_email": "Vis min e-post",
"show_fullname": "Vis mitt fulle navn",
diff --git a/public/language/nl/error.json b/public/language/nl/error.json
index 6c12e80542..936903cf0f 100644
--- a/public/language/nl/error.json
+++ b/public/language/nl/error.json
@@ -14,7 +14,7 @@
"invalid-password": "Ongeldig wachtwoord",
"invalid-username-or-password": "Geef zowel een gebruikersnaam als wachtwoord op",
"invalid-search-term": "Ongeldig zoekopdracht, een of meerdere termen",
- "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+ "invalid-pagination-value": "Invalide paginering waarde. De waarde moet op z'n minst %1 zijn en niet hoger dan %2 zijn.",
"username-taken": "Gebruikersnaam is al in gebruik ",
"email-taken": "E-mailadres is al eens eerder gebruikt",
"email-not-confirmed": "Het e-mailadres van dit account is nog niet bevestigd. Klik hier om het e-mailadres te bevestigen en de registratie af te ronden.",
@@ -50,8 +50,8 @@
"still-uploading": "Een moment geduld tot alle bestanden overgebracht zijn...",
"file-too-big": "Maximum toegestane bestandsgrootte is %1 kB - probeer een kleiner bestand te verzenden",
"guest-upload-disabled": "Uploads voor gasten zijn uitgeschaleld ",
- "already-favourited": "Dit bericht staat al tussen de favorieten",
- "already-unfavourited": "Dit bericht is al uit favorieten verwijderd",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Het is niet toegestaan andere beheerders te verbannen!",
"cant-remove-last-admin": "U bent de enige administrator. Voeg een andere gebruiker toe als administrator voordat u uw zelf verwijderd als admin",
"invalid-image-type": "Ongeldig bestandstype afbeelding. Deze afbeelding is van een bestandstype dat niet ondersteund wordt. Toegestane bestandstypes voor afbeeldingsbestanden zijn: %1",
@@ -83,7 +83,7 @@
"chat-message-too-long": "Het chatbericht is te lang",
"cant-edit-chat-message": "Het is niet toegestaan om dit bericht aan te passen",
"cant-remove-last-user": "Je kan de laatste gebruiker niet verwijderen",
- "cant-delete-chat-message": "You are not allowed to delete this message",
+ "cant-delete-chat-message": "Het is niet toegestaan om dit bericht te verwijderen",
"reputation-system-disabled": "Reputatie systeem is uitgeschakeld.",
"downvoting-disabled": "Negatief stemmen staat uitgeschakeld.",
"not-enough-reputation-to-downvote": "Dit gebruikersaccount beschikt over onvoldoende reputatie om een negatieve stem uit te mogen brengen.",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Geef de gebruikersnaam voor aanmelden",
"invite-maximum-met": "Je heb het maximum aantal mensen uitgenodigd (%1 van de %2).",
"no-session-found": "Geen login sessie gevonden!",
- "not-in-room": "User not in room"
+ "not-in-room": "Geen gebruiker in deze chat room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/nl/global.json b/public/language/nl/global.json
index 4940d479ec..3a3d7afe18 100644
--- a/public/language/nl/global.json
+++ b/public/language/nl/global.json
@@ -65,7 +65,7 @@
"posted_in_ago_by": "geplaatst in %1 %2 door %3",
"user_posted_ago": "%1 plaatste %2",
"guest_posted_ago": "Gast plaatste %1",
- "last_edited_by": "last edited by %1",
+ "last_edited_by": "voor het laatst aangepast door %1",
"norecentposts": "Geen recente berichten",
"norecenttopics": "Geen recente onderwerpen",
"recentposts": "Recente berichten",
@@ -86,5 +86,9 @@
"delete_all": "Alles verwijderen",
"map": "Kaart",
"sessions": "Login Sessies",
- "ip_address": "IP Adres"
+ "ip_address": "IP Adres",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/nl/groups.json b/public/language/nl/groups.json
index 7e914a227b..82100e579f 100644
--- a/public/language/nl/groups.json
+++ b/public/language/nl/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Deelnemen aan groep",
"membership.leave-group": "Verlaat groep",
"membership.reject": "Afwijzen",
- "new-group.group_name": "Groepsnaam:"
+ "new-group.group_name": "Groepsnaam:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json
index a047b2fad8..ba06d7ce93 100644
--- a/public/language/nl/notifications.json
+++ b/public/language/nl/notifications.json
@@ -16,9 +16,9 @@
"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 een van je berichten in %2 aan zijn of haar favorieten toegevoegd.",
- "favourited_your_post_in_dual": "%1 en %2 hebben een van je berichten in %3 aan zijn of haar favorieten toegevoegd.",
- "favourited_your_post_in_multiple": "%1 en %2 hebben een van je berichten in 3 aan hun favorieten toegevoegd.",
+ "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 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 1e709dec0e..131dccb6e4 100644
--- a/public/language/nl/pages.json
+++ b/public/language/nl/pages.json
@@ -6,12 +6,12 @@
"popular-month": "De populaire onderwerpen van deze maand",
"popular-alltime": "De populaire onderwerpen",
"recent": "Recente onderwerpen",
- "flagged-posts": "Flagged Posts",
+ "flagged-posts": "Ongepaste berichten",
"users/online": "Online Gebruikers",
"users/latest": "Meest recente gebruikers",
"users/sort-posts": "Gebruikers met de meeste berichten",
"users/sort-reputation": "Gebruikers met de meeste reputatie",
- "users/banned": "Banned Users",
+ "users/banned": "Verbannen Gebruikers",
"users/search": "Zoek Gebruiker",
"notifications": "Notificaties",
"tags": "Tags",
@@ -33,12 +33,13 @@
"account/posts": "Berichten geplaatst door %1",
"account/topics": "Onderwerpen begonnen door %1",
"account/groups": "%1's groepen",
- "account/favourites": "Favoriete berichten van %1",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Gebruikersinstellingen",
"account/watched": "Berichten die door %1 bekeken worden",
"account/upvoted": "Berichten omhoog gestemd door %1",
"account/downvoted": "Berichten omlaag gestemd door %1",
"account/best": "Beste berichten geplaast door %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 is momenteel in onderhoud. Excuses voor het ongemak en probeer het later nog eens.",
"maintenance.messageIntro": "Daarnaast heeft de beheerder het volgende bericht achtergelaten:",
"throttled.text": "%1 is momenteel niet beschikbaar door overmatig gebruikt. Excuses voor het ongemak en probeer het later nog eens."
diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json
index c1202c9e9e..d597851e73 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -35,7 +35,7 @@
"login_to_subscribe": "Log in or registreer om dit onderwerp te volgen.",
"markAsUnreadForAll.success": "Onderwerp is voor iedereen als 'gelezen' gemarkeerd.",
"mark_unread": "Ongelezen markeren",
- "mark_unread.success": "Topic marked as unread.",
+ "mark_unread.success": "Onderwerp is als 'gelezen' gemarkeerd",
"watch": "Volgen",
"unwatch": "Niet meer volgen",
"watch.title": "Krijg meldingen van nieuwe reacties op dit onderwerp",
@@ -65,9 +65,9 @@
"disabled_categories_note": "Uitgeschakelde Categorieën zijn grijs",
"confirm_move": "Verplaatsen",
"confirm_fork": "Splits",
- "favourite": "Favoriet",
- "favourites": "Favorieten",
- "favourites.has_no_favourites": "Er zijn momenteel nog geen favorieten, markeer eerst enkele berichten om ze hier te kunnen zien.",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Meer berichten...",
"move_topic": "Onderwerp verplaatsen",
"move_topics": "Verplaats onderwerpen",
diff --git a/public/language/nl/user.json b/public/language/nl/user.json
index b19040a6a2..036e69dd6d 100644
--- a/public/language/nl/user.json
+++ b/public/language/nl/user.json
@@ -22,7 +22,7 @@
"profile": "Profiel",
"profile_views": "Bekeken",
"reputation": "Reputatie",
- "favourites": "Favorieten",
+ "favourites": "Bookmarks",
"watched": "Bekeken",
"followers": "Volgers",
"following": "Volgend",
@@ -55,10 +55,11 @@
"password": "Wachtwoord",
"username_taken_workaround": "Helaas, de gewenste gebruikersnaam is al door iemand in gebruik genomen dus vandaar een kleine aanpassing naar %1 doorgevoerd",
"password_same_as_username": "Je wachtwoord is hetzelfde als je gebruikersnaam. Kies een ander wachtwoord.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Upload afbeelding",
"upload_a_picture": "Upload een afbeelding",
"remove_uploaded_picture": "Verwijder gëuploade foto",
- "image_spec": "U mag alleen PNG, JPG of BMP bestanden uploaden.",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Instellingen",
"show_email": "Inschakelen weergave van e-mailadres op profielpagina",
"show_fullname": "Laat mijn volledige naam zien",
diff --git a/public/language/nl/users.json b/public/language/nl/users.json
index a00d246ab7..2330e1b0e6 100644
--- a/public/language/nl/users.json
+++ b/public/language/nl/users.json
@@ -16,5 +16,5 @@
"unread_topics": "Ongelezen onderwerpen",
"categories": "Categorieën",
"tags": "Tags",
- "no-users-found": "No users found!"
+ "no-users-found": "Geen gebruikers gevonden!"
}
\ No newline at end of file
diff --git a/public/language/pl/error.json b/public/language/pl/error.json
index 1e7438c4a2..444dca9cf7 100644
--- a/public/language/pl/error.json
+++ b/public/language/pl/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Poczekaj na pełne załadowanie",
"file-too-big": "Maksymalny dopuszczalny rozmiar pliku to %1kB - prosimy przesłać mniejszy plik",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "Już polubiłeś ten post",
- "already-unfavourited": "Już przestałeś lubić ten post",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Nie możesz zbanować innych adminów!",
"cant-remove-last-admin": "Jesteś jedynym administratorem. Dodaj innego użytkownika jako administratora przed usunięciem siebie z tej grupy",
"invalid-image-type": "Błędny typ obrazka. Dozwolone typy to: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Zaloguj się używając nazwy użytkownika",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/pl/global.json b/public/language/pl/global.json
index 03bd0ac844..2aba9da79d 100644
--- a/public/language/pl/global.json
+++ b/public/language/pl/global.json
@@ -86,5 +86,9 @@
"delete_all": "Usuń wszystko",
"map": "Mapa",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json
index 52e28b2263..e8e7b370f9 100644
--- a/public/language/pl/groups.json
+++ b/public/language/pl/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Dołącz Do Grupy",
"membership.leave-group": "Opuść Grupę",
"membership.reject": "Odrzuć",
- "new-group.group_name": "Nazwa Grupy:"
+ "new-group.group_name": "Nazwa Grupy:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json
index 75ea1cff24..4bafa8c8e7 100644
--- a/public/language/pl/notifications.json
+++ b/public/language/pl/notifications.json
@@ -16,9 +16,9 @@
"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 polubił Twój post w %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 oflagował Twój post w %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/pl/pages.json b/public/language/pl/pages.json
index a2550c5a43..a9def8e4aa 100644
--- a/public/language/pl/pages.json
+++ b/public/language/pl/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posty napisane przez %1",
"account/topics": "Tematy stworzone przez %1",
"account/groups": "Grupy %1",
- "account/favourites": "Ulubione posty %1",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Ustawienia Użytkownika",
"account/watched": "Tematy obserwowane przez %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "Obecnie trwają prace konserwacyjne nad %1. Proszę wrócić później.",
"maintenance.messageIntro": "Dodatkowo, administrator zostawił wiadomość:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json
index 6280c7ddd0..974a61dd94 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Zablokowane kategorie zostały wyszarzone.",
"confirm_move": "Przenieś",
"confirm_fork": "Skopiuj",
- "favourite": "Polub",
- "favourites": "Ulubione",
- "favourites.has_no_favourites": "Nie masz żadnych ulubionych. Polub kilka postów!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Załaduj więcej postów",
"move_topic": "Przenieś Temat",
"move_topics": "Przenieś Tematy",
diff --git a/public/language/pl/user.json b/public/language/pl/user.json
index 1b36470c6a..ff82870ef0 100644
--- a/public/language/pl/user.json
+++ b/public/language/pl/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "wyświetleń",
"reputation": "reputacji",
- "favourites": "Ulubione",
+ "favourites": "Bookmarks",
"watched": "Obserwowane",
"followers": "Obserwujących",
"following": "Obserwowanych",
@@ -55,10 +55,11 @@
"password": "Hasło",
"username_taken_workaround": "Wybrany login jest już zajęty, więc zmieniliśmy go trochę. Proponujemy %1",
"password_same_as_username": "Twoje hasło jest takie samo jak nazwa użytkownika, prosimy wybrać inne hasło.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Prześlij zdjęcie",
"upload_a_picture": "Prześlij zdjęcie",
"remove_uploaded_picture": "Usuń Przesłane Zdjęcie",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Ustawienia",
"show_email": "Wyświetlaj mój adres e-mail",
"show_fullname": "Wyświetlaj moją pełną nazwę",
diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json
index 59ae2a5047..76498a42fa 100644
--- a/public/language/pt_BR/error.json
+++ b/public/language/pt_BR/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Aguarde a conclusão dos uploads.",
"file-too-big": "O tamanho máximo permitido de arquivo é de %1 kB - por favor faça upload de um arquivo menor",
"guest-upload-disabled": "O upload por visitantes foi desabilitado",
- "already-favourited": "Você já adicionou este post aos favoritos",
- "already-unfavourited": "Você já removeu este post dos favoritos",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Você não pode banir outros administradores!",
"cant-remove-last-admin": "Você é o único administrador. Adicione outro usuário como administrador antes de remover a si mesmo como admin",
"invalid-image-type": "Tipo inválido de imagem. Os tipos permitidos são: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Por favor use o seu nome de usuário para fazer login",
"invite-maximum-met": "Você já convidou o número máximo de pessoas (%1 de %2).",
"no-session-found": "Nenhuma sessão de login encontrada!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/pt_BR/global.json b/public/language/pt_BR/global.json
index fe803d80f6..c241e68710 100644
--- a/public/language/pt_BR/global.json
+++ b/public/language/pt_BR/global.json
@@ -86,5 +86,9 @@
"delete_all": "Deletar Tudo",
"map": "Mapa",
"sessions": "Sessões de Login",
- "ip_address": "Endereço IP"
+ "ip_address": "Endereço IP",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/pt_BR/groups.json b/public/language/pt_BR/groups.json
index 91c729622d..7634c801bc 100644
--- a/public/language/pt_BR/groups.json
+++ b/public/language/pt_BR/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Entrar no Grupo",
"membership.leave-group": "Deixar Grupo",
"membership.reject": "Rejeitar",
- "new-group.group_name": "Nome do Grupo:"
+ "new-group.group_name": "Nome do Grupo:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/pt_BR/notifications.json b/public/language/pt_BR/notifications.json
index b1f5f21914..a50d8a3f4f 100644
--- a/public/language/pt_BR/notifications.json
+++ b/public/language/pt_BR/notifications.json
@@ -16,9 +16,9 @@
"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 adicionou seu tópico aos favoritos em %2.",
- "favourited_your_post_in_dual": "%1 e %2 adicionaram seu post aos favoritos em %3.",
- "favourited_your_post_in_multiple": "%1 e %2 outros adicionaram seu post aos favoritos em %3.",
+ "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 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 cbbecbf80b..54f72ed8ce 100644
--- a/public/language/pt_BR/pages.json
+++ b/public/language/pt_BR/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts feitos por %1",
"account/topics": "Tópicos criados por %1",
"account/groups": "Grupos de %1",
- "account/favourites": "Posts Favoritos de %1",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Configurações de Usuário",
"account/watched": "Tópicos assistidos por %1",
"account/upvoted": "Posts votados positivamente por %1",
"account/downvoted": "Posts votados negativamente por %1",
"account/best": "Melhores posts de %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 está atualmente sob manutenção. Por favor retorne em outro momento.",
"maintenance.messageIntro": "Adicionalmente, o administrador deixou esta mensagem:",
"throttled.text": "%1 está atualmente indisponível devido a excesso de contingente. Por favor retorne em outro momento."
diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json
index 0601402aa0..ef4df47135 100644
--- a/public/language/pt_BR/topic.json
+++ b/public/language/pt_BR/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Categorias desabilitadas estão em cinza",
"confirm_move": "Mover",
"confirm_fork": "Ramificar",
- "favourite": "Favoritar",
- "favourites": "Favoritos",
- "favourites.has_no_favourites": "Você não tem nenhum item nos favoritos, adicione algo aos favoritos para ver aqui!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Carregando Mais Posts",
"move_topic": "Mover Tópico",
"move_topics": "Mover Tópicos",
diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json
index 5f01d4eeeb..f3ce7cdcbf 100644
--- a/public/language/pt_BR/user.json
+++ b/public/language/pt_BR/user.json
@@ -22,7 +22,7 @@
"profile": "Perfil",
"profile_views": "Visualizações de perfil",
"reputation": "Reputação",
- "favourites": "Favoritos",
+ "favourites": "Bookmarks",
"watched": "Acompanhado",
"followers": "Seguidores",
"following": "Seguindo",
@@ -55,10 +55,11 @@
"password": "Senha",
"username_taken_workaround": "O nome de usuário que você escolheu já existia, então nós o alteramos um pouquinho. Agora você é conhecido como %1",
"password_same_as_username": "A sua senha é igual ao seu nome de usuário, por favor escolha outra senha.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Carregar Foto",
"upload_a_picture": "Carregue uma Foto",
"remove_uploaded_picture": "Remover Foto Enviada",
- "image_spec": "Você pode fazer upload apenas de arquivos PNG, JPG ou BMP",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Configurações",
"show_email": "Mostrar Meu Email",
"show_fullname": "Mostrar Meu Nome Completo",
diff --git a/public/language/ro/error.json b/public/language/ro/error.json
index 82407bac70..4d1eceb05f 100644
--- a/public/language/ro/error.json
+++ b/public/language/ro/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Te rugăm să aștepți până se termină uploadul.",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "You have already favourited this post",
- "already-unfavourited": "You have already unfavourited this post",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Nu poți bana alți administratori!",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/ro/global.json b/public/language/ro/global.json
index 280a6dfb2b..501638ec86 100644
--- a/public/language/ro/global.json
+++ b/public/language/ro/global.json
@@ -86,5 +86,9 @@
"delete_all": "Şterge Tot",
"map": "Hartă",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/ro/groups.json b/public/language/ro/groups.json
index 28471f1bff..3e424b4085 100644
--- a/public/language/ro/groups.json
+++ b/public/language/ro/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json
index d771741795..1c01843b8a 100644
--- a/public/language/ro/notifications.json
+++ b/public/language/ro/notifications.json
@@ -16,9 +16,9 @@
"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 a adăugat mesajul tău la favorite în %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 13a8e26fb1..b90accee42 100644
--- a/public/language/ro/pages.json
+++ b/public/language/ro/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 este momentan în mentenanță. Întoarce-te în curând!",
"maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json
index e6186c8225..5503fa8c3d 100644
--- a/public/language/ro/topic.json
+++ b/public/language/ro/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Categoriile dezactivate sunt decolorate cu gri",
"confirm_move": "Mută",
"confirm_fork": "Bifurcă",
- "favourite": "Favorit",
- "favourites": "Favorite",
- "favourites.has_no_favourites": "Nu ai nici un mesaj favorit, adaugă mesaje la favorit pentru a le putea vedea aici!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Se încarcă mai multe mesaje",
"move_topic": "Mută Subiect",
"move_topics": "Mută Subiecte",
diff --git a/public/language/ro/user.json b/public/language/ro/user.json
index 2637691632..580617c4e5 100644
--- a/public/language/ro/user.json
+++ b/public/language/ro/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Vizualizări",
"reputation": "Reputație",
- "favourites": "Favorite",
+ "favourites": "Bookmarks",
"watched": "Watched",
"followers": "Urmărit de",
"following": "Îi urmărește pe",
@@ -55,10 +55,11 @@
"password": "Parolă",
"username_taken_workaround": "Numele de utilizator pe care l-ai cerut este deja luat, așa că l-am modificat puțin. Acum ești cunoscut ca %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Uploadează poză",
"upload_a_picture": "Uploadează o poză",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Setări",
"show_email": "Arată adresa mea de email",
"show_fullname": "Show My Full Name",
diff --git a/public/language/ru/email.json b/public/language/ru/email.json
index f415bae1e8..a4b378b897 100644
--- a/public/language/ru/email.json
+++ b/public/language/ru/email.json
@@ -21,9 +21,9 @@
"digest.cta": "Нажмите здесь для просмотра %1",
"digest.unsub.info": "Вам была выслана сводка новостей в соответствии с Вашими настройками.",
"digest.no_topics": "Нет активных тем за указанный период времени: %1",
- "digest.day": "day",
- "digest.week": "week",
- "digest.month": "month",
+ "digest.day": "день",
+ "digest.week": "неделя",
+ "digest.month": "месяц",
"notif.chat.subject": "Новое сообщение от %1",
"notif.chat.cta": "Нажмите для продолжения диалога",
"notif.chat.unsub.info": "Вы получили это уведомление в соответствии с настройками подписок.",
diff --git a/public/language/ru/error.json b/public/language/ru/error.json
index 907a8f9f83..a29d08c816 100644
--- a/public/language/ru/error.json
+++ b/public/language/ru/error.json
@@ -24,7 +24,7 @@
"confirm-email-already-sent": "Сообщение для подтверждения уже выслано на E-mail. Повторная отправка возможна через %1 мин.",
"username-too-short": "Слишком короткое имя пользователя",
"username-too-long": "Имя пользователя слишком длинное",
- "password-too-long": "Password too long",
+ "password-too-long": "Пароль слишком длинный",
"user-banned": "Пользователь заблокирован",
"user-too-new": "Вы можете написать свое первой сообщение через %1 сек.",
"no-category": "Категория не существует",
@@ -50,8 +50,8 @@
"still-uploading": "Пожалуйста, подождите завершения загрузки.",
"file-too-big": "Слишком большой файл. Максимальный размер: %1 Кбайт.",
"guest-upload-disabled": "Загрузка для гостей была отключена",
- "already-favourited": "Вы уже добавили это сообщение в избранное",
- "already-unfavourited": "Вы уже удалили это сообщение из избранного",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Вы не можете забанить других администраторов!",
"cant-remove-last-admin": "Вы единственный администратор. Назначьте другого пользователя администратором, прежде чем складывать с себя полномочия админа",
"invalid-image-type": "Неверный формат изображения. Поддерживаемые форматы: %1",
@@ -83,7 +83,7 @@
"chat-message-too-long": "Слишком длинное сообщение чата",
"cant-edit-chat-message": "У вас нет доступа для редактирования этого сообщения",
"cant-remove-last-user": "Вы не можете убрать последнего пользователя",
- "cant-delete-chat-message": "You are not allowed to delete this message",
+ "cant-delete-chat-message": "У вас нет доступа на удаление этого сообщения",
"reputation-system-disabled": "Система репутации отключена.",
"downvoting-disabled": "Понижение оценки отключено",
"not-enough-reputation-to-downvote": "У Вас недостаточно репутации для понижения оценки сообщения",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Пожалуйста, используйте своё имя пользователя для входа.",
"invite-maximum-met": "Вы пригласили максимальное количество людей (%1 из %2).",
"no-session-found": "Сессия входа не найдена!",
- "not-in-room": "User not in room"
+ "not-in-room": "Пользователь не в комнате",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/ru/global.json b/public/language/ru/global.json
index f6f1703c69..9c72d1db9a 100644
--- a/public/language/ru/global.json
+++ b/public/language/ru/global.json
@@ -86,5 +86,9 @@
"delete_all": "Удалить все",
"map": "Карта",
"sessions": "Сессии входа",
- "ip_address": "IP адрес"
+ "ip_address": "IP адрес",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json
index c9d711a028..4273a0e3ee 100644
--- a/public/language/ru/groups.json
+++ b/public/language/ru/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Вступить",
"membership.leave-group": "Покинуть",
"membership.reject": "Отклонить",
- "new-group.group_name": "Название группы:"
+ "new-group.group_name": "Название группы:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json
index a6c76e8aaa..4a40bdc5c3 100644
--- a/public/language/ru/notifications.json
+++ b/public/language/ru/notifications.json
@@ -16,9 +16,9 @@
"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.",
+ "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/ru/pages.json b/public/language/ru/pages.json
index 61718d5a69..f5b7fe7a0a 100644
--- a/public/language/ru/pages.json
+++ b/public/language/ru/pages.json
@@ -6,12 +6,12 @@
"popular-month": "Популярные темы этого месяца",
"popular-alltime": "Популярные темы за все время",
"recent": "Последние темы",
- "flagged-posts": "Flagged Posts",
+ "flagged-posts": "Отмеченные сообщения",
"users/online": "В сети",
"users/latest": "Новые пользователи",
"users/sort-posts": "Пользователи по кол-ву сообщений",
"users/sort-reputation": "Пользователи по кол-ву репутации",
- "users/banned": "Banned Users",
+ "users/banned": "Заблокированные пользователи",
"users/search": "Поиск пользователей",
"notifications": "Уведомления",
"tags": "Теги",
@@ -33,12 +33,13 @@
"account/posts": "Сообщение от %1",
"account/topics": "Тема создана %1",
"account/groups": "%1 Групп",
- "account/favourites": "%1 Избранных сообщений",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Настройки пользователя",
"account/watched": "Тему смотрели %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
- "account/best": "Best posts made by %1",
+ "account/best": "Лучшее сообщение написано %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 в настоящее время на обслуживании. Пожалуйста, возвращайтесь позже.",
"maintenance.messageIntro": "Администратор оставил сообщение:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json
index 04a3c5894d..27e85f376f 100644
--- a/public/language/ru/topic.json
+++ b/public/language/ru/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Отключенные категории затемнены",
"confirm_move": "Перенести",
"confirm_fork": "Ответвление",
- "favourite": "Избранное",
- "favourites": "Избранные",
- "favourites.has_no_favourites": "У вас нет избранного, добавьте несколько сообщений в избранное, чтобы увидеть их здесь",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Загружаем еще сообщения",
"move_topic": "Перенести тему",
"move_topics": "Перенести темы",
diff --git a/public/language/ru/user.json b/public/language/ru/user.json
index 36758fad50..88685f4ebe 100644
--- a/public/language/ru/user.json
+++ b/public/language/ru/user.json
@@ -22,7 +22,7 @@
"profile": "Профиль",
"profile_views": "Просмотров профиля",
"reputation": "Репутация",
- "favourites": "Избранное",
+ "favourites": "Bookmarks",
"watched": "Просмотров",
"followers": "Читателей",
"following": "Читаемых",
@@ -55,10 +55,11 @@
"password": "Пароль",
"username_taken_workaround": "Логин, который Вы запросили, уже занят. Мы его немного изменили. Теперь Ваш логин %1",
"password_same_as_username": "Ваш пароль совпадает с именем пользователя, пожалуйста выберете другой пароль.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Загрузить фотографию",
"upload_a_picture": "Загрузить фотографию",
"remove_uploaded_picture": "Удалить загруженные фотографии",
- "image_spec": "Вы можете загружать только PNG, JPG или BMP файлы",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Настройки",
"show_email": "Показывать мой Email",
"show_fullname": "Показывать Полное Имя",
diff --git a/public/language/ru/users.json b/public/language/ru/users.json
index 6ab7df5038..40c180685a 100644
--- a/public/language/ru/users.json
+++ b/public/language/ru/users.json
@@ -16,5 +16,5 @@
"unread_topics": "Непрочитанные темы",
"categories": "Категории",
"tags": "Теги",
- "no-users-found": "No users found!"
+ "no-users-found": "Пользователи не найдены!"
}
\ No newline at end of file
diff --git a/public/language/rw/error.json b/public/language/rw/error.json
index 5584e6b5f3..91ddd6ca7d 100644
--- a/public/language/rw/error.json
+++ b/public/language/rw/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Tegereza gupakira bibanze birangire.",
"file-too-big": "Ubunini bwemewe bushoboka bw'ifayilo ni kB %1. Gerageza upakire ifayilo ntoyaho",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "Wari wararangije gutonesha iki ngiki",
- "already-unfavourited": "Wari wararekeye aho gutonesha iki ngiki",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Ntabwo wakwirukana abandi bayobozi!",
"cant-remove-last-admin": "Ni wowe muyobozi wenyine. Ongeramo undi muntu nk'umuyobozi mbere y'uko wikura ku buyobozi",
"invalid-image-type": "Ubwoko bw'ifoto wahisemo ntibwemewe. Hemewe gusa: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Koresha izina ry'umukoresha ryawe kugirango winjiremo",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/rw/global.json b/public/language/rw/global.json
index e543582ea0..fa7e6d6ab3 100644
--- a/public/language/rw/global.json
+++ b/public/language/rw/global.json
@@ -86,5 +86,9 @@
"delete_all": "Siba Byose",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/rw/groups.json b/public/language/rw/groups.json
index 982f067a39..f14eccef93 100644
--- a/public/language/rw/groups.json
+++ b/public/language/rw/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Injira mu Itsinda",
"membership.leave-group": "Va mu Itsinda",
"membership.reject": "Hakanira",
- "new-group.group_name": "Izina ry'Itsinda:"
+ "new-group.group_name": "Izina ry'Itsinda:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/rw/notifications.json b/public/language/rw/notifications.json
index 93abd5898f..83a7b7eb4e 100644
--- a/public/language/rw/notifications.json
+++ b/public/language/rw/notifications.json
@@ -16,9 +16,9 @@
"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 yatonesheje %2 washyizeho.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 26c0ac71e9..e4c597f8f0 100644
--- a/public/language/rw/pages.json
+++ b/public/language/rw/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 ntiboneka kuko ubu iri gutunganywa. Muze kongera kugaruka. ",
"maintenance.messageIntro": "Byongeye, kandi, umuyobozi yasize ubu butumwa: ",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json
index 2f3e53b21d..81574d5241 100644
--- a/public/language/rw/topic.json
+++ b/public/language/rw/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Ibyiciro bitagaragazwa birasa n'ibipfutse",
"confirm_move": "Imura",
"confirm_fork": "Gabanyaho",
- "favourite": "Tonesha",
- "favourites": "Ibyatoneshejwe",
- "favourites.has_no_favourites": "Nta kintu na kimwe wari watonesha. Tonesha ibintu bimwe na bimwe kugirango ujye ubibona aha!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Ibindi Biraje",
"move_topic": "Imura Ikiganiro",
"move_topics": "Imura Ibiganiro",
diff --git a/public/language/rw/user.json b/public/language/rw/user.json
index a489bf8a32..0542acc9b9 100644
--- a/public/language/rw/user.json
+++ b/public/language/rw/user.json
@@ -22,7 +22,7 @@
"profile": "Ishusho",
"profile_views": "Ishusho Yarebwe",
"reputation": "Amanota",
- "favourites": "Ibitoneshwa",
+ "favourites": "Bookmarks",
"watched": "Ibikurikiranwa",
"followers": "Abamukurikira",
"following": "Akurikira",
@@ -55,10 +55,11 @@
"password": "Ijambobanga",
"username_taken_workaround": "Izina ushaka kujya ukoresha twasanze ryarafashwe. Ntugire impungenge kuko twakuboneye iryo byenda kumera kimwe. Uzaba uzwi ku izina rya %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Gushyiraho ifoto",
"upload_a_picture": "Shyiraho ifoto",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Itunganya",
"show_email": "Hagaragazwe Email Yanjye",
"show_fullname": "Hagaragazwe Izina Ryuzuye Ryanjye",
diff --git a/public/language/sc/error.json b/public/language/sc/error.json
index ca4533474d..f9199f193e 100644
--- a/public/language/sc/error.json
+++ b/public/language/sc/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Please wait for uploads to complete.",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "You have already favourited this post",
- "already-unfavourited": "You have already unfavourited this post",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "You can't ban other admins!",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/sc/global.json b/public/language/sc/global.json
index 09c4882bd4..586d9340bf 100644
--- a/public/language/sc/global.json
+++ b/public/language/sc/global.json
@@ -86,5 +86,9 @@
"delete_all": "Delete All",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/sc/groups.json b/public/language/sc/groups.json
index 2ac271a4c5..6138ea22ff 100644
--- a/public/language/sc/groups.json
+++ b/public/language/sc/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json
index e2efe63c40..fc3ba602f5 100644
--- a/public/language/sc/notifications.json
+++ b/public/language/sc/notifications.json
@@ -16,9 +16,9 @@
"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 favourited your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 8af7d8e199..a2e82aa90f 100644
--- a/public/language/sc/pages.json
+++ b/public/language/sc/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
"maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json
index 5dd4e78fa4..1f58d8582d 100644
--- a/public/language/sc/topic.json
+++ b/public/language/sc/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Is Crezes Disativadas sunt postas in colore de chìghine",
"confirm_move": "Move",
"confirm_fork": "Partzi",
- "favourite": "Preferidu",
- "favourites": "Preferidos",
- "favourites.has_no_favourites": "Non tenes perunu preferidu, pone intre is preferidos carchi arresonu pro ddu bìdere inoghe!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Càrriga Prus Arresonos",
"move_topic": "Move Arresonada",
"move_topics": "Move Topics",
diff --git a/public/language/sc/user.json b/public/language/sc/user.json
index d6d36d0c4a..3da03f2093 100644
--- a/public/language/sc/user.json
+++ b/public/language/sc/user.json
@@ -22,7 +22,7 @@
"profile": "Perfilu",
"profile_views": "Bìsitas a su perfilu",
"reputation": "Nodidos",
- "favourites": "Preferidos",
+ "favourites": "Bookmarks",
"watched": "Watched",
"followers": "Sighidores",
"following": "Sighende",
@@ -55,10 +55,11 @@
"password": "Password",
"username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Càrriga immàgine",
"upload_a_picture": "Càrriga un'immàgine",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Sèberos",
"show_email": "Ammustra s'Email Mia",
"show_fullname": "Show My Full Name",
diff --git a/public/language/sk/error.json b/public/language/sk/error.json
index 3ad3058253..c1f9cbdb12 100644
--- a/public/language/sk/error.json
+++ b/public/language/sk/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Prosím čakajte na dokončenie nahrávania",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "You have already favourited this post",
- "already-unfavourited": "You have already unfavourited this post",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Nemožte zakázať druhých adminov.",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/sk/global.json b/public/language/sk/global.json
index b3dd3aa13a..652bb0e62a 100644
--- a/public/language/sk/global.json
+++ b/public/language/sk/global.json
@@ -86,5 +86,9 @@
"delete_all": "Delete All",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/sk/groups.json b/public/language/sk/groups.json
index eaa2eea404..1073025324 100644
--- a/public/language/sk/groups.json
+++ b/public/language/sk/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json
index c151af7abd..fbb3535f62 100644
--- a/public/language/sk/notifications.json
+++ b/public/language/sk/notifications.json
@@ -16,9 +16,9 @@
"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 favourited your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 53d8874789..f5d5c49231 100644
--- a/public/language/sk/pages.json
+++ b/public/language/sk/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
"maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json
index 8096d584e7..39f4ca03d8 100644
--- a/public/language/sk/topic.json
+++ b/public/language/sk/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Vypnuté (disabled) kategorie sú šedé.",
"confirm_move": "Presunúť",
"confirm_fork": "Rozdeliť",
- "favourite": "Oblúbené",
- "favourites": "Obľúbené",
- "favourites.has_no_favourites": "Nemáte žiadne obľúbené príspevky, pridajte niektorý príspevok k obľúbeným a uvidíte ho tu!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Načítavanie viac príspevkov",
"move_topic": "Presunúť tému",
"move_topics": "Viac tém",
diff --git a/public/language/sk/user.json b/public/language/sk/user.json
index 2e721e8d5a..9cfba749c8 100644
--- a/public/language/sk/user.json
+++ b/public/language/sk/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Zobrazenie profilu",
"reputation": "Reputácia",
- "favourites": "Obľúbené",
+ "favourites": "Bookmarks",
"watched": "Watched",
"followers": "Nasledujú ho",
"following": "Nasleduje",
@@ -55,10 +55,11 @@
"password": "Heslo",
"username_taken_workaround": "Vaše požadované prihlasovacie meno je už obsadené, tak sme si ho dovolili mierne upraviť. Budeme Vás evidovať ako %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Nahrať obrázok",
"upload_a_picture": "Nahrať obrázok",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Nastavenia",
"show_email": "Zobrazovať môj email v profile",
"show_fullname": "Show My Full Name",
diff --git a/public/language/sl/error.json b/public/language/sl/error.json
index a450802630..57aa64574d 100644
--- a/public/language/sl/error.json
+++ b/public/language/sl/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Prosimo počakajte, da se prenosi končajo.",
"file-too-big": "Največja dovoljena velikost datoteke je %1 kB - prosimo naložite manjšo datoteko",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "To objavo ste že dodali med priljubljene",
- "already-unfavourited": "To objavo ste že odstranili iz priljubljenih",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Ne morete blokirati drugih administratorjev!",
"cant-remove-last-admin": "Ste edini administrator. Dodajte novega administratorja preden boste odstranili sebe.",
"invalid-image-type": "Nedovoljen format slike. Dovoljeni formati so: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Uporabite svoje uporabniško ime za prijavo",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/sl/global.json b/public/language/sl/global.json
index 3f5101bdd4..c8ba8fe3d2 100644
--- a/public/language/sl/global.json
+++ b/public/language/sl/global.json
@@ -86,5 +86,9 @@
"delete_all": "Izbriši vse",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/sl/groups.json b/public/language/sl/groups.json
index 5779451fb7..478bcb39d0 100644
--- a/public/language/sl/groups.json
+++ b/public/language/sl/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Pridruži se skupini",
"membership.leave-group": "Zapusti skupino",
"membership.reject": "Zavrni",
- "new-group.group_name": "Ime skupine:"
+ "new-group.group_name": "Ime skupine:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/sl/notifications.json b/public/language/sl/notifications.json
index 469f331406..f5d94351e4 100644
--- a/public/language/sl/notifications.json
+++ b/public/language/sl/notifications.json
@@ -16,9 +16,9 @@
"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 je dodal med priljubljene vašo objavo v %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 134a6e6f3e..3c206aadf4 100644
--- a/public/language/sl/pages.json
+++ b/public/language/sl/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Objave uporabnika %1",
"account/topics": "Ustvarjene teme uporabnika %1",
"account/groups": "Teme uporabnika %1",
- "account/favourites": "Priljubljene objave uporabnika %1",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Uporabniške nastavitve",
"account/watched": "Teme, ki jih spremlja uporabnik %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 je trenutno v prenovi. Prosimo pridite nazaj kasneje.",
"maintenance.messageIntro": "Administrator obvešča:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json
index 1d842fe0fb..503f7ee250 100644
--- a/public/language/sl/topic.json
+++ b/public/language/sl/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Onemogočene kategorije so obarvane sivo",
"confirm_move": "Premakni",
"confirm_fork": "Razcepi",
- "favourite": "Dodaj med priljubljene",
- "favourites": "Priljubljene",
- "favourites.has_no_favourites": "Nimaš priljubljenih objav, dodaj nekaj objav pod priljubljene.",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Nalagam več objav",
"move_topic": "Premakni temo",
"move_topics": "Premakni teme",
diff --git a/public/language/sl/user.json b/public/language/sl/user.json
index 916f4c5ed6..93725fc5b8 100644
--- a/public/language/sl/user.json
+++ b/public/language/sl/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Ogledi",
"reputation": "Naziv",
- "favourites": "Priljubljene",
+ "favourites": "Bookmarks",
"watched": "Zgodovina ogledov",
"followers": "Sledilci",
"following": "Sledim",
@@ -55,10 +55,11 @@
"password": "Geslo",
"username_taken_workaround": "Predlagano uporabniško ime je že zasedeno, zato predlagamo %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Naloži fotografijo",
"upload_a_picture": "Naloži fotografijo",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Nastavitve.",
"show_email": "Pokaži moj e-poštni naslov.",
"show_fullname": "Pokaži moj ime in priimek.",
diff --git a/public/language/sr/error.json b/public/language/sr/error.json
index e9e7ce0a01..d3c6ea76d6 100644
--- a/public/language/sr/error.json
+++ b/public/language/sr/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Please wait for uploads to complete.",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "You have already favourited this post",
- "already-unfavourited": "You have already unfavourited this post",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "You can't ban other admins!",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/sr/global.json b/public/language/sr/global.json
index aadbb16820..1891007d72 100644
--- a/public/language/sr/global.json
+++ b/public/language/sr/global.json
@@ -86,5 +86,9 @@
"delete_all": "Обриши све",
"map": "Мапа",
"sessions": "Логин сесија",
- "ip_address": "IP адреса"
+ "ip_address": "IP адреса",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/sr/groups.json b/public/language/sr/groups.json
index 3e44a09035..9cda34c5a7 100644
--- a/public/language/sr/groups.json
+++ b/public/language/sr/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Учланите се у групу",
"membership.leave-group": "Напусти групу",
"membership.reject": "Одбаци",
- "new-group.group_name": "Име групе:"
+ "new-group.group_name": "Име групе:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/sr/notifications.json b/public/language/sr/notifications.json
index 712538ba0e..d919bc82e7 100644
--- a/public/language/sr/notifications.json
+++ b/public/language/sr/notifications.json
@@ -16,9 +16,9 @@
"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.",
+ "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 e3eae6f34b..0e7387583e 100644
--- a/public/language/sr/pages.json
+++ b/public/language/sr/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
"maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json
index cf7b76fc3e..37e042c18f 100644
--- a/public/language/sr/topic.json
+++ b/public/language/sr/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Disabled Categories are greyed out",
"confirm_move": "Move",
"confirm_fork": "Fork",
- "favourite": "Favourite",
- "favourites": "Favourites",
- "favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Loading More Posts",
"move_topic": "Move Topic",
"move_topics": "Move Topics",
diff --git a/public/language/sr/user.json b/public/language/sr/user.json
index 2fe581051f..a1c2676cb8 100644
--- a/public/language/sr/user.json
+++ b/public/language/sr/user.json
@@ -22,7 +22,7 @@
"profile": "Профил",
"profile_views": "Прикази профила",
"reputation": "Репутација",
- "favourites": "Омиљени",
+ "favourites": "Bookmarks",
"watched": "Надгледани",
"followers": "Пратиоци",
"following": "Прати",
@@ -55,10 +55,11 @@
"password": "Лозинка",
"username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as %1",
"password_same_as_username": "Ваша лозинка је иста као ваше име, промените лозинку",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Додајте слику",
"upload_a_picture": "Upload a picture",
"remove_uploaded_picture": "Уклоните додату слику",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Подешавања",
"show_email": "Прикажи моју лозинку",
"show_fullname": "Прикажи моје пуно име",
diff --git a/public/language/sv/error.json b/public/language/sv/error.json
index 8f3513edaf..4a5cfa45a1 100644
--- a/public/language/sv/error.json
+++ b/public/language/sv/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Vänta medan uppladdningen slutförs.",
"file-too-big": "Den maximalt tillåtna filstorleken är %1 kB - ladda upp en mindre fil",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "Du har redan favoriserat det här inlägget",
- "already-unfavourited": "Du har redan avfavoriserat det här inlägget",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Du kan inte bannlysa andra administratörer.",
"cant-remove-last-admin": "Du är den enda administratören. Lägg till en annan användare som administratör innan du tar bort dig själv.",
"invalid-image-type": "Ogiltig bildtyp. Tillåtna typer är: % 1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Använd ditt användarnamn för att logga in",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/sv/global.json b/public/language/sv/global.json
index d984b99cc5..a9cb801869 100644
--- a/public/language/sv/global.json
+++ b/public/language/sv/global.json
@@ -86,5 +86,9 @@
"delete_all": "Ta bort Alla",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/sv/groups.json b/public/language/sv/groups.json
index 7a9f14b04a..4515d5e0de 100644
--- a/public/language/sv/groups.json
+++ b/public/language/sv/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Gå med i grupp",
"membership.leave-group": "Lämna grupp",
"membership.reject": "Neka",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json
index b0879d499b..0db2dee665 100644
--- a/public/language/sv/notifications.json
+++ b/public/language/sv/notifications.json
@@ -16,9 +16,9 @@
"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 har favoriserat ditt inlägg i %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 flaggade ett inlägg 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/sv/pages.json b/public/language/sv/pages.json
index 1e8f24f5cb..6953bf554e 100644
--- a/public/language/sv/pages.json
+++ b/public/language/sv/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Avnändarinställningar",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 genomgår underhåll just nu. Vänligen kom tillbaka lite senare.",
"maintenance.messageIntro": "Ytterligare så lämnade administratören detta meddelande:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json
index 119caa86e5..4fa03da4ee 100644
--- a/public/language/sv/topic.json
+++ b/public/language/sv/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "Inaktiverade kategorier är utgråade",
"confirm_move": "Flytta",
"confirm_fork": "Grena",
- "favourite": "Favorit",
- "favourites": "Favoriter",
- "favourites.has_no_favourites": "Du har inga favoriter, markera inlägg som favorit för att se dem här!",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Laddar fler inlägg",
"move_topic": "Flytta ämne",
"move_topics": "Flytta ämnen",
diff --git a/public/language/sv/user.json b/public/language/sv/user.json
index a807bdb73f..d8aeed1d65 100644
--- a/public/language/sv/user.json
+++ b/public/language/sv/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Profil-visningar",
"reputation": "Rykte",
- "favourites": "Favoriter",
+ "favourites": "Bookmarks",
"watched": "Bevakad",
"followers": "Följare",
"following": "Följer",
@@ -55,10 +55,11 @@
"password": "Lösenord",
"username_taken_workaround": "Användarnamnet är redan upptaget, så vi förändrade det lite. Du kallas nu för %1",
"password_same_as_username": "Ditt lösenord är samma som ditt användarnamn, välj ett annat lösenord.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Ladda upp bild",
"upload_a_picture": "Ladda upp en bild",
"remove_uploaded_picture": "Ta bort uppladdad bild",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Inställningar",
"show_email": "Visa min epost",
"show_fullname": "Visa Fullständigt Namn",
diff --git a/public/language/th/error.json b/public/language/th/error.json
index 7d046a412b..ec944b68dd 100644
--- a/public/language/th/error.json
+++ b/public/language/th/error.json
@@ -50,8 +50,8 @@
"still-uploading": "Please wait for uploads to complete.",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "You have already favourited this post",
- "already-unfavourited": "You have already unfavourited this post",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "You can't ban other admins!",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Please use your username to login",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/th/global.json b/public/language/th/global.json
index f655109acb..36acafc94d 100644
--- a/public/language/th/global.json
+++ b/public/language/th/global.json
@@ -86,5 +86,9 @@
"delete_all": "Delete All",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/th/groups.json b/public/language/th/groups.json
index 5f40f59e30..1ec533f3b2 100644
--- a/public/language/th/groups.json
+++ b/public/language/th/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json
index d6228f8518..a00e594a93 100644
--- a/public/language/th/notifications.json
+++ b/public/language/th/notifications.json
@@ -16,9 +16,9 @@
"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 favourited your post in %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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 5534337e1e..e017b8df5e 100644
--- a/public/language/th/pages.json
+++ b/public/language/th/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 กำลังอยู่ระหว่างการปิดปรับปรุงชั่วคราว กรุณาลองใหม่อีกครั้งในภายหลัง",
"maintenance.messageIntro": "ผู้ดูแลระบบได้ฝากข้อความต่อไปนี้เอาไว้",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/th/topic.json b/public/language/th/topic.json
index 6e979ef48c..19cecadf9d 100644
--- a/public/language/th/topic.json
+++ b/public/language/th/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "หมวดหมู่ที่ปิดใช้งานจะเป็นสีเทา",
"confirm_move": "ย้าย",
"confirm_fork": "แยก",
- "favourite": "ฮิต",
- "favourites": "ฮิต",
- "favourites.has_no_favourites": "คุณไม่ได้มีโพสต์ที่ชอบ รายการโพสต์ที่ชอบที่จะเห็นได้ที่นี่",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "โหลดโพสเพิ่มเติม",
"move_topic": "ย้ายกระทู้",
"move_topics": "Move Topics",
diff --git a/public/language/th/user.json b/public/language/th/user.json
index 129c3f3c7c..357aa42419 100644
--- a/public/language/th/user.json
+++ b/public/language/th/user.json
@@ -22,7 +22,7 @@
"profile": "รายละเอียด",
"profile_views": "ดูข้อมูลส่วนตัว",
"reputation": "ชื่อเสียง",
- "favourites": "ชอบ",
+ "favourites": "Bookmarks",
"watched": "ดูแล้ว",
"followers": "คนติดตาม",
"following": "ติดตาม",
@@ -55,10 +55,11 @@
"password": "รหัสผ่าน",
"username_taken_workaround": "ชื่อนี้มีคนใช้แล้ว เราเลยแก้ไขชื่อคุณ โดยคุณจะถูกรู้จักในชื่อ %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "อัปโหลดรูป",
"upload_a_picture": "อัปโหลดรูป",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "ตั้งค่า",
"show_email": "แสดงอีเมล์",
"show_fullname": "แสดงชื่อจริง",
diff --git a/public/language/tr/error.json b/public/language/tr/error.json
index 3e9a52baef..f086d8dcbe 100644
--- a/public/language/tr/error.json
+++ b/public/language/tr/error.json
@@ -14,7 +14,7 @@
"invalid-password": "Geçersiz Şifre",
"invalid-username-or-password": "Lütfen kullanıcı ismi ve parola girin.",
"invalid-search-term": "Geçersiz arama",
- "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+ "invalid-pagination-value": "Geçersiz sayfalama değeri, en az %1 ve en fazla %2 olabilir",
"username-taken": "Kullanıcı İsmi Alınmış",
"email-taken": "E-posta Alınmış",
"email-not-confirmed": "E-postanız onaylanmamış, onaylamak için lütfen buraya tıklayın.",
@@ -50,8 +50,8 @@
"still-uploading": "Lütfen yüklemelerin bitmesini bekleyin.",
"file-too-big": "İzin verilen en büyük dosya boyutu %1 kb - lütfen daha küçük bir dosya yükleyin",
"guest-upload-disabled": "Ziyaretçilerin yükleme yapması devre dışı bırakıldı",
- "already-favourited": "Bu iletiyi zaten favorilerinize eklediniz",
- "already-unfavourited": "Bu iletiyi zaten favorilerinizden çıkardınız",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Başka yöneticileri yasaklayamazsınız!",
"cant-remove-last-admin": "Tek yönetici sizsiniz. Kendinizi adminlikten çıkarmadan önce başka bir kullanıcıyı admin olarak ekleyiniz",
"invalid-image-type": "Geçersiz resim uzantısı. Izin verilen uzantılar: %1",
@@ -83,7 +83,7 @@
"chat-message-too-long": "Sohbet mesajı çok uzun",
"cant-edit-chat-message": "Bu mesajı düzenlemek için izin verilmez",
"cant-remove-last-user": "Son kullanıcıyı silemezsiniz",
- "cant-delete-chat-message": "You are not allowed to delete this message",
+ "cant-delete-chat-message": "Bu mesajı silmek için izin verilmez",
"reputation-system-disabled": "Saygınlık sistemi kapatılmış.",
"downvoting-disabled": "Aşagı oylama kapatılmış",
"not-enough-reputation-to-downvote": "Bu iletiyi aşagı oylamak için yeterince saygınlığınız yok.",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "Lütfen giriş için kullanıcı adınızı kullanın",
"invite-maximum-met": "Sen maksimum miktarda insanı davet ettin (%2 üzerinden %1).",
"no-session-found": "Giriş yapılmış bir oturum bulunamadı!",
- "not-in-room": "User not in room"
+ "not-in-room": "Odada kullanıcı yok",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/tr/global.json b/public/language/tr/global.json
index 7c99284277..72455cc80f 100644
--- a/public/language/tr/global.json
+++ b/public/language/tr/global.json
@@ -65,7 +65,7 @@
"posted_in_ago_by": "%1 içinde %3 tarafından %2 yayımlandı",
"user_posted_ago": "%1 %2 yayımladı",
"guest_posted_ago": "Ziyaretçi %1 yayımladı",
- "last_edited_by": "last edited by %1",
+ "last_edited_by": "en son düzenleyen %1",
"norecentposts": "Güncel İletiler Yok",
"norecenttopics": "Güncel Başlıklar Yok",
"recentposts": "Güncel İletiler",
@@ -86,5 +86,9 @@
"delete_all": "Hepsini Sil",
"map": "Harita",
"sessions": "Giriş Oturumları",
- "ip_address": "IP Adresleri"
+ "ip_address": "IP Adresleri",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/tr/groups.json b/public/language/tr/groups.json
index afb293df5c..1618633a48 100644
--- a/public/language/tr/groups.json
+++ b/public/language/tr/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Gruba Katıl",
"membership.leave-group": "Gruptan Ayrıl",
"membership.reject": "Reddet",
- "new-group.group_name": "Grup İsmi:"
+ "new-group.group_name": "Grup İsmi:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json
index e378b748e7..dfd4849065 100644
--- a/public/language/tr/notifications.json
+++ b/public/language/tr/notifications.json
@@ -16,9 +16,9 @@
"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 iletinizi favorilerine ekledi. %2.",
- "favourited_your_post_in_dual": "%1 ve %2 %3 içindeki gönderini favoriye ekledi.",
- "favourited_your_post_in_multiple": "%1 ve %2 iki kişi daha %3 içindeki gönderini favoriye ekledi.",
+ "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 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 5f6856b98f..77d821ad43 100644
--- a/public/language/tr/pages.json
+++ b/public/language/tr/pages.json
@@ -6,12 +6,12 @@
"popular-month": "Bu ayki popüler başlıklar",
"popular-alltime": "En popüler başlıklar",
"recent": "Güncel Konular",
- "flagged-posts": "Flagged Posts",
+ "flagged-posts": "Bayraklanmış İletiler",
"users/online": "Çevrimiçi Kullanıcılar",
"users/latest": "En Yeni Kullanıcılar",
"users/sort-posts": "En çok ileti gönderen kullanıcılar",
"users/sort-reputation": "En çok saygınlığı olan kullanıcılar",
- "users/banned": "Banned Users",
+ "users/banned": "Yasaklanmış Kullanıcılar",
"users/search": "Kullanıcı Ara",
"notifications": "Bildirimler",
"tags": "Etiketler",
@@ -33,12 +33,13 @@
"account/posts": "%1 tarafından gönderilen iletiler",
"account/topics": "%1 tarafından gönderilen başlıklar",
"account/groups": "%1 Kişisine Ait Gruplar",
- "account/favourites": "%1'in Favori İletileri",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "Kullanıcı Ayarları",
"account/watched": "%1 tarafından izlenen konular",
"account/upvoted": "%1 tarafından artılanan gönderiler",
"account/downvoted": "%1 tarafından eksilenen gönderiler",
"account/best": "%1 tarafından en iyi gönderiler",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 şu anda bakımda. Lütfen bir süre sonra tekrar deneyin.",
"maintenance.messageIntro": "Ayrıca, yönetici şu mesaji bıraktı:",
"throttled.text": "%1 şu anda kullanılamıyor. Lütfen daha sonra tekrar dene."
diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json
index b6616f0624..ea140fc028 100644
--- a/public/language/tr/topic.json
+++ b/public/language/tr/topic.json
@@ -35,7 +35,7 @@
"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.",
"mark_unread": "Okunmadı olarak işaretle",
- "mark_unread.success": "Topic marked as unread.",
+ "mark_unread.success": "Başlık okunmamış olarak işaretlendi.",
"watch": "İzle",
"unwatch": "İzleme",
"watch.title": "Bu başlığa gelen yeni iletilerden haberdar ol",
@@ -65,9 +65,9 @@
"disabled_categories_note": "Etkin Olmayan Kategoriler soluklaştırılır",
"confirm_move": "Taşı",
"confirm_fork": "Ayır",
- "favourite": "Favori",
- "favourites": "Favoriler",
- "favourites.has_no_favourites": "Favorilerde hiç iletiniz yok, görebilmek için iletileri favorilere ekleyin.",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Daha fazla ileti ",
"move_topic": "Başlığı Taş",
"move_topics": "Konuları Taşı",
diff --git a/public/language/tr/user.json b/public/language/tr/user.json
index b7b5a65d10..e793dd7b0e 100644
--- a/public/language/tr/user.json
+++ b/public/language/tr/user.json
@@ -22,7 +22,7 @@
"profile": "Profil",
"profile_views": "Profil Görüntülemeleri",
"reputation": "Saygınlık",
- "favourites": "Favoriler",
+ "favourites": "Bookmarks",
"watched": "İzlendi",
"followers": "Takipçiler",
"following": "Takip Ediyor",
@@ -55,10 +55,11 @@
"password": "Şifre",
"username_taken_workaround": "İstediğiniz kullanıcı ismi zaten alınmış, bu yüzden biraz degiştirdik. Şimdiki kullanıcı isminiz %1",
"password_same_as_username": "Parolanız kullanıcı adınız ile aynı, lütfen başka bir parola seçiniz.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Resim Yükle",
"upload_a_picture": "Bir Resim Yükle",
"remove_uploaded_picture": "Yüklenmiş fotoğrafı kaldır",
- "image_spec": "Sadece PNG, JPG veya BMP dosyalarını yükleyebilirsin.",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Ayarlar",
"show_email": "E-postamı göster",
"show_fullname": "Tam ismimi göster",
diff --git a/public/language/tr/users.json b/public/language/tr/users.json
index b4b5afe4e4..fa0bc51096 100644
--- a/public/language/tr/users.json
+++ b/public/language/tr/users.json
@@ -16,5 +16,5 @@
"unread_topics": "Okunmamış Başlıklar",
"categories": "Kategoriler",
"tags": "Etiketler",
- "no-users-found": "No users found!"
+ "no-users-found": "Kullanıcı bulunamadı!"
}
\ No newline at end of file
diff --git a/public/language/vi/category.json b/public/language/vi/category.json
index 1f06930274..77836d6492 100644
--- a/public/language/vi/category.json
+++ b/public/language/vi/category.json
@@ -1,16 +1,16 @@
{
- "category": "Danh mục",
- "subcategories": "Danh mục con",
+ "category": "Chuyên mục",
+ "subcategories": "Chuyên mục con",
"new_topic_button": "Chủ đề mới",
"guest-login-post": "Đăng nhập để viết bài",
"no_topics": "Không có bài viết trong danh mục này.
Hãy đăng một bài viết mới.",
"browsing": "đang xem",
"no_replies": "Chưa có bình luận nào",
"no_new_posts": "Không có bài mới.",
- "share_this_category": "Chia sẻ thư mục này",
+ "share_this_category": "Chia sẻ chuyên mục này",
"watch": "Theo dõi",
"ignore": "Bỏ qua",
"watch.message": "Bạn đang theo dõi các cập nhật của danh mục này",
- "ignore.message": "Bạn đang gỡ bỏ theo dõi danh mục này",
- "watched-categories": "Watched categories"
+ "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"
}
\ No newline at end of file
diff --git a/public/language/vi/email.json b/public/language/vi/email.json
index cf8f8e86e1..de77b60125 100644
--- a/public/language/vi/email.json
+++ b/public/language/vi/email.json
@@ -1,11 +1,11 @@
{
- "password-reset-requested": "Yêu cầu tạo lại mật khẩu - %1!",
- "welcome-to": "Chào mừng đến với %1",
+ "password-reset-requested": "Yêu cầu phục hồi mật khẩu - %1!",
+ "welcome-to": "Chào mừng bạn đến với %1",
"invite": "Lời mời từ %1",
"greeting_no_name": "Xin chào",
"greeting_with_name": "Xin chào %1",
"welcome.text1": "Cảm ơn bạn đã đăng ký tại %1!",
- "welcome.text2": "Để kích hoạt đầy đủ tính năng của tài khoản, chúng tôi cần xác định bạn là chủ của địa chỉ email mà bạn đã đăng ký.",
+ "welcome.text2": "Để kích hoạt đầy đủ tính năng của tài khoản, chúng tôi cần xác nhận bạn là chủ của địa chỉ email mà bạn đã đăng ký.",
"welcome.text3": "Quản trị viên đã chấp nhận đơn đăng ký của bạn. Bạn có thể đăng nhập với tên đăng nhập/mật khẩu ngay bây giờ.",
"welcome.cta": "Nhấn vào đây để xác nhận địa chỉ email",
"invitation.text1": "%1 đã mời bạn tham gia %2",
@@ -14,16 +14,16 @@
"reset.text2": "Để đặt lại mật khẩu, hãy click vào liên kết sau:",
"reset.cta": "Click vào đây để khởi tạo lại mật khẩu",
"reset.notify.subject": "Thay đổi mật khẩu thành công",
- "reset.notify.text1": "Chúng tôi thông báo với bạn trên %1, mật khẩu của bạn đã thay đổi thành công",
- "reset.notify.text2": "Nếu bạn không cho phép điều này, vui lòng thông báo cho quản trị viên ngay lập tức",
- "digest.notifications": "Bạn có thông báo chưa đọc từ %1",
+ "reset.notify.text1": "Xin thông báo với bạn: mật khẩu của bạn trên %1 đã được thay đổi thành công.",
+ "reset.notify.text2": "Nếu bạn không cho phép điều này, vui lòng thông báo cho quản trị viên ngay lập tức.",
+ "digest.notifications": "Bạn có thông báo chưa đọc từ %1:",
"digest.latest_topics": "Chủ đề mới nhất từ %1",
"digest.cta": "Click vào đây để truy cập %1",
"digest.unsub.info": "Tập san này được gửi đến bạn dựa theo cài đặt theo dõi của bạn.",
"digest.no_topics": "Không có chủ đề nào hoạt động trong %1 ",
- "digest.day": "day",
- "digest.week": "week",
- "digest.month": "month",
+ "digest.day": "ngày",
+ "digest.week": "tuần",
+ "digest.month": "tháng",
"notif.chat.subject": "Bạn có tin nhắn mới từ %1",
"notif.chat.cta": "Nhấn vào đây để tiếp tục cuộc hội thoại",
"notif.chat.unsub.info": "Thông báo tin nhắn này được gửi tới dựa theo cài đặt theo dõi của bạn.",
diff --git a/public/language/vi/error.json b/public/language/vi/error.json
index 2d3f6d74dc..db957c5b53 100644
--- a/public/language/vi/error.json
+++ b/public/language/vi/error.json
@@ -1,9 +1,9 @@
{
"invalid-data": "Dữ liệu không hợp lệ",
- "not-logged-in": "Bạn chưa đăng nhập",
+ "not-logged-in": "Có vẻ bạn chưa đăng nhập.",
"account-locked": "Tài khoản của bạn đang tạm thời bị khóa",
- "search-requires-login": "Searching requires an account - please login or register.",
- "invalid-cid": "Danh mục ID không hợp lệ",
+ "search-requires-login": "Bạn cần phải có tài khoản để tìm kiếm - vui lòng đăng nhập hoặc đăng ký.",
+ "invalid-cid": "ID chuyên mục không hợp lệ",
"invalid-tid": "ID chủ đề không hợp lệ",
"invalid-pid": "ID bài viết không hợp lệ",
"invalid-uid": "ID tài khoản không hợp lệ",
@@ -14,19 +14,19 @@
"invalid-password": "Mật khẩu không hợp lệ",
"invalid-username-or-password": "Xin hãy nhập cả tên đăng nhập và mật khẩu",
"invalid-search-term": "Từ khóa không hợp lệ",
- "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
+ "invalid-pagination-value": "Giá trị trang không hợp lệ, tối thiểu phải là %1 và tối đa là %2",
"username-taken": "Tên đăng nhập đã tồn tại",
"email-taken": "Email đã được đăng kí",
"email-not-confirmed": "Email của bạn chưa được xác nhận, xin hãy nhấn vào đây để xác nhận địa chỉ này là của bạn",
- "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
- "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
- "email-confirm-failed": "We could not confirm your email, please try again later.",
- "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+ "email-not-confirmed-chat": "Bạn không được quyền chat nếu email của bạn chưa được xác nhận, vui lòng click vào đây để xác nhận email của bạn.",
+ "no-email-to-confirm": "Diễn đàn này yêu cầu xác nhận email, vui lòng nhấn vào đây để nhập email.",
+ "email-confirm-failed": "Chúng tôi không thể xác nhận email của bạn, vui lòng thử lại sau.",
+ "confirm-email-already-sent": "Email xác nhận đã được gửi, vui lòng chờ %1 phút để yêu cầu gửi lại.",
"username-too-short": "Tên đăng nhập quá ngắn",
"username-too-long": "Tên đăng nhập quá dài",
- "password-too-long": "Password too long",
+ "password-too-long": "Mật khẩu quá dài",
"user-banned": "Tài khoản bị ban",
- "user-too-new": "Sorry, you are required to wait %1 second(s) before making your first post",
+ "user-too-new": "Rất tiếc, bạn phải chờ %1 giây để đăng bài viết đầu tiên.",
"no-category": "Danh mục không tồn tại",
"no-topic": "Chủ đề không tồn tại",
"no-post": "Bài viết không tồn tại",
@@ -36,65 +36,66 @@
"no-privileges": "Bạn không đủ quyền để thực thi hành động này",
"category-disabled": "Danh mục bị khóa",
"topic-locked": "Chủ đề bị khóa",
- "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting",
- "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).",
- "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
- "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
- "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
- "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
- "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
- "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
- "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
- "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
- "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
+ "post-edit-duration-expired": "Bạn chỉ được phép sửa bài viết sau khi đăng %1 giây.",
+ "content-too-short": "Vui lòng nhập một bài viết dài hơn. Bài viết phải có tối thiểu %1 ký tự.",
+ "content-too-long": "Vui lòng nhập một bài viết ngắn hơn. Bài viết chỉ có thể có tối đa %1 ký tự.",
+ "title-too-short": "Vui lòng nhập tiêu đề dài hơn. Tiêu đề phải có tối thiểu %1 ký tự.",
+ "title-too-long": "Vui lòng nhập tiêu đề ngắn hơn. Tiêu đề chỉ có thể có tối đa %1 ký tự.",
+ "too-many-posts": "Bạn chỉ có đăng bài mới mỗi %1 giây - vui lòng đợi để tiếp tục đăng bài.",
+ "too-many-posts-newbie": "Bạn chỉ có thể đăng bài mỗi %1 giây cho đến khi bạn tích luỹ được %2 điểm tín nhiệm - vui lòng đợi để tiếp tục đăng bài.",
+ "tag-too-short": "Vui lòng nhập tag dài hơn. Tag phải có tối thiểu %1 ký tự.",
+ "tag-too-long": "Vui lòng nhập tag ngắn hơn. Tag chỉ có thể có tối đa %1 ký tự.",
+ "not-enough-tags": "Quá ít tag. Chủ đề phải có tối thiểu %1 tag.",
+ "too-many-tags": "Quá nhiều tag. Chủ đề chỉ có thể có tối đa %1 tag.",
"still-uploading": "Vui lòng chờ upload",
- "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
- "guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "Bạn đã bấm yêu thích cho bài viết này rồi",
- "already-unfavourited": "Bạn đã bỏ thích bài này rồi",
+ "file-too-big": "Kích cỡ file được cho phép tối đa là %1 kB - vui lòng tải lên file có dung lượng nhỏ hơn.",
+ "guest-upload-disabled": "Khách (chưa có tài khoản) không có quyền tải lên file.",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "Bạn không thể ban được các admin khác",
- "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
- "invalid-image-type": "Invalid image type. Allowed types are: %1",
- "invalid-image-extension": "Invalid image extension",
- "invalid-file-type": "Invalid file type. Allowed types are: %1",
+ "cant-remove-last-admin": "Bạn là quản trị viên duy nhất. Hãy cho thành viên khác làm quản trị viên trước khi huỷ bỏ quyền quản trị của bạn.",
+ "invalid-image-type": "Định dạng ảnh không hợp lệ. Những định dạng được cho phép là: %1",
+ "invalid-image-extension": "Định dạng ảnh không hợp lệ",
+ "invalid-file-type": "Định dạng file không hợp lệ. Những định dạng được cho phép là: %1",
"group-name-too-short": "Tên nhóm quá ngắn",
"group-already-exists": "Nhóm đã tồn tại",
"group-name-change-not-allowed": "Không cho phép đổi tên nhóm",
- "group-already-member": "Already part of this group",
- "group-not-member": "Not a member of this group",
- "group-needs-owner": "This group requires at least one owner",
- "group-already-invited": "This user has already been invited",
- "group-already-requested": "Your membership request has already been submitted",
+ "group-already-member": "Bạn đã là thành viên của nhóm này.",
+ "group-not-member": "Không phải là thành viên của nhóm này.",
+ "group-needs-owner": "Nhóm này phải có tối thiểu một chủ sỡ hữu",
+ "group-already-invited": "Thành viên này đã được mời",
+ "group-already-requested": "Yêu cầu tham gia của bạn đã được gửi.",
"post-already-deleted": "Bài viết này đã bị xóa",
"post-already-restored": "Bài viết này đã được phục hồi",
"topic-already-deleted": "Chủ đề này đã bị xóa",
"topic-already-restored": "Chủ đề này đã được phục hồi",
- "cant-purge-main-post": "You can't purge the main post, please delete the topic instead",
+ "cant-purge-main-post": "Bạn không thể xoá bài viết chính, thay vào đó, vui lòng xoá chủ đề.",
"topic-thumbnails-are-disabled": "Thumbnails cho chủ đề đã bị tắt",
"invalid-file": "File không hợp lệ",
"uploads-are-disabled": "Đã khóa lựa chọn tải lên",
- "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
- "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
+ "signature-too-long": "Rất tiếc, chữ ký của bạn chỉ có thể có tối đa %1 ký tự.",
+ "about-me-too-long": "Rất tiếc, giới thiệu bản thân của bạn chỉ có thể có tối đa %1 ký tự.",
"cant-chat-with-yourself": "Bạn không thể chat với chính bạn!",
"chat-restricted": "Người dùng này đã bật chế độ hạn chế tin nhắn chat. Bạn phải được anh/cô ta follow thì mới có thể gởi tin nhắn đến họ được.",
- "chat-disabled": "Chat system disabled",
- "too-many-messages": "You have sent too many messages, please wait awhile.",
- "invalid-chat-message": "Invalid chat message",
- "chat-message-too-long": "Chat message is too long",
- "cant-edit-chat-message": "You are not allowed to edit this message",
- "cant-remove-last-user": "You can't remove the last user",
- "cant-delete-chat-message": "You are not allowed to delete this message",
+ "chat-disabled": "Hệ thống chat đã bị vô hiệu hoá",
+ "too-many-messages": "Bạn đã gửi quá nhiều tin nhắn, vui lòng đợi trong giây lát.",
+ "invalid-chat-message": "Tin nhắn không hợp lệ",
+ "chat-message-too-long": "Tin nhắn quá dài",
+ "cant-edit-chat-message": "Bạn không được phép chỉnh sửa tin nhắn này",
+ "cant-remove-last-user": "Bạn không thể xoá thành viên cuối cùng",
+ "cant-delete-chat-message": "Bạn không được phép xoá tin nhắn này",
"reputation-system-disabled": "Hệ thống tín nhiệm đã bị vô hiệu hóa.",
"downvoting-disabled": "Downvote đã bị tắt",
"not-enough-reputation-to-downvote": "Bạn không có đủ phiếu tín nhiệm để downvote bài này",
"not-enough-reputation-to-flag": "Bạn không đủ tín nhiệm để đánh dấu bài viết này",
- "already-flagged": "You have already flagged this post",
+ "already-flagged": "Bạn đã gắn cờ cho bài viết này",
"reload-failed": "NodeBB gặp lỗi trong khi tải lại: \"%1\". NodeBB sẽ tiếp tục hoạt động với dữ liệu trước đó, tuy nhiên bạn nên tháo gỡ những gì bạn vừa thực hiện trước khi tải lại.",
"registration-error": "Lỗi đăng kí",
- "parse-error": "Something went wrong while parsing server response",
- "wrong-login-type-email": "Please use your email to login",
- "wrong-login-type-username": "Please use your username to login",
- "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
- "no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "parse-error": "Có gì không ổn khi nhận kết quả từ máy chủ",
+ "wrong-login-type-email": "Xin vui lòng sửa dụng email của bạn để đăng nhập",
+ "wrong-login-type-username": "Vui lòng sử dụng tên đăng nhập của bạn để đăng nhập",
+ "invite-maximum-met": "Bạn đã sử dụng hết số lượng lời mời bạn có thể gửi (%1 đã gửi trên tổng số %2 được cho phép)",
+ "no-session-found": "Không tìm thấy phiên đăng nhập!",
+ "not-in-room": "Thành viên không có trong phòng",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/vi/global.json b/public/language/vi/global.json
index 55d850c49d..e466d74fae 100644
--- a/public/language/vi/global.json
+++ b/public/language/vi/global.json
@@ -2,11 +2,11 @@
"home": "Trang chủ",
"search": "Tìm kiếm",
"buttons.close": "Đóng lại",
- "403.title": "Từ chối truy cập",
- "403.message": "You seem to have stumbled upon a page that you do not have access to.",
- "403.login": "Perhaps you should try logging in?",
+ "403.title": "Truy cập bị từ chối",
+ "403.message": "Có vẻ bạn đang cố vào một trang mà bạn không có quyền truy cập.",
+ "403.login": "Có lẽ bạn nên thử đăng nhập?",
"404.title": "Không tìm thấy",
- "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.",
+ "404.message": "Có vẻ như bạn đang cố vào một trang không tồn tại. Hãy trở lại trang chủ.",
"500.title": "Lỗi nội bộ",
"500.message": "Úi chà! Có vẻ như có trục trặc rồi!",
"register": "Đăng ký",
@@ -22,7 +22,7 @@
"pagination.out_of": "%1 trong số %2",
"pagination.enter_index": "Nhập khóa",
"header.admin": "Quản trị viên",
- "header.categories": "Categories",
+ "header.categories": "Chuyên mục",
"header.recent": "Gần đây",
"header.unread": "Chưa đọc",
"header.tags": "Tags",
@@ -33,12 +33,12 @@
"header.notifications": "Thông báo",
"header.search": "Tìm kiếm",
"header.profile": "Hồ sơ",
- "header.navigation": "Navigation",
+ "header.navigation": "Điều hướng",
"notifications.loading": "Đang tải Thông báo",
- "chats.loading": "Đang tải phần Chat",
+ "chats.loading": "Đang tải chat",
"motd.welcome": "Chào mừng bạn tới NodeBB, Platform của tương lai",
"previouspage": "Trang trước",
- "nextpage": "Trang kế tiếp",
+ "nextpage": "Trang kế",
"alert.success": "Thành công",
"alert.error": "Lỗi",
"alert.banned": "Bị cấm",
@@ -49,29 +49,29 @@
"users": "Số người dùng",
"topics": "Số Chủ đề",
"posts": "Số bài viết",
- "best": "Best",
- "upvoted": "Upvoted",
- "downvoted": "Downvoted",
- "views": "Số lượt view",
- "reputation": "Độ uy tín",
+ "best": "Hay nhất",
+ "upvoted": "Tán thành",
+ "downvoted": "Phản đối",
+ "views": "Lượt xem",
+ "reputation": "Điểm tín nhiệm",
"read_more": "Đọc thêm",
- "more": "More",
+ "more": "Xem thêm",
"posted_ago_by_guest": "Đã viết %1 bởi Khách",
"posted_ago_by": "Đã viết %1 bởi %2",
"posted_ago": "Đã viết %1",
- "posted_in": "posted in %1",
- "posted_in_by": "posted in %1 by %2",
+ "posted_in": "được đăng trong %1",
+ "posted_in_by": "được đăng trong %1 bởi %2",
"posted_in_ago": "được đăng trong %1 %2",
"posted_in_ago_by": "Đã viết trong %1 %2 bởi %3",
"user_posted_ago": "%1 đã viết %2",
"guest_posted_ago": "Khách đã viết %1",
- "last_edited_by": "last edited by %1",
+ "last_edited_by": "được chỉnh sửa lần cuối bởi %1",
"norecentposts": "Không có bài viết nào gần đây",
"norecenttopics": "Không có chủ đề gần đây",
"recentposts": "Số bài viết gần đây",
"recentips": "Các IP vừa mới đăng nhập",
"away": "Đang đi vắng",
- "dnd": "Do not disturb",
+ "dnd": "Đừng làm phiền",
"invisible": "Ẩn",
"offline": "Đang offline",
"email": "Email",
@@ -84,7 +84,11 @@
"follow": "Theo dõi",
"unfollow": "Huỷ theo dõi",
"delete_all": "Xóa hết",
- "map": "Map",
- "sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "map": "Bản đồ",
+ "sessions": "Phiên đăng nhập",
+ "ip_address": "Địa chỉ IP",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/vi/groups.json b/public/language/vi/groups.json
index 7ce867cb97..3ea795c76b 100644
--- a/public/language/vi/groups.json
+++ b/public/language/vi/groups.json
@@ -6,47 +6,48 @@
"no_groups_found": "Không có nhóm nào để hiển thị",
"pending.accept": "Chấp nhận",
"pending.reject": "Từ chối",
- "pending.accept_all": "Accept All",
- "pending.reject_all": "Reject All",
- "pending.none": "There are no pending members at this time",
- "invited.none": "There are no invited members at this time",
- "invited.uninvite": "Rescind Invitation",
- "invited.search": "Search for a user to invite to this group",
- "invited.notification_title": "You have been invited to join %1",
- "request.notification_title": "Group Membership Request from %1",
- "request.notification_text": "%1 has requested to become a member of %2",
+ "pending.accept_all": "Chấp nhận tất cả",
+ "pending.reject_all": "Từ chối tất cả",
+ "pending.none": "Hiện tại không có thành viên nào đang chờ được duyệt để tham gia nhóm",
+ "invited.none": "Hiện tại không có thành viên nào được mời tham gia nhóm",
+ "invited.uninvite": "Từ chối lời mời",
+ "invited.search": "Tìm kiếm thành viên để mời vào nhóm",
+ "invited.notification_title": "Bạn đã được mời tham gia %1",
+ "request.notification_title": "Yêu cầu tham gia nhóm từ %1",
+ "request.notification_text": "%1 yêu cầu chấp nhận để trở thành thành viên của %2",
"cover-save": "Lưu",
"cover-saving": "Đang lưu",
"details.title": "Thông tin nhóm",
"details.members": "Danh sách thành viên",
- "details.pending": "Pending Members",
- "details.invited": "Invited Members",
+ "details.pending": "Thành viên đang chờ trả lời",
+ "details.invited": "Thành viên đã được mời",
"details.has_no_posts": "Nhóm thành viên này chưa viết bài viết nào.",
"details.latest_posts": "Bài mới nhất",
- "details.private": "Private",
- "details.disableJoinRequests": "Disable join requests",
- "details.grant": "Grant/Rescind Ownership",
- "details.kick": "Kick",
- "details.owner_options": "Group Administration",
+ "details.private": "Riêng tư",
+ "details.disableJoinRequests": "Vô hiệu hóa yêu cầu tham gia",
+ "details.grant": "Cấp/Huỷ quyền trưởng nhóm",
+ "details.kick": "Đá ra",
+ "details.owner_options": "Quản trị nhóm",
"details.group_name": "Tên nhóm",
- "details.member_count": "Member Count",
- "details.creation_date": "Creation Date",
- "details.description": "Description",
- "details.badge_preview": "Badge Preview",
- "details.change_icon": "Change Icon",
- "details.change_colour": "Change Colour",
- "details.badge_text": "Badge Text",
- "details.userTitleEnabled": "Show Badge",
- "details.private_help": "If enabled, joining of groups requires approval from a group owner",
- "details.hidden": "Hidden",
- "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
- "details.delete_group": "Delete Group",
+ "details.member_count": "Số thành viên",
+ "details.creation_date": "Ngày mở nhóm",
+ "details.description": "Miêu tả",
+ "details.badge_preview": "Xem thử huy hiệu",
+ "details.change_icon": "Đổi icon",
+ "details.change_colour": "Đổi màu",
+ "details.badge_text": "Huy hiệu",
+ "details.userTitleEnabled": "Hiện huy hiệu",
+ "details.private_help": "Nếu bật, để tham gia nhóm cần phải có sự chấp thuận từ trưởng nhóm",
+ "details.hidden": "Đã ẩn",
+ "details.hidden_help": "Nếu bật, nhóm này sẽ không được hiện thị trong danh sách nhóm, và thành viên phải được mời để tham gia",
+ "details.delete_group": "Xoá nhóm",
"event.updated": "Thông tin nhóm đã được cập nhật",
- "event.deleted": "The group \"%1\" has been deleted",
- "membership.accept-invitation": "Accept Invitation",
- "membership.invitation-pending": "Invitation Pending",
- "membership.join-group": "Join Group",
- "membership.leave-group": "Leave Group",
- "membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "event.deleted": "Nhóm \"%1\" đã bị xoá",
+ "membership.accept-invitation": "Chấp nhận lời mời",
+ "membership.invitation-pending": "Lời mời đang chờ trả lời",
+ "membership.join-group": "Tham gia nhóm",
+ "membership.leave-group": "Rời khỏi nhóm",
+ "membership.reject": "Từ chối",
+ "new-group.group_name": "Tên nhóm",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/vi/language.json b/public/language/vi/language.json
index fbe233f267..f0787f748a 100644
--- a/public/language/vi/language.json
+++ b/public/language/vi/language.json
@@ -1,5 +1,5 @@
{
- "name": "Tiếng Anh",
+ "name": "Tiếng Việt",
"code": "vi",
"dir": "ltr"
}
\ No newline at end of file
diff --git a/public/language/vi/login.json b/public/language/vi/login.json
index 4ae9230b8a..01b7f2dc96 100644
--- a/public/language/vi/login.json
+++ b/public/language/vi/login.json
@@ -1,10 +1,10 @@
{
- "username-email": "Username / Email",
- "username": "Username",
+ "username-email": "Tên đăng nhập / Email",
+ "username": "Tên đăng nhập",
"email": "Email",
- "remember_me": "Ghi nhớ tôi?",
+ "remember_me": "Ghi nhớ?",
"forgot_password": "Quên mật khẩu?",
- "alternative_logins": "Đăng nhập bằng tên khác",
+ "alternative_logins": "Đăng nhập bằng tài khoản khác",
"failed_login_attempt": "Đăng nhập thất bại, xin hãy thử lại",
"login_successful": "Bạn đã đăng nhập thành công!",
"dont_have_account": "Chưa có tài khoản?"
diff --git a/public/language/vi/modules.json b/public/language/vi/modules.json
index f0ad033020..f53818ced6 100644
--- a/public/language/vi/modules.json
+++ b/public/language/vi/modules.json
@@ -1,13 +1,13 @@
{
"chat.chatting_with": "Chat với ",
"chat.placeholder": "Nhập tin nhắn ở đây, nhấn enter để gửi",
- "chat.send": "Gửi đi",
+ "chat.send": "Gửi",
"chat.no_active": "Bạn hiện giờ không có cuộc chat nào",
- "chat.user_typing": "%1b đang gõ",
+ "chat.user_typing": "%1b đang gõ...",
"chat.user_has_messaged_you": "%1 đã gửi tin cho bạn.",
- "chat.see_all": "See all chats",
+ "chat.see_all": "Xem tất cả",
"chat.no-messages": "Hãy chọn 1 tài khoản để xem lịch sử chat",
- "chat.no-users-in-room": "No users in this room",
+ "chat.no-users-in-room": "Không có người nào trong phòng này.",
"chat.recent-chats": "Vừa chat",
"chat.contacts": "Liên hệ",
"chat.message-history": "Lịch sử tin nhắn",
@@ -16,22 +16,22 @@
"chat.seven_days": "7 ngày",
"chat.thirty_days": "30 ngày",
"chat.three_months": "3 tháng",
- "chat.delete_message_confirm": "Are you sure you wish to delete this message?",
- "chat.roomname": "Chat Room %1",
- "chat.add-users-to-room": "Add users to room",
- "composer.compose": "Compose",
- "composer.show_preview": "Show Preview",
- "composer.hide_preview": "Hide Preview",
+ "chat.delete_message_confirm": "Bạn có chắc chắn bạn muốn xoá tin nhắn này chứ?",
+ "chat.roomname": "Phòng chat %1",
+ "chat.add-users-to-room": "Thêm người vào phòng",
+ "composer.compose": "Soạn thảo",
+ "composer.show_preview": "Hiện Xem trước",
+ "composer.hide_preview": "Ẩn Xem trước",
"composer.user_said_in": "%1 đã nói trong %2:",
"composer.user_said": "%1 đã nói:",
"composer.discard": "Bạn có chắc chắn hủy bỏ bài viết này?",
- "composer.submit_and_lock": "Submit and Lock",
- "composer.toggle_dropdown": "Toggle Dropdown",
- "composer.uploading": "Uploading %1",
+ "composer.submit_and_lock": "Đăng và Khoá",
+ "composer.toggle_dropdown": "Đóng/mở dropdown",
+ "composer.uploading": "Đang tải lên %1",
"bootbox.ok": "OK",
- "bootbox.cancel": "Cancel",
- "bootbox.confirm": "Confirm",
- "cover.dragging_title": "Cover Photo Positioning",
- "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
- "cover.saved": "Cover photo image and position saved"
+ "bootbox.cancel": "Huỷ bỏ",
+ "bootbox.confirm": "Xác nhận",
+ "cover.dragging_title": "Điều chỉnh vị trí ảnh cover",
+ "cover.dragging_message": "Kéo ảnh cover vào vị trí bạn ưng ý và nhấn \"Lưu\"",
+ "cover.saved": "Ảnh cover và vị trí đã được lưu"
}
\ No newline at end of file
diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json
index 922275e1c3..8780782f08 100644
--- a/public/language/vi/notifications.json
+++ b/public/language/vi/notifications.json
@@ -1,35 +1,35 @@
{
"title": "Thông báo",
"no_notifs": "Bạn không có thông báo nào mới",
- "see_all": "See all notifications",
+ "see_all": "Xem tất cả thông báo",
"mark_all_read": "Đánh dấu đã xem tất cả thông báo",
"back_to_home": "Quay lại %1",
"outgoing_link": "Liên kết ngoài",
- "outgoing_link_message": "You are now leaving %1",
+ "outgoing_link_message": "Bạn đang rời khỏi %1",
"continue_to": "Tiếp tục tới %1",
"return_to": "Quay lại %1",
"new_notification": "Thông báo mới",
"you_have_unread_notifications": "Bạn có thông báo chưa đọc",
"new_message_from": "Tin nhắn mới từ %1",
"upvoted_your_post_in": "%1 đã bình chọn bài của bạn trong %2.",
- "upvoted_your_post_in_dual": "%1 and %2 have upvoted your post in %3.",
- "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 đã thích bài của bạn trong %2.",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "upvoted_your_post_in_dual": "%1 và %2 đã tán thành với bài viết của bạn trong %3.",
+ "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 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 gắn cờ 1 bài trong %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",
+ "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",
"user_posted_to": "%1 đã trả lời %2",
- "user_posted_to_dual": "%1 and %2 have posted replies to: %3",
- "user_posted_to_multiple": "%1 and %2 others have posted replies to: %3",
+ "user_posted_to_dual": "%1 và %2 đã trả lời: %3",
+ "user_posted_to_multiple": "%1 và %2 người khác đã trả lời: %3",
"user_posted_topic": "%1 đã gởi chủ đề mới ở %2",
"user_started_following_you": "%1 đã theo dõi bạn.",
- "user_started_following_you_dual": "%1 and %2 started following you.",
- "user_started_following_you_multiple": "%1 and %2 others started following you.",
- "new_register": "%1 sent a registration request.",
+ "user_started_following_you_dual": "%1 và %2 đã bắt đầu theo dõi bạn.",
+ "user_started_following_you_multiple": "%1 và %2 người khác đã bắt đầu theo dõi bạn.",
+ "new_register": "%1 đã gửi một yêu cầu tham gia.",
"email-confirmed": "Đã xác nhận email",
"email-confirmed-message": "Cảm ơn bạn đã xác nhận địa chỉ email của bạn. Tài khoản của bạn đã được kích hoạt đầy đủ.",
"email-confirm-error-message": "Đã có lỗi khi xác nhận địa chỉ email. Có thể đoạn mã không đúng hoặc đã hết hạn.",
diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json
index ea0217f9aa..13b6ab018d 100644
--- a/public/language/vi/pages.json
+++ b/public/language/vi/pages.json
@@ -1,45 +1,46 @@
{
"home": "Trang chủ",
"unread": "Chủ đề chưa đọc",
- "popular-day": "Popular topics today",
- "popular-week": "Popular topics this week",
- "popular-month": "Popular topics this month",
- "popular-alltime": "All time popular topics",
+ "popular-day": "Chủ đề nổi bật hôm nay",
+ "popular-week": "Chủ đề nội bật tuần này",
+ "popular-month": "Chủ đề nổi bật tháng này",
+ "popular-alltime": "Chủ đề nổi bật mọi thời đại",
"recent": "Chủ đề gần đây",
- "flagged-posts": "Flagged Posts",
- "users/online": "Online Users",
- "users/latest": "Latest Users",
- "users/sort-posts": "Users with the most posts",
- "users/sort-reputation": "Users with the most reputation",
- "users/banned": "Banned Users",
- "users/search": "User Search",
+ "flagged-posts": "Bài viết bị gắn cờ",
+ "users/online": "Thành viên đang online",
+ "users/latest": "Thành viên mới nhất",
+ "users/sort-posts": "Thành viên có nhiều bài đăng nhất",
+ "users/sort-reputation": "Thành viên có điểm tín nhiệm cao nhất",
+ "users/banned": "Thành viên đã bị cấm",
+ "users/search": "Tìm kiếm thành viên",
"notifications": "Thông báo",
- "tags": "Tags",
- "tag": "Topics tagged under \"%1\"",
- "register": "Register an account",
- "login": "Login to your account",
- "reset": "Reset your account password",
- "categories": "Categories",
- "groups": "Groups",
- "group": "%1 group",
- "chats": "Chats",
- "chat": "Chatting with %1",
- "account/edit": "Editing \"%1\"",
- "account/edit/password": "Editing password of \"%1\"",
- "account/edit/username": "Editing username of \"%1\"",
- "account/edit/email": "Editing email of \"%1\"",
- "account/following": "People %1 follows",
- "account/followers": "People who follow %1",
- "account/posts": "Posts made by %1",
- "account/topics": "Topics created by %1",
- "account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
- "account/settings": "User Settings",
- "account/watched": "Topics watched by %1",
- "account/upvoted": "Posts upvoted by %1",
- "account/downvoted": "Posts downvoted by %1",
- "account/best": "Best posts made by %1",
+ "tags": "Tag",
+ "tag": "Chủ đề được gắn tag \"%1\"",
+ "register": "Đăng ký một tài khoản mới",
+ "login": "Đăng nhập vào tài khoản của bạn",
+ "reset": "Phục hồi mật khẩu của bạn",
+ "categories": "Chuyên mục",
+ "groups": "Nhóm",
+ "group": "Nhóm %1",
+ "chats": "Chat",
+ "chat": "Chat với %1",
+ "account/edit": "Chỉnh sửa \"%1\"",
+ "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/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",
+ "account/topics": "Chủ đề được tạo bởi %1",
+ "account/groups": "Nhóm của %1",
+ "account/favourites": "%1's Bookmarked Posts",
+ "account/settings": "Thiết lập",
+ "account/watched": "Chủ đề %1 đang theo dõi",
+ "account/upvoted": "Bài viết %1 tán thành",
+ "account/downvoted": "Bài viết %1 phản đối",
+ "account/best": "Bài viết hay nhất của %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 đang được bảo trì. Xin vui lòng quay lại sau.",
"maintenance.messageIntro": "Ban quản lí để lại lời nhắn sau:",
- "throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
+ "throttled.text": "%1 hiện đang bị quá tải. Vui lòng quay lại sau."
}
\ No newline at end of file
diff --git a/public/language/vi/recent.json b/public/language/vi/recent.json
index 12a131279d..99766aefda 100644
--- a/public/language/vi/recent.json
+++ b/public/language/vi/recent.json
@@ -5,15 +5,15 @@
"month": "Tháng",
"year": "Năm",
"alltime": "Tất cả thời gian",
- "no_recent_topics": "Không có chủ đề nào gần đây",
- "no_popular_topics": "There are no popular topics.",
+ "no_recent_topics": "Không có chủ đề nào gần đây.",
+ "no_popular_topics": "Không có chủ đề nào phổ biến.",
"there-is-a-new-topic": "Có chủ đề mới",
"there-is-a-new-topic-and-a-new-post": "Có chủ đề mới và bài viết mới",
- "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.",
- "there-are-new-topics": "There are %1 new topics.",
- "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.",
- "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.",
+ "there-is-a-new-topic-and-new-posts": "Có 1 chủ đề mới và %1 bài viết mới.",
+ "there-are-new-topics": "Có %1 chủ đề mới.",
+ "there-are-new-topics-and-a-new-post": "Có %1 chủ đề mới và 1 bài viết mới.",
+ "there-are-new-topics-and-new-posts": "Có %1 chủ đề mới và %2 bài viết mới.",
"there-is-a-new-post": "Có bài viết mới",
- "there-are-new-posts": "There are %1 new posts.",
- "click-here-to-reload": "Nhấn vào đây để tải lại"
+ "there-are-new-posts": "Có %1 bài viết mới.",
+ "click-here-to-reload": "Nhấn vào đây để tải lại."
}
\ No newline at end of file
diff --git a/public/language/vi/register.json b/public/language/vi/register.json
index b24f67d78e..91e70a7d0b 100644
--- a/public/language/vi/register.json
+++ b/public/language/vi/register.json
@@ -1,12 +1,12 @@
{
"register": "Đăng ký",
- "help.email": "Theo mặc định, Email của bạn sẽ ở dạng ẩn và public sẽ không thấy được",
+ "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ự",
"email_address": "Địa chỉ Email",
"email_address_placeholder": "Nhập địa chỉ Email",
- "username": "Tên truy cập",
- "username_placeholder": "Nhập tên truy cập",
+ "username": "Tên đăng nhập",
+ "username_placeholder": "Nhập tên đăng nhập",
"password": "Mật khẩu",
"password_placeholder": "Nhập mật khẩu",
"confirm_password": "Xác nhận mật khẩu",
@@ -15,5 +15,5 @@
"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": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator."
+ "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."
}
\ No newline at end of file
diff --git a/public/language/vi/reset_password.json b/public/language/vi/reset_password.json
index 7e3ce09565..53e9e4060c 100644
--- a/public/language/vi/reset_password.json
+++ b/public/language/vi/reset_password.json
@@ -11,7 +11,7 @@
"enter_email_address": "Nhập địa chỉ Email",
"password_reset_sent": "Đã gửi mật khẩu được thiết lập lại",
"invalid_email": "Email không đúng / Email không tồn tại!",
- "password_too_short": "The password entered is too short, please pick a different password.",
- "passwords_do_not_match": "The two passwords you've entered do not match.",
- "password_expired": "Your password has expired, please choose a new password"
+ "password_too_short": "Mật khẩu bạn nhập quá ngắn, vui lòng chọn một mật khẩu khác.",
+ "passwords_do_not_match": "Hai mật khẩu bạn nhập không trùng khớp với nhau.",
+ "password_expired": "Mật khẩu của bạn đã hết hạn, vui lòng chọn một mật khẩu mới."
}
\ No newline at end of file
diff --git a/public/language/vi/search.json b/public/language/vi/search.json
index 312c315c73..6e3244bf2d 100644
--- a/public/language/vi/search.json
+++ b/public/language/vi/search.json
@@ -1,40 +1,40 @@
{
"results_matching": "%1 kết quả(s) trùng với \"%2\", (%3 giây)",
- "no-matches": "No matches found",
- "advanced-search": "Advanced Search",
- "in": "In",
- "titles": "Titles",
- "titles-posts": "Titles and Posts",
- "posted-by": "Posted by",
- "in-categories": "In Categories",
- "search-child-categories": "Search child categories",
- "reply-count": "Reply Count",
- "at-least": "At least",
- "at-most": "At most",
- "post-time": "Post time",
- "newer-than": "Newer than",
- "older-than": "Older than",
- "any-date": "Any date",
- "yesterday": "Yesterday",
- "one-week": "One week",
- "two-weeks": "Two weeks",
- "one-month": "One month",
- "three-months": "Three months",
- "six-months": "Six months",
- "one-year": "One year",
- "sort-by": "Sort by",
- "last-reply-time": "Last reply time",
- "topic-title": "Topic title",
- "number-of-replies": "Number of replies",
- "number-of-views": "Number of views",
- "topic-start-date": "Topic start date",
- "username": "Username",
- "category": "Category",
- "descending": "In descending order",
- "ascending": "In ascending order",
- "save-preferences": "Save preferences",
- "clear-preferences": "Clear preferences",
- "search-preferences-saved": "Search preferences saved",
- "search-preferences-cleared": "Search preferences cleared",
- "show-results-as": "Show results as"
+ "no-matches": "Không tìm thấy kết quả phù hợp",
+ "advanced-search": "Tìm kiếm nâng cao",
+ "in": "Trong",
+ "titles": "Các tựa đề",
+ "titles-posts": "Tựa đề và Bài viết",
+ "posted-by": "Đăng bởi",
+ "in-categories": "Nằm trong chuyên mục",
+ "search-child-categories": "Tìm kiếm chuyên mục con",
+ "reply-count": "Số lượt trả lời",
+ "at-least": "Tối thiểu",
+ "at-most": "Tối đa",
+ "post-time": "Thời điểm đăng bài",
+ "newer-than": "Mới hơn",
+ "older-than": "Cũ hơn",
+ "any-date": "Bất kì ngày nào",
+ "yesterday": "Hôm qua",
+ "one-week": "Một tuần",
+ "two-weeks": "Hai tuần",
+ "one-month": "Một tháng",
+ "three-months": "Ba tháng",
+ "six-months": "Sáu tháng",
+ "one-year": "Một năm",
+ "sort-by": "Sắp xếp theo",
+ "last-reply-time": "Thời điểm trả lời lần cuối",
+ "topic-title": "Tựa đề chủ đề",
+ "number-of-replies": "Số lượt trả lời",
+ "number-of-views": "Số lượt xem",
+ "topic-start-date": "Ngày bắt đầu chủ đề",
+ "username": "Tên đăng nhập",
+ "category": "Chuyên mục ",
+ "descending": "Theo thứ tự giảm dần",
+ "ascending": "Theo thứ tự tăng dần",
+ "save-preferences": "Lưu tuỳ chọn",
+ "clear-preferences": "Xoá tuỳ chọn",
+ "search-preferences-saved": "Tìm kiếm tuỳ chọn đã lưu",
+ "search-preferences-cleared": "Tìm kiếm tuỳ chọn đã xoá",
+ "show-results-as": "Hiện thị kết quả theo"
}
\ No newline at end of file
diff --git a/public/language/vi/tags.json b/public/language/vi/tags.json
index 7b8931883f..f0bd336781 100644
--- a/public/language/vi/tags.json
+++ b/public/language/vi/tags.json
@@ -1,7 +1,7 @@
{
"no_tag_topics": "Không có bài viết nào với thẻ này.",
"tags": "Thẻ",
- "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
- "enter_tags_here_short": "Tên thẻ...",
+ "enter_tags_here": "Nhập thẻ ở đây, mỗi thẻ phải có từ %1 tới %2 ký tự.",
+ "enter_tags_here_short": "Nhập thẻ...",
"no_tags": "Chưa có thẻ nào."
}
\ No newline at end of file
diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json
index 0248c39aad..683acae9fa 100644
--- a/public/language/vi/topic.json
+++ b/public/language/vi/topic.json
@@ -13,20 +13,20 @@
"notify_me": "Được thông báo khi có trả lời mới trong chủ đề này",
"quote": "Trích dẫn",
"reply": "Trả lời",
- "reply-as-topic": "Reply as topic",
+ "reply-as-topic": "Trả lời dưới dạng chủ đề",
"guest-login-reply": "Hãy đăng nhập để trả lời",
"edit": "Chỉnh sửa",
"delete": "Xóa",
"purge": "Xóa hẳn",
"restore": "Phục hồi",
"move": "Chuyển đi",
- "fork": "Fork",
- "link": "đường dẫn",
+ "fork": "Tạo bản sao",
+ "link": "Đường dẫn",
"share": "Chia sẻ",
"tools": "Công cụ",
- "flag": "Flag",
+ "flag": "Gắn cờ",
"locked": "Khóa",
- "bookmark_instructions": "Click here to return to the last unread post in this thread.",
+ "bookmark_instructions": "Nhấn vào đây để trở lại bài viết cuối cùng mà bạn chưa đọc trong chủ đề này.",
"flag_title": "Flag bài viết này để chỉnh sửa",
"flag_success": "Chủ đề này đã được flag để chỉnh sửa",
"deleted_message": "Chủ đề này đã bị xóa. Chỉ ban quản trị mới xem được.",
@@ -34,8 +34,8 @@
"not_following_topic.message": "Bạn sẽ không còn nhận được thông báo từ chủ đề này",
"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ộ",
- "mark_unread": "Mark unread",
- "mark_unread.success": "Topic marked as unread.",
+ "mark_unread": "Đánh dấu chưa đọc",
+ "mark_unread.success": "Chủ đề đã được đánh dấu chưa đọc.",
"watch": "Theo dõi",
"unwatch": "Ngừng theo dõi",
"watch.title": "Được thông báo khi có trả lời mới trong chủ đề này",
@@ -49,9 +49,9 @@
"thread_tools.unlock": "Mở khóa chủ đề",
"thread_tools.move": "Chuyển chủ đề",
"thread_tools.move_all": "Chuyển tất cả",
- "thread_tools.fork": "Fork chủ đề",
+ "thread_tools.fork": "Tạo bản sao chủ đề",
"thread_tools.delete": "Xóa chủ đề",
- "thread_tools.delete-posts": "Delete Posts",
+ "thread_tools.delete-posts": "Xoá bài viết",
"thread_tools.delete_confirm": "Bạn có muốn xóa chủ đề này?",
"thread_tools.restore": "Phục hồi chủ đề",
"thread_tools.restore_confirm": "Bạn có muốn phục hồi chủ đề này?",
@@ -63,25 +63,25 @@
"post_purge_confirm": "Bạn có chắc muốn xóa hẳn bài này?",
"load_categories": "Đang tải các phần mục",
"disabled_categories_note": "Các phần mục bị khóa đã được đánh xám",
- "confirm_move": "Chuyển",
- "confirm_fork": "Fork",
- "favourite": "Yêu thích",
- "favourites": "Đang yêu thích",
- "favourites.has_no_favourites": "Bạn đang không có yêu thích nào. Hãy yêu thích một vài bài viết để thấy được chúng tại đây!",
+ "confirm_move": "Di chuyển",
+ "confirm_fork": "Tạo bảo sao",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "Tải thêm các bài gửi khác",
"move_topic": "Chuyển chủ đề",
"move_topics": "Di chuyển chủ đề",
"move_post": "Chuyển bài gửi",
"post_moved": "Đã chuyển bài gửi!",
- "fork_topic": "Fork chủ đề",
+ "fork_topic": "Tạo bản sao chủ đề",
"topic_will_be_moved_to": "Chủ đề này sẽ được chuyển tới phần mục",
- "fork_topic_instruction": "Nhấp vào bài gửi mà bạn muốn fork",
+ "fork_topic_instruction": "Chọn vào bài gửi mà bạn muốn fork",
"fork_no_pids": "Chưa chọn bài gửi nào!",
"fork_success": "Tạo bản sao thành công! Nhấn vào đây để chuyển tới chủ đề vừa tạo.",
- "delete_posts_instruction": "Click the posts you want to delete/purge",
+ "delete_posts_instruction": "Chọn những bài viết bạn muốn xoá",
"composer.title_placeholder": "Nhập tiêu đề cho chủ đề của bạn tại đây...",
"composer.handle_placeholder": "Tên",
- "composer.discard": "Loại bỏ",
+ "composer.discard": "Huỷ bỏ",
"composer.submit": "Gửi",
"composer.replying_to": "Đang trả lời %1",
"composer.new_topic": "Chủ đề mới",
@@ -101,12 +101,12 @@
"newest_to_oldest": "Mới đến cũ",
"most_votes": "Bình chọn nhiều nhất",
"most_posts": "Có nhiều bài viết nhất",
- "stale.title": "Create new topic instead?",
- "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
- "stale.create": "Create a new topic",
- "stale.reply_anyway": "Reply to this topic anyway",
+ "stale.title": "Tạo chủ đề mới?",
+ "stale.warning": "Chủ đề bạn đang trả lời đã khá cũ. Bạn có muốn tạo chủ đề mới, và liên kết với chủ đề hiện tại trong bài viết trả lời của bạn?",
+ "stale.create": "Tạo chủ đề mới",
+ "stale.reply_anyway": "Trả lời chủ đề này",
"link_back": "Re: [%1](%2)",
"spam": "Spam",
- "offensive": "Offensive",
- "custom-flag-reason": "Enter a flagging reason"
+ "offensive": "Phản cảm",
+ "custom-flag-reason": "Nhập lý do bị gắn cờ"
}
\ No newline at end of file
diff --git a/public/language/vi/unread.json b/public/language/vi/unread.json
index 049d36dba3..14233ae900 100644
--- a/public/language/vi/unread.json
+++ b/public/language/vi/unread.json
@@ -5,6 +5,6 @@
"mark_as_read": "Đánh dấu đã đọc",
"selected": "Đã chọn",
"all": "Tất cả",
- "all_categories": "All categories",
+ "all_categories": "Tất cả chuyên mục",
"topics_marked_as_read.success": "Chủ đề được đánh dấu đã đọc"
}
\ No newline at end of file
diff --git a/public/language/vi/user.json b/public/language/vi/user.json
index a6e095cadb..188905b64b 100644
--- a/public/language/vi/user.json
+++ b/public/language/vi/user.json
@@ -6,13 +6,13 @@
"postcount": "Số bài viết",
"email": "Email",
"confirm_email": "Xác nhận email",
- "ban_account": "Ban Account",
- "ban_account_confirm": "Do you really want to ban this user?",
- "unban_account": "Unban Account",
+ "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",
"delete_account": "Xóa tài khoản",
"delete_account_confirm": "Bạn có chắc muốn xóa tài khoản của mình?
Hành động này không thể khôi phục và bạn sẽ mất toàn bộ dữ liệu
Hãy nhập tên đăng nhập để xác nhận.",
- "delete_this_account_confirm": "Are you sure you want to delete this account?
This action is irreversible and you will not be able to recover any data
",
- "account-deleted": "Account deleted",
+ "delete_this_account_confirm": "Bạn có chắc bạn muốn xoá tài khoản này chứ?
Tác vụ này không thể đảo ngược và bạn sẽ không thể phục hồi lại được dữ liệu đã xoá
",
+ "account-deleted": "Tài khoản đã bị xoá",
"fullname": "Tên đầy đủ",
"website": "Website",
"location": "Địa điểm",
@@ -22,24 +22,24 @@
"profile": "Hồ sơ",
"profile_views": "Số lượt người ghé thăm",
"reputation": "Mức uy tín",
- "favourites": "Yêu thích",
+ "favourites": "Bookmarks",
"watched": "Đã theo dõi",
"followers": "Số người theo dõi",
"following": "Đang theo dõi",
- "aboutme": "About me",
+ "aboutme": "Giới thiệu bản thân",
"signature": "Chữ ký",
"birthday": "Ngày sinh ",
"chat": "Chat",
- "chat_with": "Chat with %1",
+ "chat_with": "Chat với %1",
"follow": "Theo dõi",
"unfollow": "Hủy theo dõi",
"more": "Xem thêm",
"profile_update_success": "Hồ sơ đã được cập nhật thành công",
"change_picture": "Thay đổi hình ảnh",
- "change_username": "Change Username",
- "change_email": "Change Email",
+ "change_username": "Đổi tên đăng nhập",
+ "change_email": "Đổi email",
"edit": "Chỉnh sửa",
- "default_picture": "Default Icon",
+ "default_picture": "Icon mặc định",
"uploaded_picture": "Ảnh đã tải lên",
"upload_new_picture": "Tải lên ảnh mới",
"upload_new_picture_from_url": "Tải ảnh mới từ URL",
@@ -54,11 +54,12 @@
"confirm_password": "Xác nhận mật khẩu",
"password": "Mật khẩu",
"username_taken_workaround": "Tên truy cập này đã tồn tại, vì vậy chúng tôi đã sửa đổi nó một chút. Tên truy cập của bạn giờ là %1",
- "password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_username": "Mật khẩu của bạn trùng với tên đăng nhập, vui lòng chọn một mật khẩu khác.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "Tải lên hình ảnh",
"upload_a_picture": "Tải lên một hình ảnh",
- "remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "remove_uploaded_picture": "Xoá ảnh đã tải lên",
+ "upload_cover_picture": "Upload cover picture",
"settings": "Thiết lập",
"show_email": "Hiện Email của tôi",
"show_fullname": "Hiện tên đầy đủ",
@@ -74,33 +75,33 @@
"settings-require-reload": "Một số thay đổi trong cài đặt đòi hỏi tải lại. Nhấn vào đây để tải lại trang.",
"has_no_follower": "Người dùng này hiện chưa có ai theo dõi :(",
"follows_no_one": "Người dùng này hiện chưa theo dõi ai :(",
- "has_no_posts": "This user hasn't posted anything yet.",
- "has_no_topics": "This user hasn't posted any topics yet.",
- "has_no_watched_topics": "This user hasn't watched any topics yet.",
- "has_no_upvoted_posts": "This user hasn't upvoted any posts yet.",
- "has_no_downvoted_posts": "This user hasn't downvoted any posts yet.",
- "has_no_voted_posts": "This user has no voted posts",
+ "has_no_posts": "Thành viên này chưa đăng bài viết nào cả.",
+ "has_no_topics": "Thành viên này chưa đăng chủ đề nào cả.",
+ "has_no_watched_topics": "Thành viên này chưa theo dõi chủ đề nào cả.",
+ "has_no_upvoted_posts": "Thành viên này chưa tán thành bài viết nào cả.",
+ "has_no_downvoted_posts": "Thành viên này chưa phản đối bài viết nào cả.",
+ "has_no_voted_posts": "Thành viên này không có bài viết nào được tán thành.",
"email_hidden": "Ẩn Email",
"hidden": "Đã ẩn",
- "paginate_description": "Paginate topics and posts instead of using infinite scroll",
+ "paginate_description": "Phân trang chủ đề và bài viết thay vì sử dụng cuộn vô hạn",
"topics_per_page": "Số chủ đề trong một trang",
"posts_per_page": "Số bài viết trong một trang",
- "notification_sounds": "Play a sound when you receive a notification",
+ "notification_sounds": "Phát âm thanh khi bạn nhận được thông báo mới",
"browsing": "Đang xem cài đặt",
- "open_links_in_new_tab": "Open outgoing links in new tab",
+ "open_links_in_new_tab": "Mở link trong tab mới.",
"enable_topic_searching": "Bật In-topic Searching",
- "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
- "follow_topics_you_reply_to": "Follow topics that you reply to",
- "follow_topics_you_create": "Follow topics you create",
+ "topic_search_help": "Nếu bật, tìm kiếm trong chủ đề sẽ thay thế tính năng tính năng tìm kiếm của trình duyệt và cho phép bạn tìm kiếm trong toàn bộ chủ đề, thay vì chỉ tìm kiếm nội dung đang hiện thị trên màn hình",
+ "follow_topics_you_reply_to": "Theo dõi chủ đề bạn trả lời",
+ "follow_topics_you_create": "Theo dõi chủ đề bạn tạo",
"grouptitle": "Chọn tên nhóm mà bạn muốn hiển thị",
- "no-group-title": "No group title",
- "select-skin": "Select a Skin",
- "select-homepage": "Select a Homepage",
- "homepage": "Homepage",
- "homepage_description": "Select a page to use as the forum homepage or 'None' to use the default homepage.",
- "custom_route": "Custom Homepage Route",
- "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"
+ "no-group-title": "Không có tên nhóm",
+ "select-skin": "Chọn một giao diện",
+ "select-homepage": "Chọn Trang chủ",
+ "homepage": "Trang chủ",
+ "homepage_description": "Chọn một trang để sử dụng như trang chủ của diễn đàn hoặc chọn \"None\" để sử dụng trang chủ mặc định.",
+ "custom_route": "Đường dẫn trang chủ tuỳ chọn",
+ "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"
}
\ No newline at end of file
diff --git a/public/language/vi/users.json b/public/language/vi/users.json
index adf12ca433..0e60994360 100644
--- a/public/language/vi/users.json
+++ b/public/language/vi/users.json
@@ -1,20 +1,20 @@
{
- "latest_users": "Những người dùng mới nhất",
- "top_posters": "Những người viết bài nhiều nhất",
- "most_reputation": "Uy tín nhất",
+ "latest_users": "Thành viên mới nhất",
+ "top_posters": "Thành viên đăng bài nhiều nhất",
+ "most_reputation": "Thành viên có điểm tín nhiệm cao nhất",
"search": "Tìm kiếm",
- "enter_username": "Gõ tên người dùng để tìm kiếm",
+ "enter_username": "Gõ tên thành viên để tìm kiếm",
"load_more": "Tải thêm",
- "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
- "filter-by": "Filter By",
- "online-only": "Online only",
- "invite": "Invite",
- "invitation-email-sent": "An invitation email has been sent to %1",
- "user_list": "User List",
- "recent_topics": "Recent Topics",
- "popular_topics": "Popular Topics",
- "unread_topics": "Unread Topics",
- "categories": "Categories",
- "tags": "Tags",
- "no-users-found": "No users found!"
+ "users-found-search-took": "Đã tìm thấy %1 thành viên! Tìm kiếm mất %2 giây.",
+ "filter-by": "Lọc bằng",
+ "online-only": "Đang online",
+ "invite": "Mời",
+ "invitation-email-sent": "Email mời đã được gửi tới %1",
+ "user_list": "Danh sách thành viên",
+ "recent_topics": "Chủ đề mới",
+ "popular_topics": "Chủ để nổi bật",
+ "unread_topics": "Chủ đề chưa đọc",
+ "categories": "Chuyên mục",
+ "tags": "Thẻ",
+ "no-users-found": "Không tìm thấy thành viên nào!"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json
index 730af9e35d..ab0a5b42b8 100644
--- a/public/language/zh_CN/error.json
+++ b/public/language/zh_CN/error.json
@@ -50,8 +50,8 @@
"still-uploading": "请等待上传完成",
"file-too-big": "上传文件的大小限制为 %1 KB - 请缩减文件大小",
"guest-upload-disabled": "未登录用户不允许上传",
- "already-favourited": "您已收藏该帖",
- "already-unfavourited": "您已取消收藏此帖",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "您不能封禁其他管理员！",
"cant-remove-last-admin": "您是唯一的管理员。在删除您的管理员权限前，请添加另一个管理员。",
"invalid-image-type": "无效的图像类型。允许的类型有：%1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "请输入您的用户名登录",
"invite-maximum-met": "您的邀请人数超出了上限 (%1 超过了 %2)。",
"no-session-found": "未登录!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/global.json b/public/language/zh_CN/global.json
index 0b11cde25a..e6501acb20 100644
--- a/public/language/zh_CN/global.json
+++ b/public/language/zh_CN/global.json
@@ -86,5 +86,9 @@
"delete_all": "全部删除",
"map": "地图",
"sessions": "已登录的会话",
- "ip_address": "IP地址"
+ "ip_address": "IP地址",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/groups.json b/public/language/zh_CN/groups.json
index 81e38901cb..45964d8d2b 100644
--- a/public/language/zh_CN/groups.json
+++ b/public/language/zh_CN/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "加入小组",
"membership.leave-group": "退出小组",
"membership.reject": "拒绝",
- "new-group.group_name": "组名: "
+ "new-group.group_name": "组名: ",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json
index 2880311394..9d22253112 100644
--- a/public/language/zh_CN/notifications.json
+++ b/public/language/zh_CN/notifications.json
@@ -16,9 +16,9 @@
"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 收藏了您的帖子。",
+ "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/zh_CN/pages.json b/public/language/zh_CN/pages.json
index 1b8ffa7227..bc9f7f1fa5 100644
--- a/public/language/zh_CN/pages.json
+++ b/public/language/zh_CN/pages.json
@@ -33,12 +33,13 @@
"account/posts": "%1 发布的帖子",
"account/topics": "%1 创建的主题",
"account/groups": "%1 的小组",
- "account/favourites": "%1 收藏的帖子",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "用户设置",
"account/watched": "主题已被 %1 关注",
"account/upvoted": "帖子被 %1 顶过",
"account/downvoted": "帖子被 %1 踩过",
"account/best": "%1 发布的最佳帖子",
+ "confirm": "Email Confirmed",
"maintenance.text": "%1 正在进行维护。请稍后再来。",
"maintenance.messageIntro": "此外，管理员留下的消息：",
"throttled.text": "%1 因负荷超载暂不可用。请稍后再来。"
diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json
index eb76dc0eaf..7b1a9d98f0 100644
--- a/public/language/zh_CN/topic.json
+++ b/public/language/zh_CN/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "停用的版面为灰色",
"confirm_move": "移动",
"confirm_fork": "分割",
- "favourite": "收藏",
- "favourites": "收藏",
- "favourites.has_no_favourites": "您还没有任何收藏，收藏后的帖子会显示在这里！",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "正在加载更多帖子",
"move_topic": "移动主题",
"move_topics": "移动主题",
diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json
index fd4439ca6b..3eda0be577 100644
--- a/public/language/zh_CN/user.json
+++ b/public/language/zh_CN/user.json
@@ -22,7 +22,7 @@
"profile": "资料",
"profile_views": "资料浏览",
"reputation": "威望",
- "favourites": "收藏的帖子",
+ "favourites": "Bookmarks",
"watched": "已订阅",
"followers": "粉丝",
"following": "关注",
@@ -55,10 +55,11 @@
"password": "密码",
"username_taken_workaround": "您申请的用户名已被占用，所以我们稍作更改。您现在的用户名是 %1",
"password_same_as_username": "您的密码与用户名相同，请选择另外的密码。",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "上传头像",
"upload_a_picture": "上传头像",
"remove_uploaded_picture": "删除已上传的头像",
- "image_spec": "您只可以上传PNG、JPG或 BMP 格式的文件",
+ "upload_cover_picture": "Upload cover picture",
"settings": "设置",
"show_email": "显示我的电子邮箱",
"show_fullname": "显示我的全名",
diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json
index c36a4ed0bb..f56559ea37 100644
--- a/public/language/zh_TW/error.json
+++ b/public/language/zh_TW/error.json
@@ -50,8 +50,8 @@
"still-uploading": "請等待上傳完成。",
"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
"guest-upload-disabled": "Guest uploading has been disabled",
- "already-favourited": "你已經收藏了這篇文章",
- "already-unfavourited": "你已放棄收藏這篇文章",
+ "already-favourited": "You have already bookmarked this post",
+ "already-unfavourited": "You have already unbookmarked this post",
"cant-ban-other-admins": "您無法禁止其他的管理員！",
"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
"invalid-image-type": "無效的圖像類型。允許的類型：%1",
@@ -96,5 +96,6 @@
"wrong-login-type-username": "請使用您的使用者名稱進行登錄",
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!",
- "not-in-room": "User not in room"
+ "not-in-room": "User not in room",
+ "no-users-in-room": "No users in this room"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/global.json b/public/language/zh_TW/global.json
index 82d1ff0589..10e4169e07 100644
--- a/public/language/zh_TW/global.json
+++ b/public/language/zh_TW/global.json
@@ -86,5 +86,9 @@
"delete_all": "全部刪除",
"map": "Map",
"sessions": "Login Sessions",
- "ip_address": "IP Address"
+ "ip_address": "IP Address",
+ "enter_page_number": "Enter page number",
+ "upload_file": "Upload file",
+ "upload": "Upload",
+ "allowed-file-types": "Allowed file types are %1"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/groups.json b/public/language/zh_TW/groups.json
index 170bf7ee23..9e8658c7e1 100644
--- a/public/language/zh_TW/groups.json
+++ b/public/language/zh_TW/groups.json
@@ -48,5 +48,6 @@
"membership.join-group": "Join Group",
"membership.leave-group": "Leave Group",
"membership.reject": "Reject",
- "new-group.group_name": "Group Name:"
+ "new-group.group_name": "Group Name:",
+ "upload-group-cover": "Upload group cover"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/notifications.json b/public/language/zh_TW/notifications.json
index 4711f56a36..477d2e91ab 100644
--- a/public/language/zh_TW/notifications.json
+++ b/public/language/zh_TW/notifications.json
@@ -16,9 +16,9 @@
"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 收藏了你在 %2的post。",
- "favourited_your_post_in_dual": "%1 and %2 have favourited your post in %3.",
- "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.",
+ "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裡的一個post。",
"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/zh_TW/pages.json b/public/language/zh_TW/pages.json
index be4eda4d90..121be06593 100644
--- a/public/language/zh_TW/pages.json
+++ b/public/language/zh_TW/pages.json
@@ -33,12 +33,13 @@
"account/posts": "Posts made by %1",
"account/topics": "Topics created by %1",
"account/groups": "%1's Groups",
- "account/favourites": "%1's Favourite Posts",
+ "account/favourites": "%1's Bookmarked Posts",
"account/settings": "User Settings",
"account/watched": "Topics watched by %1",
"account/upvoted": "Posts upvoted by %1",
"account/downvoted": "Posts downvoted by %1",
"account/best": "Best posts made by %1",
+ "confirm": "Email Confirmed",
"maintenance.text": "目前 %1 正在進行維修。請稍後再來。",
"maintenance.messageIntro": "此外，管理員有以下訊息：",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json
index 39184aa828..62f48e9523 100644
--- a/public/language/zh_TW/topic.json
+++ b/public/language/zh_TW/topic.json
@@ -65,9 +65,9 @@
"disabled_categories_note": "停用的版面為灰色",
"confirm_move": "移動",
"confirm_fork": "作為主題",
- "favourite": "收藏",
- "favourites": "收藏",
- "favourites.has_no_favourites": "你還沒有任何收藏，收藏的文章將會出現在這裡！",
+ "favourite": "Bookmark",
+ "favourites": "Bookmarks",
+ "favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
"loading_more_posts": "載入更多文章",
"move_topic": "移動主題",
"move_topics": "移動主題",
diff --git a/public/language/zh_TW/user.json b/public/language/zh_TW/user.json
index e0c737d761..b69a38a69f 100644
--- a/public/language/zh_TW/user.json
+++ b/public/language/zh_TW/user.json
@@ -22,7 +22,7 @@
"profile": "個人資料",
"profile_views": "資料被查看",
"reputation": "聲譽",
- "favourites": "我的最愛",
+ "favourites": "Bookmarks",
"watched": "觀看者",
"followers": "跟隨者",
"following": "正在關注",
@@ -55,10 +55,11 @@
"password": "密碼",
"username_taken_workaround": "您所註冊的使用者名稱已經被使用了，所以我們將它略微改變。你現在改稱 %1",
"password_same_as_username": "Your password is the same as your username, please select another password.",
+ "password_same_as_email": "Your password is the same as your email, please select another password.",
"upload_picture": "上傳頭像",
"upload_a_picture": "上傳一張照片",
"remove_uploaded_picture": "Remove Uploaded Picture",
- "image_spec": "You may only upload PNG, JPG, or BMP files",
+ "upload_cover_picture": "Upload cover picture",
"settings": "設定",
"show_email": "顯示我的郵箱",
"show_fullname": "顯示我的全名",
diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js
index a845b59790..c6da11cd88 100644
--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@@ -1,5 +1,5 @@
"use strict";
-/*global define, app, socket, ajaxify, RELATIVE_PATH, bootbox, templates, Chart */
+/*global config, define, app, socket, ajaxify, bootbox, templates, Chart, utils */
define('admin/manage/category', [
'uploader',
@@ -75,7 +75,7 @@ define('admin/manage/category', [
}
});
- $('[data-name="imageClass"]').on('change', function(ev) {
+ $('[data-name="imageClass"]').on('change', function() {
$('.category-preview').css('background-size', $(this).val());
});
@@ -103,7 +103,11 @@ define('admin/manage/category', [
var inputEl = $(this),
cid = inputEl.attr('data-cid');
- uploader.open(RELATIVE_PATH + '/api/admin/category/uploadpicture', { cid: cid }, 0, function(imageUrlOnServer) {
+ uploader.show({
+ title: 'Upload category image',
+ route: config.relative_path + '/api/admin/category/uploadpicture',
+ params: {cid: cid}
+ }, function(imageUrlOnServer) {
inputEl.val(imageUrlOnServer);
var previewBox = inputEl.parent().parent().siblings('.category-preview');
previewBox.css('background', 'url(' + imageUrlOnServer + '?' + new Date().getTime() + ')');
@@ -123,7 +127,7 @@ define('admin/manage/category', [
$(this).parent().addClass('hide').hide();
});
- $('.category-preview').on('click', function(ev) {
+ $('.category-preview').on('click', function() {
iconSelect.init($(this).find('i'), modified);
});
@@ -145,7 +149,7 @@ define('admin/manage/category', [
});
Category.setupPrivilegeTable();
-
+
if (window.location.hash === '#analytics') {
Category.setupGraphs();
} else {
diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js
index 273b7be0a3..c4b880f761 100644
--- a/public/src/admin/settings.js
+++ b/public/src/admin/settings.js
@@ -111,10 +111,12 @@ define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) {
var uploadBtn = $(this);
uploadBtn.on('click', function() {
uploader.show({
+ title: uploadBtn.attr('data-title'),
+ description: uploadBtn.attr('data-description'),
route: uploadBtn.attr('data-route'),
params: {},
- fileSize: 0,
- showHelp: uploadBtn.attr('data-help') ? uploadBtn.attr('data-help') === 1 : undefined
+ showHelp: uploadBtn.attr('data-help') ? uploadBtn.attr('data-help') === 1 : undefined,
+ accept: uploadBtn.attr('data-accept')
}, function(image) {
// need to move these into template, ex data-callback
if (ajaxify.currentPage === 'admin/general/sounds') {
diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js
index a436b2c6dd..0c22e33d56 100644
--- a/public/src/client/account/edit.js
+++ b/public/src/client/account/edit.js
@@ -4,8 +4,7 @@
define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'], function(header, uploader, translator) {
var AccountEdit = {},
- uploadedPicture = '',
- selectedImageType = '';
+ uploadedPicture = '';
AccountEdit.init = function() {
uploadedPicture = ajaxify.data.uploadedpicture;
@@ -81,9 +80,9 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
// boolean to signify whether an uploaded picture is present in the pictures list
var uploaded = pictures.reduce(function(memo, cur) {
- return memo || cur.type === 'uploaded'
+ return memo || cur.type === 'uploaded';
}, false);
-
+
templates.parse('partials/modals/change_picture_modal', {
pictures: pictures,
uploaded: uploaded,
@@ -109,12 +108,15 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
});
modal.on('shown.bs.modal', updateImages);
- modal.on('click', '.list-group-item', selectImageType);
+ modal.on('click', '.list-group-item', function selectImageType() {
+ modal.find('.list-group-item').removeClass('active');
+ $(this).addClass('active');
+ });
+
handleImageUpload(modal);
function updateImages() {
- var currentPicture = $('#user-current-picture').attr('src'),
- userIcon = modal.find('.user-icon');
+ var userIcon = modal.find('.user-icon');
userIcon
.css('background-color', ajaxify.data['icon:bgColor'])
@@ -128,15 +130,10 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
if (this.getAttribute('src') === ajaxify.data.picture) {
$(this).parents('.list-group-item').addClass('active');
}
- })
+ });
}
}
- function selectImageType() {
- modal.find('.list-group-item').removeClass('active');
- $(this).addClass('active');
- }
-
function saveSelection() {
var type = modal.find('.list-group-item.active').attr('data-type'),
src = modal.find('.list-group-item.active img').attr('src');
@@ -213,7 +210,15 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
modal.find('[data-action="upload"]').on('click', function() {
modal.modal('hide');
- uploader.open(config.relative_path + '/api/user/' + ajaxify.data.userslug + '/uploadpicture', {}, ajaxify.data.maximumProfileImageSize, function(imageUrlOnServer) {
+
+ uploader.show({
+ route: config.relative_path + '/api/user/' + ajaxify.data.userslug + '/uploadpicture',
+ params: {},
+ fileSize: ajaxify.data.maximumProfileImageSize,
+ title: '[[user:upload_picture]]',
+ description: '[[user:upload_a_picture]]',
+ accept: '.png,.jpg,.bmp'
+ }, function(imageUrlOnServer) {
onUploadComplete(imageUrlOnServer);
});
diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js
index 6449ac839f..520224d9ef 100644
--- a/public/src/client/account/header.js
+++ b/public/src/client/account/header.js
@@ -74,7 +74,12 @@ define('forum/account/header', [
}, callback);
},
function() {
- uploader.open(config.relative_path + '/api/user/' + ajaxify.data.userslug + '/uploadcover', { uid: yourid }, 0, function(imageUrlOnServer) {
+ uploader.show({
+ title: '[[user:upload_cover_picture]]',
+ route: config.relative_path + '/api/user/' + ajaxify.data.userslug + '/uploadcover',
+ params: {uid: yourid },
+ accept: '.png,.jpg,.bmp'
+ }, function(imageUrlOnServer) {
components.get('account/cover').css('background-image', 'url(' + imageUrlOnServer + '?v=' + Date.now() + ')');
});
},
diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js
index de2fccd842..05375476dd 100644
--- a/public/src/client/groups/details.js
+++ b/public/src/client/groups/details.js
@@ -30,7 +30,11 @@ define('forum/groups/details', [
}, callback);
},
function() {
- uploader.open(RELATIVE_PATH + '/api/groups/uploadpicture', { groupName: groupName }, 0, function(imageUrlOnServer) {
+ uploader.show({
+ title: '[[groups:upload-group-cover]]',
+ route: config.relative_path + '/api/groups/uploadpicture',
+ params: {groupname: groupName}
+ }, function(imageUrlOnServer) {
components.get('groups/cover').css('background-image', 'url(' + imageUrlOnServer + ')');
});
},
diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js
index ce66d37c17..575508b2b9 100644
--- a/public/src/modules/uploader.js
+++ b/public/src/modules/uploader.js
@@ -1,6 +1,6 @@
'use strict';
-/* globals define, templates, translator */
+/* globals define, templates */
define('uploader', ['csrf', 'translator'], function(csrf, translator) {
@@ -18,7 +18,11 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
module.show = function(data, callback) {
parseModal({
showHelp: data.hasOwnProperty('showHelp') && data.showHelp !== undefined ? data.showHelp : true,
- fileSize: data.hasOwnProperty('fileSize') && data.fileSize !== undefined ? parseInt(data.fileSize, 10) : false
+ fileSize: data.hasOwnProperty('fileSize') && data.fileSize !== undefined ? parseInt(data.fileSize, 10) : false,
+ title: data.title || '[[global:upload_file]]',
+ description: data.description || '',
+ button: data.button || '[[global:upload]]',
+ accept: data.accept ? data.accept.replace(/,/g, ',') : ''
}, function(uploadModal) {
uploadModal = $(uploadModal);
@@ -31,65 +35,63 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
uploadForm.attr('action', data.route);
uploadForm.find('#params').val(JSON.stringify(data.params));
- uploadModal.find('#pictureUploadSubmitBtn').off('click').on('click', function() {
+ uploadModal.find('#fileUploadSubmitBtn').on('click', function() {
uploadForm.submit();
});
- uploadForm.off('submit').submit(function() {
+ uploadForm.submit(function() {
+ onSubmit(uploadModal, callback);
+ return false;
+ });
+ });
+ };
- function showAlert(type, message) {
- module.hideAlerts(uploadModal);
- uploadModal.find('#alert-' + type).translateText(message).removeClass('hide');
- }
+ function onSubmit(uploadModal, callback) {
+ function showAlert(type, message) {
+ module.hideAlerts(uploadModal);
+ uploadModal.find('#alert-' + type).translateText(message).removeClass('hide');
+ }
- showAlert('status', '[[uploads:uploading-file]]');
+ showAlert('status', '[[uploads:uploading-file]]');
- uploadModal.find('#upload-progress-bar').css('width', '0%');
- uploadModal.find('#upload-progress-box').show().removeClass('hide');
+ uploadModal.find('#upload-progress-bar').css('width', '0%');
+ uploadModal.find('#upload-progress-box').show().removeClass('hide');
- if (!uploadModal.find('#userPhotoInput').val()) {
- showAlert('error', '[[uploads:select-file-to-upload]]');
- return false;
+ if (!uploadModal.find('#fileInput').val()) {
+ return showAlert('error', '[[uploads:select-file-to-upload]]');
+ }
+
+ uploadModal.find('#uploadForm').ajaxSubmit({
+ headers: {
+ 'x-csrf-token': csrf.get()
+ },
+ error: function(xhr) {
+ xhr = maybeParse(xhr);
+ showAlert('error', xhr.responseJSON ? (xhr.responseJSON.error || xhr.statusText) : 'error uploading, code : ' + xhr.status);
+ },
+ uploadProgress: function(event, position, total, percent) {
+ uploadModal.find('#upload-progress-bar').css('width', percent + '%');
+ },
+ success: function(response) {
+ response = maybeParse(response);
+
+ if (response.error) {
+ return showAlert('error', response.error);
}
- $(this).ajaxSubmit({
- headers: {
- 'x-csrf-token': csrf.get()
- },
- error: function(xhr) {
- xhr = maybeParse(xhr);
- showAlert('error', xhr.responseJSON ? (xhr.responseJSON.error || xhr.statusText) : 'error uploading, code : ' + xhr.status);
- },
-
- uploadProgress: function(event, position, total, percent) {
- uploadModal.find('#upload-progress-bar').css('width', percent + '%');
- },
-
- success: function(response) {
- response = maybeParse(response);
-
- if (response.error) {
- showAlert('error', response.error);
- return;
- }
-
- callback(response[0].url);
-
- showAlert('success', '[[uploads:upload-success]]');
- setTimeout(function() {
- module.hideAlerts(uploadModal);
- uploadModal.modal('hide');
- }, 750);
- }
- });
+ callback(response[0].url);
- return false;
- });
+ showAlert('success', '[[uploads:upload-success]]');
+ setTimeout(function() {
+ module.hideAlerts(uploadModal);
+ uploadModal.modal('hide');
+ }, 750);
+ }
});
- };
+ }
function parseModal(tplVals, callback) {
- templates.parse('partials/modals/upload_picture_modal', tplVals, function(html) {
+ templates.parse('partials/modals/upload_file_modal', tplVals, function(html) {
translator.translate(html, callback);
});
}
diff --git a/src/messaging.js b/src/messaging.js
index e39e9f0d3b..1974313c81 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -314,7 +314,7 @@ var async = require('async'),
Messaging.canMessageUser = function(uid, toUid, callback) {
if (parseInt(meta.config.disableChat) === 1 || !uid || uid === toUid) {
- return callback(null, false);
+ return callback(new Error('[[error:chat-disabled]]'));
}
async.waterfall([
@@ -323,43 +323,40 @@ var async = require('async'),
},
function (exists, next) {
if (!exists) {
- return callback(null, false);
+ return callback(new Error('[[error:no-user]]'));
}
user.getUserFields(uid, ['banned', 'email:confirmed'], next);
},
function (userData, next) {
if (parseInt(userData.banned, 10) === 1) {
- return callback(null, false);
+ return callback(new Error('[[error:user-banned]]'));
}
if (parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) {
- return callback(null, false);
+ return callback(new Error('[[error:email-not-confirmed-chat]]'));
}
- user.getSettings(toUid, next);
+ async.parallel({
+ settings: async.apply(user.getSettings, toUid),
+ isAdmin: async.apply(user.isAdministrator, uid),
+ isFollowing: async.apply(user.isFollowing, toUid, uid)
+ }, next);
},
- function(settings, next) {
- if (!settings.restrictChat) {
- return callback(null, true);
+ function(results, next) {
+ if (!results.settings.restrictChat || results.isAdmin || results.isFollowing) {
+ return next();
}
- user.isAdministrator(uid, next);
- },
- function(isAdmin, next) {
- if (isAdmin) {
- return callback(null, true);
- }
- user.isFollowing(toUid, uid, next);
+ next(new Error('[[error:chat-restricted]]'));
}
], callback);
-
};
Messaging.canMessageRoom = function(uid, roomId, callback) {
if (parseInt(meta.config.disableChat) === 1 || !uid) {
return callback(new Error('[[error:chat-disabled]]'));
}
-
+
async.waterfall([
function (next) {
Messaging.isUserInRoom(uid, roomId, next);
@@ -368,14 +365,14 @@ var async = require('async'),
if (!inRoom) {
return next(new Error('[[error:not-in-room]]'));
}
-
+
Messaging.getUserCountInRoom(roomId, next);
},
function(count, next) {
if (count < 2) {
return next(new Error('[[error:no-users-in-room]]'));
}
-
+
user.getUserFields(uid, ['banned', 'email:confirmed'], next);
},
function (userData, next) {
diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index 26426b9f9f..bcf8309a40 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -62,8 +62,8 @@ SocketModules.chats.newRoom = function(socket, data, callback) {
}
Messaging.canMessageUser(socket.uid, data.touid, function(err, allowed) {
- if (err || !allowed) {
- return callback(err || new Error('[[error:chat-restricted]]'));
+ if (err) {
+ return callback(err);
}
Messaging.newRoom(socket.uid, [data.touid], callback);
diff --git a/src/views/admin/footer.tpl b/src/views/admin/footer.tpl
index 02f80c73f0..de228ce0d7 100644
--- a/src/views/admin/footer.tpl
+++ b/src/views/admin/footer.tpl
@@ -2,40 +2,6 @@
-
diff --git a/src/views/admin/general/sounds.tpl b/src/views/admin/general/sounds.tpl
index 72036f72cc..dfdbae512d 100644
--- a/src/views/admin/general/sounds.tpl
+++ b/src/views/admin/general/sounds.tpl
@@ -63,7 +63,7 @@
diff --git a/tests/messaging.js b/tests/messaging.js
index ae1db0952a..4758fde40b 100644
--- a/tests/messaging.js
+++ b/tests/messaging.js
@@ -27,39 +27,39 @@ describe('Messaging Library', function() {
describe('.canMessage()', function() {
it('should not error out', function(done) {
- Messaging.canMessageUser(testUids[1], testUids[2], function(err, allowed) {
+ Messaging.canMessageUser(testUids[1], testUids[2], function(err) {
assert.ifError(err);
done();
});
});
it('should allow messages to be sent to an unrestricted user', function(done) {
- Messaging.canMessageUser(testUids[1], testUids[2], function(err, allowed) {
- assert.strictEqual(allowed, true, 'should be true, received ' + allowed);
+ Messaging.canMessageUser(testUids[1], testUids[2], function(err) {
+ assert.ifError(err);
done();
});
});
it('should NOT allow messages to be sent to a restricted user', function(done) {
User.setSetting(testUids[1], 'restrictChat', '1', function() {
- Messaging.canMessageUser(testUids[2], testUids[1], function(err, allowed) {
- assert.strictEqual(allowed, false, 'should be false, received ' + allowed);
+ Messaging.canMessageUser(testUids[2], testUids[1], function(err) {
+ assert.strictEqual(err.message, '[[error:chat-restricted]]');
done();
});
});
});
it('should always allow admins through', function(done) {
- Messaging.canMessageUser(testUids[0], testUids[1], function(err, allowed) {
- assert.strictEqual(allowed, true, 'should be true, received ' + allowed);
+ Messaging.canMessageUser(testUids[0], testUids[1], function(err) {
+ assert.ifError(err);
done();
});
});
it('should allow messages to be sent to a restricted user if restricted user follows sender', function(done) {
User.follow(testUids[1], testUids[2], function() {
- Messaging.canMessageUser(testUids[2], testUids[1], function(err, allowed) {
- assert.strictEqual(allowed, true, 'should be true, received ' + allowed);
+ Messaging.canMessageUser(testUids[2], testUids[1], function(err) {
+ assert.ifError(err);
done();
});
});