diff --git a/package.json b/package.json index 0609a3dc22..305eeb4416 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "0.9.2", + "version": "0.9.3", "homepage": "http://www.nodebb.org", "repository": { "type": "git", @@ -39,24 +39,23 @@ "mkdirp": "~0.5.0", "morgan": "^1.3.2", "nconf": "~0.8.2", - "nodebb-plugin-composer-default": "1.0.24", - "nodebb-plugin-dbsearch": "0.2.18", + "nodebb-plugin-composer-default": "1.0.26", + "nodebb-plugin-dbsearch": "0.3.0", "nodebb-plugin-emoji-extended": "0.4.17", - "nodebb-plugin-markdown": "4.0.8", + "nodebb-plugin-markdown": "4.0.9", "nodebb-plugin-mentions": "1.0.12", "nodebb-plugin-soundpack-default": "0.1.5", "nodebb-plugin-spam-be-gone": "0.4.5", "nodebb-rewards-essentials": "0.0.6", "nodebb-theme-lavender": "3.0.2", - "nodebb-theme-persona": "4.0.40", - "nodebb-theme-vanilla": "5.0.15", + "nodebb-theme-persona": "4.0.45", + "nodebb-theme-vanilla": "5.0.17", "nodebb-widget-essentials": "2.0.5", "nodemailer": "0.7.1", "npm": "^2.1.4", "passport": "^0.3.0", "passport-local": "1.0.0", "prompt": "^0.2.14", - "redisearch": "^0.0.6", "request": "^2.44.0", "rimraf": "~2.4.2", "rss": "^1.0.0", diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 7bb7290cec..32e348c4f9 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -78,6 +78,7 @@ "too-many-messages": "لقد أرسلت الكثير من الرسائل، الرجاء اﻹنتظار قليلاً", "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", "reputation-system-disabled": "نظام السمعة معطل", "downvoting-disabled": "التصويتات السلبية معطلة", "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع", diff --git a/public/language/ar/modules.json b/public/language/ar/modules.json index 17998d13f9..34c2c43e43 100644 --- a/public/language/ar/modules.json +++ b/public/language/ar/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 أيام", "chat.thirty_days": "30 يومًا", "chat.three_months": "3 أشهر", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "اكتب", "composer.show_preview": "عرض المعاينة", "composer.hide_preview": "إخفاء المعاينة", diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index 04fb977999..76b34aa3b1 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "لديك تنبيهات غير مقروءة.", "new_message_from": "رسالة جديدة من %1", "upvoted_your_post_in": "%1 أضاف صوتًا إيجابيا إلى مشاركتك في %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 أضاف مشاركتك في %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.", "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_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_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.", "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني", "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.", diff --git a/public/language/bg/error.json b/public/language/bg/error.json index cbc97af490..92f321a474 100644 --- a/public/language/bg/error.json +++ b/public/language/bg/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Изпратили сте твърде много съобщения. Моля, изчакайте малко.", "invalid-chat-message": "Невалидно съобщение", "chat-message-too-long": "Съобщението е твърде дълго", + "cant-edit-chat-message": "Нямате право да редактирате това съобщение", "reputation-system-disabled": "Системата за репутация е изключена.", "downvoting-disabled": "Отрицателното гласуване е изключено", "not-enough-reputation-to-downvote": "Нямате достатъчно репутация, за да гласувате отрицателно за тази публикация", diff --git a/public/language/bg/modules.json b/public/language/bg/modules.json index cb4509c571..884db0222a 100644 --- a/public/language/bg/modules.json +++ b/public/language/bg/modules.json @@ -15,12 +15,13 @@ "chat.seven_days": "7 дни", "chat.thirty_days": "30 дни", "chat.three_months": "3 месеца", + "chat.delete_message_confirm": "Сигурен/а ли сте, че искате да изтриете това съобщение?", "composer.compose": "Писане", "composer.show_preview": "Показване на прегледа", "composer.hide_preview": "Скриване на прегледа", "composer.user_said_in": "%1 каза в %2:", "composer.user_said": "%1 каза:", - "composer.discard": "Сигурни ли сте, че искате да отхвърлите тази публикация?", + "composer.discard": "Сигурен/а ли сте, че искате да отхвърлите тази публикация?", "composer.submit_and_lock": "Публикуване и заключване", "composer.toggle_dropdown": "Превключване на падащото меню", "composer.uploading": "Качване на %1", diff --git a/public/language/bg/notifications.json b/public/language/bg/notifications.json index 960c14058d..900cc77153 100644 --- a/public/language/bg/notifications.json +++ b/public/language/bg/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Имате непрочетени известия", "new_message_from": "Ново съобщение от %1", "upvoted_your_post_in": "%1 гласува положително за Ваша публикация в %2.", + "upvoted_your_post_in_dual": "%1 и %2 гласуваха положително за Ваша публикация в %3.", + "upvoted_your_post_in_multiple": "%1 и %2 други гласуваха положително за Ваша публикация в %3.", "moved_your_post": "%1 премести публикацията Ви в %2", "moved_your_topic": "%1 премести %2", "favourited_your_post_in": "%1 отбеляза Ваша публикация в %2 като любима.", + "favourited_your_post_in_dual": "%1 и %2 отбелязаха Ваша публикация в %3 като любима.", + "favourited_your_post_in_multiple": "%1 и %2 други отбелязаха Ваша публикация в %3 като любима.", "user_flagged_post_in": "%1 докладва Ваша публикация в %2", + "user_flagged_post_in_dual": "%1 и %2 докладваха Ваша публикация в %3", + "user_flagged_post_in_multiple": "%1 и %2 други докладваха Ваша публикация в %3", "user_posted_to": "%1 публикува отговор на: %2", + "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 започнаха да Ви следват.", + "user_started_following_you_multiple": "%1 и %2 започнаха да Ви следват.", "new_register": "%1 изпрати заявка за регистрация.", "email-confirmed": "Е-пощата беше потвърдена", "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.", diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index 217b68c211..f698f949dd 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -48,15 +48,15 @@ "thread_tools.move_all": "Преместване на всички", "thread_tools.fork": "Разделяне на темата", "thread_tools.delete": "Изтриване на темата", - "thread_tools.delete_confirm": "Сигурни ли сте, че искате да изтриете тази тема?", + "thread_tools.delete_confirm": "Сигурен/а ли сте, че искате да изтриете тази тема?", "thread_tools.restore": "Възстановяване на темата", - "thread_tools.restore_confirm": "Сигурни ли сте, че искате да възстановите тази тема?", + "thread_tools.restore_confirm": "Сигурен/а ли сте, че искате да възстановите тази тема?", "thread_tools.purge": "Изчистване на темата", - "thread_tools.purge_confirm": "Сигурни ли сте, че искате да изчистите тази тема?", + "thread_tools.purge_confirm": "Сигурен/а ли сте, че искате да изчистите тази тема?", "topic_move_success": "Темата беше преместена успешно в %1", - "post_delete_confirm": "Сигурни ли сте, че искате да изтриете тази публикация?", - "post_restore_confirm": "Сигурни ли сте, че искате да възстановите тази публикация?", - "post_purge_confirm": "Сигурни ли сте, че искате да изчистите тази публикация?", + "post_delete_confirm": "Сигурен/а ли сте, че искате да изтриете тази публикация?", + "post_restore_confirm": "Сигурен/а ли сте, че искате да възстановите тази публикация?", + "post_purge_confirm": "Сигурен/а ли сте, че искате да изчистите тази публикация?", "load_categories": "Зареждане на категориите", "disabled_categories_note": "Изключените категории са засивени", "confirm_move": "Преместване", diff --git a/public/language/bg/user.json b/public/language/bg/user.json index c6f82b78d8..6b2a9a87b9 100644 --- a/public/language/bg/user.json +++ b/public/language/bg/user.json @@ -10,8 +10,8 @@ "ban_account_confirm": "Наистина ли искате да блокирате този потребител?", "unban_account": "Отблокиране на акаунта", "delete_account": "Изтриване на акаунта", - "delete_account_confirm": "Сигурни ли сте, че искате да изтриете акаунта си?
Това действие е необратимо и няма да можете да възстановите нищо от данните си

Въведете потребителското си име, за да потвърдите, че искате да унищожите този акаунт.", - "delete_this_account_confirm": "Сигурни ли сте, че искате да изтриете този акаунт?
Това действие е необратимо и няма да можете да възстановите нищо от данните

", + "delete_account_confirm": "Сигурен/а ли сте, че искате да изтриете акаунта си?
Това действие е необратимо и няма да можете да възстановите нищо от данните си

Въведете потребителското си име, за да потвърдите, че искате да унищожите този акаунт.", + "delete_this_account_confirm": "Сигурен/а ли сте, че искате да изтриете този акаунт?
Това действие е необратимо и няма да можете да възстановите нищо от данните

", "account-deleted": "Акаунтът е изтрит", "fullname": "Цяло име", "website": "Уеб сайт", diff --git a/public/language/bn/error.json b/public/language/bn/error.json index a8273c1320..7905e5e766 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "সম্মাননা ব্যাবস্থা নিস্ক্রীয় রাখা হয়েছে", "downvoting-disabled": "ঋণাত্মক ভোট নিস্ক্রীয় রাখা হয়েছে।", "not-enough-reputation-to-downvote": "আপনার এই পোস্ট downvote করার জন্য পর্যাপ্ত সম্মাননা নেই", diff --git a/public/language/bn/modules.json b/public/language/bn/modules.json index dc26f2fd17..27052c6ef9 100644 --- a/public/language/bn/modules.json +++ b/public/language/bn/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "৭ দিন", "chat.thirty_days": "৩০ দিন", "chat.three_months": "৩ মাস", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json index 887c120059..67900e08bf 100644 --- a/public/language/bn/notifications.json +++ b/public/language/bn/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "আপনার অপঠিত বিজ্ঞপ্তি আছে।", "new_message_from": "%1 থেকে নতুন বার্তা", "upvoted_your_post_in": "%1 , %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 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.", "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", "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_topic": "%1 has posted a new topic: %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.", "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে", "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।", diff --git a/public/language/cs/error.json b/public/language/cs/error.json index 3efb6790f4..79ff4e89f2 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "Systém reputací je zakázán.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/cs/modules.json b/public/language/cs/modules.json index cd4fe64059..d3687e90bb 100644 --- a/public/language/cs/modules.json +++ b/public/language/cs/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 dní", "chat.thirty_days": "30 dní", "chat.three_months": "3 měsíce", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index 1d9b507b33..d8583da969 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", "upvoted_your_post_in": "%1 has upvoted your post in %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 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.", "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", "user_posted_to": "%1 has posted a reply to: %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_topic": "%1 has posted a new topic: %2", "user_started_following_you": "%1 started following you.", + "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.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", diff --git a/public/language/da/error.json b/public/language/da/error.json index fb02400438..86deb28910 100644 --- a/public/language/da/error.json +++ b/public/language/da/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Du har sendt for mange beskeder, vent venligt lidt.", "invalid-chat-message": "Ugyldig chat besked", "chat-message-too-long": "Chat beskeden er for lang", + "cant-edit-chat-message": "You are not allowed to edit this message", "reputation-system-disabled": "Vurderingssystem er slået fra.", "downvoting-disabled": "Nedvurdering er slået fra", "not-enough-reputation-to-downvote": "Du har ikke nok omdømme til at nedstemme dette indlæg", diff --git a/public/language/da/modules.json b/public/language/da/modules.json index a15c48fffd..6f4af1099c 100644 --- a/public/language/da/modules.json +++ b/public/language/da/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 dage", "chat.thirty_days": "30 dage", "chat.three_months": "3 måneder", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Skriv", "composer.show_preview": "Vis forhåndsvisning", "composer.hide_preview": "Fjern forhåndsvisning", diff --git a/public/language/da/notifications.json b/public/language/da/notifications.json index 0952b1eab7..af2a4476f2 100644 --- a/public/language/da/notifications.json +++ b/public/language/da/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Du har ulæste notifikationer.", "new_message_from": "Ny besked fra %1", "upvoted_your_post_in": "%1 har upvotet dit indlæg i %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 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.", "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", "user_posted_to": "%1 har skrevet et svar til: %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_topic": "%1 har oprettet en ny tråd: %2", "user_started_following_you": "%1 har valgt at følge dig.", + "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 har sendt en registrerings anmodning.", "email-confirmed": "Email bekræftet", "email-confirmed-message": "Tak fordi du validerede din email. Din konto er nu fuldt ud aktiveret.", diff --git a/public/language/de/error.json b/public/language/de/error.json index e4918e8800..ae24d940a3 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Du hast zu viele Nachrichten versandt, bitte warte eine Weile.", "invalid-chat-message": "Ungültige Nachricht", "chat-message-too-long": "Die Nachricht ist zu lang", + "cant-edit-chat-message": "Du darfst diese Nachricht nicht ändern", "reputation-system-disabled": "Das Reputationssystem ist deaktiviert.", "downvoting-disabled": "Downvotes sind deaktiviert.", "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten.", diff --git a/public/language/de/modules.json b/public/language/de/modules.json index 4c0a2058d1..3f4a175a72 100644 --- a/public/language/de/modules.json +++ b/public/language/de/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Tage", "chat.thirty_days": "30 Tage", "chat.three_months": "3 Monate", + "chat.delete_message_confirm": "Bist du sicher, dass du diese Nachricht löschen möchtest?", "composer.compose": "Verfassen", "composer.show_preview": "Vorschau zeigen", "composer.hide_preview": "Vorschau ausblenden", diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index 175a55e39f..073425aad6 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.", "new_message_from": "Neue Nachricht von %1", "upvoted_your_post_in": "%1 hat deinen Beitrag in %2 positiv bewertet.", + "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 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 and %2 have favourited your post in %3.", + "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.", "user_flagged_post_in": "%1 hat einen Beitrag in %2 gemeldet", + "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_posted_to": "%1 hat auf %2 geantwortet.", + "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_topic": "%1 hat ein neues Thema erstellt: %2", "user_started_following_you": "%1 folgt dir jetzt.", + "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 hat eine Registrationsanfrage geschickt.", "email-confirmed": "E-Mail bestätigt", "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.", diff --git a/public/language/de/pages.json b/public/language/de/pages.json index 6eda35c198..a914d22356 100644 --- a/public/language/de/pages.json +++ b/public/language/de/pages.json @@ -35,7 +35,7 @@ "account/favourites": "Von %1 favorisierte Beiträge", "account/settings": "Benutzer-Einstellungen", "account/watched": "Themen angeschaut von %1", - "maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komm später wieder.", + "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." } \ No newline at end of file diff --git a/public/language/el/error.json b/public/language/el/error.json index 2b18e271de..2b88dc7741 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "Το σύστημα φήμης έχει απενεργοποιηθεί.", "downvoting-disabled": "Η καταψήφιση έχει απενεργοποιηθεί", "not-enough-reputation-to-downvote": "Δεν έχεις αρκετή φήμη για να καταψηφίσεις αυτή την δημοσίευση", diff --git a/public/language/el/modules.json b/public/language/el/modules.json index a47af0e58a..f5ebd8bf9d 100644 --- a/public/language/el/modules.json +++ b/public/language/el/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Ημέρες", "chat.thirty_days": "30 Ημέρες", "chat.three_months": "3 Μήνες", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/el/notifications.json b/public/language/el/notifications.json index 5d0447dea8..0ef1347183 100644 --- a/public/language/el/notifications.json +++ b/public/language/el/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Έχεις μη αναγνωσμένες ειδοποιήσεις.", "new_message_from": "Νέο μήνυμα από τον/την %1", "upvoted_your_post_in": "Ο/Η %1 υπερψήφισε την δημοσίευσή σου στο %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": "Η δημοσίευσή σου στο %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.", "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_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_topic": "%1 has posted a new topic: %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.", "email-confirmed": "Το Εmail Επιβεβαιώθηκε", "email-confirmed-message": "Ευχαριστούμε που επιβεβαίωσες το email σου. Ο λογαριασμός σου είναι πλέον πλήρως ενεργοποιημένος.", diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json index c9751317f1..f942fa3536 100644 --- a/public/language/en@pirate/error.json +++ b/public/language/en@pirate/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/en@pirate/modules.json b/public/language/en@pirate/modules.json index 7d2111c556..6a44ff18d9 100644 --- a/public/language/en@pirate/modules.json +++ b/public/language/en@pirate/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Days", "chat.thirty_days": "30 Days", "chat.three_months": "3 Months", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/en@pirate/notifications.json b/public/language/en@pirate/notifications.json index e6986f0684..3efe38a794 100644 --- a/public/language/en@pirate/notifications.json +++ b/public/language/en@pirate/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", "upvoted_your_post_in": "%1 has upvoted your post in %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 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.", "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", "user_posted_to": "%1 has posted a reply to: %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_topic": "%1 has posted a new topic: %2", "user_started_following_you": "%1 started following you.", + "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.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 4159d211d8..dbdb2c3c69 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -101,6 +101,7 @@ "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", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", @@ -113,5 +114,7 @@ "registration-error": "Registration Error", "parse-error": "Something went wrong while parsing server response", "wrong-login-type-email": "Please use your email to login", - "wrong-login-type-username": "Please use your username to login" -} \ No newline at end of file + "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)." +} diff --git a/public/language/en_GB/modules.json b/public/language/en_GB/modules.json index 6bb97b68a4..5dc56fa8c2 100644 --- a/public/language/en_GB/modules.json +++ b/public/language/en_GB/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Days", "chat.thirty_days": "30 Days", "chat.three_months": "3 Months", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", diff --git a/public/language/en_GB/notifications.json b/public/language/en_GB/notifications.json index f9b569170d..0692155373 100644 --- a/public/language/en_GB/notifications.json +++ b/public/language/en_GB/notifications.json @@ -14,13 +14,23 @@ "new_message_from": "New message from %1", "upvoted_your_post_in": "%1 has upvoted your post in %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 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.", "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", "user_posted_to" : "%1 has posted a reply to: %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_topic": "%1 has posted a new topic: %2", "user_started_following_you": "%1 started following you.", + "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.", "email-confirmed": "Email Confirmed", diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json index 2789d31b2d..64f954a4cd 100644 --- a/public/language/en_US/error.json +++ b/public/language/en_US/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/en_US/modules.json b/public/language/en_US/modules.json index b089365c68..f38f3f7ed5 100644 --- a/public/language/en_US/modules.json +++ b/public/language/en_US/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Days", "chat.thirty_days": "30 Days", "chat.three_months": "3 Months", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/en_US/notifications.json b/public/language/en_US/notifications.json index 1d5a798c26..f7f6f404a8 100644 --- a/public/language/en_US/notifications.json +++ b/public/language/en_US/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", "upvoted_your_post_in": "%1 has upvoted your post in %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 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.", "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", "user_posted_to": "%1 has posted a reply to: %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_topic": "%1 has posted a new topic: %2", "user_started_following_you": "%1 started following you.", + "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.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", diff --git a/public/language/es/error.json b/public/language/es/error.json index 6b3cf3948b..35705567f6 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Has enviado demasiados mensajes, por favor espera un poco.", "invalid-chat-message": "Mensaje de Chat inválido", "chat-message-too-long": "Mensaje de Chat es demasiado largo", + "cant-edit-chat-message": "You are not allowed to edit this message", "reputation-system-disabled": "El sistema de reputación está deshabilitado.", "downvoting-disabled": "La votación negativa está deshabilitada.", "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post", diff --git a/public/language/es/modules.json b/public/language/es/modules.json index 6badc0c562..f16b1e3e1b 100644 --- a/public/language/es/modules.json +++ b/public/language/es/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 días", "chat.thirty_days": "30 días", "chat.three_months": "3 meses", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Crear", "composer.show_preview": "Ver Previsualización", "composer.hide_preview": "Ocultar Previsualización", diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index c9e5798685..506f9f83c4 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Tienes notificaciones sin leer.", "new_message_from": "Nuevo mensaje de %1", "upvoted_your_post_in": "%1 ha votado positivamente tu respuesta en %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 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 and %2 have favourited your post in %3.", + "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.", "user_flagged_post_in": "%1 ha reportado una respuesta en %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_posted_to": "%1 ha respondido a: %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_topic": "%1 ha publicado un nuevo tema: %2", "user_started_following_you": "%1 comenzó a seguirte.", + "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 envió una solicitud de registro.", "email-confirmed": "Correo electrónico confirmado", "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.", diff --git a/public/language/et/error.json b/public/language/et/error.json index 666098ff89..5f4fc05e44 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Oled saatnud liiga palju sõnumeid, oota natukene.", "invalid-chat-message": "Vigane vestluse sõnum", "chat-message-too-long": "Vestluse sõnum on liiga pikk", + "cant-edit-chat-message": "You are not allowed to edit this message", "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.", diff --git a/public/language/et/modules.json b/public/language/et/modules.json index 99ab787405..691063085f 100644 --- a/public/language/et/modules.json +++ b/public/language/et/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Päeva", "chat.thirty_days": "30 Päeva", "chat.three_months": "3 Kuud", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Koosta", "composer.show_preview": "Kuva eelvaadet", "composer.hide_preview": "Peida eelvaade", diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json index beaf377781..9f5bc10fd8 100644 --- a/public/language/et/notifications.json +++ b/public/language/et/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Sul ei ole lugemata teateid.", "new_message_from": "Uus sõnum kasutajalt %1", "upvoted_your_post_in": "%1 hääletas sinu postituse poolt teemas %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 märgistas sinu postituse lemmikuks teemas %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.", "user_flagged_post_in": "%1 raporteeris postitust %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_posted_to": "Kasutaja %1 postitas vastuse teemasse %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_topic": "%1 on postitanud uue teema: %2", "user_started_following_you": "%1 hakkas sind jälgima.", + "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 saatis registreerimistaotluse.", "email-confirmed": "Emaili aadress kinnitatud", "email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja on nüüd täielikult aktiveeritud.", diff --git a/public/language/fa_IR/category.json b/public/language/fa_IR/category.json index a17a584fd5..a75615859f 100644 --- a/public/language/fa_IR/category.json +++ b/public/language/fa_IR/category.json @@ -12,5 +12,5 @@ "ignore": "نادیده گرفتن", "watch.message": "در حال حاظر شما به روز رسانی های این شاخه را دنبال می کنید", "ignore.message": "در حال حاظر شما به روز رسانی های این شاخه را نادیده میگیرد", - "watched-categories": "Watched categories" + "watched-categories": "دسته های دیده شده" } \ No newline at end of file diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json index be76d173ad..dc30bcb82d 100644 --- a/public/language/fa_IR/error.json +++ b/public/language/fa_IR/error.json @@ -39,30 +39,30 @@ "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.", "content-too-short": "خواهشمندیم دیدگاه بلندتری بنویسید. دیدگاه‌ها دست‌کم باید 1% نویسه داشته باشند.", "content-too-long": "لطفا طول مطلب را کوتاه تر کنید. طول پست نمیتواند بیشتر از %1 کاراکتر باشد.", - "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)", - "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file", + "title-too-short": "لطفا یک عنوان بلندتر وارد کنید. عنوان باید حداقل 1% کاراکتر داشته باشد.", + "title-too-long": "لطفا یک عنوان بلندتر وارد کنید. عنوان باید حداقل 1% کاراکتر داشته باشد.", + "too-many-posts": "شما می توانید هر 1% ثانیه یک پست ایجاد کنید - لطفا قبل از ارسال پست جدید صبر کنید", + "too-many-posts-newbie": "به عنوان یک کاربر جدید ، تا زمانی که شما 2% اعتبار کسب کنید می توانید هر 1% ثانیه یک پست ایجاد کنید - لطفا قبل از ایجاد پست جدید صبر کنید .", + "tag-too-short": "لطفا برچسب بلندتری وارد کنید. برچسبها باید حداقل 1% کاراکتر داشته باشند.", + "tag-too-long": "لطفا برچسب کوتاه تری وارد کنید . برچسب ها نباید بیشتر از 1% کاراکتر داشته باشند", + "not-enough-tags": "تعداد برچسب ها کافی نیست. موضوع ها یابد حداقل 1% برچسب داشته باشند", + "too-many-tags": "تعداد برچسب ها بیشتر از حد مجاز است. موضوع ها نمی توانند بیشتر از 1% برچسب داشته باشند", + "file-too-big": "حداکثر مجاز حجم فایل 1% کیلوبایت می باشد - لطفا فایلی با حجم کمتر بارگزاری کنید", "already-favourited": "شما قبلا این دیدگاه را محبوب کرده اید", "already-unfavourited": "شما قبلا این دیدگاه را نامحبوب کرده اید", "cant-ban-other-admins": "شما نمی‌توانید دیگر مدیران را محروم کنید!", - "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", + "cant-remove-last-admin": "شما تنها مدیر می باشید . شما باید قبل از عزل خود از مدیریت یک کاربر دیگر را مدیر کنید", "invalid-image-type": "نوع تصویر نامعتبر است. نوعهای قابل قبول اینها هستند: %1", "invalid-image-extension": "پسوند عکس نامعتبر است", "invalid-file-type": "نوع پرونده نامعتبر است. نوعهای قابل قبول اینها هستند: %1", "group-name-too-short": "نام گروه خیلی کوتاه است.", "group-already-exists": "این گروه از پیش وجود دارد.", "group-name-change-not-allowed": "تغیر نام گروه نیاز به دسترسی دارد.", - "group-already-member": "Already part of this group", - "group-not-member": "Not a member of this group", + "group-already-member": "شما عضوی از این گروه می باشید", + "group-not-member": "شما عضوی از این گروه نمی باشید", "group-needs-owner": "این گروه حداقل یک مالک باید داشته باشد", - "group-already-invited": "This user has already been invited", - "group-already-requested": "Your membership request has already been submitted", + "group-already-invited": "این کاربر قبلا به گروه دعوت شده است", + "group-already-requested": "درخواست عضویت شما قبلا تایید شده است", "post-already-deleted": "این دیدگاه پیش‌تر پاک شده است", "post-already-restored": "دیدگاه پیش‌تر بازگردانی شده است.", "topic-already-deleted": "جستار پیش‌تر حذف شده است", @@ -71,18 +71,19 @@ "topic-thumbnails-are-disabled": "چهرک‌های جستار غیرفعال شده است.", "invalid-file": "فایل نامعتبر است.", "uploads-are-disabled": "امکان بارگذاری غیرفعال شده است.", - "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": "با عرض پوزش ، امضای شما نمی تواند طولانی تر از 1% کاراکتر باشد", + "about-me-too-long": "با عرض پوزش محتوای 'درباره ی من' نمی تواند طولانی تر از 1% کاراکتر باشد", "cant-chat-with-yourself": "شما نمی‌توانید با خودتان گفتگو کنید!", "chat-restricted": "این کاربر پیام های گفتگوی خود را محدود کرده است . آنها بایدشما را دنبال کنند تا اینکه شما بتوانید به آنها پیامی بفرستید", "too-many-messages": "شما پیامهای خیلی زیادی فرستاده اید، لطفا مدتی صبر نمایید", - "invalid-chat-message": "Invalid chat message", - "chat-message-too-long": "Chat message is too long", + "invalid-chat-message": "پیغام نامعتبر", + "chat-message-too-long": "پیغام طولانی تر از حد مجاز است", + "cant-edit-chat-message": "شما اجازه ی ویرایش این پیغام را ندارید", "reputation-system-disabled": "سیستم اعتبار غیر فعال شده است", "downvoting-disabled": "رای منفی غیر فعال شده است", "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رای منفی به این دیدگاه را ندارید.", "not-enough-reputation-to-flag": "شما اعتبار کافی برای نشاندار کردن این دیدگاه ندارید", - "already-flagged": "You have already flagged this post", + "already-flagged": "شما قبلا این پست را پرچمگذاری کرده اید", "reload-failed": "NodeBB در هنگام بارگذاری مجدد با یک مشکل مواجه شده است: \"%1\". NodeBB سرویس رسانی به کلاینت های سرویس گیرنده را ادامه خواهد داد، اگرچه شما کاری را قبل از بارگیری مجدد انجام دادید بازگردانی کنید", "registration-error": "خطای ثبت نام", "parse-error": "هنگام تجزیه پاسخ سرور اشتباهی پیش امد", diff --git a/public/language/fa_IR/global.json b/public/language/fa_IR/global.json index 76959934cd..6289311c41 100644 --- a/public/language/fa_IR/global.json +++ b/public/language/fa_IR/global.json @@ -56,8 +56,8 @@ "posted_ago_by_guest": "ارسال شده در %1 توسط مهمان", "posted_ago_by": "ارسال شده در %1 توسط %2", "posted_ago": "ارسال شده در %1", - "posted_in": "posted in %1", - "posted_in_by": "posted in %1 by %2", + "posted_in": "پست شده در 1%", + "posted_in_by": "پشت شده در 1% توسط 2%", "posted_in_ago": "ارسال شده در %1 %2", "posted_in_ago_by": "ارسال شده در %1 %2 توسط %3", "posted_in_ago_by_guest": "ارسال شده در %1 %2 توسط مهمان", @@ -70,7 +70,7 @@ "recentposts": "دیدگاه‌های تازه", "recentips": "آخرین IPها", "away": "دور از دسترس", - "dnd": "Do not disturb", + "dnd": "مزاحم نشوید", "invisible": "مخفی", "offline": "آفلاین", "email": "رایانامه", @@ -83,5 +83,5 @@ "follow": "دنبال کن", "unfollow": "دنبال نکن", "delete_all": "حذف همه", - "map": "Map" + "map": "نقشه" } \ No newline at end of file diff --git a/public/language/fa_IR/groups.json b/public/language/fa_IR/groups.json index a997c32629..b378005c8d 100644 --- a/public/language/fa_IR/groups.json +++ b/public/language/fa_IR/groups.json @@ -12,9 +12,9 @@ "invited.none": "در حال حاضر هیچ کسی دعوت نشده است", "invited.uninvite": "لغو دعوت", "invited.search": "جستجو به دنبال کاربرانی به جهت دعوت به این گروه", - "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", + "invited.notification_title": "شما برای پیوستن به %1 دعوت شده اید", + "request.notification_title": "درخواست عضویت در گروه از طرف %1", + "request.notification_text": "%1 درخواست عضویت در %2 را دارد", "cover-save": "ذخیره", "cover-saving": "در حال ذخیره کردن", "details.title": "جزئیات گروه", diff --git a/public/language/fa_IR/login.json b/public/language/fa_IR/login.json index 7a7c99fd6b..578071109d 100644 --- a/public/language/fa_IR/login.json +++ b/public/language/fa_IR/login.json @@ -1,7 +1,7 @@ { "username-email": "نام کاربری / رایانامه", "username": "نام کاربری", - "email": "رایانامه", + "email": "ایمیل", "remember_me": "مرا به یاد بسپار؟", "forgot_password": "گذرواژه را فراموش کرده‌اید؟", "alternative_logins": "روش‌های درون آمدن جایگزین", diff --git a/public/language/fa_IR/modules.json b/public/language/fa_IR/modules.json index 6548730c12..f49a077dd6 100644 --- a/public/language/fa_IR/modules.json +++ b/public/language/fa_IR/modules.json @@ -5,7 +5,7 @@ "chat.no_active": "شما هیچ گفتگوی فعالی ندارید.", "chat.user_typing": "%1 در حال نوشتن است...", "chat.user_has_messaged_you": "%1 به شما پیام داده است.", - "chat.see_all": "See all chats", + "chat.see_all": "دیدن همه ی چت ها", "chat.no-messages": "مشخص کنید تاریخچه گفتگوهایتان با چه کاربری را می‌خواهید ببینید", "chat.recent-chats": "گفتگوهای اخیر", "chat.contacts": "تماس‌ها", @@ -15,6 +15,7 @@ "chat.seven_days": "7 روز", "chat.thirty_days": "30 روز", "chat.three_months": "3 ماه", + "chat.delete_message_confirm": "آیا مطمئن هستید که می خواهید این پیغام را حذف کنید؟", "composer.compose": "ارسال", "composer.show_preview": "نمایش پیش‌نمایش", "composer.hide_preview": "مخفی کردن پیش‌نمایش", @@ -23,11 +24,11 @@ "composer.discard": "آیا از دور انداختن این دیدگاه اطمینان دارید؟", "composer.submit_and_lock": "ارسال و قفل", "composer.toggle_dropdown": "باز و بسته کردن کرکره", - "composer.uploading": "Uploading %1", + "composer.uploading": "در حال بارگزاری 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.confirm": "تایید", + "cover.dragging_title": "تنظیم مکان عکس کاور", + "cover.dragging_message": "عکس کاور با کلیک موس گرفته و در مکان دلخواه رها کنید و بر روی \"ذخیره\" کلیک کنید", + "cover.saved": "عکس کاور و مکان آن ذخیره شد" } \ No newline at end of file diff --git a/public/language/fa_IR/notifications.json b/public/language/fa_IR/notifications.json index 5d4098ccbe..7ca96bd4e6 100644 --- a/public/language/fa_IR/notifications.json +++ b/public/language/fa_IR/notifications.json @@ -1,7 +1,7 @@ { "title": "آگاه‌سازی‌ها", "no_notifs": "هیچ آگاه‌سازی تازه‌ای ندارید", - "see_all": "See all notifications", + "see_all": "دیدن همه ی اطلاعیه ها", "mark_all_read": "همه اطلاعیه ها را خوانده شده علامت بزن", "back_to_home": "بازگشت به %1", "outgoing_link": "پیوند برون‌رو", @@ -12,13 +12,23 @@ "you_have_unread_notifications": "شما آگاه‌سازی‌های نخوانده دارید.", "new_message_from": "پیام تازه از %1", "upvoted_your_post_in": "%1 امتیاز مثبت به دیدگاه شما در %2 داده", - "moved_your_post": "%1 has moved your post to %2", - "moved_your_topic": "%1 has moved %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 پست شما را به %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.", "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_posted_to": "پاسخ دادن به %2 از سوی %1", + "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_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 یک درخواست ثبت نام ارسال کرده است", "email-confirmed": "رایانامه تایید شد", "email-confirmed-message": "بابت تایید ایمیلتان سپاس‌گزاریم. حساب کاربری شما اکنون به صورت کامل فعال شده است.", diff --git a/public/language/fa_IR/pages.json b/public/language/fa_IR/pages.json index 6a25342754..d48dcf06c2 100644 --- a/public/language/fa_IR/pages.json +++ b/public/language/fa_IR/pages.json @@ -1,16 +1,16 @@ { "home": "خانه", "unread": "جستاره‌های نخوانده", - "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": "موضوعات پربازدید امروز", + "popular-week": "موضوعات پربازدید این هفته", + "popular-month": "موضوعات پربازدید این ماه", + "popular-alltime": "موضوعات پربازدید", "recent": "جستارهای تازه", "users/online": "کاربران آنلاین", "users/latest": "آخرین کاربران", "users/sort-posts": "کاربران با بیش‌ترین دیدگاه", - "users/sort-reputation": "Users with the most reputation", - "users/map": "User Map", + "users/sort-reputation": "کاربران دارای بیشترین اعتبار", + "users/map": "نقشه ی کاربر", "users/search": "جستجوی کاربر", "notifications": "آگاه‌سازی‌ها", "tags": "برچسب‌ها", @@ -24,9 +24,9 @@ "chats": "گفتگوها", "chat": "گفتگو با %1", "account/edit": "ویرایش \"%1\"", - "account/edit/password": "Editing password of \"%1\"", - "account/edit/username": "Editing username of \"%1\"", - "account/edit/email": "Editing email of \"%1\"", + "account/edit/password": "ویرایش کلمه ی عبورِ \"1%\"", + "account/edit/username": "ویرایش نام کاربریِ \"1%\"", + "account/edit/email": "ویرایش ایمیلِ \"1%\"", "account/following": "کاربرانی که %1 دنبال می‌کند", "account/followers": "کاربرانی که %1 را دنبال می‌کنند", "account/posts": "دیدگاه‌های %1", @@ -34,8 +34,8 @@ "account/groups": "گروه‌های %1", "account/favourites": "دیدگاه‌های مورد پسند %1", "account/settings": "تنظیمات کاربر", - "account/watched": "Topics watched by %1", + "account/watched": "موضوع های دیده شده توسط \"1%\"", "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/fa_IR/topic.json b/public/language/fa_IR/topic.json index aea16ab1ab..211a360e84 100644 --- a/public/language/fa_IR/topic.json +++ b/public/language/fa_IR/topic.json @@ -25,7 +25,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": "این جستار پاک شده است. تنها کاربرانِ با حق مدیریت جستار می‌توانند آن را ببینند.", @@ -96,12 +96,12 @@ "newest_to_oldest": "جدید‌ترین به قدیمی‌ترین", "most_votes": "بیشترین رای‌ها", "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?", - "stale.create": "Create a new topic", - "stale.reply_anyway": "Reply to this topic anyway", - "stale.link_back": "Re: [%1](%2)", - "spam": "Spam", - "offensive": "Offensive", - "custom-flag-reason": "Enter a flagging reason" + "stale.title": "آیا مایلید به جای آن یک موضوع جدید ایجاد کنید؟", + "stale.warning": "موضوعی که شما در حال پاسخگویی به آن هستید قدیمی می باشد. آیا میلید به جای آن یک موضوع جدید ایجاد کنید و در آن به این موضوع ارجاع دهید؟", + "stale.create": "ایجاد یک موضوع جدید", + "stale.reply_anyway": "در هر صورت می خواهم به این موضوع پاسخ دهم", + "stale.link_back": "پاسخ : [1%](2%)", + "spam": "اسپم", + "offensive": "توهین آمیز", + "custom-flag-reason": "وارد کردن دلیل پرچمگذاری" } \ No newline at end of file diff --git a/public/language/fa_IR/user.json b/public/language/fa_IR/user.json index e0249abb3c..f808164656 100644 --- a/public/language/fa_IR/user.json +++ b/public/language/fa_IR/user.json @@ -12,7 +12,7 @@ "delete_account": "حذف حساب کاربری", "delete_account_confirm": "آیا مطمئنید که میخواهید حساب کاربری خود را حذف کنید؟
این عمل غیر قابل بازگشت است و شما قادر نخواهید بود هیچ کدام از اطلاعات خود را بازیابی کنید./strong>

برای تایید حذف این حساب کاربری، نام کاربری خود را وارد کنید", "delete_this_account_confirm": " آیا مطمئنید که میخواهید این حساب کاربری را حذف کنید؟
این عمل غیر قابل بازگشت است و شما قادر نخواهید بود هیچ کدام از اطلاعات را بازیابی کنید.

", - "account-deleted": "Account deleted", + "account-deleted": "حساب کاربری پاک شد", "fullname": "نام و نام خانوادگی", "website": "تارنما", "location": "محل سکونت", @@ -30,16 +30,16 @@ "signature": "امضا", "birthday": "روز تولد", "chat": "گفتگو", - "chat_with": "Chat with %1", + "chat_with": "چت کردن با 1%", "follow": "دنبال کن", "unfollow": "دنبال نکن", "more": "بیشتر", "profile_update_success": "نمایه باموفقیت به روز شده است!", "change_picture": "تغییر تصویر", - "change_username": "Change Username", - "change_email": "Change Email", + "change_username": "تغییر نام کاربری", + "change_email": "تغییر ایمیل", "edit": "ویرایش", - "default_picture": "Default Icon", + "default_picture": "آیکون پیش فرض", "uploaded_picture": "تصویر بارشده", "upload_new_picture": "بارگذاری تصویر تازه", "upload_new_picture_from_url": "بارگذاری تصویر جدید از نشانی وب", @@ -54,11 +54,11 @@ "confirm_password": "تکرار گذرواژه", "password": "گذرواژه", "username_taken_workaround": "نام کاربری درخواستی شما در حال حاضر گرفته شده است، بنابراین ما آن را کمی تغییر داده‌ایم. شما هم‌اکنون با نام %1%1", "upvoted_your_post_in": "%1 has upvoted your post in %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 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.", "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", "user_posted_to": "%1 on vastannut viestiin: %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_topic": "%1 on kirjoittanut uuden aiheen: %2", "user_started_following_you": "%1 alkoi seurata sinua.", + "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.", "email-confirmed": "Sähköpostiosoite vahvistettu", "email-confirmed-message": "Kiitos sähköpostiosoitteesi vahvistamisesta. Käyttäjätilisi on nyt täysin aktivoitu.", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index c2d2e44ef5..71576b247c 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Vous avez envoyé trop de messages, veuillez patienter un instant.", "invalid-chat-message": "Message de Chat invalide", "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", "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", diff --git a/public/language/fr/modules.json b/public/language/fr/modules.json index 7b175d741d..5c520acaa3 100644 --- a/public/language/fr/modules.json +++ b/public/language/fr/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Jours", "chat.thirty_days": "30 Jours", "chat.three_months": "3 Mois", + "chat.delete_message_confirm": "Êtes-vous sûr de vouloir supprimer ce message ?", "composer.compose": "Écrire", "composer.show_preview": "Afficher l'aperçu", "composer.hide_preview": "Masquer l'aperçu", diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index a15584d512..d66e72dc24 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Vous avez des notifications non-lues", "new_message_from": "Nouveau message de %1", "upvoted_your_post_in": "%1 a voté pour votre message dans %2.", + "upvoted_your_post_in_dual": "%1 et %2 ont voté pour votre message dans %3.", + "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.", "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", "user_posted_to": "%1 a répondu à : %2", + "user_posted_to_dual": "%1 et %2 ont posté une réponse à : %3", + "user_posted_to_multiple": "%1 et %2 autres ont posté une réponse à : %3", "user_posted_topic": "%1 a posté un nouveau sujet: %2.", "user_started_following_you": "%1 vous suit.", + "user_started_following_you_dual": "%1 et %2 vous suivent.", + "user_started_following_you_multiple": "%1 et %2 autres vous suivent.", "new_register": "%1 a envoyé une demande d'incription.", "email-confirmed": "Email vérifié", "email-confirmed-message": "Merci pour la validation de votre adresse email. Votre compte est désormais activé.", diff --git a/public/language/gl/error.json b/public/language/gl/error.json index 79659f458b..2e3c7fbd64 100644 --- a/public/language/gl/error.json +++ b/public/language/gl/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Estás a enviar moitas mensaxes, por favor, agarda un anaco. ", "invalid-chat-message": "Mensaxe inválida", "chat-message-too-long": "Mensaxe moi longa", + "cant-edit-chat-message": "You are not allowed to edit this message", "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", diff --git a/public/language/gl/modules.json b/public/language/gl/modules.json index 276bee77cd..d14cfde04f 100644 --- a/public/language/gl/modules.json +++ b/public/language/gl/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Días", "chat.thirty_days": "30 Días", "chat.three_months": "3 Meses", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Elaborar", "composer.show_preview": "Amosar vista previa", "composer.hide_preview": "Agochar vista previa", diff --git a/public/language/gl/notifications.json b/public/language/gl/notifications.json index 17547336f7..5c91bd8677 100644 --- a/public/language/gl/notifications.json +++ b/public/language/gl/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Tes notificacións non lidas", "new_message_from": "Nova mensaxe de %1", "upvoted_your_post_in": "%1 votoute positivo en %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 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 and %2 have favourited your post in %3.", + "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.", "user_flagged_post_in": "%1 reportou unha mensaxe en %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_posted_to": "%1 publicou unha resposta en: %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_topic": "%1 publicou un novo tema: %2", "user_started_following_you": "%1 comezou a seguirte.", + "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 enviou unha petición de rexistro.", "email-confirmed": "Correo confirmado", "email-confirmed-message": "Grazas por validar o teu correo. A túa conta agora está activada.", diff --git a/public/language/he/error.json b/public/language/he/error.json index e94ba5754f..7043c6f0bd 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -78,6 +78,7 @@ "too-many-messages": "שלחת יותר מדי הודעות, אנא המתן לזמן מה.", "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", "reputation-system-disabled": "מערכת המוניטין לא פעילה.", "downvoting-disabled": "היכולת להצביע נגד לא פעילה", "not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה", diff --git a/public/language/he/modules.json b/public/language/he/modules.json index 5e39866635..9113acc99a 100644 --- a/public/language/he/modules.json +++ b/public/language/he/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 ימים", "chat.thirty_days": "30 ימים", "chat.three_months": "3 חודשים", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "הצג תצוגה מקדימה", "composer.hide_preview": "הסתר תצוגה מקדימה", diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 6d93c08512..49d1b54c31 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "יש לך התראות שלא נקראו.", "new_message_from": "הודעה חדשה מ %1", "upvoted_your_post_in": "%1 הצביע בעד הפוסט שלך ב %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 הוסיף את הפוסט שלך ב %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.", "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_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_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.", "email-confirmed": "כתובת המייל אושרה", "email-confirmed-message": "תודה שאישרת את כתובת המייל שלך. החשבון שלך פעיל כעת.", diff --git a/public/language/hu/error.json b/public/language/hu/error.json index 9a1dee1cd1..55b583f036 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Túl sok üzenetet küldtél, kérlek várj egy picit.", "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", "reputation-system-disabled": "Hírnév funkció kikapcsolva.", "downvoting-disabled": "Leszavazás funkció kikapcsolva", "not-enough-reputation-to-downvote": "Nem rendelkezel elég Hírnév ponttal, hogy leszavazhasd ezt a hozzászólást", diff --git a/public/language/hu/modules.json b/public/language/hu/modules.json index 476f5a1ce4..a7b2ad7380 100644 --- a/public/language/hu/modules.json +++ b/public/language/hu/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 nap", "chat.thirty_days": "30 nap", "chat.three_months": "3 hónap", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json index 643037bd28..f255352a1a 100644 --- a/public/language/hu/notifications.json +++ b/public/language/hu/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", "upvoted_your_post_in": "%1 has upvoted your post in %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 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.", "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", "user_posted_to": "%1 has posted a reply to: %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_topic": "%1 has posted a new topic: %2", "user_started_following_you": "%1 started following you.", + "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.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", diff --git a/public/language/id/error.json b/public/language/id/error.json index bf90d17b14..594a2de6ab 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "Sistem reputasi ditiadakan.", "downvoting-disabled": "Downvoting ditiadakan", "not-enough-reputation-to-downvote": "Tidak cukup reputation untuk downvote post ini", diff --git a/public/language/id/modules.json b/public/language/id/modules.json index e78074ee16..4ff8a22c55 100644 --- a/public/language/id/modules.json +++ b/public/language/id/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Hari", "chat.thirty_days": "30 Hari", "chat.three_months": "3 Bulan", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json index 296bfd9c2a..7333364bd9 100644 --- a/public/language/id/notifications.json +++ b/public/language/id/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Kamu memiliki pemberitahuan yang belum dibaca.", "new_message_from": "Pesan baru dari %1", "upvoted_your_post_in": "%1 telah melakukan upvote untuk posting kamu di %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 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.", "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", "user_posted_to": "%1 telah mengirim sebuah balasan kepada: %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_topic": "%1 telah membuat topik baru: %2", "user_started_following_you": "%1 mulai mengikutimu.", + "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 mengirim permintaan registrasi.", "email-confirmed": "Email telah Dikonfirmasi", "email-confirmed-message": "Terimakasih telah melakukan validasi email. Akunmu saat ini telah aktif sepenuhnya.", diff --git a/public/language/it/error.json b/public/language/it/error.json index 4ea8d69813..aa566cd0bb 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Hai inviato troppi messaggi, aspetta un attimo.", "invalid-chat-message": "Messaggio chat non valido", "chat-message-too-long": "Il messaggio chat è troppo lungo", + "cant-edit-chat-message": "You are not allowed to edit this message", "reputation-system-disabled": "Il sistema di reputazione è disabilitato.", "downvoting-disabled": "Il Downvoting è disabilitato", "not-enough-reputation-to-downvote": "Non hai i privilegi per votare negativamente questo post", diff --git a/public/language/it/modules.json b/public/language/it/modules.json index 04b4d8df6f..495233686b 100644 --- a/public/language/it/modules.json +++ b/public/language/it/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Giorni", "chat.thirty_days": "30 Giorni", "chat.three_months": "3 Mesi", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Componi", "composer.show_preview": "Visualizza Anteprima", "composer.hide_preview": "Nascondi Anteprima", diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index 15ca49f2ec..e5d6625d0e 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Hai notifiche non lette.", "new_message_from": "Nuovo messaggio da %1", "upvoted_your_post_in": "%1 ha votato positivamente il tuo post in %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 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.", "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", "user_posted_to": "%1 ha postato una risposta a: %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_topic": "%1 ha postato un nuovo Topic: %2", "user_started_following_you": "%1 ha iniziato a seguirti.", + "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 ha inviato una richiesta di registrazione.", "email-confirmed": "Email Confermata", "email-confirmed-message": "Grazie per aver validato la tua email. Il tuo account è ora completamente attivato.", diff --git a/public/language/ja/error.json b/public/language/ja/error.json index de02133cd3..d644dee7a7 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/ja/modules.json b/public/language/ja/modules.json index 1bfece5756..1271c9bad3 100644 --- a/public/language/ja/modules.json +++ b/public/language/ja/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Days", "chat.thirty_days": "30 Days", "chat.three_months": "3 Months", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json index e5f9facc16..963dbc3e6e 100644 --- a/public/language/ja/notifications.json +++ b/public/language/ja/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "未読の通知があります。", "new_message_from": "%1からの新しいメッセージ", "upvoted_your_post_in": "%1 has upvoted your post in %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 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.", "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", "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_topic": "%1 has posted a new topic: %2", "user_started_following_you": "%1 started following you.", + "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.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", diff --git a/public/language/ko/error.json b/public/language/ko/error.json index 726ae49716..ece356b205 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "인기도 시스템을 사용하지 않습니다.", "downvoting-disabled": "비추천 기능을 사용하지 않습니다.", "not-enough-reputation-to-downvote": "인기도가 낮아 이 게시물에 반대할 수 없습니다.", diff --git a/public/language/ko/modules.json b/public/language/ko/modules.json index b398719598..541dfbe8c9 100644 --- a/public/language/ko/modules.json +++ b/public/language/ko/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7일", "chat.thirty_days": "30일", "chat.three_months": "3개월", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json index e7d56db47b..97dcfc3b64 100644 --- a/public/language/ko/notifications.json +++ b/public/language/ko/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "읽지 않은 알림이 있습니다.", "new_message_from": "%1님이 메시지를 보냈습니다.", "upvoted_your_post_in": "%1님이 %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님이 %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.", "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_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_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.", "email-confirmed": "확인된 이메일", "email-confirmed-message": "이메일을 확인해주셔서 감사합니다. 계정이 완전히 활성화되었습니다.", diff --git a/public/language/lt/error.json b/public/language/lt/error.json index dbf3491455..7cb715cf30 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Išsiuntėte per daug pranešimų, kurį laiką prašome palaukti.", "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", "reputation-system-disabled": "Reputacijos sistema išjungta.", "downvoting-disabled": "Downvoting yra išjungtas", "not-enough-reputation-to-downvote": "Jūs neturite pakankamai reputacijos balsuoti prieš šį pranešimą", diff --git a/public/language/lt/modules.json b/public/language/lt/modules.json index 2ce3c13d35..15d2be4499 100644 --- a/public/language/lt/modules.json +++ b/public/language/lt/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 dienos", "chat.thirty_days": "30 dienų", "chat.three_months": "3 mėnesiai", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Sukomponuoti", "composer.show_preview": "Rodyti pavyzdį", "composer.hide_preview": "Slėpti pavyzdį", diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json index 596993bb92..4bbd1e6fae 100644 --- a/public/language/lt/notifications.json +++ b/public/language/lt/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Jūs turite neperskaitytų pranešimų.", "new_message_from": "Nauja žinutė nuo %1", "upvoted_your_post_in": "%1 užbalsavo už jūsų pranešima čia %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 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.", "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", "user_posted_to": "%1 parašė atsaką %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_topic": "%1 paskelbė naują temą: %2", "user_started_following_you": "%1 pradėjo sekti tave", + "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 atsiuntė registracijos prašymą", "email-confirmed": "El. paštas patvirtintas", "email-confirmed-message": "Dėkojame už el. pašto patvirtinimą. Jūsų paskyra pilnai aktyvuota.", diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 08762edc17..c84eef1e46 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Anda menghantar terlalu banyak pesanan, sila tunggu seketika.", "invalid-chat-message": "Mesej borak tidak sah", "chat-message-too-long": "Mesej borak terlalu panjang", + "cant-edit-chat-message": "You are not allowed to edit this message", "reputation-system-disabled": "Sistem reputasi dilumpuhkan.", "downvoting-disabled": "Undi turun dilumpuhkan", "not-enough-reputation-to-downvote": "Anda tidak mempunyai reputasi mencukupi untuk mengundi turun kiriman ini", diff --git a/public/language/ms/modules.json b/public/language/ms/modules.json index 5f49a6dddf..6c1b501c72 100644 --- a/public/language/ms/modules.json +++ b/public/language/ms/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Hari", "chat.thirty_days": "30 Hari", "chat.three_months": "3 Bulan", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Tulis", "composer.show_preview": "Pra-lihat", "composer.hide_preview": "Sorok pra-lihat", diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json index 34c1f104a0..196e3971ca 100644 --- a/public/language/ms/notifications.json +++ b/public/language/ms/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Ada pemberitahuan yang belum dibaca", "new_message_from": "Pesanan baru daripada %1", "upvoted_your_post_in": "%1 telah mengundi naik kiriman and di %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 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 and %2 have favourited your post in %3.", + "favourited_your_post_in_multiple": "%1 and %2 others have favourited your post in %3.", "user_flagged_post_in": "%1 menanda kiriman anda 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", "user_posted_to": "%1 telah membalas kiriman kepada: %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_topic": "%1 membuka topik baru : %2", "user_started_following_you": "%1 mula mengikut anda.", + "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 menghantar jemputan pendaftaran.", "email-confirmed": "Emel Disahkan", "email-confirmed-message": "Terima kasih kerana mengesahkan emel anda. Akaun anda telah diaktifkan sepenuhnya.", diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 828d5f3179..0219f91127 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Du har sendt for mange meldinger, vennligst vent en stund.", "invalid-chat-message": "Ugyldig samtalemelding", "chat-message-too-long": "Samtalemeldingen er for lang", + "cant-edit-chat-message": "You are not allowed to edit this message", "reputation-system-disabled": "Ryktesystemet er deaktivert.", "downvoting-disabled": "Nedstemming er deaktivert", "not-enough-reputation-to-downvote": "Du har ikke nok rykte til å nedstemme det innlegget", diff --git a/public/language/nb/modules.json b/public/language/nb/modules.json index 0a2e6a3b16..7b9fc62a57 100644 --- a/public/language/nb/modules.json +++ b/public/language/nb/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 dager", "chat.thirty_days": "30 dager", "chat.three_months": "3 måneder", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Komponer", "composer.show_preview": "Vis forhåndsvisning", "composer.hide_preview": "Skjul forhåndsvisning", diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index 425997b22f..568357137a 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Du har uleste varsler.", "new_message_from": "Ny melding fra %1", "upvoted_your_post_in": "%1 har stemt opp innlegget ditt i %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 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.", "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", "user_posted_to": "%1 har skrevet et svar til: %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_topic": "%1 har skrevet et nytt emne: %2", "user_started_following_you": "%1 begynte å følge deg.", + "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 sendte en forespørsel om registrering", "email-confirmed": "E-post bekreftet", "email-confirmed-message": "Takk for at du har validert din e-post. Kontoen din er nå fullstendig aktivert.", diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 34dc9092e5..bfe113c836 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Er zijn in korte tijd teveel berichten verzonden, een moment geduld.", "invalid-chat-message": "Ongeldig bericht", "chat-message-too-long": "Het chatbericht is te lang", + "cant-edit-chat-message": "Het is niet toegestaan om dit bericht aan te passen", "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.", diff --git a/public/language/nl/modules.json b/public/language/nl/modules.json index d31e411c96..39a61ffe9f 100644 --- a/public/language/nl/modules.json +++ b/public/language/nl/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 dagen", "chat.thirty_days": "30 dagen", "chat.three_months": "3 maanden", + "chat.delete_message_confirm": "Weet u het zeker dat u dit bericht wilt verwijderen?", "composer.compose": "Samenstellen", "composer.show_preview": "Voorbeeldweergave", "composer.hide_preview": "Verberg voorbeeld", diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json index f049f78b92..d2c8ec0058 100644 --- a/public/language/nl/notifications.json +++ b/public/language/nl/notifications.json @@ -9,19 +9,29 @@ "continue_to": "Door naar %1", "return_to": "Terug naar %1", "new_notification": "Nieuwe melding", - "you_have_unread_notifications": "Ongelezen berichten", + "you_have_unread_notifications": "Je hebt nieuwe notificaties.", "new_message_from": "Nieuw bericht van %1", "upvoted_your_post_in": "%1 heeft voor een bericht gestemd in %2.", + "upvoted_your_post_in_dual": "%1 en %2 hebben voor een bericht in gestemd in %3.", + "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.", "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", "user_posted_to": "%1 heeft een reactie geplaatst in %2", + "user_posted_to_dual": "%1 en %2 hebben een reactie geplaatst in: %3", + "user_posted_to_multiple": "%1 en %2 hebben een reactie geplaatst in: %3", "user_posted_topic": "%1 heeft een nieuw onderwerp geplaatst: %2", "user_started_following_you": "%1 volgt jou nu.", + "user_started_following_you_dual": "%1 en %2 volgen jou nu.", + "user_started_following_you_multiple": "%1 en %2 andere volgen jou nu.", "new_register": "%1 heeft een registratie verzoek aangevraagd.", "email-confirmed": "E-mailadres bevestigd", "email-confirmed-message": "Bedankt voor het bevestigen van je e-mailadres. Dit account is nu volledig geactiveerd.", "email-confirm-error-message": "Er was een probleem met het bevestigen van dit e-mailadres. Misschien is de code niet goed ingevoerd of was de beschikbare tijd inmiddels verstreken.", - "email-confirm-sent": "Bevestigingsmail verstuurd" + "email-confirm-sent": "Bevestigingsmail verstuurd." } \ No newline at end of file diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 1b405773f0..5ae93ea34b 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Wysłałeś zbyt wiele wiadomości, prosimy chwilę poczekać.", "invalid-chat-message": "Nieprawidłowa wiadomość", "chat-message-too-long": "Wiadomość jest zbyt długa", + "cant-edit-chat-message": "You are not allowed to edit this message", "reputation-system-disabled": "System reputacji jest wyłączony.", "downvoting-disabled": "Negatywna ocena postów jest wyłączona", "not-enough-reputation-to-downvote": "Masz za mało reputacji, aby negatywnie ocenić ten post", diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json index 47a4eb6fa3..a8e49b7379 100644 --- a/public/language/pl/modules.json +++ b/public/language/pl/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 dni", "chat.thirty_days": "30 dni", "chat.three_months": "3 miesiące", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Twórz", "composer.show_preview": "Pokaż Podgląd", "composer.hide_preview": "Ukryj Podgląd", diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json index e655a6253a..e34cb43dc6 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Masz nieprzeczytane powiadomienia.", "new_message_from": "Nowa wiadomość od %1", "upvoted_your_post_in": "%1 zagłosował na Twój post w %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 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.", "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", "user_posted_to": "%1 dodał odpowiedź do %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_topic": "%1 wysłał nowy temat: %2", "user_started_following_you": "%1 zaczął Cię śledzić.", + "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 wysłał żądanie rejestracji.", "email-confirmed": "E-mail potwierdzony", "email-confirmed-message": "Dziękujemy za potwierdzenie maila. Twoje konto zostało aktywowane.", diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json index 9d4558f368..9301f0cc0a 100644 --- a/public/language/pt_BR/error.json +++ b/public/language/pt_BR/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Você enviou muitas mensagens, por favor aguarde um momento.", "invalid-chat-message": "Mensagem de chat inválida", "chat-message-too-long": "A mensagem de chat é muito longa", + "cant-edit-chat-message": "You are not allowed to edit this message", "reputation-system-disabled": "O sistema de reputação está desabilitado.", "downvoting-disabled": "Negativação está desabilitada", "not-enough-reputation-to-downvote": "Você não possui reputação suficiente para negativar este post", diff --git a/public/language/pt_BR/modules.json b/public/language/pt_BR/modules.json index 103c81a8e5..755ff96c4c 100644 --- a/public/language/pt_BR/modules.json +++ b/public/language/pt_BR/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Dias", "chat.thirty_days": "30 Dias", "chat.three_months": "3 Meses", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compor", "composer.show_preview": "Exibir Pré-visualização", "composer.hide_preview": "Esconder Pré-visualização", diff --git a/public/language/pt_BR/notifications.json b/public/language/pt_BR/notifications.json index 7a3b36d8d6..58d959e039 100644 --- a/public/language/pt_BR/notifications.json +++ b/public/language/pt_BR/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Você possui notificações não lidas.", "new_message_from": "Nova mensagem de %1", "upvoted_your_post_in": "%1 deu voto positivo para seu post em %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 moveu seu post para %2", "moved_your_topic": "%1 movido %2", "favourited_your_post_in": "%1 adicionou seu tópico aos favoritos em %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.", "user_flagged_post_in": "%1 sinalizou um post em %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_posted_to": "%1 postou uma resposta para: %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_topic": "%1 postou um novo tópico: %2", "user_started_following_you": "%1 começou a seguir você.", + "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 lhe enviou um pedido de cadastro.", "email-confirmed": "Email Confirmado", "email-confirmed-message": "Obrigado por validar o seu email. Agora sua conta está plenamente ativada.", diff --git a/public/language/ro/error.json b/public/language/ro/error.json index 09f303afff..9f5ef511b3 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "Sistemul de reputație este dezactivat.", "downvoting-disabled": "Votarea negativă este dezactivată", "not-enough-reputation-to-downvote": "Nu ai destulă reputație pentru a vota negativ acest post.", diff --git a/public/language/ro/modules.json b/public/language/ro/modules.json index c3d76d0617..b8e3f73cba 100644 --- a/public/language/ro/modules.json +++ b/public/language/ro/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Zile", "chat.thirty_days": "30 de zile", "chat.three_months": "3 Luni", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json index a7cc002529..a37dac936b 100644 --- a/public/language/ro/notifications.json +++ b/public/language/ro/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Ai notificări necitite.", "new_message_from": "Un mesaj nou de la %1", "upvoted_your_post_in": "%1 a votat pozitiv mesajul tău în %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 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.", "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", "user_posted_to": "%1 a postat un răspuns la: %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_topic": "%1 has posted a new topic: %2", "user_started_following_you": "%1 a început să te urmărească.", + "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.", "email-confirmed": "Email confirmat", "email-confirmed-message": "Îți mulțumim pentru validarea emailului. Contul tău este acuma activat.", diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 6b93882e6e..4dd3c99934 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Вы отправили слишком много сообщений, подождите немного.", "invalid-chat-message": "Неверное сообщение чата", "chat-message-too-long": "Слишком длинное сообщение чата", + "cant-edit-chat-message": "У вас нет доступа для редактирования этого сообщения", "reputation-system-disabled": "Система репутации отключена.", "downvoting-disabled": "Понижение оценки отключено", "not-enough-reputation-to-downvote": "У Вас недостаточно репутации для понижения оценки сообщения", diff --git a/public/language/ru/modules.json b/public/language/ru/modules.json index 68032d3140..b9ea06f477 100644 --- a/public/language/ru/modules.json +++ b/public/language/ru/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 дней", "chat.thirty_days": "30 дней", "chat.three_months": "3 месяца", + "chat.delete_message_confirm": "Вы уверены, что хотите удалить это сообщение?", "composer.compose": "Редактор", "composer.show_preview": "Показать предпросмотр", "composer.hide_preview": "Скрыть предпросмотр", @@ -23,7 +24,7 @@ "composer.discard": "Вы уверены, что хотите отменить все изменения?", "composer.submit_and_lock": "Отправить и закрыть", "composer.toggle_dropdown": "Показать выпадающий список", - "composer.uploading": "Uploading %1", + "composer.uploading": "Загрузка %1", "bootbox.ok": "ОК", "bootbox.cancel": "Отмена", "bootbox.confirm": "Подтвердить", diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index 24be55d9ea..9c258affe0 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "У вас есть непрочитанные уведомления.", "new_message_from": "Новое сообщение от %1", "upvoted_your_post_in": "%1 проголосовал за Ваше сообщение в %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", + "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 and %2 others have favourited 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_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_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 отправлен запрос на регистрацию.", "email-confirmed": "Email подтвержден", "email-confirmed-message": "Спасибо за подтверждение Вашего Email-адреса. Ваш аккаунт активирован.", diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index b733f7305a..0ba0064291 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -98,10 +98,10 @@ "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?", - "stale.create": "Create a new topic", - "stale.reply_anyway": "Reply to this topic anyway", + "stale.create": "Создать новую тему", + "stale.reply_anyway": "Всё равно ответить в этой теме", "stale.link_back": "Re: [%1](%2)", - "spam": "Spam", + "spam": "Спам", "offensive": "Offensive", "custom-flag-reason": "Enter a flagging reason" } \ No newline at end of file diff --git a/public/language/ru/user.json b/public/language/ru/user.json index 83a614e156..d9b7cc6621 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -30,16 +30,16 @@ "signature": "Подпись", "birthday": "День рождения", "chat": "Чат", - "chat_with": "Chat with %1", + "chat_with": "Чат с %1", "follow": "Читать", "unfollow": "Не читать", "more": "Ещё", "profile_update_success": "Профиль обновлен!", "change_picture": "Изменить фотографию", - "change_username": "Change Username", - "change_email": "Change Email", + "change_username": "Изменить имя пользователя", + "change_email": "Изменить Email", "edit": "Редактировать", - "default_picture": "Default Icon", + "default_picture": "Иконка по умолчанию", "uploaded_picture": "Загруженные фотографии", "upload_new_picture": "Загрузить новую фотографию", "upload_new_picture_from_url": "Загрузить новое изображение с адреса URL", @@ -58,7 +58,7 @@ "upload_picture": "Загрузить фотографию", "upload_a_picture": "Загрузить фотографию", "remove_uploaded_picture": "Удалить загруженные фотографии", - "image_spec": "You may only upload PNG, JPG, or BMP files", + "image_spec": "Вы можете загружать только PNG, JPG или BMP файлы", "settings": "Настройки", "show_email": "Показывать мой Email", "show_fullname": "Показывать Полное Имя", @@ -92,8 +92,8 @@ "grouptitle": "Выберите бейдж группы для отображения", "no-group-title": "Не показывать бейдж", "select-skin": "Выбрать скин", - "select-homepage": "Select a Homepage", - "homepage": "Homepage", + "select-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\")", diff --git a/public/language/rw/error.json b/public/language/rw/error.json index 4c2ebfffdd..73b8c31193 100644 --- a/public/language/rw/error.json +++ b/public/language/rw/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Wohereje ubutumwa bwinshi cyane. Ba utegerejeho gato. ", "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", "reputation-system-disabled": "Ibijyanye n'itangwa ry'amanota ntibyemerewe. ", "downvoting-disabled": "Kwambura amanota ntibyemerewe", "not-enough-reputation-to-downvote": "Ntabwo ufite amanota ahagije ngo ube wakwemererwa kugira uwo wambura amanota", diff --git a/public/language/rw/modules.json b/public/language/rw/modules.json index 2990e472a1..9d603f2800 100644 --- a/public/language/rw/modules.json +++ b/public/language/rw/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "Iminsi 7", "chat.thirty_days": "Iminsi 30", "chat.three_months": "Amezi 3", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Andika", "composer.show_preview": "Bona Uko Biza Gusa", "composer.hide_preview": "Hisha Uko Biza Gusa", diff --git a/public/language/rw/notifications.json b/public/language/rw/notifications.json index a9d10be6e2..64f4c98753 100644 --- a/public/language/rw/notifications.json +++ b/public/language/rw/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Ufite amatangazo utarasoma. ", "new_message_from": " %1 yakwandikiye", "upvoted_your_post_in": "%1 yagushimye aguha inota kuri %2 washyizeho.", + "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 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.", "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", "user_posted_to": "%1 yanditse kuri: %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_topic": "%1 yatangije ikiganiro gishya: %2", "user_started_following_you": "%1 yatangiye kugukurikira.", + "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 yasabye kwandikwa.", "email-confirmed": "Email Yemejwe", "email-confirmed-message": "Urakoze kugaragaza ko email yawe ikora. Ubu ngubu konte yawe irakora nta kabuza. ", diff --git a/public/language/sc/error.json b/public/language/sc/error.json index c9751317f1..f942fa3536 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/sc/modules.json b/public/language/sc/modules.json index 401825cafc..7cc210827f 100644 --- a/public/language/sc/modules.json +++ b/public/language/sc/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Days", "chat.thirty_days": "30 Days", "chat.three_months": "3 Months", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json index 929f5a55c6..b9d09d0159 100644 --- a/public/language/sc/notifications.json +++ b/public/language/sc/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", "upvoted_your_post_in": "%1 has upvoted your post in %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 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.", "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", "user_posted_to": "%1 has posted a reply to: %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_topic": "%1 has posted a new topic: %2", "user_started_following_you": "%1 started following you.", + "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.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", diff --git a/public/language/sk/error.json b/public/language/sk/error.json index d9f7faba24..fd7db0bcc1 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/sk/modules.json b/public/language/sk/modules.json index 6849172112..e781d5bbd6 100644 --- a/public/language/sk/modules.json +++ b/public/language/sk/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Days", "chat.thirty_days": "30 Days", "chat.three_months": "3 Months", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json index a8e6619d33..5b62d0317e 100644 --- a/public/language/sk/notifications.json +++ b/public/language/sk/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Máte neprečítané notifikácie", "new_message_from": "Nova spáva od %1", "upvoted_your_post_in": "%1 has upvoted your post in %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 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.", "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", "user_posted_to": "%1 odpovedal: %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_topic": "%1 has posted a new topic: %2", "user_started_following_you": "%1 started following you.", + "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.", "email-confirmed": "Email bol potvrdený", "email-confirmed-message": "Ďakujeme za potvrdenie tvojho emailu. Účet je plne aktivovaný.", diff --git a/public/language/sl/error.json b/public/language/sl/error.json index b4b0dc8897..72f171c6b4 100644 --- a/public/language/sl/error.json +++ b/public/language/sl/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Poslali ste veliko število sporočil, prosimo počakajte nekaj časa.", "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", "reputation-system-disabled": "Možnost ugleda je onemogočena.", "downvoting-disabled": "Negativno glasovanje je onemogočeno", "not-enough-reputation-to-downvote": "Nimate dovolj ugleda za negativno glasovanje", diff --git a/public/language/sl/modules.json b/public/language/sl/modules.json index ab7048bbfa..7f8318d8cd 100644 --- a/public/language/sl/modules.json +++ b/public/language/sl/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 dni", "chat.thirty_days": "30 dni", "chat.three_months": "3 mesece", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Ustvari", "composer.show_preview": "Pokaži predogled", "composer.hide_preview": "Skrij predogled", diff --git a/public/language/sl/notifications.json b/public/language/sl/notifications.json index b0164f086e..6554627f8f 100644 --- a/public/language/sl/notifications.json +++ b/public/language/sl/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Imate neprebrana obvestila.", "new_message_from": "Novo obvestilo od %1", "upvoted_your_post_in": "%1 je glasoval za vašo objavo v %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 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.", "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", "user_posted_to": "%1 je odgovoril na: %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_topic": "%1 je odprl novo temo: %2", "user_started_following_you": "%1 te sledi.", + "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 je poslal prošnjo za registracijo.", "email-confirmed": "E-mail naslov potrjen", "email-confirmed-message": "Hvala ker ste potrdili svoj naslov. Račun je sedaj aktiviran.", diff --git a/public/language/sr/error.json b/public/language/sr/error.json index cb440dbe73..b3b76f7f55 100644 --- a/public/language/sr/error.json +++ b/public/language/sr/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/sr/modules.json b/public/language/sr/modules.json index e1410e6399..0681713873 100644 --- a/public/language/sr/modules.json +++ b/public/language/sr/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 дана", "chat.thirty_days": "30 дана", "chat.three_months": "3 месеца", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Састави", "composer.show_preview": "Прикажи преглед", "composer.hide_preview": "Сакриј преглед", diff --git a/public/language/sr/notifications.json b/public/language/sr/notifications.json index e65b13f46d..79d715bae4 100644 --- a/public/language/sr/notifications.json +++ b/public/language/sr/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Имате непрочитаних обавештења.", "new_message_from": "Нова порука од %1", "upvoted_your_post_in": "%1 дода глас вашој поруци у %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 доду вашу поруку из %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.", "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_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_topic": "%1 постави нову тему:", "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.", "email-confirmed": "Е-пошта је је отврђена.", "email-confirmed-message": "Хвала на овери ваше е-поште. Ваш налог је сада у потпуности активан.", diff --git a/public/language/sv/error.json b/public/language/sv/error.json index 5692e2b5a6..20379d5846 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Du har skickat för många meddelanden, var god vänta", "invalid-chat-message": "Ogiltigt chattmeddelande", "chat-message-too-long": "Chattmeddelande är för långt", + "cant-edit-chat-message": "You are not allowed to edit this message", "reputation-system-disabled": "Ryktessystemet är inaktiverat.", "downvoting-disabled": "Nedröstning är inaktiverat", "not-enough-reputation-to-downvote": "Du har inte tillräckligt förtroende för att rösta ner det här meddelandet", diff --git a/public/language/sv/modules.json b/public/language/sv/modules.json index 5df9836063..658badc21b 100644 --- a/public/language/sv/modules.json +++ b/public/language/sv/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Dagar", "chat.thirty_days": "30 Dagar", "chat.three_months": "3 Månader", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Komponera", "composer.show_preview": "Visa förhandsgranskning", "composer.hide_preview": "Dölj förhandsgranskning", diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index dbf4d290c6..dcb54b72ab 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Du har olästa notiser.", "new_message_from": "Nytt medelande från %1", "upvoted_your_post_in": "%1 har röstat upp ditt inlägg i %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 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.", "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", "user_posted_to": "%1 har skrivit ett svar på: %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_topic": "%1 har skapat ett nytt ämne: %2", "user_started_following_you": "%1 började följa dig.", + "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 skickade en registreringsförfrågan.", "email-confirmed": "Epost bekräftad", "email-confirmed-message": "Tack för att du bekräftat din epostadress. Ditt konto är nu fullt ut aktiverat.", diff --git a/public/language/th/error.json b/public/language/th/error.json index 3194dc9366..683c012832 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/th/modules.json b/public/language/th/modules.json index df389d716f..824e19d8f2 100644 --- a/public/language/th/modules.json +++ b/public/language/th/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Days", "chat.thirty_days": "30 Days", "chat.three_months": "3 Months", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json index 34fc870629..14fd6afc25 100644 --- a/public/language/th/notifications.json +++ b/public/language/th/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "คุณมีคำเตือนที่ยังไม่ได้อ่าน", "new_message_from": "New message from %1", "upvoted_your_post_in": "%1 has upvoted your post in %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 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.", "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", "user_posted_to": "%1 has posted a reply to: %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_topic": "%1 has posted a new topic: %2", "user_started_following_you": "%1 started following you.", + "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.", "email-confirmed": "Email ได้รับการยืนยันแล้ว", "email-confirmed-message": "ขอบคุณที่ยืนยัน Email ของคุณ บัญชีของคุณสามารถใช้งานได้แล้ว", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index c6fe3a6ffc..85d45e6e2f 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -78,6 +78,7 @@ "too-many-messages": "Ardı ardına çok fazla mesaj yolladınız, lütfen biraz bekleyiniz.", "invalid-chat-message": "Geçersiz sohbet mesajı", "chat-message-too-long": "Sohbet mesajı çok uzun", + "cant-edit-chat-message": "Bu mesajı düzenlemek 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.", diff --git a/public/language/tr/modules.json b/public/language/tr/modules.json index 00bdcf3fd3..88316ba76e 100644 --- a/public/language/tr/modules.json +++ b/public/language/tr/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7 Gün", "chat.thirty_days": "30 Gün", "chat.three_months": "3 Ay", + "chat.delete_message_confirm": "Bu mesajı silmek istediğinden emin misin?", "composer.compose": "Yaz", "composer.show_preview": "Önizleme Göster", "composer.hide_preview": "Önizleme Sakla", diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index b0eb25ec97..b69d4c980f 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "Okunmamış bildirimleriniz var.", "new_message_from": "%1 size bir mesaj gönderdi", "upvoted_your_post_in": "%1 iletinizi beğendi. %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 senin iletin %2 taşındı", "moved_your_topic": "%1 has moved %2", "favourited_your_post_in": "%1 iletinizi favorilerine ekledi. %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.", "user_flagged_post_in": "%1 bir iletiyi bayrakladı. %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_posted_to": "%1 %2 başlığına bir ileti gönderdi.", + "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_topic": "%1 yeni bir konu yarattı: %2", "user_started_following_you": "%1 sizi takip etmeye başladı.", + "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 kayıt olma isteği gönderdi.", "email-confirmed": "E-posta onaylandı", "email-confirmed-message": "E-postanızı onaylandığınız için teşekkürler. Hesabınız tamamen aktive edildi.", diff --git a/public/language/vi/error.json b/public/language/vi/error.json index af9159d7b1..04cf0e7372 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -78,6 +78,7 @@ "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", "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", diff --git a/public/language/vi/modules.json b/public/language/vi/modules.json index 9b1b93666d..76a96ebb53 100644 --- a/public/language/vi/modules.json +++ b/public/language/vi/modules.json @@ -15,6 +15,7 @@ "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?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index 533e5d2a53..3d3ca64228 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -12,13 +12,23 @@ "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.", "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_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_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.", "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 đủ.", diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json index 7af774c65f..2e4570daca 100644 --- a/public/language/zh_CN/error.json +++ b/public/language/zh_CN/error.json @@ -78,6 +78,7 @@ "too-many-messages": "您发送了太多消息，请稍等片刻。", "invalid-chat-message": "无效的聊天信息", "chat-message-too-long": "聊天信息太长", + "cant-edit-chat-message": "You are not allowed to edit this message", "reputation-system-disabled": "威望系统已禁用。", "downvoting-disabled": "扣分功能已禁用", "not-enough-reputation-to-downvote": "您的威望不足以给此帖扣分", diff --git a/public/language/zh_CN/modules.json b/public/language/zh_CN/modules.json index aae25f0135..7d90c3439a 100644 --- a/public/language/zh_CN/modules.json +++ b/public/language/zh_CN/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7天", "chat.thirty_days": "30天", "chat.three_months": "3个月", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "编写", "composer.show_preview": "显示预览", "composer.hide_preview": "隐藏预览", diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json index 9589fe7507..5fba6a56e0 100644 --- a/public/language/zh_CN/notifications.json +++ b/public/language/zh_CN/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "您有未读的通知。", "new_message_from": "来自 %1 的新消息", "upvoted_your_post_in": "%1 在 %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 移动到了 %2", "moved_your_topic": "%1 移动到了 %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.", "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_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_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 发出了注册请求", "email-confirmed": "电子邮箱已确认", "email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已全面激活。", diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json index 6cb00eb735..779883fd94 100644 --- a/public/language/zh_TW/error.json +++ b/public/language/zh_TW/error.json @@ -78,6 +78,7 @@ "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", "reputation-system-disabled": "信譽系統已停用。", "downvoting-disabled": "Downvoting已停用", "not-enough-reputation-to-downvote": "你沒有足夠的信譽downvote這個帖子", diff --git a/public/language/zh_TW/modules.json b/public/language/zh_TW/modules.json index a6b03030b8..309d07f658 100644 --- a/public/language/zh_TW/modules.json +++ b/public/language/zh_TW/modules.json @@ -15,6 +15,7 @@ "chat.seven_days": "7日", "chat.thirty_days": "30日", "chat.three_months": "3個月", + "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "composer.compose": "Compose", "composer.show_preview": "Show Preview", "composer.hide_preview": "Hide Preview", diff --git a/public/language/zh_TW/notifications.json b/public/language/zh_TW/notifications.json index 993d2cd3d8..fb2f3baa39 100644 --- a/public/language/zh_TW/notifications.json +++ b/public/language/zh_TW/notifications.json @@ -12,13 +12,23 @@ "you_have_unread_notifications": "您有未讀的訊息！", "new_message_from": "來自 %1 的新訊息", "upvoted_your_post_in": "%1 upvote了您在 %2的post。", + "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 收藏了你在 %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.", "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", "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_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.", "email-confirmed": "已確認電郵", "email-confirmed-message": "感謝您驗證您的電郵。您的帳戶現已全面啟用。", diff --git a/public/less/admin/bootstrap/alerts.less b/public/less/admin/bootstrap/alerts.less index df070b8ab2..c4199db927 100644 --- a/public/less/admin/bootstrap/alerts.less +++ b/public/less/admin/bootstrap/alerts.less @@ -18,6 +18,7 @@ // Specified for the h4 to prevent conflicts of changing @headings-color color: inherit; } + // Provide class for links that match alerts .alert-link { font-weight: @alert-link-font-weight; @@ -28,6 +29,7 @@ > ul { margin-bottom: 0; } + > p + p { margin-top: 5px; } @@ -57,12 +59,15 @@ .alert-success { .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text); } + .alert-info { .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text); } + .alert-warning { .alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text); } + .alert-danger { .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text); } diff --git a/public/less/admin/bootstrap/badges.less b/public/less/admin/bootstrap/badges.less index b27c405a30..6ee16dca41 100644 --- a/public/less/admin/bootstrap/badges.less +++ b/public/less/admin/bootstrap/badges.less @@ -12,7 +12,7 @@ font-weight: @badge-font-weight; color: @badge-color; line-height: @badge-line-height; - vertical-align: baseline; + vertical-align: middle; white-space: nowrap; text-align: center; background-color: @badge-bg; @@ -28,7 +28,9 @@ position: relative; top: -1px; } - .btn-xs & { + + .btn-xs &, + .btn-group-xs > .btn & { top: 0; padding: 1px 5px; } @@ -49,12 +51,15 @@ color: @badge-active-color; background-color: @badge-active-bg; } + .list-group-item > & { float: right; } + .list-group-item > & + & { margin-right: 5px; } + .nav-pills > li > a > & { margin-left: 3px; } diff --git a/public/less/admin/bootstrap/bootstrap.less b/public/less/admin/bootstrap/bootstrap.less index 61b77474f9..1c0477805f 100644 --- a/public/less/admin/bootstrap/bootstrap.less +++ b/public/less/admin/bootstrap/bootstrap.less @@ -1,3 +1,9 @@ +/*! + * Bootstrap v3.3.6 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + // Core variables and mixins @import "variables.less"; @import "mixins.less"; diff --git a/public/less/admin/bootstrap/button-groups.less b/public/less/admin/bootstrap/button-groups.less index f84febbd56..293245a650 100644 --- a/public/less/admin/bootstrap/button-groups.less +++ b/public/less/admin/bootstrap/button-groups.less @@ -36,6 +36,7 @@ margin-left: -5px; // Offset the first child's margin &:extend(.clearfix all); + .btn, .btn-group, .input-group { float: left; @@ -71,13 +72,13 @@ .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; } -.btn-group > .btn-group:first-child { +.btn-group > .btn-group:first-child:not(:last-child) { > .btn:last-child, > .dropdown-toggle { .border-right-radius(0); } } -.btn-group > .btn-group:last-child > .btn:first-child { +.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { .border-left-radius(0); } @@ -172,12 +173,12 @@ border-radius: 0; } &:first-child:not(:last-child) { - border-top-right-radius: @border-radius-base; + .border-top-radius(@btn-border-radius-base); .border-bottom-radius(0); } &:last-child:not(:first-child) { - border-bottom-left-radius: @border-radius-base; .border-top-radius(0); + .border-bottom-radius(@btn-border-radius-base); } } .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { diff --git a/public/less/admin/bootstrap/buttons.less b/public/less/admin/bootstrap/buttons.less index 40553c6386..9cbb8f416f 100644 --- a/public/less/admin/bootstrap/buttons.less +++ b/public/less/admin/bootstrap/buttons.less @@ -17,7 +17,7 @@ background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid transparent; white-space: nowrap; - .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base); + .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @btn-border-radius-base); .user-select(none); &, @@ -47,10 +47,16 @@ &[disabled], fieldset[disabled] & { cursor: @cursor-disabled; - pointer-events: none; // Future-proof disabling of clicks .opacity(.65); .box-shadow(none); } + + a& { + &.disabled, + fieldset[disabled] & { + pointer-events: none; // Future-proof disabling of clicks on `` elements + } + } } @@ -107,7 +113,7 @@ &:hover, &:focus { color: @link-hover-color; - text-decoration: underline; + text-decoration: @link-hover-decoration; background-color: transparent; } &[disabled], @@ -126,14 +132,14 @@ .btn-lg { // line-height: ensure even-numbered height of button next to large input - .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); + .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @btn-border-radius-large); } .btn-sm { // line-height: ensure proper height of button next to small input - .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); + .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small); } .btn-xs { - .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small); + .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small); } diff --git a/public/less/admin/bootstrap/carousel.less b/public/less/admin/bootstrap/carousel.less index 5724d8a56e..252011e9e2 100644 --- a/public/less/admin/bootstrap/carousel.less +++ b/public/less/admin/bootstrap/carousel.less @@ -27,24 +27,24 @@ // WebKit CSS3 transforms for supported devices @media all and (transform-3d), (-webkit-transform-3d) { - transition: transform .6s ease-in-out; - backface-visibility: hidden; - perspective: 1000; + .transition-transform(~'0.6s ease-in-out'); + .backface-visibility(~'hidden'); + .perspective(1000px); &.next, &.active.right { - transform: translate3d(100%, 0, 0); + .translate3d(100%, 0, 0); left: 0; } &.prev, &.active.left { - transform: translate3d(-100%, 0, 0); + .translate3d(-100%, 0, 0); left: 0; } &.next.left, &.prev.right, &.active { - transform: translate3d(0, 0, 0); + .translate3d(0, 0, 0); left: 0; } } @@ -101,6 +101,7 @@ color: @carousel-control-color; text-align: center; text-shadow: @carousel-text-shadow; + background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug // We can't have this transition here because WebKit cancels the carousel // animation if you trip this while in the middle of another animation. @@ -130,6 +131,7 @@ .glyphicon-chevron-right { position: absolute; top: 50%; + margin-top: -10px; z-index: 5; display: inline-block; } @@ -147,7 +149,7 @@ .icon-next { width: 20px; height: 20px; - margin-top: -10px; + line-height: 1; font-family: serif; } @@ -195,6 +197,7 @@ // Internet Explorer 8-9 does not support clicks on elements without a set // `background-color`. We cannot use `filter` since that's not viewed as a // background color by the browser. Thus, a hack is needed. + // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Internet_Explorer // // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we // set alpha transparency for the best results possible. @@ -238,18 +241,18 @@ .glyphicon-chevron-right, .icon-prev, .icon-next { - width: 30px; - height: 30px; - margin-top: -15px; - font-size: 30px; + width: (@carousel-control-font-size * 1.5); + height: (@carousel-control-font-size * 1.5); + margin-top: (@carousel-control-font-size / -2); + font-size: (@carousel-control-font-size * 1.5); } .glyphicon-chevron-left, .icon-prev { - margin-left: -15px; + margin-left: (@carousel-control-font-size / -2); } .glyphicon-chevron-right, .icon-next { - margin-right: -15px; + margin-right: (@carousel-control-font-size / -2); } } diff --git a/public/less/admin/bootstrap/close.less b/public/less/admin/bootstrap/close.less index 9b4e74f2b8..6d5bfe087a 100644 --- a/public/less/admin/bootstrap/close.less +++ b/public/less/admin/bootstrap/close.less @@ -23,6 +23,7 @@ // Additional properties for button version // iOS requires the button element instead of an anchor tag. // If you want the anchor version, it requires `href="#"`. + // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile button& { padding: 0; cursor: pointer; diff --git a/public/less/admin/bootstrap/component-animations.less b/public/less/admin/bootstrap/component-animations.less index 967715d98b..0bcee910ac 100644 --- a/public/less/admin/bootstrap/component-animations.less +++ b/public/less/admin/bootstrap/component-animations.less @@ -17,9 +17,8 @@ .collapse { display: none; - visibility: hidden; - &.in { display: block; visibility: visible; } + &.in { display: block; } tr&.in { display: table-row; } tbody&.in { display: table-row-group; } } diff --git a/public/less/admin/bootstrap/dropdowns.less b/public/less/admin/bootstrap/dropdowns.less index 84a48c1413..f6876c1a9b 100644 --- a/public/less/admin/bootstrap/dropdowns.less +++ b/public/less/admin/bootstrap/dropdowns.less @@ -10,12 +10,14 @@ height: 0; margin-left: 2px; vertical-align: middle; - border-top: @caret-width-base solid; + border-top: @caret-width-base dashed; + border-top: @caret-width-base solid ~"\9"; // IE8 border-right: @caret-width-base solid transparent; border-left: @caret-width-base solid transparent; } // The dropdown wrapper (div) +.dropup, .dropdown { position: relative; } @@ -183,14 +185,15 @@ // Reverse the caret .caret { border-top: 0; - border-bottom: @caret-width-base solid; + border-bottom: @caret-width-base dashed; + border-bottom: @caret-width-base solid ~"\9"; // IE8 content: ""; } // Different positioning for bottom up menu .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 1px; + margin-bottom: 2px; } } diff --git a/public/less/admin/bootstrap/forms.less b/public/less/admin/bootstrap/forms.less index 1bcc2b6b97..e8b071a138 100644 --- a/public/less/admin/bootstrap/forms.less +++ b/public/less/admin/bootstrap/forms.less @@ -56,7 +56,6 @@ input[type="checkbox"] { line-height: normal; } -// Set the height of file controls to match text inputs input[type="file"] { display: block; } @@ -123,7 +122,7 @@ output { background-color: @input-bg; background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid @input-border; - border-radius: @input-border-radius; + border-radius: @input-border-radius; // Note: This has no effect on s in CSS. .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); .transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s"); @@ -133,6 +132,12 @@ output { // Placeholder .placeholder(); + // Unstyle the caret on ` - + diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl index 96ceb01ff6..dbb13f2714 100644 --- a/src/views/admin/settings/post.tpl +++ b/src/views/admin/settings/post.tpl @@ -132,13 +132,18 @@ Allow users to upload regular files +
- Maximum File Size

+ +
+ + +
- Topic Thumb Size

+ +
+ + +
+ +
+ + +

+ Enter comma-separated list of file extensions here (e.g. pdf,xls,doc). + An empty list means all extensions are allowed. +

+
diff --git a/src/views/admin/settings/tags.tpl b/src/views/admin/settings/tags.tpl index 6c09dab80e..e1e8f01f1c 100644 --- a/src/views/admin/settings/tags.tpl +++ b/src/views/admin/settings/tags.tpl @@ -4,12 +4,6 @@
Tag Settings
-
- -
@@ -31,4 +25,31 @@
+ +
+
Privacy
+
+ +
+ +
+ +
+
+ +
+
Related Topics
+
+
+
+ + +
+
+
+
+ \ No newline at end of file diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl index dc25c99980..f1075b0c60 100644 --- a/src/views/admin/settings/user.tpl +++ b/src/views/admin/settings/user.tpl @@ -39,9 +39,19 @@ + + +
+ + +

+ 0 for no restriction. Admins get infinite invitations
+ Only applicable for "Invite Only" +

+
@@ -273,4 +283,4 @@ - \ No newline at end of file +