diff --git a/install/data/defaults.json b/install/data/defaults.json
index 0ecd7b5fd1..15418fdf42 100644
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -3,6 +3,10 @@
"field": "title",
"value": "NodeBB"
},
+ {
+ "field": "showSiteTitle",
+ "value": "1"
+ },
{
"field": "postDelay",
"value": 10
diff --git a/package.json b/package.json
index 73e81c4b63..b9ab598728 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPLv3 or later",
"description": "NodeBB Forum",
- "version": "0.5.0-4",
+ "version": "0.5.0",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",
diff --git a/public/language/ar/category.json b/public/language/ar/category.json
index 27f20b6d25..7d62f59e6f 100644
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -3,5 +3,6 @@
"no_topics": "لا توجد مواضيع في هذه الفئةلماذا لا تحاول نشر موضوع؟
",
"browsing": "تصفح",
"no_replies": "لم يرد أحد",
- "share_this_category": "انشر هذه الفئة"
+ "share_this_category": "انشر هذه الفئة",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/ar/email.json b/public/language/ar/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/ar/email.json
+++ b/public/language/ar/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/ar/error.json b/public/language/ar/error.json
index df25651826..6e6956b0ec 100644
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "كلمة السر غير مقبولة",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "اسم المستخدم ماخوذ",
"email-taken": "البريد الالكتروني ماخوذ",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "المستخدم محظور",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
@@ -52,5 +55,9 @@
"upload-error": "مشكلة في الرفع: 1%",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json
index 32d6b62dcf..eec61f2062 100644
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "New Notification",
"you_have_unread_notifications": "You have unread notifications.",
"new_message_from": "New message from %1",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 has favourited your post.",
- "user_flagged_post": "%1 flagged a post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 has posted a reply to: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/ar/recent.json b/public/language/ar/recent.json
index fa2a081df6..866d0e28fc 100644
--- a/public/language/ar/recent.json
+++ b/public/language/ar/recent.json
@@ -4,5 +4,6 @@
"week": "أسبوع",
"month": "شهر",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "There are no recent topics."
}
\ No newline at end of file
diff --git a/public/language/ar/search.json b/public/language/ar/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/ar/search.json
+++ b/public/language/ar/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json
index 930f642748..eed42e4f01 100644
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "هذا الموضوع سوف ينقل إلى فئة",
"fork_topic_instruction": "إضغط على الردود لتفريعهم",
"fork_no_pids": "لم تختار أي رد",
- "fork_success": "تفريع الموضوع بنجاح!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Enter your topic title here...",
"composer.discard": "Discard",
"composer.submit": "Submit",
diff --git a/public/language/ar/user.json b/public/language/ar/user.json
index 3ec0b2df33..f5a6be3c14 100644
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -4,6 +4,8 @@
"username": "إسم المستخدم",
"email": "البريد الإلكتروني",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "الاسم الكامل",
"website": "الموقع الإلكتروني",
"location": "موقع",
@@ -50,6 +52,7 @@
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "هذا المستخدم ليس لديه أي أتباع :(",
"follows_no_one": "هذا المستخدم لا يتبع أحد :(",
"has_no_posts": "This user didn't post anything yet.",
@@ -61,5 +64,7 @@
"posts_per_page": "Posts per Page",
"notification_sounds": "Play a sound when you receive a notification.",
"browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/cs/category.json b/public/language/cs/category.json
index fcaf82c582..0c5e3af859 100644
--- a/public/language/cs/category.json
+++ b/public/language/cs/category.json
@@ -3,5 +3,6 @@
"no_topics": "V této kategorii zatím nejsou žádné příspěvky.
Můžeš být první!",
"browsing": "prohlíží",
"no_replies": "Nikdo ještě neodpověděl",
- "share_this_category": "Share this category"
+ "share_this_category": "Share this category",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/cs/email.json b/public/language/cs/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/cs/email.json
+++ b/public/language/cs/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/cs/error.json b/public/language/cs/error.json
index 77c582b23f..f90d459cce 100644
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Invalid Password",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "User banned",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
@@ -52,5 +55,9 @@
"upload-error": "Upload Error : %1",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json
index e315bfd6c0..8a77183b5e 100644
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "New Notification",
"you_have_unread_notifications": "You have unread notifications.",
"new_message_from": "New message from %1",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 has favourited your post.",
- "user_flagged_post": "%1 flagged a post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 has posted a reply to: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/cs/recent.json b/public/language/cs/recent.json
index 34933d6d13..d769997c6f 100644
--- a/public/language/cs/recent.json
+++ b/public/language/cs/recent.json
@@ -4,5 +4,6 @@
"week": "Týden",
"month": "Měsíc",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "There are no recent topics."
}
\ No newline at end of file
diff --git a/public/language/cs/search.json b/public/language/cs/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/cs/search.json
+++ b/public/language/cs/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json
index fd1e316089..b3a0eb1aeb 100644
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Toto téma bude přesunuto do kategorie",
"fork_topic_instruction": "Vyber příspěvky, které chceš oddělit",
"fork_no_pids": "Žádné příspěvky nebyly vybrány!",
- "fork_success": "Téma bylo úspěšně rozděleno!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Enter your topic title here...",
"composer.discard": "Discard",
"composer.submit": "Submit",
diff --git a/public/language/cs/user.json b/public/language/cs/user.json
index 6d2bba05e5..48e9c3655b 100644
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -4,6 +4,8 @@
"username": "Uživatelské jméno",
"email": "Email",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Jméno a příjmení",
"website": "Webové stránky",
"location": "Poloha",
@@ -50,6 +52,7 @@
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Tohoto uživatele nikdo nesleduje :(",
"follows_no_one": "Tento uživatel nikoho nesleduje :(",
"has_no_posts": "This user didn't post anything yet.",
@@ -61,5 +64,7 @@
"posts_per_page": "Posts per Page",
"notification_sounds": "Play a sound when you receive a notification.",
"browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/de/category.json b/public/language/de/category.json
index df8b9796ef..185540948a 100644
--- a/public/language/de/category.json
+++ b/public/language/de/category.json
@@ -3,5 +3,6 @@
"no_topics": "Es gibt noch keine Themen in dieser Kategorie.
Warum beginnst du nicht das erste?",
"browsing": "Aktiv",
"no_replies": "Niemand hat geantwortet",
- "share_this_category": "Teile diese Kategorie"
+ "share_this_category": "Teile diese Kategorie",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/de/email.json b/public/language/de/email.json
index e3c67dc47b..6936a71750 100644
--- a/public/language/de/email.json
+++ b/public/language/de/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Aktuellste Themen vom %1",
"digest.cta": "Klicke hier, um %1 zu besuchen",
"digest.unsub.info": "Diese Zusammenfassung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
- "digest.unsub.cta": "Klicke hier, um diese Einstellungen zu ändern",
"digest.daily.no_topics": "Es gab heute keine aktiven Themen",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "Dies ist eine Test-E-Mail, um zu überprüfen, ob der E-Mailer deines NodeBB korrekt eingestellt wurde.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Danke!"
}
\ No newline at end of file
diff --git a/public/language/de/error.json b/public/language/de/error.json
index 73e0f64c0e..ddf1509f60 100644
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Ungültiger Titel",
"invalid-user-data": "Ungültige Benutzerdaten",
"invalid-password": "Ungültiges Passwort",
+ "invalid-username-or-password": "Bitte gebe einen Benutzernamen und ein Passwort an",
"invalid-pagination-value": "Die Nummerierung ist ungültig",
"username-taken": "Der Benutzername ist bereits vergeben",
"email-taken": "Die E-Mail-Adresse ist bereits vergeben",
"email-not-confirmed": "Deine E-Mail wurde noch nicht bestätigt. Bitte klicke hier, um deine E-Mail zu bestätigen.",
"username-too-short": "Benutzername ist zu kurz",
+ "username-too-long": "Der Benutzername ist zu lang",
"user-banned": "Der Benutzer ist gesperrt",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Die Kategorie existiert nicht",
"no-topic": "Das Thema existiert nicht",
"no-post": "Der Beitrag existiert nicht",
@@ -52,5 +55,9 @@
"upload-error": "Upload-Fehler: %1",
"signature-too-long": "Die Signatur darf maximal %1 Zeichen enthalten!",
"cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!",
- "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten."
+ "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.",
+ "not-enough-reputation-to-flag": "Deine Reputation ist nicht gut genug, um diesen Beitrag zu melden.",
+ "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen."
}
\ No newline at end of file
diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json
index 295796f5d6..a12ad1694c 100644
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Neue Benachrichtigung",
"you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.",
"new_message_from": "Neue Nachricht von %1",
- "upvoted_your_post": "%1 hat deinen Beitrag positiv bewertet.",
- "favourited_your_post": "%1 favorisiert deinen Beitrag.",
- "user_flagged_post": "%1 hat einen Beitrag markiert.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 hat auf %2 geantwortet.",
"user_mentioned_you_in": "%1 erwähnte dich in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "E-Mail bestätigt",
"email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.",
"email-confirm-error": "Es ist ein Fehler aufgetreten ...",
diff --git a/public/language/de/pages.json b/public/language/de/pages.json
index c49854a2a4..2df893a878 100644
--- a/public/language/de/pages.json
+++ b/public/language/de/pages.json
@@ -5,7 +5,7 @@
"recent": "Neueste Themen",
"users": "Registrierte User",
"notifications": "Benachrichtigungen",
- "tags": "Topics tagged under \"%1\"",
+ "tags": "Themen markiert unter \"%1\"",
"user.edit": "Bearbeite \"%1\"",
"user.following": "Nutzer, die %1 folgt",
"user.followers": "Nutzer, die %1 folgen",
diff --git a/public/language/de/recent.json b/public/language/de/recent.json
index b428875786..7e5cc47101 100644
--- a/public/language/de/recent.json
+++ b/public/language/de/recent.json
@@ -4,5 +4,6 @@
"week": "Woche",
"month": "Monat",
"year": "Jahr",
+ "alltime": "All Time",
"no_recent_topics": "Es gibt keine aktuellen Themen."
}
\ No newline at end of file
diff --git a/public/language/de/search.json b/public/language/de/search.json
index 47ca0be16b..7176039ead 100644
--- a/public/language/de/search.json
+++ b/public/language/de/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)"
+ "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/de/topic.json b/public/language/de/topic.json
index 85edcd53c7..77fbaf000f 100644
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Dieses Thema wird verschoben nach",
"fork_topic_instruction": "Klicke auf die Beiträge, die du aufspalten willst",
"fork_no_pids": "Keine Beiträge ausgewählt!",
- "fork_success": "Thema erfolgreich aufgespalten!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Hier den Titel des Themas eingeben...",
"composer.discard": "Verwerfen",
"composer.submit": "Absenden",
@@ -87,7 +87,7 @@
"more_users_and_guests": "%1 weitere(r) Nutzer und %2 Gäste",
"more_users": "%1 weitere(r) Nutzer",
"more_guests": "%1 weitere Gäste",
- "users_and_others": "%1 and %2 others",
+ "users_and_others": "%1 und %2 andere",
"sort_by": "Sortieren nach",
"oldest_to_newest": "Älteste zuerst",
"newest_to_oldest": "Neuster zuerst",
diff --git a/public/language/de/user.json b/public/language/de/user.json
index 524a2ae08b..d3b4e12d45 100644
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -4,6 +4,8 @@
"username": "Nutzername",
"email": "E-Mail",
"confirm_email": "E-Mail bestätigen",
+ "delete_account": "Konto löschen",
+ "delete_account_confirm": "Are you sure you want to delete your account?
This action is irreversible and you will not be able to recover any of your data
Enter your username to confirm that you wish to destroy this account.",
"fullname": "Kompletter Name",
"website": "Homepage",
"location": "Wohnort",
@@ -50,6 +52,7 @@
"digest_daily": "Täglich",
"digest_weekly": "Wöchentlich",
"digest_monthly": "Monatlich",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Dieser User hat noch keine Follower.",
"follows_no_one": "Dieser User folgt noch niemandem :(",
"has_no_posts": "Dieser Nutzer hat noch nichts gepostet.",
@@ -61,5 +64,7 @@
"posts_per_page": "Beiträge pro Seite",
"notification_sounds": "Ton abspielen, wenn ich eine Benachrichtigung erhalte.",
"browsing": "Browser Einstellungen",
- "open_links_in_new_tab": "Externe Links in neuem Tab öffnen?"
+ "open_links_in_new_tab": "Externe Links in neuem Tab öffnen?",
+ "follow_topics_you_reply_to": "Folge Themen, auf die du antwortest.",
+ "follow_topics_you_create": "Folge Themen, die du erstellst."
}
\ No newline at end of file
diff --git a/public/language/en@pirate/category.json b/public/language/en@pirate/category.json
index 44e19baa01..74b946d216 100644
--- a/public/language/en@pirate/category.json
+++ b/public/language/en@pirate/category.json
@@ -3,5 +3,6 @@
"no_topics": "Thar be no topics in 'tis category.
Why don't ye give a go' postin' one?",
"browsing": "browsin'",
"no_replies": "No one has replied to ye message",
- "share_this_category": "Share this category"
+ "share_this_category": "Share this category",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/en@pirate/email.json b/public/language/en@pirate/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/en@pirate/email.json
+++ b/public/language/en@pirate/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json
index 77c582b23f..f90d459cce 100644
--- a/public/language/en@pirate/error.json
+++ b/public/language/en@pirate/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Invalid Password",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "User banned",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
@@ -52,5 +55,9 @@
"upload-error": "Upload Error : %1",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/en@pirate/notifications.json b/public/language/en@pirate/notifications.json
index cc1705eff6..49a3a10e05 100644
--- a/public/language/en@pirate/notifications.json
+++ b/public/language/en@pirate/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "New Notification",
"you_have_unread_notifications": "You have unread notifications.",
"new_message_from": "New message from %1",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 has favourited your post.",
- "user_flagged_post": "%1 flagged a post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 has posted a reply to: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/en@pirate/recent.json b/public/language/en@pirate/recent.json
index 6e6df209fa..bb4318cb39 100644
--- a/public/language/en@pirate/recent.json
+++ b/public/language/en@pirate/recent.json
@@ -4,5 +4,6 @@
"week": "Week",
"month": "Month",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "There be no recent topics."
}
\ No newline at end of file
diff --git a/public/language/en@pirate/search.json b/public/language/en@pirate/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/en@pirate/search.json
+++ b/public/language/en@pirate/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/en@pirate/topic.json b/public/language/en@pirate/topic.json
index aa69261f90..6093dc2302 100644
--- a/public/language/en@pirate/topic.json
+++ b/public/language/en@pirate/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "This topic will be moved to the category",
"fork_topic_instruction": "Click the posts you want to fork",
"fork_no_pids": "No posts selected!",
- "fork_success": "Succesfully forked topic!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Enter your topic title here...",
"composer.discard": "Discard",
"composer.submit": "Submit",
diff --git a/public/language/en@pirate/user.json b/public/language/en@pirate/user.json
index 286d72030a..fb50580f31 100644
--- a/public/language/en@pirate/user.json
+++ b/public/language/en@pirate/user.json
@@ -4,6 +4,8 @@
"username": "User Name",
"email": "Email",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Full Name",
"website": "Website",
"location": "Location",
@@ -50,6 +52,7 @@
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "This user doesn't have any followers :(",
"follows_no_one": "This user isn't following anyone :(",
"has_no_posts": "This user didn't post anything yet.",
@@ -61,5 +64,7 @@
"posts_per_page": "Posts per Page",
"notification_sounds": "Play a sound when you receive a notification.",
"browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/en_US/category.json b/public/language/en_US/category.json
index 99ba34a172..93272e1a06 100644
--- a/public/language/en_US/category.json
+++ b/public/language/en_US/category.json
@@ -3,5 +3,6 @@
"no_topics": "There are no topics in this category.
Why don't you try posting one?",
"browsing": "browsing",
"no_replies": "No one has replied",
- "share_this_category": "Share this category"
+ "share_this_category": "Share this category",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/en_US/email.json b/public/language/en_US/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/en_US/email.json
+++ b/public/language/en_US/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json
index bfec6e00d7..c63073194a 100644
--- a/public/language/en_US/error.json
+++ b/public/language/en_US/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Invalid Password",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "User banned",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
@@ -52,5 +55,9 @@
"upload-error": "Upload Error : %1",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/en_US/notifications.json b/public/language/en_US/notifications.json
index 7f97d92275..4d2461226d 100644
--- a/public/language/en_US/notifications.json
+++ b/public/language/en_US/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "New Notification",
"you_have_unread_notifications": "You have unread notifications.",
"new_message_from": "New message from %1",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 has favorited your post.",
- "user_flagged_post": "%1 flagged a post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 has posted a reply to: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/en_US/recent.json b/public/language/en_US/recent.json
index 1bf0cf9f01..d683cce436 100644
--- a/public/language/en_US/recent.json
+++ b/public/language/en_US/recent.json
@@ -4,5 +4,6 @@
"week": "Week",
"month": "Month",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "There are no recent topics."
}
\ No newline at end of file
diff --git a/public/language/en_US/search.json b/public/language/en_US/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/en_US/search.json
+++ b/public/language/en_US/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/en_US/topic.json b/public/language/en_US/topic.json
index 8ffca481ab..c64d0c9881 100644
--- a/public/language/en_US/topic.json
+++ b/public/language/en_US/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "This topic will be moved to the category",
"fork_topic_instruction": "Click the posts you want to fork",
"fork_no_pids": "No posts selected!",
- "fork_success": "Succesfully forked topic!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Enter your topic title here...",
"composer.discard": "Discard",
"composer.submit": "Submit",
diff --git a/public/language/en_US/user.json b/public/language/en_US/user.json
index 0c68cc21b0..58ea366320 100644
--- a/public/language/en_US/user.json
+++ b/public/language/en_US/user.json
@@ -4,6 +4,8 @@
"username": "User Name",
"email": "Email",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Full Name",
"website": "Website",
"location": "Location",
@@ -50,6 +52,7 @@
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "This user doesn't have any followers :(",
"follows_no_one": "This user isn't following anyone :(",
"has_no_posts": "This user didn't post anything yet.",
@@ -61,5 +64,7 @@
"posts_per_page": "Posts per Page",
"notification_sounds": "Play a sound when you receive a notification.",
"browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/es/category.json b/public/language/es/category.json
index cd64161deb..ff01be1a31 100644
--- a/public/language/es/category.json
+++ b/public/language/es/category.json
@@ -3,5 +3,6 @@
"no_topics": "No hay temas en esta categoría.
¿Por que no te animas y publicas uno?",
"browsing": "viendo ahora",
"no_replies": "Nadie ha respondido aún",
- "share_this_category": "Compartir esta categoría"
+ "share_this_category": "Compartir esta categoría",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/es/email.json b/public/language/es/email.json
index 98e591ab02..c83494b565 100644
--- a/public/language/es/email.json
+++ b/public/language/es/email.json
@@ -1,20 +1,23 @@
{
- "password-reset-requested": "Password Reset Requested - %1!",
- "welcome-to": "Welcome to %1",
- "greeting_no_name": "Hello",
- "greeting_with_name": "Hello %1",
- "welcome.text1": "Thank you for registering with %1!",
- "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
- "welcome.cta": "Click here to confirm your email address",
- "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
- "reset.text2": "To continue with the password reset, please click on the following link:",
- "reset.cta": "Click here to reset your password",
- "digest.notifications": "You have some unread notifications from %1:",
- "digest.latest_topics": "Latest topics from %1",
- "digest.cta": "Click here to visit %1",
- "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
- "digest.daily.no_topics": "There have been no active topics in the past day",
- "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
- "closing": "Thanks!"
+ "password-reset-requested": "Reinicio de contraseña solicitado - %1!",
+ "welcome-to": "Bienvenido a %1",
+ "greeting_no_name": "Hola",
+ "greeting_with_name": "Hola %1",
+ "welcome.text1": "Gracias por registrarte con %1!",
+ "welcome.text2": "Para activar completamente tu cuenta, necesitamos verificar que la dirección email con la que te registraste te pertenece.",
+ "welcome.cta": "Cliquea aquí para confirmar tu dirección email.",
+ "reset.text1": "Recibimos una solicitud para reiniciar tu contraseña, posiblemente porque la olvidaste. Si no es así, por favor ignora este email.",
+ "reset.text2": "Para continuar con el reinicio de contraseña, por favor cliquea en el siguiente vínculo:",
+ "reset.cta": "Cliquea aquí para reiniciar tu contraseña",
+ "digest.notifications": "Tienes algunas notificaciónes de %1 sin leer:",
+ "digest.latest_topics": "Últimos temas de %1",
+ "digest.cta": "Cliquea aquí para visitar %1",
+ "digest.unsub.info": "Este compendio te fue enviado debido a tus ajustes de subscripción.",
+ "digest.daily.no_topics": "No han habido temas activos en el día pasado",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
+ "test.text1": "Este es un email de prueba para verificar que el envío de email está ajustado correctamente para tu NodeBB",
+ "unsub.cta": "Click here to alter those settings",
+ "closing": "¡Gracias!"
}
\ No newline at end of file
diff --git a/public/language/es/error.json b/public/language/es/error.json
index 38ff5515ae..79fd819d2f 100644
--- a/public/language/es/error.json
+++ b/public/language/es/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Título no válido!",
"invalid-user-data": "Datos de Usuario no válidos",
"invalid-password": "Contraseña no válida",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Valor de paginación no válido.",
"username-taken": "Nombre de usuario ya escogido",
"email-taken": "El correo electrónico ya está escogido.",
"email-not-confirmed": "Tu correo electrónico está sin confirmar, por favor haz click aquí para confirmar tu email.",
"username-too-short": "El nombre de usuario es demasiado corto",
+ "username-too-long": "Username too long",
"user-banned": "Usuario expulsado",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "La categoría no existe",
"no-topic": "El tema no existe.",
"no-post": "La publicación no existe",
@@ -25,7 +28,7 @@
"no-user": "El usuario no existe",
"no-teaser": "El extracto del tema no existe.",
"no-privileges": "No tienes los privilegios necesarios para esa acción.",
- "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
+ "no-emailers-configured": "Ningún plugin para email fue cargado, así que no se pudo enviar email de prueba.",
"category-disabled": "Categoría deshabilitada.",
"topic-locked": "Tema bloqueado.",
"still-uploading": "Por favor, espera a que terminen las subidas.",
@@ -52,5 +55,9 @@
"upload-error": "Error de subida: %1",
"signature-too-long": "Las firmas no pueden ser más largas de %1 caracteres!",
"cant-chat-with-yourself": "No puedes conversar contigo mismo!",
- "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post"
+ "reputation-system-disabled": "Reputation system is disabled.",
+ "downvoting-disabled": "Downvoting is disabled",
+ "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/es/groups.json b/public/language/es/groups.json
index c00c111e11..bb4b46d1f8 100644
--- a/public/language/es/groups.json
+++ b/public/language/es/groups.json
@@ -1,7 +1,7 @@
{
- "view_group": "View Group",
- "details.title": "Group Details",
- "details.members": "Member List",
- "details.has_no_posts": "This group's members have not made any posts.",
- "details.latest_posts": "Latest Posts"
+ "view_group": "Ver Grupo",
+ "details.title": "Detalles de Grupo",
+ "details.members": "Lista de Miembros",
+ "details.has_no_posts": "Los miembros de este grupo no han hecho ninguna publicación.",
+ "details.latest_posts": "Últimas Publicaciones"
}
\ No newline at end of file
diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json
index 3a7168a44d..3be3cccdc8 100644
--- a/public/language/es/notifications.json
+++ b/public/language/es/notifications.json
@@ -4,17 +4,20 @@
"see_all": "Ver todas las notificaciones",
"back_to_home": "Volver a %1",
"outgoing_link": "Enlace Externo",
- "outgoing_link_message": "You are now leaving %1.",
- "continue_to": "Continue to %1",
- "return_to": "Return to %1",
+ "outgoing_link_message": "Ahora estás saliendo %1.",
+ "continue_to": "Continuar a %1",
+ "return_to": "Regresar a %1",
"new_notification": "Nueva Notificación",
"you_have_unread_notifications": "Tienes notificaciones sin leer.",
"new_message_from": "Nuevo mensaje de %1",
- "upvoted_your_post": "%1 ha marcado como favorita tu respuesta.",
- "favourited_your_post": "%1 ha marcado como favorita tu respuesta.",
- "user_flagged_post": "%1 ha marcado como indebida una respuesta.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 ha publicado una respuesta a: %2",
"user_mentioned_you_in": "%1 te mencionó en %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Correo electrónico confirmado",
"email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.",
"email-confirm-error": "Un error ocurrió...",
diff --git a/public/language/es/pages.json b/public/language/es/pages.json
index 4b79bc293f..ab6e4eaedd 100644
--- a/public/language/es/pages.json
+++ b/public/language/es/pages.json
@@ -5,7 +5,7 @@
"recent": "Temas Recientes",
"users": "Usuarios Registrado",
"notifications": "Notificaciones",
- "tags": "Topics tagged under \"%1\"",
+ "tags": "Temas etiquetados bajo \"%1\"",
"user.edit": "Editando \"%1\"",
"user.following": "Gente que sigue %1 ",
"user.followers": "Seguidores de %1",
diff --git a/public/language/es/recent.json b/public/language/es/recent.json
index 8b25e63d46..a187f9d661 100644
--- a/public/language/es/recent.json
+++ b/public/language/es/recent.json
@@ -4,5 +4,6 @@
"week": "Semana",
"month": "Mes",
"year": "Año",
+ "alltime": "All Time",
"no_recent_topics": "No hay publicaciones recientes"
}
\ No newline at end of file
diff --git a/public/language/es/search.json b/public/language/es/search.json
index d0ffc64f36..8ac377c932 100644
--- a/public/language/es/search.json
+++ b/public/language/es/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 resuldado(s) coinciden con \"%2\". (%3 segundos)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/es/topic.json b/public/language/es/topic.json
index ae3fa08fc1..d8eafd749c 100644
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Este tema será movido a la categoría",
"fork_topic_instruction": "Click en las publicaciones que quieres bifurcar",
"fork_no_pids": "¡No seleccionaste publicaciones!",
- "fork_success": "¡Bifurcado con exito!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Ingresa el titulo de tu tema",
"composer.discard": "Descartar",
"composer.submit": "Enviar",
@@ -87,7 +87,7 @@
"more_users_and_guests": "%1 usuario(s) y %2 invitado(s) más",
"more_users": "%1 usuario(s) más",
"more_guests": "%1 invitado(s) más",
- "users_and_others": "%1 and %2 others",
+ "users_and_others": "%1 y otros %2",
"sort_by": "Ordenar por",
"oldest_to_newest": "Más antiguo a más nuevo",
"newest_to_oldest": "Más nuevo a más antiguo",
diff --git a/public/language/es/user.json b/public/language/es/user.json
index c020d86931..32a7fe7340 100644
--- a/public/language/es/user.json
+++ b/public/language/es/user.json
@@ -4,6 +4,8 @@
"username": "Nombre de usuario",
"email": "Correo Electrónico",
"confirm_email": "Repetir correo electrónico",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Nombre completo",
"website": "Sitio Web",
"location": "Ubicación",
@@ -50,6 +52,7 @@
"digest_daily": "Diariamente",
"digest_weekly": "Semanalmente",
"digest_monthly": "Mensualmente",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Este miembro no tiene seguidores. :(",
"follows_no_one": "Este miembro no sigue a nadie. :(",
"has_no_posts": "Este usuario aún no ha publicado nada.",
@@ -61,5 +64,7 @@
"posts_per_page": "Post por página",
"notification_sounds": "Reproducir un sonido al recibir una notificación",
"browsing": "Preferencias de navegación.",
- "open_links_in_new_tab": "Abrir los enlaces externos en una nueva pestaña?"
+ "open_links_in_new_tab": "Abrir los enlaces externos en una nueva pestaña?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/et/category.json b/public/language/et/category.json
index 1d35948aac..865d8dbae9 100644
--- a/public/language/et/category.json
+++ b/public/language/et/category.json
@@ -3,5 +3,6 @@
"no_topics": "Kahjuks ei leidu siin kategoorias ühtegi teemat.
Soovid postitada?",
"browsing": "vaatab",
"no_replies": "Keegi pole vastanud",
- "share_this_category": "Jaga seda kategooriat"
+ "share_this_category": "Jaga seda kategooriat",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/et/email.json b/public/language/et/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/et/email.json
+++ b/public/language/et/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/et/error.json b/public/language/et/error.json
index 596a04b4df..51926c86b5 100644
--- a/public/language/et/error.json
+++ b/public/language/et/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Vigane pealkiri!",
"invalid-user-data": "Vigased kasutaja andmed",
"invalid-password": "Vigane parool",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Vigane lehe väärtus",
"username-taken": "Kasutajanimi on juba võetud",
"email-taken": "Email on võetud",
"email-not-confirmed": "Su emaili aadress ei ole kinnitatud, vajuta siia et kinnitada.",
"username-too-short": "Kasutajanimi on liiga lühike",
+ "username-too-long": "Username too long",
"user-banned": "Kasutaja bannitud",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Kategooriat ei eksisteeri",
"no-topic": "Teemat ei eksisteeri",
"no-post": "Postitust ei eksisteeri",
@@ -52,5 +55,9 @@
"upload-error": "Üleslaadimise viga: %1",
"signature-too-long": "Allkiri ei saa olla pikem kui %1 tähemärki!",
"cant-chat-with-yourself": "Sa ei saa endaga vestelda!",
- "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele."
+ "reputation-system-disabled": "Reputation system is disabled.",
+ "downvoting-disabled": "Downvoting is disabled",
+ "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele.",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json
index 4de13a6e0f..8ee69d3072 100644
--- a/public/language/et/notifications.json
+++ b/public/language/et/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Uus teade",
"you_have_unread_notifications": "Sul ei ole lugemata teateid.",
"new_message_from": "Uus sõnum kasutajalt %1",
- "upvoted_your_post": "%1 hääletas sinu postituse poolt.",
- "favourited_your_post": "%1 märkis sinu postituse lemmikuks.",
- "user_flagged_post": "%1 märgistas postituse.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "Kasutaja %1 postitas vastuse teemasse %2",
"user_mentioned_you_in": "%1 mainis sind postituses %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Emaili aadress kinnitatud",
"email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja omn nüüd täielikult aktiveeritud.",
"email-confirm-error": "Süsteemis tekkis viga...",
diff --git a/public/language/et/recent.json b/public/language/et/recent.json
index 7afd6c41cd..53c112df2d 100644
--- a/public/language/et/recent.json
+++ b/public/language/et/recent.json
@@ -4,5 +4,6 @@
"week": "Nädal",
"month": "Kuu",
"year": "Aasta",
+ "alltime": "All Time",
"no_recent_topics": "Hetkel ei ole hiljutisi teemasid."
}
\ No newline at end of file
diff --git a/public/language/et/search.json b/public/language/et/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/et/search.json
+++ b/public/language/et/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/et/topic.json b/public/language/et/topic.json
index dc4dcc62cb..8b57bef58d 100644
--- a/public/language/et/topic.json
+++ b/public/language/et/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "See teema liigutatakse antud kategooriasse",
"fork_topic_instruction": "Vajuta postitustele, mida soovid forkida",
"fork_no_pids": "Sa ei ole postitusi valinud!",
- "fork_success": "Edukalt forkisid teema!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Sisesta teema pealkiri siia...",
"composer.discard": "Katkesta",
"composer.submit": "Postita",
diff --git a/public/language/et/user.json b/public/language/et/user.json
index 7e9a6cc46d..edde90c4cf 100644
--- a/public/language/et/user.json
+++ b/public/language/et/user.json
@@ -4,6 +4,8 @@
"username": "Kasutajanimi",
"email": "Email",
"confirm_email": "Kinnita email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Täisnimi",
"website": "Koduleht",
"location": "Asukoht",
@@ -50,6 +52,7 @@
"digest_daily": "Igapäevaselt",
"digest_weekly": "Iga nädal",
"digest_monthly": "Iga kuu",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Sellel kasutajal pole ühtegi jälgijat :(",
"follows_no_one": "See kasutaja ei jälgi kedagi :(",
"has_no_posts": "See kasutaja pole midagi postitanud veel.",
@@ -61,5 +64,7 @@
"posts_per_page": "Postitusi ühe lehekülje kohta",
"notification_sounds": "Tee häält, kui saabub teade.",
"browsing": "Sirvimis sätted",
- "open_links_in_new_tab": "Ava väljaminevad lingid uues vaheaknas?"
+ "open_links_in_new_tab": "Ava väljaminevad lingid uues vaheaknas?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/fa_IR/category.json b/public/language/fa_IR/category.json
index 1f5299e534..c1c61a1a9f 100644
--- a/public/language/fa_IR/category.json
+++ b/public/language/fa_IR/category.json
@@ -3,5 +3,6 @@
"no_topics": "هیچ جستاری در این دسته نیست.
چرا شما یکی نفرستید؟",
"browsing": "بینندهها",
"no_replies": "هیچ کسی پاسخ نداده است.",
- "share_this_category": "به اشتراکگذاری این دسته"
+ "share_this_category": "به اشتراکگذاری این دسته",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/email.json b/public/language/fa_IR/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/fa_IR/email.json
+++ b/public/language/fa_IR/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json
index cf82fa6622..64f4d35823 100644
--- a/public/language/fa_IR/error.json
+++ b/public/language/fa_IR/error.json
@@ -12,12 +12,15 @@
"invalid-title": "عنوان نامعتبر است!",
"invalid-user-data": "دادههای کاربری نامعتبر است.",
"invalid-password": "گذرواژه نامعتبر است.",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "عدد صفحهبندی نامعتبر است.",
"username-taken": "این نام کاربری گرفته شده است.",
"email-taken": "این رایانامه گرفته شده است.",
"email-not-confirmed": "رایانامه شما تأیید نشده است، لطفاً برای تأیید رایانامهتان اینجا را بفشارید.",
"username-too-short": "نام کاربری خیلی کوتاه است.",
+ "username-too-long": "Username too long",
"user-banned": "کاربر محروم شد.",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "چنین دستهای وجود ندارد.",
"no-topic": "چنین جستاری وجود ندارد.",
"no-post": "چنین دیدگاهی وجود ندارد.",
@@ -52,5 +55,9 @@
"upload-error": "خطای بارگذاری: %1",
"signature-too-long": "امضا نمیتواند بیشتر از %1 نویسه داشته باشد.",
"cant-chat-with-yourself": "شما نمیتوانید با خودتان گفتگو کنید!",
- "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رای منفی به این دیدگاه را ندارید."
+ "reputation-system-disabled": "Reputation system is disabled.",
+ "downvoting-disabled": "Downvoting is disabled",
+ "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رای منفی به این دیدگاه را ندارید.",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/fa_IR/notifications.json b/public/language/fa_IR/notifications.json
index a643005e04..62b48b71af 100644
--- a/public/language/fa_IR/notifications.json
+++ b/public/language/fa_IR/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "آکاهسازی تازه",
"you_have_unread_notifications": "شما آگاهسازیهای نخوانده دارید.",
"new_message_from": "پیام تازه از %1",
- "upvoted_your_post": "%1 به دیدگاه شما رای داده است.",
- "favourited_your_post": "%1 دیدگاه شما را پسندیده است.",
- "user_flagged_post": "پرچم خوردن یک دیدگاه از سوی %1",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "پاسخ دادن به %2 از سوی %1",
"user_mentioned_you_in": "%1 در %2 به شما اشاره کرد",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "رایانامه تایید شد",
"email-confirmed-message": "بابت تایید ایمیلتان سپاسگزاریم. حساب کاربری شما اکنون به صورت کامل فعال شده است.",
"email-confirm-error": "خطایی پیش آمده است...",
diff --git a/public/language/fa_IR/recent.json b/public/language/fa_IR/recent.json
index 74a8876ebf..4f6f3256a5 100644
--- a/public/language/fa_IR/recent.json
+++ b/public/language/fa_IR/recent.json
@@ -4,5 +4,6 @@
"week": "هفته",
"month": "ماه",
"year": "سال",
+ "alltime": "All Time",
"no_recent_topics": "هیچ جستار تازهای نیست."
}
\ No newline at end of file
diff --git a/public/language/fa_IR/search.json b/public/language/fa_IR/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/fa_IR/search.json
+++ b/public/language/fa_IR/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json
index 1c525fad8b..47f345fc6d 100644
--- a/public/language/fa_IR/topic.json
+++ b/public/language/fa_IR/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "این جستار جابهجا خواهد شد به دستهٔ",
"fork_topic_instruction": "دیدگاههایی را که میخواهید به جستار تازه ببرید، برگزینید",
"fork_no_pids": "هیچ دیدگاهی انتخاب نشده!",
- "fork_success": "جستار با موفقیت منشعب شد.",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "سرنویس جستارتان را اینجا بنویسید...",
"composer.discard": "دور بیانداز",
"composer.submit": "بفرست",
diff --git a/public/language/fa_IR/user.json b/public/language/fa_IR/user.json
index cfe346d5fd..f460e31c7b 100644
--- a/public/language/fa_IR/user.json
+++ b/public/language/fa_IR/user.json
@@ -4,6 +4,8 @@
"username": "نام کاربری",
"email": "رایانامه",
"confirm_email": "تأیید رایانامه",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "نام کامل",
"website": "تارنما",
"location": "محل سکونت",
@@ -50,6 +52,7 @@
"digest_daily": "روزانه",
"digest_weekly": "هفتگی",
"digest_monthly": "ماهانه",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "این کاربر هیچ دنبالکنندهای ندارد :(",
"follows_no_one": "این کاربر هیچ کسی را دنبال نمیکند :(",
"has_no_posts": "این کاربر هنوز هیچ دیدگاهی نگذاشته است.",
@@ -61,5 +64,7 @@
"posts_per_page": "شمار دیدگاهها در هر برگه",
"notification_sounds": "پخش صدا هنگامی که شما یک آگاهسازی دریافت میکنید.",
"browsing": "تنظیمات مرور",
- "open_links_in_new_tab": "بازکردن لینکهای خارجی در تب جدید؟"
+ "open_links_in_new_tab": "بازکردن لینکهای خارجی در تب جدید؟",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/fi/category.json b/public/language/fi/category.json
index 67c3c2125a..f3ae42f69f 100644
--- a/public/language/fi/category.json
+++ b/public/language/fi/category.json
@@ -3,5 +3,6 @@
"no_topics": "Tällä aihealueella ei ole yhtään aihetta.
Miksi et aloittaisi uutta?",
"browsing": "selaamassa",
"no_replies": "Kukaan ei ole vastannut",
- "share_this_category": "Jaa tämä kategoria"
+ "share_this_category": "Jaa tämä kategoria",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/fi/email.json b/public/language/fi/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/fi/email.json
+++ b/public/language/fi/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/fi/error.json b/public/language/fi/error.json
index a9c4718431..73febab0c3 100644
--- a/public/language/fi/error.json
+++ b/public/language/fi/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Virheellinen otsikko!",
"invalid-user-data": "Virheellinen käyttäjätieto",
"invalid-password": "Virheellinen salasana",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Virheellinen taittoarvo",
"username-taken": "Käyttäjänimi varattu",
"email-taken": "Sähköpostiosoite varattu",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Käyttäjänimi on liian lyhyt",
+ "username-too-long": "Username too long",
"user-banned": "Käyttäjä on estetty",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Kategoriaa ei ole olemassa",
"no-topic": "Aihetta ei ole olemassa",
"no-post": "Viestiä ei ole olemassa",
@@ -52,5 +55,9 @@
"upload-error": "Lähetysvirhe: %1",
"signature-too-long": "Allekirjoitus ei voi olla pidempi kuin %1 merkkiä!",
"cant-chat-with-yourself": "Et voi keskustella itsesi kanssa!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json
index e9507997a0..2eb5163d4a 100644
--- a/public/language/fi/notifications.json
+++ b/public/language/fi/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Uusi ilmoitus",
"you_have_unread_notifications": "Sinulla on lukemattomia ilmoituksia.",
"new_message_from": "Uusi viesti käyttäjältä %1",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 lisäsi viestisi suosikkeihinsa.",
- "user_flagged_post": "%1 flagged a post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 has posted a reply to: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Sähköpostiosoite vahvistettu",
"email-confirmed-message": "Kiitos sähköpostiosoitteesi vahvistamisesta. Käyttäjätilisi on nyt täysin aktivoitu.",
"email-confirm-error": "Tapahtui virhe...",
diff --git a/public/language/fi/recent.json b/public/language/fi/recent.json
index fb3bd49dbf..b2bff39da7 100644
--- a/public/language/fi/recent.json
+++ b/public/language/fi/recent.json
@@ -4,5 +4,6 @@
"week": "Viikko",
"month": "Kuukausi",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "Ei viimeisimpiä aiheita."
}
\ No newline at end of file
diff --git a/public/language/fi/search.json b/public/language/fi/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/fi/search.json
+++ b/public/language/fi/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json
index ad1ef0f1a0..bccb155bf4 100644
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Tämä keskustelu siirretään aihealueelle",
"fork_topic_instruction": "Napsauta viestejä, jotka haluat haaroittaa",
"fork_no_pids": "Ei valittuja viestejä!",
- "fork_success": "Keskustelu haaroitettu onnistuneesti!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Syötä aiheesi otsikko tähän...",
"composer.discard": "Hylkää",
"composer.submit": "Lähetä",
diff --git a/public/language/fi/user.json b/public/language/fi/user.json
index 47b8df6b9c..d8aecf0e3d 100644
--- a/public/language/fi/user.json
+++ b/public/language/fi/user.json
@@ -4,6 +4,8 @@
"username": "Käyttäjän nimi",
"email": "Sähköposti",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Koko nimi",
"website": "Kotisivu",
"location": "Sijainti",
@@ -50,6 +52,7 @@
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Kukaan ei seuraa tätä käyttäjää :(",
"follows_no_one": "Tämä käyttäjä ei seuraa ketään :(",
"has_no_posts": "Tämä käyttäjä ei ole kirjoittanut vielä mitään.",
@@ -61,5 +64,7 @@
"posts_per_page": "Viestiä per sivu",
"notification_sounds": "Soita merkkiääni ilmoituksen saapuessa.",
"browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/fr/category.json b/public/language/fr/category.json
index d53466e617..47b8ebb764 100644
--- a/public/language/fr/category.json
+++ b/public/language/fr/category.json
@@ -3,5 +3,6 @@
"no_topics": "Il n'y a aucun sujet dans cette catégorie.
Pourquoi ne pas en créer un ?",
"browsing": "parcouru par",
"no_replies": "Personne n'a répondu",
- "share_this_category": "Partager cette catégorie"
+ "share_this_category": "Partager cette catégorie",
+ "ignore": "Ignorer"
}
\ No newline at end of file
diff --git a/public/language/fr/email.json b/public/language/fr/email.json
index 88cb8c270a..88872a11fb 100644
--- a/public/language/fr/email.json
+++ b/public/language/fr/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Derniers sujets de %1 :",
"digest.cta": "Cliquez ici pour aller sur %1",
"digest.unsub.info": "Ce message vous a été envoyé en raison de vos paramètres d'abonnement.",
- "digest.unsub.cta": "Cliquez ici pour modifier ces paramètres",
"digest.daily.no_topics": "Il n'y a eu aucun sujet actif ces derniers jours",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "Ceci est un email de test pour vérifier que l'emailer est correctement configuré pour NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Merci !"
}
\ No newline at end of file
diff --git a/public/language/fr/error.json b/public/language/fr/error.json
index 63d9a1765f..bcc272f6d8 100644
--- a/public/language/fr/error.json
+++ b/public/language/fr/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Titre invalide !",
"invalid-user-data": "Données utilisateur invalides",
"invalid-password": "Mot de passe invalide",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Valeur de pagination invalide",
"username-taken": "Nom d’utilisateur déjà utilisé",
"email-taken": "Email déjà utilisé",
"email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquez ici pour la valider.",
"username-too-short": "Nom d'utilisateur trop court",
+ "username-too-long": "Username too long",
"user-banned": "Utilisateur banni",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Cette catégorie n'existe pas",
"no-topic": "Ce sujet n'existe pas",
"no-post": "Ce message n'existe pas",
@@ -52,5 +55,9 @@
"upload-error": "Erreur d'envoi : %1",
"signature-too-long": "La signature ne peut dépasser %1 caractères !",
"cant-chat-with-yourself": "Vous ne pouvez chatter avec vous même !",
- "not-enough-reputation-to-downvote": "Vous n'avez pas une réputation assez élevée pour noter négativement ce message"
+ "reputation-system-disabled": "Reputation system is disabled.",
+ "downvoting-disabled": "Downvoting is disabled",
+ "not-enough-reputation-to-downvote": "Vous n'avez pas une réputation assez élevée pour noter négativement ce message",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json
index 560fb83751..5e1178f78c 100644
--- a/public/language/fr/notifications.json
+++ b/public/language/fr/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Nouvelle notification",
"you_have_unread_notifications": "Vous avez des notifications non-lues",
"new_message_from": "Nouveau message de %1",
- "upvoted_your_post": "%1 a voté pour votre message.",
- "favourited_your_post": "%1 a mis votre message en favoris.",
- "user_flagged_post": "%1 a signalé un message.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 a répondu à : %2",
"user_mentioned_you_in": "%1 vous a mentionné dans %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email vérifié",
"email-confirmed-message": "Merci pour la validation de votre adresse email. Votre compte est désormais activé.",
"email-confirm-error": "Un erreur est survenue ...",
diff --git a/public/language/fr/recent.json b/public/language/fr/recent.json
index 2e69d07a4e..6af7b3e81a 100644
--- a/public/language/fr/recent.json
+++ b/public/language/fr/recent.json
@@ -4,5 +4,6 @@
"week": "Semaine",
"month": "Mois",
"year": "An",
+ "alltime": "All Time",
"no_recent_topics": "Il n'y a aucun sujet récent."
}
\ No newline at end of file
diff --git a/public/language/fr/search.json b/public/language/fr/search.json
index ab88db2e52..8974b7f593 100644
--- a/public/language/fr/search.json
+++ b/public/language/fr/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 résultat(s) correspondant(s) à \"%2\", (%3 secondes)"
+ "results_matching": "%1 résultat(s) correspondant(s) à \"%2\", (%3 secondes)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json
index 47473793ec..f73fad2ed0 100644
--- a/public/language/fr/topic.json
+++ b/public/language/fr/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Ce sujet sera déplacé vers la catégorie",
"fork_topic_instruction": "Cliquez sur les postes à scinder",
"fork_no_pids": "Aucun post sélectionné !",
- "fork_success": "Sujet scindé !",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Entrer le titre du sujet ici ...",
"composer.discard": "Abandonner",
"composer.submit": "Envoyer",
diff --git a/public/language/fr/user.json b/public/language/fr/user.json
index 6ee1f52ce5..76667e98ed 100644
--- a/public/language/fr/user.json
+++ b/public/language/fr/user.json
@@ -4,6 +4,8 @@
"username": "Nom d'utilisateur",
"email": "Email",
"confirm_email": "Confirmer l'adresse email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Nom",
"website": "Site web",
"location": "Emplacement",
@@ -50,6 +52,7 @@
"digest_daily": "Quotidien",
"digest_weekly": "Hebdomadaire",
"digest_monthly": "Mensuel",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Cet utilisateur n'est suivi par personne :(",
"follows_no_one": "Cet utilisateur ne suit personne :(",
"has_no_posts": "Ce membre n'a rien posté pour le moment",
@@ -61,5 +64,7 @@
"posts_per_page": "Messages par page",
"notification_sounds": "Émettre un son lors de la réception de notifications.",
"browsing": "Paramètres de navigation",
- "open_links_in_new_tab": "Ouvrir les liens externes dans un nouvel onglet ?"
+ "open_links_in_new_tab": "Ouvrir les liens externes dans un nouvel onglet ?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/he/category.json b/public/language/he/category.json
index 4d32d01bea..bc5e530729 100644
--- a/public/language/he/category.json
+++ b/public/language/he/category.json
@@ -3,5 +3,6 @@
"no_topics": "קטגוריה זו ריקה מנושאים.
למה שלא תנסה להוסיף נושא חדש?",
"browsing": "צופים בנושא זה כעת",
"no_replies": "אין תגובות",
- "share_this_category": "שתף קטגוריה זו"
+ "share_this_category": "שתף קטגוריה זו",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/he/email.json b/public/language/he/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/he/email.json
+++ b/public/language/he/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/he/error.json b/public/language/he/error.json
index c5cd72a2a0..28cd04e663 100644
--- a/public/language/he/error.json
+++ b/public/language/he/error.json
@@ -12,12 +12,15 @@
"invalid-title": "כותרת שגויה",
"invalid-user-data": "מידע משתמש שגוי",
"invalid-password": "סיסמא שגויה",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "ערך דפדוף שגוי",
"username-taken": "שם משתמש תפוס",
"email-taken": "כתובת אימייל תפוסה",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "שם משתמש קצר מדי",
+ "username-too-long": "Username too long",
"user-banned": "המשתמש חסום",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "קטגוריה אינה קיימת",
"no-topic": "נושא אינו קיים",
"no-post": "פוסט אינו קיים",
@@ -52,5 +55,9 @@
"upload-error": "שגיאה בהעלאה : %1",
"signature-too-long": "חתימה אינה יכולה להיות ארוכה מ %1 תווים!",
"cant-chat-with-yourself": "לא ניתן לעשות צ'אט עם עצמך!",
- "not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה"
+ "reputation-system-disabled": "Reputation system is disabled.",
+ "downvoting-disabled": "Downvoting is disabled",
+ "not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json
index bcbb5eac8b..f3f8efa00f 100644
--- a/public/language/he/notifications.json
+++ b/public/language/he/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "New Notification",
"you_have_unread_notifications": "You have unread notifications.",
"new_message_from": "New message from %1",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 has favourited your post.",
- "user_flagged_post": "%1 flagged a post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 has posted a reply to: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/he/recent.json b/public/language/he/recent.json
index 5629c9f23f..0a20c6301a 100644
--- a/public/language/he/recent.json
+++ b/public/language/he/recent.json
@@ -4,5 +4,6 @@
"week": "שבוע",
"month": "חודש",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "אין נושאים חדשים"
}
\ No newline at end of file
diff --git a/public/language/he/search.json b/public/language/he/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/he/search.json
+++ b/public/language/he/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/he/topic.json b/public/language/he/topic.json
index 8bff5a472c..59d3ab6736 100644
--- a/public/language/he/topic.json
+++ b/public/language/he/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "נושא זה יועבר לקטגוריה",
"fork_topic_instruction": "לחץ על הפוסטים שברצונך לשכפל",
"fork_no_pids": "לא בחרת אף פוסט!",
- "fork_success": "הנושא שוכפל בהצלחה!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "הכנס את כותרת הנושא כאן...",
"composer.discard": "מחק",
"composer.submit": "שלח",
diff --git a/public/language/he/user.json b/public/language/he/user.json
index 1897b49f7d..badb2cf544 100644
--- a/public/language/he/user.json
+++ b/public/language/he/user.json
@@ -4,6 +4,8 @@
"username": "שם משתמש",
"email": "כתובת אימייל",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "שם מלא",
"website": "אתר",
"location": "מיקום",
@@ -50,6 +52,7 @@
"digest_daily": "יומי",
"digest_weekly": "שבועי",
"digest_monthly": "חודשי",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "למשתמש זה אין עוקבים :(",
"follows_no_one": "משתמש זה אינו עוקב אחרי אחרים :(",
"has_no_posts": "המשתמש הזה עוד לא פרסם כלום.",
@@ -61,5 +64,7 @@
"posts_per_page": "כמות פוסטים בעמוד",
"notification_sounds": "השמע צליל כאשר מתקבלת הודעה עבורך.",
"browsing": "הגדרות צפייה",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/hu/category.json b/public/language/hu/category.json
index f6f1002ad9..f0eb8a400b 100644
--- a/public/language/hu/category.json
+++ b/public/language/hu/category.json
@@ -3,5 +3,6 @@
"no_topics": "Még nincs nyitva egy téma sem ebben a kategóriában.Miért nem hozol létre egyet?",
"browsing": "jelenlévők",
"no_replies": "Senki sem válaszolt még",
- "share_this_category": "Hozzászólás megosztása"
+ "share_this_category": "Hozzászólás megosztása",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/hu/email.json b/public/language/hu/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/hu/email.json
+++ b/public/language/hu/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/hu/error.json b/public/language/hu/error.json
index 77c582b23f..f90d459cce 100644
--- a/public/language/hu/error.json
+++ b/public/language/hu/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Invalid Password",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "User banned",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
@@ -52,5 +55,9 @@
"upload-error": "Upload Error : %1",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json
index c189a4e5bb..86ce42f88a 100644
--- a/public/language/hu/notifications.json
+++ b/public/language/hu/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "New Notification",
"you_have_unread_notifications": "You have unread notifications.",
"new_message_from": "New message from %1",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 has favourited your post.",
- "user_flagged_post": "%1 flagged a post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 has posted a reply to: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/hu/recent.json b/public/language/hu/recent.json
index 332aaf1de2..b595ffd958 100644
--- a/public/language/hu/recent.json
+++ b/public/language/hu/recent.json
@@ -4,5 +4,6 @@
"week": "Hét",
"month": "Hónap",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "Nincs friss topik."
}
\ No newline at end of file
diff --git a/public/language/hu/search.json b/public/language/hu/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/hu/search.json
+++ b/public/language/hu/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json
index 693d3466f5..44e43200be 100644
--- a/public/language/hu/topic.json
+++ b/public/language/hu/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Ez a téma ebbe a kategóriába lesz mozgatva",
"fork_topic_instruction": "Klikkelj azokra a hozzászólásokra, amiket szét akarsz szedni",
"fork_no_pids": "Nincs hozzászólás kiválasztva!",
- "fork_success": "Sikeresen szétválasztott topik!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Írd be a témanevet...",
"composer.discard": "Elvet",
"composer.submit": "Küldés",
diff --git a/public/language/hu/user.json b/public/language/hu/user.json
index 9e371cc20b..fd14fd271c 100644
--- a/public/language/hu/user.json
+++ b/public/language/hu/user.json
@@ -4,6 +4,8 @@
"username": "Felhasználónév",
"email": "E-mail",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Teljes Név",
"website": "Weboldal",
"location": "Lakhely",
@@ -50,6 +52,7 @@
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Ezt a felhasználót nem követi senki :(",
"follows_no_one": "Ez a felhasználó nem követ senkit :(",
"has_no_posts": "Ennek a felhasználónak még nincsen hozzászólása.",
@@ -61,5 +64,7 @@
"posts_per_page": "Hozzászólás oldalanként",
"notification_sounds": "Hang lejátszása ha értesítés érkezett.",
"browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/it/category.json b/public/language/it/category.json
index 4d813335c3..c1f4ace222 100644
--- a/public/language/it/category.json
+++ b/public/language/it/category.json
@@ -3,5 +3,6 @@
"no_topics": "Non ci sono discussioni in questa categoria.
Perché non ne inizi una?",
"browsing": "visualizzando",
"no_replies": "Nessuno ha risposto",
- "share_this_category": "Share this category"
+ "share_this_category": "Share this category",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/it/email.json b/public/language/it/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/it/email.json
+++ b/public/language/it/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/it/error.json b/public/language/it/error.json
index 77c582b23f..f90d459cce 100644
--- a/public/language/it/error.json
+++ b/public/language/it/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Invalid Password",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "User banned",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
@@ -52,5 +55,9 @@
"upload-error": "Upload Error : %1",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json
index 1d2e122b74..957afe9eec 100644
--- a/public/language/it/notifications.json
+++ b/public/language/it/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Nuove Notifiche",
"you_have_unread_notifications": "Hai notifiche non lette.",
"new_message_from": "Nuovo messaggio da %1",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 has favourited your post.",
- "user_flagged_post": "%1 flagged a post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 has posted a reply to: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/it/recent.json b/public/language/it/recent.json
index 56a1191bc0..2047204baf 100644
--- a/public/language/it/recent.json
+++ b/public/language/it/recent.json
@@ -4,5 +4,6 @@
"week": "Settimana",
"month": "Mese",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "Non ci sono discussioni recenti."
}
\ No newline at end of file
diff --git a/public/language/it/search.json b/public/language/it/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/it/search.json
+++ b/public/language/it/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/it/topic.json b/public/language/it/topic.json
index 5f18f9cd39..2efb613bca 100644
--- a/public/language/it/topic.json
+++ b/public/language/it/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Questa discussione verrà spostata nella categoria",
"fork_topic_instruction": "Clicca sui post che vuoi dividere",
"fork_no_pids": "Nessun post selezionato!",
- "fork_success": "Discussione divisa con successo!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Inserisci qui il titolo della discussione...",
"composer.discard": "Annulla",
"composer.submit": "Invia",
diff --git a/public/language/it/user.json b/public/language/it/user.json
index 7f437d56c5..18acd1c232 100644
--- a/public/language/it/user.json
+++ b/public/language/it/user.json
@@ -4,6 +4,8 @@
"username": "Nome Utente",
"email": "Email",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Nome e Cognome",
"website": "Sito Internet",
"location": "Località",
@@ -50,6 +52,7 @@
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Questo utente non è seguito da nessuno :(",
"follows_no_one": "Questo utente non segue nessuno :(",
"has_no_posts": "Questo utente non ha ancora postato nulla.",
@@ -61,5 +64,7 @@
"posts_per_page": "Post per Pagina",
"notification_sounds": "Play a sound when you receive a notification.",
"browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/ja/category.json b/public/language/ja/category.json
index 43bc8f22d5..c5ffc01c13 100644
--- a/public/language/ja/category.json
+++ b/public/language/ja/category.json
@@ -3,5 +3,6 @@
"no_topics": "まだスレッドはありません.
一番目のスレッドを書いてみないか？",
"browsing": "閲覧中",
"no_replies": "返事はまだありません",
- "share_this_category": "この板を共有"
+ "share_this_category": "この板を共有",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/ja/email.json b/public/language/ja/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/ja/email.json
+++ b/public/language/ja/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/ja/error.json b/public/language/ja/error.json
index cbaf323360..0d6aad1afd 100644
--- a/public/language/ja/error.json
+++ b/public/language/ja/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "無効なユーザーデータ",
"invalid-password": "無効なパスワード",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "無効な改ページ設定値",
"username-taken": "ユーザー名が取られた",
"email-taken": "メールアドレスが使用された",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "ユーザーが停止された",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "板が存在しない",
"no-topic": "スレッドが存在しない",
"no-post": "ポストが存在しない",
@@ -52,5 +55,9 @@
"upload-error": "Upload Error : %1",
"signature-too-long": "署名は最大%1文字までです！",
"cant-chat-with-yourself": "自分にチャットすることはできません！",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json
index efe8333fac..9823deff19 100644
--- a/public/language/ja/notifications.json
+++ b/public/language/ja/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "新しい通知",
"you_have_unread_notifications": "未読の通知があります。",
"new_message_from": "%1からの新しいメッセージ",
- "upvoted_your_post": "%1はあなたのポストを評価しました。",
- "favourited_your_post": "%1はあなたのポストをお気に入りにしました。",
- "user_flagged_post": "%1 ポストを報告しました。",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 は %2 への返事を作成しました。",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/ja/recent.json b/public/language/ja/recent.json
index 4ca75a039d..35cdd2b23f 100644
--- a/public/language/ja/recent.json
+++ b/public/language/ja/recent.json
@@ -4,5 +4,6 @@
"week": "最近 1 週",
"month": "最近 1 ヶ月",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "最近のスレッドはありません。"
}
\ No newline at end of file
diff --git a/public/language/ja/search.json b/public/language/ja/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/ja/search.json
+++ b/public/language/ja/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json
index 7d24e2e34f..94366f766e 100644
--- a/public/language/ja/topic.json
+++ b/public/language/ja/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "スレッドはこちらのカテゴリへ移動",
"fork_topic_instruction": "フォークしたいポストをクリックして",
"fork_no_pids": "ポストが選択されていません！",
- "fork_success": "スレッドをフォークできました！",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "スレッドのタイトルを入力して...",
"composer.discard": "破棄する",
"composer.submit": "保存する",
diff --git a/public/language/ja/user.json b/public/language/ja/user.json
index f37a215849..0c683c1b86 100644
--- a/public/language/ja/user.json
+++ b/public/language/ja/user.json
@@ -4,6 +4,8 @@
"username": "ユーザー名",
"email": "メール",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "フルネーム",
"website": "ウェブサイト",
"location": "ロケーション",
@@ -50,6 +52,7 @@
"digest_daily": "デイリー",
"digest_weekly": "ウィークリー",
"digest_monthly": "マンスリー",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "フォロワーはまだいません :(",
"follows_no_one": "フォロー中のユーザーはまだいません :(",
"has_no_posts": "まだポストを投稿したことありません。",
@@ -61,5 +64,7 @@
"posts_per_page": "ページ毎のポスト数",
"notification_sounds": "通知が来たとき音を流す",
"browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/ko/category.json b/public/language/ko/category.json
index 5437b07304..0ce8558aa9 100644
--- a/public/language/ko/category.json
+++ b/public/language/ko/category.json
@@ -3,5 +3,6 @@
"no_topics": "이 카테고리에는 생성된 주제가 없습니다.
먼저 주제를 생성해 보세요.",
"browsing": "이 주제를 읽고 있는 사용자",
"no_replies": "답글이 없습니다.",
- "share_this_category": "이 카테고리를 공유"
+ "share_this_category": "이 카테고리를 공유",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/ko/email.json b/public/language/ko/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/ko/email.json
+++ b/public/language/ko/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/ko/error.json b/public/language/ko/error.json
index fa961bc709..be2363f55a 100644
--- a/public/language/ko/error.json
+++ b/public/language/ko/error.json
@@ -12,12 +12,15 @@
"invalid-title": "올바르지 않은 제목입니다.",
"invalid-user-data": "올바르지 않은 사용자 정보입니다.",
"invalid-password": "올바르지 않은 비밀번호입니다.",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "올바르지 않은 페이지입니다.",
"username-taken": "이미 사용 중인 사용자 이름입니다.",
"email-taken": "이미 사용 중인 이메일입니다.",
"email-not-confirmed": "아직 이메일이 인증되지 않았습니다. 여기를 누르면 인증 메일을 발송할 수 있습니다.",
"username-too-short": "사용자 이름이 너무 짧습니다.",
+ "username-too-long": "Username too long",
"user-banned": "차단된 사용자입니다.",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "존재하지 않는 카테고리입니다.",
"no-topic": "존재하지 않는 주제입니다.",
"no-post": "존재하지 않는 게시물입니다.",
@@ -52,5 +55,9 @@
"upload-error": "업로드 오류가 발생했습니다. : %1",
"signature-too-long": "서명은 최대 %1자로 제한됩니다.",
"cant-chat-with-yourself": "자신과는 채팅할 수 없습니다.",
- "not-enough-reputation-to-downvote": "인기도가 낮아 이 게시물에 반대할 수 없습니다."
+ "reputation-system-disabled": "Reputation system is disabled.",
+ "downvoting-disabled": "Downvoting is disabled",
+ "not-enough-reputation-to-downvote": "인기도가 낮아 이 게시물에 반대할 수 없습니다.",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json
index 8ececb6c49..90d004d7e0 100644
--- a/public/language/ko/notifications.json
+++ b/public/language/ko/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "새 알림",
"you_have_unread_notifications": "읽지 않은 알림이 있습니다.",
"new_message_from": "%1님이 메시지를 보냈습니다.",
- "upvoted_your_post": "%1님이 내 게시물을 추천했습니다.",
- "favourited_your_post": "%1님이 내 게시물을 관심글로 등록했습니다.",
- "user_flagged_post": "%1님이 게시물을 신고했습니다.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1님이 %2님의 게시물에 답글을 작성했습니다.",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/ko/recent.json b/public/language/ko/recent.json
index 6190dda700..5e3f728004 100644
--- a/public/language/ko/recent.json
+++ b/public/language/ko/recent.json
@@ -4,5 +4,6 @@
"week": "주간",
"month": "월간",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "최근 생성된 주제가 없습니다."
}
\ No newline at end of file
diff --git a/public/language/ko/search.json b/public/language/ko/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/ko/search.json
+++ b/public/language/ko/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json
index 3619cdc736..7e4d14a405 100644
--- a/public/language/ko/topic.json
+++ b/public/language/ko/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "이 주제를 지정한 카테고리로 이동합니다.",
"fork_topic_instruction": "복제할 게시물을 선택하세요.",
"fork_no_pids": "게시물이 선택되지 않았습니다.",
- "fork_success": "성공적으로 주제를 복제했습니다.",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "여기에 제목을 입력하세요.",
"composer.discard": "취소",
"composer.submit": "등록",
diff --git a/public/language/ko/user.json b/public/language/ko/user.json
index baf5183211..fb0625f04f 100644
--- a/public/language/ko/user.json
+++ b/public/language/ko/user.json
@@ -4,6 +4,8 @@
"username": "사용자 이름",
"email": "이메일",
"confirm_email": "이메일 확인",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "이름",
"website": "웹 사이트",
"location": "거주지",
@@ -50,6 +52,7 @@
"digest_daily": "매일",
"digest_weekly": "매주",
"digest_monthly": "매월",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "아무도 이 사용자를 팔로우하지 않습니다.",
"follows_no_one": "이 사용자는 아무도 팔로우하지 않습니다.",
"has_no_posts": "이 사용자는 게시물을 작성하지 않았습니다.",
@@ -61,5 +64,7 @@
"posts_per_page": "페이지 당 게시물 수",
"notification_sounds": "알림을 수신하면 알림음을 재생",
"browsing": "페이지 열기",
- "open_links_in_new_tab": "외부 링크를 새 탭에서 열기"
+ "open_links_in_new_tab": "외부 링크를 새 탭에서 열기",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/lt/category.json b/public/language/lt/category.json
index ba84df3cf4..1c9dd0899b 100644
--- a/public/language/lt/category.json
+++ b/public/language/lt/category.json
@@ -3,5 +3,6 @@
"no_topics": "Šioje kategorijoje temų nėra.
Kodėl gi jums nesukūrus naujos?",
"browsing": "naršo",
"no_replies": "Niekas dar neatsakė",
- "share_this_category": "Pasidalinti šią kategoriją"
+ "share_this_category": "Pasidalinti šią kategoriją",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/lt/email.json b/public/language/lt/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/lt/email.json
+++ b/public/language/lt/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/lt/error.json b/public/language/lt/error.json
index ca771bc828..48edfbb72a 100644
--- a/public/language/lt/error.json
+++ b/public/language/lt/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Neteisingas pavadinimas!",
"invalid-user-data": "Klaidingi vartotojo duomenys",
"invalid-password": "Klaidingas slaptažodis",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Klaidinga puslapiavimo reikšmė",
"username-taken": "Vartotojo vardas jau užimtas",
"email-taken": "El. pašto adresas jau užimtas",
"email-not-confirmed": "Jūsų el. paštas nepatvirtintas, prašome paspausti čia norint jį patvirtinti.",
"username-too-short": "Slapyvardis per trumpas",
+ "username-too-long": "Username too long",
"user-banned": "Vartotojas užblokuotas",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Kategorija neegzistuoja",
"no-topic": "Tema neegzistuoja",
"no-post": "Pranešimas neegzistuoja",
@@ -52,5 +55,9 @@
"upload-error": "Įkėlimo klaida: %1",
"signature-too-long": "Parašas negali būti ilgesnis negu %1 simboliai!",
"cant-chat-with-yourself": "Jūs negalite susirašinėti su savimi!",
- "not-enough-reputation-to-downvote": "Jūs neturite pakankamai reputacijos balsuoti prieš šį pranešimą"
+ "reputation-system-disabled": "Reputation system is disabled.",
+ "downvoting-disabled": "Downvoting is disabled",
+ "not-enough-reputation-to-downvote": "Jūs neturite pakankamai reputacijos balsuoti prieš šį pranešimą",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json
index 96ffad091b..864652cb57 100644
--- a/public/language/lt/notifications.json
+++ b/public/language/lt/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Naujas pranešimas",
"you_have_unread_notifications": "Jūs turite neperskaitytų pranešimų.",
"new_message_from": "Nauja žinutė nuo %1",
- "upvoted_your_post": "%1 teigiamai įvertino jūsų pranešimą.",
- "favourited_your_post": "%1 pamėgo jūsų pranešimą.",
- "user_flagged_post": "%1 pažymėjo pranešimą moderavimui.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 parašė atsaką %2",
"user_mentioned_you_in": "%1 paminėjo Jus %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "El. paštas patvirtintas",
"email-confirmed-message": "Dėkojame už el. pašto patvirtinimą. Jūsų paskyra pilnai aktyvuota.",
"email-confirm-error": "Įvyko klaida...",
diff --git a/public/language/lt/recent.json b/public/language/lt/recent.json
index 5be1ef3ff5..0ccdef0f8c 100644
--- a/public/language/lt/recent.json
+++ b/public/language/lt/recent.json
@@ -4,5 +4,6 @@
"week": "Savaitė",
"month": "Mėnesis",
"year": "Metai",
+ "alltime": "All Time",
"no_recent_topics": "Paskutinių temų nėra"
}
\ No newline at end of file
diff --git a/public/language/lt/search.json b/public/language/lt/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/lt/search.json
+++ b/public/language/lt/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json
index 2eb059c363..2d1896a77c 100644
--- a/public/language/lt/topic.json
+++ b/public/language/lt/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Ši tema bus perkelta į kategoriją",
"fork_topic_instruction": "Pažymėkite ant įrašų, kuriuos norite perkelti į naują temą",
"fork_no_pids": "Nepasirinktas joks įrašas!",
- "fork_success": "Tema sėkmingai išskaidyta!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Įrašykite temos pavadinimą...",
"composer.discard": "Atšaukti",
"composer.submit": "Patvirtinti",
diff --git a/public/language/lt/user.json b/public/language/lt/user.json
index 7c811b34a4..2823f89e95 100644
--- a/public/language/lt/user.json
+++ b/public/language/lt/user.json
@@ -4,6 +4,8 @@
"username": "Vartotojo vardas",
"email": "El. paštas",
"confirm_email": "Patvirtinti el. paštą",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Vardas ir pavardė",
"website": "Tinklalapis",
"location": "Vieta",
@@ -50,6 +52,7 @@
"digest_daily": "Kas dieną",
"digest_weekly": "Kas savaitę",
"digest_monthly": "Kas mėnesį",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Šis vartotojas neturi jokių sekėjų :(",
"follows_no_one": "Šis vartotojas nieko neseka :(",
"has_no_posts": "Šis vartotojas dar neparašė nė vieno pranešimo.",
@@ -61,5 +64,7 @@
"posts_per_page": "Pranešimų puslapyje",
"notification_sounds": "Groti garsą kai gaunate pranešimą.",
"browsing": "Naršymo nustatymai",
- "open_links_in_new_tab": "Atidaryti nuorodas naujame skirtuke?"
+ "open_links_in_new_tab": "Atidaryti nuorodas naujame skirtuke?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/ms/category.json b/public/language/ms/category.json
index 755fb94858..db2dc8d039 100644
--- a/public/language/ms/category.json
+++ b/public/language/ms/category.json
@@ -3,5 +3,6 @@
"no_topics": "Tiada topik dalam kategori ini.
Cuba menghantar topik yang baru?",
"browsing": "melihat",
"no_replies": "Tiada jawapan",
- "share_this_category": "Kongsi kategori ini"
+ "share_this_category": "Kongsi kategori ini",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/ms/email.json b/public/language/ms/email.json
index 3126f0da9d..8d02c3995f 100644
--- a/public/language/ms/email.json
+++ b/public/language/ms/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Terima Kasih!"
}
\ No newline at end of file
diff --git a/public/language/ms/error.json b/public/language/ms/error.json
index c76dc586f1..b6ad0bd586 100644
--- a/public/language/ms/error.json
+++ b/public/language/ms/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Password salah!",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Nama pengunna terlalu pendek",
+ "username-too-long": "Username too long",
"user-banned": "User banned",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
@@ -52,5 +55,9 @@
"upload-error": "Upload Error : %1",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json
index 530c9d1f93..02cc302284 100644
--- a/public/language/ms/notifications.json
+++ b/public/language/ms/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Pemberitahuan baru",
"you_have_unread_notifications": "Anda ada pemberitahuan yang belum dibaca",
"new_message_from": "Pesanan baru daripada %1",
- "upvoted_your_post": "%1 telah undi-naik posting anda",
- "favourited_your_post": "strong>%1 telah menggemari posting anda",
- "user_flagged_post": "%1 menandakan posting",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 telah membalas posting kepada: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/ms/recent.json b/public/language/ms/recent.json
index 8342257702..bface6de72 100644
--- a/public/language/ms/recent.json
+++ b/public/language/ms/recent.json
@@ -4,5 +4,6 @@
"week": "Minggu",
"month": "Bulan",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "Tiada topik terkini"
}
\ No newline at end of file
diff --git a/public/language/ms/search.json b/public/language/ms/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/ms/search.json
+++ b/public/language/ms/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json
index a40da8e224..dde98de2a8 100644
--- a/public/language/ms/topic.json
+++ b/public/language/ms/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Topik ini akan dipindahkan kepada kategori",
"fork_topic_instruction": "Clik kiriman yang anda hendak salin",
"fork_no_pids": "Tiada kiriman yang dipilih",
- "fork_success": "Berjaya menyalin topik!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Masukkan tajuk topik disini",
"composer.discard": "Abaikan",
"composer.submit": "Hantar",
diff --git a/public/language/ms/user.json b/public/language/ms/user.json
index f560bec8d5..cff395f87a 100644
--- a/public/language/ms/user.json
+++ b/public/language/ms/user.json
@@ -4,6 +4,8 @@
"username": "Nama pengguna",
"email": "Emel",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Nama penuh",
"website": "Laman Web",
"location": "Lokasi",
@@ -50,6 +52,7 @@
"digest_daily": "Harian",
"digest_weekly": "Mingguan",
"digest_monthly": "Bulanan",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Pengguna ini tiada pengikut :(",
"follows_no_one": "Pengguna ini tidak mengikuti sesiapa :(",
"has_no_posts": "Pengguna ini masih belum mengirim sebarang pos",
@@ -61,5 +64,7 @@
"posts_per_page": "Kiriman setiap muka",
"notification_sounds": "Mainkan muzik apabila anda menerima maklumbalas",
"browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/nb/category.json b/public/language/nb/category.json
index 14ab70de34..af2119d658 100644
--- a/public/language/nb/category.json
+++ b/public/language/nb/category.json
@@ -3,5 +3,6 @@
"no_topics": "Det er ingen emner i denne kategorien
Hvorfor ikke lage ett?",
"browsing": "leser",
"no_replies": "Ingen har svart",
- "share_this_category": "Del denne kategorien"
+ "share_this_category": "Del denne kategorien",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/nb/email.json b/public/language/nb/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/nb/email.json
+++ b/public/language/nb/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/nb/error.json b/public/language/nb/error.json
index 77c582b23f..f90d459cce 100644
--- a/public/language/nb/error.json
+++ b/public/language/nb/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Invalid Password",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "User banned",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
@@ -52,5 +55,9 @@
"upload-error": "Upload Error : %1",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json
index 96afebd800..2ffabea7c1 100644
--- a/public/language/nb/notifications.json
+++ b/public/language/nb/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Nytt varsel",
"you_have_unread_notifications": "Du har uleste varsler.",
"new_message_from": "Ny melding fra %1",
- "upvoted_your_post": "%1 har stemt opp ditt innlegg.",
- "favourited_your_post": "%1 har favorittmerket ditt innlegg.",
- "user_flagged_post": "%1 flagget ett innlegg.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 har skrevet et svar til: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/nb/recent.json b/public/language/nb/recent.json
index 608c10c8b6..d3b44fc0f4 100644
--- a/public/language/nb/recent.json
+++ b/public/language/nb/recent.json
@@ -4,5 +4,6 @@
"week": "Uke",
"month": "Måned",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "Det er ingen nye tråder."
}
\ No newline at end of file
diff --git a/public/language/nb/search.json b/public/language/nb/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/nb/search.json
+++ b/public/language/nb/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json
index 9aeddb6ecf..65f9f09bb5 100644
--- a/public/language/nb/topic.json
+++ b/public/language/nb/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Dette emnet vil bli flyttet til kategorien",
"fork_topic_instruction": "Trykk på innleggene du vil dele",
"fork_no_pids": "Ingen innlegg valgt!",
- "fork_success": "Innlegg ble delt!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Skriv din tråd-tittel her",
"composer.discard": "Forkast",
"composer.submit": "Send",
diff --git a/public/language/nb/user.json b/public/language/nb/user.json
index c19894c3f3..7575e7f77f 100644
--- a/public/language/nb/user.json
+++ b/public/language/nb/user.json
@@ -4,6 +4,8 @@
"username": "Brukernavn",
"email": "E-post",
"confirm_email": "Bekfreft e-post",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Fullt navn",
"website": "Nettsted",
"location": "Plassering",
@@ -50,6 +52,7 @@
"digest_daily": "Daglig",
"digest_weekly": "Ukentlig",
"digest_monthly": "Månedlig",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Denne brukeren har ingen følgere :(",
"follows_no_one": "Denne brukeren følger ingen :(",
"has_no_posts": "Denne brukeren har ikke skrevet noe enda.",
@@ -61,5 +64,7 @@
"posts_per_page": "Innlegg per side",
"notification_sounds": "Spill av en lyd når du mottar ett varsel.",
"browsing": "Surfeinnstillinger",
- "open_links_in_new_tab": "Åpne utgående linker i en ny fane?"
+ "open_links_in_new_tab": "Åpne utgående linker i en ny fane?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/nl/category.json b/public/language/nl/category.json
index 59ca9e6530..45dbbf4d4d 100644
--- a/public/language/nl/category.json
+++ b/public/language/nl/category.json
@@ -3,5 +3,6 @@
"no_topics": "Er zijn geen onderwerpen in deze categorie.
Waarom maak je er niet een aan?",
"browsing": "verkennen",
"no_replies": "Niemand heeft gereageerd",
- "share_this_category": "Deel deze categorie"
+ "share_this_category": "Deel deze categorie",
+ "ignore": "Negeren"
}
\ No newline at end of file
diff --git a/public/language/nl/email.json b/public/language/nl/email.json
index a4bd403e2a..ee272f19f5 100644
--- a/public/language/nl/email.json
+++ b/public/language/nl/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "De laatste onderwerpen van %1",
"digest.cta": "Klik hier om deze website te bezoeken %1 ",
"digest.unsub.info": "Deze overzicht was verzonden naar jou vanwege je abbonement instellingen",
- "digest.unsub.cta": "Klik hier om u instellingen te wijzigen",
- "digest.daily.no_topics": "Er zijn geen actieve topics vandaag",
+ "digest.daily.no_topics": "Er zijn geen actieve onderwerpen vandaag",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "Dit is een test email om te verifiëren dat de email service correct is opgezet voor jou NodeBB",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Bedankt!"
}
\ No newline at end of file
diff --git a/public/language/nl/error.json b/public/language/nl/error.json
index b6a85567d1..d27566d742 100644
--- a/public/language/nl/error.json
+++ b/public/language/nl/error.json
@@ -9,15 +9,18 @@
"invalid-uid": "Ongeldig Gebruikers ID",
"invalid-username": "Ongeldig Gebruikersnaam",
"invalid-email": "Ongeldig Email Adres",
- "invalid-title": "Ongeldig Titel!",
+ "invalid-title": "Ongeldige Titel!",
"invalid-user-data": "Ongeldig Gebruikersdata",
"invalid-password": "Ongeldig wachtwoord",
+ "invalid-username-or-password": "Geef alsjeblieft een gebruikersnaam en wachtwoord op",
"invalid-pagination-value": "Ongeldig pagineringswaarde",
"username-taken": "Gebruikersnaam is al bezet",
"email-taken": "Email adres is al gebruikt",
"email-not-confirmed": "U email adres is niet bevestigd, Klik hier om uw email adres te bevestigen",
"username-too-short": "Gebruikersnaam is te kort",
+ "username-too-long": "Gebruikersnaam is te lang",
"user-banned": "Gebruiker verbannen",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Categorie bestaat niet",
"no-topic": "Onderwerp bestaat niet",
"no-post": "Bericht bestaat niet",
@@ -52,5 +55,9 @@
"upload-error": "Upload Fout : %1",
"signature-too-long": "Deze handtekening kan niet groter zijn dan %1 karakters!",
"cant-chat-with-yourself": "Je kan niet met jezelf chatten!",
- "not-enough-reputation-to-downvote": "U heeft niet de benodigde reputatie om dit bericht te downvoten"
+ "reputation-system-disabled": "Reputatie systeem is uitgeschakeld",
+ "downvoting-disabled": "Downvoten is uitgeschakeld",
+ "not-enough-reputation-to-downvote": "U heeft niet de benodigde reputatie om dit bericht te downvoten",
+ "not-enough-reputation-to-flag": "U heeft niet de benodigde reputatie om dit bericht te melden aan de admins",
+ "reload-failed": "NodeBB heeft een probleem geconstateerd tijdens het laden van: \"%1\".\nNodeBB blijft verder draaien. Het is wel verstandig om de actie wat u daarvoor heeft gedaan ongedaan te maken door te herladen."
}
\ No newline at end of file
diff --git a/public/language/nl/global.json b/public/language/nl/global.json
index 94f5da88ba..446c5d35bd 100644
--- a/public/language/nl/global.json
+++ b/public/language/nl/global.json
@@ -50,16 +50,16 @@
"read_more": "Lees meer",
"posted_ago_by_guest": "geplaatst %1 door gast",
"posted_ago_by": "geplaatst %1 door %2",
- "posted_ago": "geplaatst %1",
- "posted_in_ago_by_guest": "geplaatst in % 1 %2 door gast",
+ "posted_ago": "geplaatst door %1",
+ "posted_in_ago_by_guest": "geplaatst in %1 %2 door gast",
"posted_in_ago_by": "geplaatst in %1 %2 door %3",
"posted_in_ago": "geplaatst in %1 %2",
"replied_ago": "gereageerd %1",
- "user_posted_ago": "%1 geplaatst %2",
+ "user_posted_ago": "%1 plaatste %2",
"guest_posted_ago": "Gast plaatste %1",
"last_edited_by_ago": "voor het laatst aangepast door %1 %2",
"norecentposts": "Geen Recente Berichten",
- "norecenttopics": "Geen Recente Topics",
+ "norecenttopics": "Geen Recente Onderwerpen",
"recentposts": "Recente Berichten",
"recentips": "Recente Ingelogde IPs",
"away": "Afwezig",
diff --git a/public/language/nl/login.json b/public/language/nl/login.json
index ea7a6e3bcd..fa8f5d55d7 100644
--- a/public/language/nl/login.json
+++ b/public/language/nl/login.json
@@ -2,7 +2,7 @@
"username": "Gebruikersnaam / Emailadres",
"remember_me": "Mij Onthouden?",
"forgot_password": "Wachtwoord Vergeten?",
- "alternative_logins": "Alternatieve Logins",
+ "alternative_logins": "Alternatieve Loginmethodes",
"failed_login_attempt": "Mislukte inlog poging, probeer het later opnieuw.",
"login_successful": "Je bent succesvol ingelogd!",
"dont_have_account": "Heeft u nog geen account?"
diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json
index 6758b7959f..4c51c977b5 100644
--- a/public/language/nl/notifications.json
+++ b/public/language/nl/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "een nieuwe notificatie",
"you_have_unread_notifications": "U heeft ongelezen notificaties",
"new_message_from": "Nieuw bericht van %1",
- "upvoted_your_post": "%1 heeft uw bericht geupvote",
- "favourited_your_post": "%1 heeft uw bericht aan zijn favorieten toegevoegd",
- "user_flagged_post": "%1 rapporteert uw bericht",
+ "upvoted_your_post_in": "%1 heeft uw bericht geupvote in %2.",
+ "moved_your_post": "%1 heeft uw bericht verplaatst",
+ "moved_your_topic": "%1 heeft uw onderwerp verplaatst.",
+ "favourited_your_post_in": "%1 heeft uw bericht gefavoriet in %2.",
+ "user_flagged_post_in": "%1 rapporteerde een bericht in %2",
"user_posted_to": "%1 heeft een reactie op het bericht gegeven aan %2",
"user_mentioned_you_in": "%1 heeft u genoemd in %2",
+ "user_started_following_you": "%1 volgt u nu.",
"email-confirmed": "Email adres bevestigd",
"email-confirmed-message": "Bedankt voor het bevestigen van uw email adres. Uw account is nu volledig actief.",
"email-confirm-error": "Een fout vond plaats",
diff --git a/public/language/nl/recent.json b/public/language/nl/recent.json
index 2bfc4af744..fbbfaaeb52 100644
--- a/public/language/nl/recent.json
+++ b/public/language/nl/recent.json
@@ -4,5 +4,6 @@
"week": "Week",
"month": "Maand",
"year": "Jaar",
+ "alltime": "Intussen",
"no_recent_topics": "Er zijn geen recente reacties."
}
\ No newline at end of file
diff --git a/public/language/nl/search.json b/public/language/nl/search.json
index b7035add16..cb61065a4e 100644
--- a/public/language/nl/search.json
+++ b/public/language/nl/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 resulta(a)ten was een match \"%2\", (%3 seconds)"
+ "results_matching": "%1 resulta(a)ten was een match \"%2\", (%3 seconds)",
+ "no-matches": "Geen berichten gevonden"
}
\ No newline at end of file
diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json
index 800d6348ca..0530a16f5c 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -17,7 +17,7 @@
"purge": "weggooien",
"restore": "Herstellen",
"move": "Verplaatsen",
- "fork": "Fork",
+ "fork": "Afsplitsen",
"banned": "verbannen",
"link": "Link",
"share": "Delen",
@@ -36,7 +36,7 @@
"watch": "Volgen",
"watch.title": "Krijg notificaties van nieuwe reacties op dit onderwerp",
"share_this_post": "Deel dit Bericht",
- "thread_tools.title": "Thread Gereedschap",
+ "thread_tools.title": "Acties",
"thread_tools.markAsUnreadForAll": "Ongelezen Markeren",
"thread_tools.pin": "Onderwerp Vastmaken",
"thread_tools.unpin": "Onderwerp Losmaken",
@@ -44,13 +44,13 @@
"thread_tools.unlock": "Onderwerp Openen",
"thread_tools.move": "Onderwerp Verplaatsen",
"thread_tools.move_all": "Verplaats alles",
- "thread_tools.fork": "Onderwerp Forken",
+ "thread_tools.fork": "Onderwerp Afsplitsen",
"thread_tools.delete": "Onderwerp Verwijderen",
"thread_tools.delete_confirm": "Weet u het zeker dat u dit onderwerp wilt verwijderen?",
"thread_tools.restore": "Onderwerp Herstellen",
"thread_tools.restore_confirm": "Weet u het zeker dat u het onderwerp wilt herstellen?",
- "thread_tools.purge": "Gooi onderwerp weg",
- "thread_tools.purge_confirm": "Weet u het zeker dat u dit onderwerp wilt weggooien?",
+ "thread_tools.purge": "Wis Onderwerp ",
+ "thread_tools.purge_confirm": "Weet u het zeker dat u dit onderwerp wilt wissen?",
"topic_move_success": "Deze onderwerp is succesvol verplaatst naar %1",
"post_delete_confirm": "Weet u het zeker dat u dit bericht wilt verwijderen?",
"post_restore_confirm": "Weet u het zeker dat u dit bericht wilt herstellen?",
@@ -58,7 +58,7 @@
"load_categories": "Categorieën Laden",
"disabled_categories_note": "Uitgeschakelde Categorieën zijn grijs",
"confirm_move": "Verplaatsen",
- "confirm_fork": "Fork",
+ "confirm_fork": "Splits",
"favourite": "Favoriet",
"favourites": "Favorieten",
"favourites.has_no_favourites": "Je hebt geen favorieten, sla een aantal berichten op als favoriet om ze hier te zien!",
@@ -67,11 +67,11 @@
"move_topics": "Verplaats onderwerpen",
"move_post": "Bericht Verplaatsen",
"post_moved": "Bericht verplaatst!",
- "fork_topic": "Onderwerp Forken",
+ "fork_topic": "Afgesplitste Onderwerp ",
"topic_will_be_moved_to": "Dit onderwerp zal verplaatst worden naar de categorie",
"fork_topic_instruction": "Klik op de berichten die je wilt forken",
"fork_no_pids": "Geen berichten geselecteerd!",
- "fork_success": "Onderwerp is met succes geforkt!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Vul de titel voor het onderwerp hier in...",
"composer.discard": "Annuleren",
"composer.submit": "Opslaan",
@@ -84,9 +84,9 @@
"composer.thumb_file_label": "Of upload een bestand",
"composer.thumb_remove": "Velden leegmaken",
"composer.drag_and_drop_images": "Sleep en Zet Afbeeldingen Hier",
- "more_users_and_guests": "%1 meer gebruiker(s) en %2 gast(en)",
+ "more_users_and_guests": "%1 of meerdere gebruiker(s) en %2 gast(en)",
"more_users": "%1 meer gebruiker(s)",
- "more_guests": "%1 meer gast(en)",
+ "more_guests": "%1 of meerdere gast(en)",
"users_and_others": "%1 en %2 anderen",
"sort_by": "gesorteerd op",
"oldest_to_newest": "Oud naar Nieuw",
diff --git a/public/language/nl/user.json b/public/language/nl/user.json
index 37103e7644..e91b069cae 100644
--- a/public/language/nl/user.json
+++ b/public/language/nl/user.json
@@ -4,6 +4,8 @@
"username": "Gebruikersnaam",
"email": "Email",
"confirm_email": "Bevestig uw email adres",
+ "delete_account": "Account Verwijderen",
+ "delete_account_confirm": "Are you sure you want to delete your account?
This action is irreversible and you will not be able to recover any of your data
Enter your username to confirm that you wish to destroy this account.",
"fullname": "Volledige Naam",
"website": "Website",
"location": "Locatie",
@@ -50,6 +52,7 @@
"digest_daily": "Dagelijks",
"digest_weekly": "Weekelijks",
"digest_monthly": "Maandelijks",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Deze gebruiker heeft geen volgers :(",
"follows_no_one": "Deze gebruiker volgt niemand :(",
"has_no_posts": "Deze gebruiker heeft nog geen berichten geplaatst",
@@ -61,5 +64,7 @@
"posts_per_page": "Berichten per Pagina",
"notification_sounds": "Speel een geluid af wanneer ik een notificatie ontvang.",
"browsing": "Zoek Instellingen",
- "open_links_in_new_tab": "Open de uitgaande links in een nieuw tabblad?"
+ "open_links_in_new_tab": "Open de uitgaande links in een nieuw tabblad?",
+ "follow_topics_you_reply_to": "Volg de onderwerpen waarop u gereageerd heeft.",
+ "follow_topics_you_create": "Volg de onderwerpen die u gecreëerd heeft."
}
\ No newline at end of file
diff --git a/public/language/pl/category.json b/public/language/pl/category.json
index 8e6707e13d..997aae19ae 100644
--- a/public/language/pl/category.json
+++ b/public/language/pl/category.json
@@ -3,5 +3,6 @@
"no_topics": "W tej kategorii nie ma jeszcze żadnych wątków.
Dlaczego ty nie utworzysz jakiegoś?",
"browsing": "przegląda",
"no_replies": "Nikt jeszcze nie odpowiedział",
- "share_this_category": "Udostępnij tę kategorię"
+ "share_this_category": "Udostępnij tę kategorię",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/pl/email.json b/public/language/pl/email.json
index 98e591ab02..9a154171c0 100644
--- a/public/language/pl/email.json
+++ b/public/language/pl/email.json
@@ -1,20 +1,23 @@
{
- "password-reset-requested": "Password Reset Requested - %1!",
- "welcome-to": "Welcome to %1",
- "greeting_no_name": "Hello",
- "greeting_with_name": "Hello %1",
- "welcome.text1": "Thank you for registering with %1!",
- "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
- "welcome.cta": "Click here to confirm your email address",
- "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
- "reset.text2": "To continue with the password reset, please click on the following link:",
- "reset.cta": "Click here to reset your password",
- "digest.notifications": "You have some unread notifications from %1:",
- "digest.latest_topics": "Latest topics from %1",
- "digest.cta": "Click here to visit %1",
- "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
- "digest.daily.no_topics": "There have been no active topics in the past day",
- "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
- "closing": "Thanks!"
+ "password-reset-requested": "Wybrano przywrócenie hasła - %1",
+ "welcome-to": "Witaj w %1",
+ "greeting_no_name": "Witaj",
+ "greeting_with_name": "Witaj %1",
+ "welcome.text1": "Dziękujemy za rejestrację w %1",
+ "welcome.text2": "Aby aktywować swoje konto, musisz potwierdzić, że skorzystałeś z własnego adresu e-mail.",
+ "welcome.cta": "Kliknij tutaj, by potwierdzić swój adres",
+ "reset.text1": "Otrzymaliśmy żądanie przywrócenia Twojego hasła. Jeśli nie żądałeś przywrócenia hasła, zignoruj ten e-mail.",
+ "reset.text2": "Aby przywrócić swoje hasło, skorzystaj z poniższego linku:",
+ "reset.cta": "Kliknij tu, by przywrócić swoje hasło",
+ "digest.notifications": "Masz nieprzeczytane powiadomienia z %1:",
+ "digest.latest_topics": "Ostatnie tematy z %1",
+ "digest.cta": "Kliknij, by odwiedzić %1",
+ "digest.unsub.info": "To podsumowanie zostało wysłane zgodnie z Twoimi ustawieniami.",
+ "digest.daily.no_topics": "Wczoraj nie było żadnych aktywnych tematów",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
+ "test.text1": "To jest e-mail testowy, aby sprawdzić, czy poprawnie skonfigurowałeś e-mailer w swoim NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
+ "closing": "Dziękujemy!"
}
\ No newline at end of file
diff --git a/public/language/pl/error.json b/public/language/pl/error.json
index e0df9469bb..c91c2ad906 100644
--- a/public/language/pl/error.json
+++ b/public/language/pl/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Błędny tytuł.",
"invalid-user-data": "Błędne dane użytkownika.",
"invalid-password": "Błędne hasło",
+ "invalid-username-or-password": "Proszę podać nazwę użytkownika i hasło",
"invalid-pagination-value": "Błędna wartość paginacji",
"username-taken": "Login zajęty.",
"email-taken": "E-mail zajęty.",
"email-not-confirmed": "Twój email nie jest potwierdzony, kliknij tutaj aby go potwierdzić.",
"username-too-short": "Nazwa użytkownika za krótka.",
+ "username-too-long": "Zbyt długa nazwa użytkownika",
"user-banned": "Użytkownik zbanowany",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Kategoria nie istnieje.",
"no-topic": "Temat nie istnieje",
"no-post": "Post nie istnieje",
@@ -25,7 +28,7 @@
"no-user": "Użytkownik nie istnieje",
"no-teaser": "Podgląd nie istnieje",
"no-privileges": "Nie masz wystarczających praw by to wykonać.",
- "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
+ "no-emailers-configured": "Nie zainstalowano żadnego dodatku obsługującego e-mail, więc nie można wysłać testowej wiadomości.",
"category-disabled": "Kategoria wyłączona.",
"topic-locked": "Temat zamknięty",
"still-uploading": "Poczekaj na pełne załadowanie",
@@ -52,5 +55,9 @@
"upload-error": "Błąd uploadu: %1",
"signature-too-long": "Sygnatura nie może mieć więcej niż %1 znaków.",
"cant-chat-with-yourself": "Nie możesz czatować ze sobą",
- "not-enough-reputation-to-downvote": "Masz za mało reputacji by ocenić ten post."
+ "reputation-system-disabled": "System reputacji został wyłączony",
+ "downvoting-disabled": "Ocena postów jest wyłączona",
+ "not-enough-reputation-to-downvote": "Masz za mało reputacji by ocenić ten post.",
+ "not-enough-reputation-to-flag": "Nie masz wystarczającej reputacji by oflagować ten post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/pl/global.json b/public/language/pl/global.json
index 84ac6226d5..6a4b6c40b2 100644
--- a/public/language/pl/global.json
+++ b/public/language/pl/global.json
@@ -18,7 +18,7 @@
"save_changes": "Zapisz zmiany",
"close": "Zamknij",
"pagination": "Numerowanie stron",
- "pagination.out_of": "%1 poza %2",
+ "pagination.out_of": "%1 z %2",
"pagination.enter_index": "Wpisz indeks.",
"header.admin": "Administracja",
"header.recent": "Ostatnie",
diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json
index c00c111e11..ecce894b28 100644
--- a/public/language/pl/groups.json
+++ b/public/language/pl/groups.json
@@ -1,7 +1,7 @@
{
- "view_group": "View Group",
- "details.title": "Group Details",
- "details.members": "Member List",
- "details.has_no_posts": "This group's members have not made any posts.",
- "details.latest_posts": "Latest Posts"
+ "view_group": "Obejrzyj grupę",
+ "details.title": "Szczegóły grupy",
+ "details.members": "Lista członków",
+ "details.has_no_posts": "Członkowie tej grupy nie napisali żadnych postów.",
+ "details.latest_posts": "Ostatnie posty"
}
\ No newline at end of file
diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json
index e63c958dc9..154ae27501 100644
--- a/public/language/pl/modules.json
+++ b/public/language/pl/modules.json
@@ -14,5 +14,5 @@
"chat.maximize": "Maksymalizuj",
"composer.user_said_in": "%1 powiedział w %2:",
"composer.user_said": "%1 powiedział:",
- "composer.discard": "Na pewno chcesz ignorować ten post?"
+ "composer.discard": "Na pewno chcesz porzucić ten post?"
}
\ No newline at end of file
diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json
index 493b232147..c715ae9567 100644
--- a/public/language/pl/notifications.json
+++ b/public/language/pl/notifications.json
@@ -2,19 +2,22 @@
"title": "Powiadomienia",
"no_notifs": "Nie masz nowych powiadomień",
"see_all": "Zobacz wszystkie powiadomienia",
- "back_to_home": "Back to %1",
+ "back_to_home": "Wróć do %1",
"outgoing_link": "Łącze wychodzące",
- "outgoing_link_message": "You are now leaving %1.",
+ "outgoing_link_message": "Opuszczasz %1.",
"continue_to": "Continue to %1",
"return_to": "Return to %1",
"new_notification": "Nowe powiadomienie",
"you_have_unread_notifications": "Masz nieprzeczytane powiadomienia.",
"new_message_from": "Nowa wiadomość od %1",
- "upvoted_your_post": "%1 zagłosował na Twój post",
- "favourited_your_post": "%1 polubił/a Twój post.",
- "user_flagged_post": "%1 oznaczył/a Twój post",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 dodał odpowiedź do %2",
- "user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_mentioned_you_in": "%1 wspomniał cię w %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "E-mail potwierdzony",
"email-confirmed-message": "Dziękujemy za potwierdzenie maila. Twoje konto zostało aktywowane.",
"email-confirm-error": "Wystąpił błąd.",
diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json
index fb43e50c1a..02e459b55a 100644
--- a/public/language/pl/pages.json
+++ b/public/language/pl/pages.json
@@ -5,7 +5,7 @@
"recent": "Ostatnie wątki",
"users": "Zarejestrowani użytkownicy",
"notifications": "Powiadomienia",
- "tags": "Topics tagged under \"%1\"",
+ "tags": "Tematy oznaczone \"%1\"",
"user.edit": "Edytowanie \"%1\"",
"user.following": "Obserwowani przez %1",
"user.followers": "Obserwujący %1",
diff --git a/public/language/pl/recent.json b/public/language/pl/recent.json
index 74050bc028..8f92e35c6a 100644
--- a/public/language/pl/recent.json
+++ b/public/language/pl/recent.json
@@ -3,6 +3,7 @@
"day": "Dzień",
"week": "Tydzień",
"month": "Miesiąc",
- "year": "Year",
+ "year": "Rok",
+ "alltime": "All Time",
"no_recent_topics": "Brak ostatnich wątków."
}
\ No newline at end of file
diff --git a/public/language/pl/search.json b/public/language/pl/search.json
index d0ffc64f36..2a9252fdab 100644
--- a/public/language/pl/search.json
+++ b/public/language/pl/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 wyników pasujących do \"%2\", (%3 sekund)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/pl/tags.json b/public/language/pl/tags.json
index f065d4bbfa..d4b35e3b39 100644
--- a/public/language/pl/tags.json
+++ b/public/language/pl/tags.json
@@ -1,6 +1,6 @@
{
- "no_tag_topics": "There are no topics with this tag.",
- "tags": "Tags",
- "enter_tags_here": "Enter tags here. Press enter after each tag.",
- "no_tags": "There are no tags yet."
+ "no_tag_topics": "Nie ma tematów z tym tagiem",
+ "tags": "Tagi",
+ "enter_tags_here": "Tutaj wpisz tagi. Naciśnij enter po każdym.",
+ "no_tags": "Jeszcze nie ma tagów."
}
\ No newline at end of file
diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json
index bcb2ad0721..25ae1af224 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -14,7 +14,7 @@
"reply": "Odpowiedz",
"edit": "Edytuj",
"delete": "Usuń",
- "purge": "Purge",
+ "purge": "Wyczyść",
"restore": "Przywróć",
"move": "Przenieś",
"fork": "Skopiuj",
@@ -23,7 +23,7 @@
"share": "Udostępnij",
"tools": "Narzędzia",
"flag": "Zgłoś",
- "locked": "Locked",
+ "locked": "Zablokowany",
"bookmark_instructions": "Kliknij tutaj, aby wrócić do ostatniej pozycji lub zamknij, aby odrzucić.",
"flag_title": "Zgłoś post do moderacji",
"flag_confirm": "Na pewno chcesz oznaczyć ten post?",
@@ -49,12 +49,12 @@
"thread_tools.delete_confirm": "Na pewno chcesz usunąć ten wątek?",
"thread_tools.restore": "Przywróć wątek",
"thread_tools.restore_confirm": "Na pewno chcesz przywrócić ten wątek?",
- "thread_tools.purge": "Purge Topic",
- "thread_tools.purge_confirm": "Are you sure you want to purge this thread?",
+ "thread_tools.purge": "Wyczyść wątek",
+ "thread_tools.purge_confirm": "Jesteś pewien, że chcesz wyczyścić ten wątek?",
"topic_move_success": "Temat przeniesiono do %1",
"post_delete_confirm": "Na pewno chcesz usunąć ten post?",
"post_restore_confirm": "Na pewno chcesz przywrócić ten post?",
- "post_purge_confirm": "Are you sure you want to purge this post?",
+ "post_purge_confirm": "Jesteś pewien, że chcesz wyczyścić ten post?",
"load_categories": "Ładowanie kategorii",
"disabled_categories_note": "Zablokowane kategorie zostały wyszarzone.",
"confirm_move": "Przenieś",
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Ten wątek zostanie przeniesiony do kategorii",
"fork_topic_instruction": "Zaznacz posty, które chcesz sklonować",
"fork_no_pids": "Nie zaznaczyłeś żadnych postów!",
- "fork_success": "Pomyślnie sklonowano wątek",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Wpisz tytuł wątku tutaj",
"composer.discard": "Odrzuć",
"composer.submit": "Wyślij",
@@ -87,9 +87,9 @@
"more_users_and_guests": "%1 więcej użytkownik(ów) i %2 gośc(i)",
"more_users": "%1 więcej użytkownik(ów)",
"more_guests": "%1 więcej gośc(i)",
- "users_and_others": "%1 and %2 others",
- "sort_by": "Sort by",
- "oldest_to_newest": "Oldest to Newest",
- "newest_to_oldest": "Newest to Oldest",
- "most_votes": "Most votes"
+ "users_and_others": "%1 i %2 innych",
+ "sort_by": "Sortuj po",
+ "oldest_to_newest": "Najpierw najstarsze",
+ "newest_to_oldest": "Najpierw najnowsze",
+ "most_votes": "Najwięcej głosów"
}
\ No newline at end of file
diff --git a/public/language/pl/user.json b/public/language/pl/user.json
index ceb114e4af..82b79963f7 100644
--- a/public/language/pl/user.json
+++ b/public/language/pl/user.json
@@ -3,7 +3,9 @@
"offline": "Offline",
"username": "Nazwa użytkownika",
"email": "Adres e-mail",
- "confirm_email": "Confirm Email",
+ "confirm_email": "Potwierdź e-mail",
+ "delete_account": "Skasuj konto",
+ "delete_account_confirm": "Are you sure you want to delete your account?
This action is irreversible and you will not be able to recover any of your data
Enter your username to confirm that you wish to destroy this account.",
"fullname": "Pełna nazwa",
"website": "Strona WWW",
"location": "Położenie",
@@ -37,7 +39,7 @@
"change_password_success": "Twoje hasło jest zaktualizowane!",
"confirm_password": "Potwierdź hasło",
"password": "Hasło",
- "username_taken_workaround": "Login jakiego chciałeś/aś użyć jest już zajęty, ale my to załatwimy. Jesteś znany/a jako %1",
+ "username_taken_workaround": "Wybrany login jest już zajęty, więc zmieniliśmy go trochę. Proponujemy %1",
"upload_picture": "Prześlij zdjęcie",
"upload_a_picture": "Prześlij zdjęcie",
"image_spec": "Możesz przesłać tylko pliki PNG, JPG lub GIF.",
@@ -50,6 +52,7 @@
"digest_daily": "Codziennie",
"digest_weekly": "Co tydzień",
"digest_monthly": "Co miesiąc",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Ten użytkownik nie ma jeszcze żadnych obserwujących",
"follows_no_one": "Użytkownik jeszcze nikogo nie obsweruje.",
"has_no_posts": "Użytkownik nie napisał jeszcze żadnych postów.",
@@ -61,5 +64,7 @@
"posts_per_page": "Postów na stronę",
"notification_sounds": "Odtwórz dźwięk po otrzymaniu powiadomienia.",
"browsing": "Ustawienia szukania",
- "open_links_in_new_tab": "Otwierać linki zewnętrzne w nowych kartach?"
+ "open_links_in_new_tab": "Otwierać linki zewnętrzne w nowych kartach?",
+ "follow_topics_you_reply_to": "Śledź tematy, w których piszesz.",
+ "follow_topics_you_create": "Śledź swoje tematy."
}
\ No newline at end of file
diff --git a/public/language/pl/users.json b/public/language/pl/users.json
index 6a12eb61d4..1c87248f14 100644
--- a/public/language/pl/users.json
+++ b/public/language/pl/users.json
@@ -5,6 +5,6 @@
"search": "Szukaj",
"enter_username": "Wpisz nazwę użytkownika",
"load_more": "Więcej",
- "user-not-found": "User not found!",
- "users-found-search-took": "%1 user(s) found! Search took %2 ms."
+ "user-not-found": "Nie znaleziono użytkownika!",
+ "users-found-search-took": "Znaleziono %1 użytkowników. Szukanie zajęło %2 ms."
}
\ No newline at end of file
diff --git a/public/language/pt_BR/category.json b/public/language/pt_BR/category.json
index 7b63409f19..13a29a5a02 100644
--- a/public/language/pt_BR/category.json
+++ b/public/language/pt_BR/category.json
@@ -3,5 +3,6 @@
"no_topics": "Não tem nenhum tópico nesta categoria.
Por que não tenta postar o primeiro?",
"browsing": "navegando",
"no_replies": "Ninguém respondeu",
- "share_this_category": "Compartilhar"
+ "share_this_category": "Compartilhar",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/pt_BR/email.json b/public/language/pt_BR/email.json
index f0b4cce398..2857f112a3 100644
--- a/public/language/pt_BR/email.json
+++ b/public/language/pt_BR/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Últimos tópicos de %1",
"digest.cta": "Clique aqui para visitar %1",
"digest.unsub.info": "Este resumo foi enviado para você devido a configuração de assinatura",
- "digest.unsub.cta": "Clique aqui para alterar suas configurações",
"digest.daily.no_topics": "Não houve nenhum tópico ativo atualmente",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "Este é um e-mail de teste, para verificar que o email está corretamente configurado no seu NodeBB.\n",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Obrigado!"
}
\ No newline at end of file
diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json
index 9dca9b0ae2..d6e0da1ede 100644
--- a/public/language/pt_BR/error.json
+++ b/public/language/pt_BR/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Título inválido.",
"invalid-user-data": "Informação de usuário inválida",
"invalid-password": "Senha inválida",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Informação inválida de paginação",
"username-taken": "Usuário já existe",
"email-taken": "Email já foi utilizado em um cadastro",
"email-not-confirmed": "Seu email não está confirmado, por favor, clique aqui para confirmá-lo",
"username-too-short": "Nome de usuário muito curto",
+ "username-too-long": "Username too long",
"user-banned": "Usuário banido",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Categoria não existe",
"no-topic": "Tópico não existe",
"no-post": "Post não existe",
@@ -52,5 +55,9 @@
"upload-error": "Erro de Upload : %1",
"signature-too-long": "Assinatura não pode conter mais que %1 caracteres!",
"cant-chat-with-yourself": "Impossível bater papo consigo mesmo!",
- "not-enough-reputation-to-downvote": "Você não possui reputação suficiente para negativar este post"
+ "reputation-system-disabled": "Reputation system is disabled.",
+ "downvoting-disabled": "Downvoting is disabled",
+ "not-enough-reputation-to-downvote": "Você não possui reputação suficiente para negativar este post",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/pt_BR/notifications.json b/public/language/pt_BR/notifications.json
index 08a4240c19..fc82e93866 100644
--- a/public/language/pt_BR/notifications.json
+++ b/public/language/pt_BR/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Nova notificação",
"you_have_unread_notifications": "Você possui notificações não lidas.",
"new_message_from": "Nova mensagem de %1",
- "upvoted_your_post": "%1 votou no seu post.",
- "favourited_your_post": "%1 favoritou seu post.",
- "user_flagged_post": "%1 sinalizou seu post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 respondeu para: %2",
"user_mentioned_you_in": "%1 mensionou você em %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmado",
"email-confirmed-message": "Obrigado por validar seu email. Sua conta foi ativada.",
"email-confirm-error": "Ocorreu um erro...",
diff --git a/public/language/pt_BR/pages.json b/public/language/pt_BR/pages.json
index b700cccb53..48c03f52d9 100644
--- a/public/language/pt_BR/pages.json
+++ b/public/language/pt_BR/pages.json
@@ -5,7 +5,7 @@
"recent": "Tópicos Recentes",
"users": "Usuários Registrados",
"notifications": "Notificações",
- "tags": "Topics tagged under \"%1\"",
+ "tags": "Tópicos com a tag sob \"%1\"",
"user.edit": "Editando \"%1\"",
"user.following": "Seguidos por %1",
"user.followers": "Seguidores de %1",
diff --git a/public/language/pt_BR/recent.json b/public/language/pt_BR/recent.json
index 27a5e4e108..3185b1419b 100644
--- a/public/language/pt_BR/recent.json
+++ b/public/language/pt_BR/recent.json
@@ -4,5 +4,6 @@
"week": "Semana",
"month": "Mês",
"year": "Ano",
+ "alltime": "All Time",
"no_recent_topics": "Nenhum tópico recente."
}
\ No newline at end of file
diff --git a/public/language/pt_BR/search.json b/public/language/pt_BR/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/pt_BR/search.json
+++ b/public/language/pt_BR/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json
index eaa541ed33..a0f0caea3d 100644
--- a/public/language/pt_BR/topic.json
+++ b/public/language/pt_BR/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Este tópico será movido para a categoria",
"fork_topic_instruction": "Clique nos posts que você quer clonar",
"fork_no_pids": "Nenhum post selecionado!",
- "fork_success": "Clone realizado com sucesso!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Digite aqui o título para o seu tópico...",
"composer.discard": "Descartar",
"composer.submit": "Enviar",
@@ -87,7 +87,7 @@
"more_users_and_guests": "%1 mais usuário(s) e %2 visitante(s)",
"more_users": "%1 mais usuário(s)",
"more_guests": "%1 mais visitante(s)",
- "users_and_others": "%1 and %2 others",
+ "users_and_others": "%1 e %2 outros",
"sort_by": "Ordenar por",
"oldest_to_newest": "Mais Antigo para Recente",
"newest_to_oldest": "Recente para mais Antigo",
diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json
index 8ecaf1e00b..78084398dd 100644
--- a/public/language/pt_BR/user.json
+++ b/public/language/pt_BR/user.json
@@ -4,6 +4,8 @@
"username": "Usuário",
"email": "Email",
"confirm_email": "Confirmar Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Nome Completo",
"website": "Website",
"location": "Localização",
@@ -50,6 +52,7 @@
"digest_daily": "Diariamente",
"digest_weekly": "Semanalmente",
"digest_monthly": "Mensalmente",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Este usuário não possui seguidores :(",
"follows_no_one": "Este usuário não está seguindo ninguém :(",
"has_no_posts": "Este usuário não postou nada ainda.",
@@ -61,5 +64,7 @@
"posts_per_page": "Posts por Página",
"notification_sounds": "Tocar um som quando receber notificação.",
"browsing": "Configurações de Navegação",
- "open_links_in_new_tab": "Abrir links externos em nova aba?"
+ "open_links_in_new_tab": "Abrir links externos em nova aba?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/ro/category.json b/public/language/ro/category.json
index fbd7cd2393..8c5034e4fd 100644
--- a/public/language/ro/category.json
+++ b/public/language/ro/category.json
@@ -3,5 +3,6 @@
"no_topics": "Nu există nici un subiect de discuție în această categorie.
De ce nu încerci să postezi tu unul?",
"browsing": "navighează",
"no_replies": "Nu a răspuns nimeni",
- "share_this_category": "Distribuie această categorie"
+ "share_this_category": "Distribuie această categorie",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/ro/email.json b/public/language/ro/email.json
index 9c7da47629..7dd905af3f 100644
--- a/public/language/ro/email.json
+++ b/public/language/ro/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Apasă aici pentru a vizita %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Mulțumesc!"
}
\ No newline at end of file
diff --git a/public/language/ro/error.json b/public/language/ro/error.json
index 5b54c36e72..a40ac5f0d0 100644
--- a/public/language/ro/error.json
+++ b/public/language/ro/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Titlu invalid!",
"invalid-user-data": "Date utilizator invalide",
"invalid-password": "Parolă Invalidă",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Date paginație invalide",
"username-taken": "Numele de utilizator este deja folosit",
"email-taken": "Adresa de email este deja folostă",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Numele de utilizator este prea scurt",
+ "username-too-long": "Username too long",
"user-banned": "Utilizator banat",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Categoria nu există",
"no-topic": "Subiectul nu există",
"no-post": "Mesajul nu există",
@@ -52,5 +55,9 @@
"upload-error": "Eroare Upload : %1",
"signature-too-long": "Semnătura ta nu poate fi mai lungă de %1 caractere!",
"cant-chat-with-yourself": "Nu poți conversa cu tine!",
- "not-enough-reputation-to-downvote": "Nu ai destulă reputație pentru a vota negativ acest post."
+ "reputation-system-disabled": "Reputation system is disabled.",
+ "downvoting-disabled": "Downvoting is disabled",
+ "not-enough-reputation-to-downvote": "Nu ai destulă reputație pentru a vota negativ acest post.",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json
index 682cb05ee2..568af20877 100644
--- a/public/language/ro/notifications.json
+++ b/public/language/ro/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Notificare Nouă",
"you_have_unread_notifications": "Ai notificări necitite.",
"new_message_from": "Un mesaj nou de la %1",
- "upvoted_your_post": "%1 a votat pozitiv mesajul tău.",
- "favourited_your_post": "%1 a adăugat mesajul tău la favorite.",
- "user_flagged_post": "%1 a semnalizat un mesaj.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 a postat un răspuns la: %2",
"user_mentioned_you_in": "%1 te-a menționat în %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email confirmat",
"email-confirmed-message": "Îți mulțumim pentru validarea emailului. Contul tău este acuma activat.",
"email-confirm-error": "S-a produs o eroare ...",
diff --git a/public/language/ro/recent.json b/public/language/ro/recent.json
index b17702e5e9..c0600afba9 100644
--- a/public/language/ro/recent.json
+++ b/public/language/ro/recent.json
@@ -4,5 +4,6 @@
"week": "Săptămână",
"month": "Lună",
"year": "An",
+ "alltime": "All Time",
"no_recent_topics": "Nu există subiecte recente."
}
\ No newline at end of file
diff --git a/public/language/ro/search.json b/public/language/ro/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/ro/search.json
+++ b/public/language/ro/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json
index eccb976288..3bcdf5805e 100644
--- a/public/language/ro/topic.json
+++ b/public/language/ro/topic.json
@@ -54,7 +54,7 @@
"topic_move_success": "Acest mesaj a fost mutat cu succes în %1",
"post_delete_confirm": "Ești sigur că vrei să ștergi acest mesaj?",
"post_restore_confirm": "Esti sigur că vrei să restaurezi acest mesaj?",
- "post_purge_confirm": "Are you sure you want to purge this post?",
+ "post_purge_confirm": "Ești sigur că vrei să cureți acest mesaj?",
"load_categories": "Se Încarcă Categoriile",
"disabled_categories_note": "Categoriile dezactivate sunt decolorate cu gri",
"confirm_move": "Mută",
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Acest subiect va fi mutat în categoria",
"fork_topic_instruction": "Apasă pe mesajele care vrei sa le bifurci",
"fork_no_pids": "Nu a fost selectat nici un mesaj!",
- "fork_success": "Ai bifurcat mesajul cu succes!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Introdu numele subiectului aici ...",
"composer.discard": "Renunță",
"composer.submit": "Trimite",
@@ -87,7 +87,7 @@
"more_users_and_guests": "%1 utlizator(i) și %2 vizitator(i)",
"more_users": "%1 utilizator(i)",
"more_guests": "%1 vizitator(i)",
- "users_and_others": "%1 and %2 others",
+ "users_and_others": "%1 și alți %2",
"sort_by": "Sortează de la",
"oldest_to_newest": "Vechi la Noi",
"newest_to_oldest": "Noi la Vechi",
diff --git a/public/language/ro/user.json b/public/language/ro/user.json
index 19de3dccf8..1719ecce2e 100644
--- a/public/language/ro/user.json
+++ b/public/language/ro/user.json
@@ -4,6 +4,8 @@
"username": "Nume utilizator",
"email": "Adresă Email",
"confirm_email": "Confirmă Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Nume Întreg",
"website": "Pagină Web",
"location": "Locație",
@@ -50,6 +52,7 @@
"digest_daily": "Zilnic",
"digest_weekly": "Săptămânal",
"digest_monthly": "Lunar",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Pe acest utilizator nu îl urmărește nimeni :(",
"follows_no_one": "Acest utilizator nu urmărește pe nimeni :(",
"has_no_posts": "Acest utilizator nu a postat nici un mesaj până acuma.",
@@ -61,5 +64,7 @@
"posts_per_page": "Mesaje pe pagină",
"notification_sounds": "Redă un sunet când primești o notificare.",
"browsing": "Setări navigare",
- "open_links_in_new_tab": "Deschide linkurile externe intr-un tab nou?"
+ "open_links_in_new_tab": "Deschide linkurile externe intr-un tab nou?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/ru/category.json b/public/language/ru/category.json
index 9248f1cfd9..9454af6989 100644
--- a/public/language/ru/category.json
+++ b/public/language/ru/category.json
@@ -3,5 +3,6 @@
"no_topics": "В этой категории еще нет тем.
Почему бы вам не создать первую?",
"browsing": "просматривают",
"no_replies": "Нет ответов",
- "share_this_category": "Поделиться этой категорией"
+ "share_this_category": "Поделиться этой категорией",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/ru/email.json b/public/language/ru/email.json
index d0fc8fabed..5d463a1779 100644
--- a/public/language/ru/email.json
+++ b/public/language/ru/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Последние темы %1",
"digest.cta": "Кликните здесь для просмотра %1",
"digest.unsub.info": "Вам была выслана сводка новостей в соответствии с вашими настройками.",
- "digest.unsub.cta": "Кликните здесь для изменения ваших настроек.",
"digest.daily.no_topics": "За минувший день новых тем нет.",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "Это тестовое сообщение для проверки почтового сервиса NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Спасибо!"
}
\ No newline at end of file
diff --git a/public/language/ru/error.json b/public/language/ru/error.json
index 63a6a93355..a715f9c9a2 100644
--- a/public/language/ru/error.json
+++ b/public/language/ru/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Неверный заголовок!",
"invalid-user-data": "Неверные Пользовательские Данные",
"invalid-password": "Неверный Пароль",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Неверное значение пагинации",
"username-taken": "Имя пользователя занято",
"email-taken": "Email занят",
"email-not-confirmed": "Ваш email не подтвержден, нажмите для подтверждения.",
"username-too-short": "Слишком короткое имя пользователя",
+ "username-too-long": "Username too long",
"user-banned": "Пользователь заблокирован",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Несуществующая категория",
"no-topic": "Несуществующая тема",
"no-post": "Несуществующая запись",
@@ -52,5 +55,9 @@
"upload-error": "Ошибка загрузки : %1",
"signature-too-long": "Подпись не может быть длиннее %1 символов",
"cant-chat-with-yourself": "Вы не можете общаться с самим собой",
- "not-enough-reputation-to-downvote": "У Вас недостаточно репутации для понижения оценки поста"
+ "reputation-system-disabled": "Reputation system is disabled.",
+ "downvoting-disabled": "Downvoting is disabled",
+ "not-enough-reputation-to-downvote": "У Вас недостаточно репутации для понижения оценки поста",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json
index 1648ebc8f8..0bd4597dd7 100644
--- a/public/language/ru/notifications.json
+++ b/public/language/ru/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Новое Уведомление",
"you_have_unread_notifications": "У вас есть непрочитанные уведомления",
"new_message_from": "Новое сообщение от %1",
- "upvoted_your_post": "%1 проголосовал за Ваш пост",
- "favourited_your_post": "%1 добавил Ваш пост в избранное",
- "user_flagged_post": "%1 пометил пост",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 ответил на запись: %2",
"user_mentioned_you_in": "%1 упомянул вас в %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Подтвержден",
"email-confirmed-message": "Спасибо за подтверждение Вашего Email-адреса. Ваш аккаунт активирован.",
"email-confirm-error": "Произошла ошибка...",
diff --git a/public/language/ru/recent.json b/public/language/ru/recent.json
index 7dabef695e..428c2c6b3d 100644
--- a/public/language/ru/recent.json
+++ b/public/language/ru/recent.json
@@ -4,5 +4,6 @@
"week": "Неделя",
"month": "Месяц",
"year": "Год",
+ "alltime": "All Time",
"no_recent_topics": "Нет свежих тем."
}
\ No newline at end of file
diff --git a/public/language/ru/search.json b/public/language/ru/search.json
index 5f0a069bef..17b82606bd 100644
--- a/public/language/ru/search.json
+++ b/public/language/ru/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 результатов по фразе \"%2\", (%3 секунды) "
+ "results_matching": "%1 результатов по фразе \"%2\", (%3 секунды) ",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json
index 9757210077..5a97aa09ea 100644
--- a/public/language/ru/topic.json
+++ b/public/language/ru/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Эта тема будет перенесена в категорию",
"fork_topic_instruction": "Отметьте сообщения для ответвления",
"fork_no_pids": "Сообщения не отмечены!",
- "fork_success": "Ответвление темы создано!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Введите название темы...",
"composer.discard": "Отменить",
"composer.submit": "Подтвердить",
diff --git a/public/language/ru/user.json b/public/language/ru/user.json
index 6f3e7c92e2..e1902b30ee 100644
--- a/public/language/ru/user.json
+++ b/public/language/ru/user.json
@@ -4,6 +4,8 @@
"username": "Имя пользователя",
"email": "Email",
"confirm_email": "Подтвердить Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Полное имя",
"website": "Сайт",
"location": "Откуда",
@@ -50,6 +52,7 @@
"digest_daily": "За День",
"digest_weekly": "За Неделю",
"digest_monthly": "За Месяц",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Этого пользователя никто не читает :(",
"follows_no_one": "Этот пользователь никого не читает :(",
"has_no_posts": "Это пользователь еще ничего не написал.",
@@ -61,5 +64,7 @@
"posts_per_page": "Постов на Странице",
"notification_sounds": "Звук при получении уведомления",
"browsing": "Настройки просмотра",
- "open_links_in_new_tab": "Открывать ссылки, ведущие на другие сайты, в новой вкладке?"
+ "open_links_in_new_tab": "Открывать ссылки, ведущие на другие сайты, в новой вкладке?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/sc/category.json b/public/language/sc/category.json
index d249aa6ffd..35e7f7b522 100644
--- a/public/language/sc/category.json
+++ b/public/language/sc/category.json
@@ -3,5 +3,6 @@
"no_topics": "Non bi sunt arresonadas in custa creze.
Pro ite non nde pones una?",
"browsing": "navighende",
"no_replies": "Perunu at rispostu",
- "share_this_category": "Share this category"
+ "share_this_category": "Share this category",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/sc/email.json b/public/language/sc/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/sc/email.json
+++ b/public/language/sc/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/sc/error.json b/public/language/sc/error.json
index 77c582b23f..f90d459cce 100644
--- a/public/language/sc/error.json
+++ b/public/language/sc/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Invalid Password",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "User banned",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
@@ -52,5 +55,9 @@
"upload-error": "Upload Error : %1",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json
index c5c59c39e1..0fecd4d1a7 100644
--- a/public/language/sc/notifications.json
+++ b/public/language/sc/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "New Notification",
"you_have_unread_notifications": "You have unread notifications.",
"new_message_from": "New message from %1",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 has favourited your post.",
- "user_flagged_post": "%1 flagged a post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 has posted a reply to: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/sc/recent.json b/public/language/sc/recent.json
index b6d27107b3..2e2d9401c7 100644
--- a/public/language/sc/recent.json
+++ b/public/language/sc/recent.json
@@ -4,5 +4,6 @@
"week": "Chida",
"month": "Mese",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "Non bi sunt ùrtimas arresonadas."
}
\ No newline at end of file
diff --git a/public/language/sc/search.json b/public/language/sc/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/sc/search.json
+++ b/public/language/sc/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json
index afc9d94ddd..b6eee990c6 100644
--- a/public/language/sc/topic.json
+++ b/public/language/sc/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Custa arresonada at a èssere mòvida in sa creze",
"fork_topic_instruction": "Sèbera is arresonos chi boles partzire",
"fork_no_pids": "Perunu arresonu seberadu!",
- "fork_success": "As partzidu s'arresonada!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Pone su tìtulu de s'arresonada inoghe...",
"composer.discard": "Lassa a Pèrdere",
"composer.submit": "Imbia",
diff --git a/public/language/sc/user.json b/public/language/sc/user.json
index d1dfdd8b2e..826a3a82be 100644
--- a/public/language/sc/user.json
+++ b/public/language/sc/user.json
@@ -4,6 +4,8 @@
"username": "Nùmene de Impitadore",
"email": "Email",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Nùmene e Sambenadu",
"website": "Giassu web",
"location": "Logu",
@@ -50,6 +52,7 @@
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Custu impitadore non tenet perunu sighidore :(",
"follows_no_one": "Custu impitadore no est sighende nissunu :(",
"has_no_posts": "Custu impitadore no at ancora publicadu nudda.",
@@ -61,5 +64,7 @@
"posts_per_page": "Arresonos pro Pàgina",
"notification_sounds": "Play a sound when you receive a notification.",
"browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/sk/category.json b/public/language/sk/category.json
index e804178494..ead803aae6 100644
--- a/public/language/sk/category.json
+++ b/public/language/sk/category.json
@@ -3,5 +3,6 @@
"no_topics": "V tejto kategórií zatiaľ nie sú žiadne príspevky.
Môžeš byť prvý!",
"browsing": "prehliada",
"no_replies": "Nikdo ešte neodpovedal",
- "share_this_category": "zdielaj túto kategóriu"
+ "share_this_category": "zdielaj túto kategóriu",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/sk/email.json b/public/language/sk/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/sk/email.json
+++ b/public/language/sk/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/sk/error.json b/public/language/sk/error.json
index 8481519d05..60262ff3e4 100644
--- a/public/language/sk/error.json
+++ b/public/language/sk/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Nesprávny titulok!",
"invalid-user-data": "Neplatné užívatelské údaje",
"invalid-password": "Nesprávne heslo",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Nesprávna hodnota stránkovania",
"username-taken": "Užívateľske meno je obsadené",
"email-taken": "Email je obsadený",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "Užívateľ je zakázaný",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Kategória neexistuje",
"no-topic": "Téme neexistuje",
"no-post": "Príspevok neexistuje",
@@ -52,5 +55,9 @@
"upload-error": "Upload chyba: %1",
"signature-too-long": "Podpis nesmie byť dlhší ako %1 znakov!",
"cant-chat-with-yourself": "Nemôžete chatovat so samým sebou.",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json
index 7a5b20cbb7..cffd1a1fc0 100644
--- a/public/language/sk/notifications.json
+++ b/public/language/sk/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Nová notifikácia",
"you_have_unread_notifications": "Máte neprečítané notifikácie",
"new_message_from": "Nova spáva od %1",
- "upvoted_your_post": "%1 zahlasoval za Váš príspevok.",
- "favourited_your_post": "%1 pridal do obľubených Váš príspevok.",
- "user_flagged_post": "%1 označil Váš príspevok",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 odpovedal: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email bol potvrdený",
"email-confirmed-message": "Ďakujeme za potvrdenie tvojho emailu. Účet je plne aktivovaný.",
"email-confirm-error": "Vyskytla sa chyba...",
diff --git a/public/language/sk/recent.json b/public/language/sk/recent.json
index cfb6b18bc5..963740ba54 100644
--- a/public/language/sk/recent.json
+++ b/public/language/sk/recent.json
@@ -4,5 +4,6 @@
"week": "Týždeň",
"month": "Mesiac",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "Nie sú žiadne posledné témy"
}
\ No newline at end of file
diff --git a/public/language/sk/search.json b/public/language/sk/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/sk/search.json
+++ b/public/language/sk/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json
index 697c0880ca..72da1a0869 100644
--- a/public/language/sk/topic.json
+++ b/public/language/sk/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Táto téma bude presunutá do kategórie",
"fork_topic_instruction": "Vyber príspevky, ktoré chceš oddeliť",
"fork_no_pids": "Žiadne príspevky neboli vybrané!",
- "fork_success": "Téma bola úspešne rozdelená!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Vlož nadpis témy sem...",
"composer.discard": "Zahodiť",
"composer.submit": "Poslať",
diff --git a/public/language/sk/user.json b/public/language/sk/user.json
index 3a42def9f0..7b10ab4040 100644
--- a/public/language/sk/user.json
+++ b/public/language/sk/user.json
@@ -4,6 +4,8 @@
"username": "Uživateľské meno",
"email": "Email",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Meno a priezvisko",
"website": "Webová stránka",
"location": "Poloha",
@@ -50,6 +52,7 @@
"digest_daily": "Denne",
"digest_weekly": "Týždenne",
"digest_monthly": "Mesačne",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Tohoto užívatela nikto nesleduje :(",
"follows_no_one": "Tento užívateľ nikoho nesleduje :(",
"has_no_posts": "Tento používateľ ešte nespravil príspevok",
@@ -61,5 +64,7 @@
"posts_per_page": "Príspevkov na stranu",
"notification_sounds": "Prehraj zvuk ked príde notifikácia",
"browsing": "Hľadaj v nadstaveniach",
- "open_links_in_new_tab": "Otvoriť tieto odkazy v novom tabe ?"
+ "open_links_in_new_tab": "Otvoriť tieto odkazy v novom tabe ?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/sv/category.json b/public/language/sv/category.json
index 25b9f9fa83..c9662de9c0 100644
--- a/public/language/sv/category.json
+++ b/public/language/sv/category.json
@@ -3,5 +3,6 @@
"no_topics": "Det finns inga ämnen i denna kategori.
Varför inte skapa ett?",
"browsing": "läser",
"no_replies": "Ingen har svarat",
- "share_this_category": "Dela den här kategorin"
+ "share_this_category": "Dela den här kategorin",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/sv/email.json b/public/language/sv/email.json
index 2a6f643862..5c84229840 100644
--- a/public/language/sv/email.json
+++ b/public/language/sv/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Senaste ämnen från %1",
"digest.cta": "Klicka här för att besöka %1",
"digest.unsub.info": "Det här meddelandet fick du på grund av dina inställningar för prenumeration. ",
- "digest.unsub.cta": "Klicka här för att ändra dom inställningarna",
"digest.daily.no_topics": "Det verkar inte varit några aktiva ämnen dom senaste dagarna ",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "\nDet här är ett textmeddelande som verifierar att eposten är korrekt installerat för din NodeBB. ",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Tack!"
}
\ No newline at end of file
diff --git a/public/language/sv/error.json b/public/language/sv/error.json
index 8de10daaae..6f118116f3 100644
--- a/public/language/sv/error.json
+++ b/public/language/sv/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Ogiltig rubrik.",
"invalid-user-data": "Ogiltig användardata",
"invalid-password": "Ogiltigt lösenord",
+ "invalid-username-or-password": "Specificera både användarnamn och lösenord",
"invalid-pagination-value": "Ogiltigt sidnummer",
"username-taken": "Användarnamn upptaget",
"email-taken": "Epostadress upptagen",
"email-not-confirmed": "Din epostadress är ännu inte bekräftad. Klicka här för att bekräfta din epostadress.",
"username-too-short": "Användarnamnet är för kort",
+ "username-too-long": "Användarnamnet är för långt",
"user-banned": "Användare bannad",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Kategori hittades inte",
"no-topic": "Ämne hittades inte",
"no-post": "Inlägget hittades inte",
@@ -52,5 +55,9 @@
"upload-error": "Fel vid uppladdning: %1",
"signature-too-long": "Signaturer kan inte vara längre än %1 tecken.",
"cant-chat-with-yourself": "Du kan inte chatta med dig själv.",
- "not-enough-reputation-to-downvote": "Du har inte tillräckligt förtroende för att rösta ner det här meddelandet"
+ "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",
+ "not-enough-reputation-to-flag": "Du har inte tillräckligt förtroende för att flagga det här inlägget.",
+ "reload-failed": "NodeBB stötte på problem med att ladda om: \"%1\". NodeBB kommer fortsätta servera den befintliga resurser till klienten, men du borde återställa det du gjorde alldeles innan du försökte ladda om."
}
\ No newline at end of file
diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json
index 9f262b008a..267c761ba5 100644
--- a/public/language/sv/notifications.json
+++ b/public/language/sv/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Ny notis",
"you_have_unread_notifications": "Du har olästa notiser.",
"new_message_from": "Nytt medelande från %1",
- "upvoted_your_post": "%1 har röstat på ditt inlägg.",
- "favourited_your_post": "%1 har favoriserat ditt inlägg.",
- "user_flagged_post": "%1 flaggade ett inlägg.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 har skrivit ett svar på: %2",
"user_mentioned_you_in": "%1 nämnde dig i %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Epost bekräftad",
"email-confirmed-message": "Tack för att du bekräftat din epostadress. Ditt konto är nu fullt ut aktiverat.",
"email-confirm-error": "Ett fel uppstod...",
diff --git a/public/language/sv/pages.json b/public/language/sv/pages.json
index c4c0efc382..72c9d13e33 100644
--- a/public/language/sv/pages.json
+++ b/public/language/sv/pages.json
@@ -5,7 +5,7 @@
"recent": "Senaste ämnena",
"users": "Registrerade användare",
"notifications": "Notiser",
- "tags": "Topics tagged under \"%1\"",
+ "tags": "Ämnen märkta med \"%1\"",
"user.edit": "Ändrar \"%1\"",
"user.following": "Personer %1 Följer",
"user.followers": "Personer som följer %1",
diff --git a/public/language/sv/recent.json b/public/language/sv/recent.json
index 4478c47921..f9e04c9081 100644
--- a/public/language/sv/recent.json
+++ b/public/language/sv/recent.json
@@ -4,5 +4,6 @@
"week": "Vecka",
"month": "Månad",
"year": "År",
+ "alltime": "All Time",
"no_recent_topics": "Det finns inga olästa ämnen."
}
\ No newline at end of file
diff --git a/public/language/sv/search.json b/public/language/sv/search.json
index 996a7d81fd..49e8bde9a0 100644
--- a/public/language/sv/search.json
+++ b/public/language/sv/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 resultat matchar \"%2\", (%3 sekunder)"
+ "results_matching": "%1 resultat matchar \"%2\", (%3 sekunder)",
+ "no-matches": "Inga inlägg hittades"
}
\ No newline at end of file
diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json
index 8615e49c77..f2f1adb18d 100644
--- a/public/language/sv/topic.json
+++ b/public/language/sv/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Detta ämne kommer bli flytta till kategori",
"fork_topic_instruction": "Klicka på de inlägg du vill grena",
"fork_no_pids": "Inga inlägg valda!",
- "fork_success": "Grening av inlägg lyckad!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Skriv in ämnets titel här...",
"composer.discard": "Avbryt",
"composer.submit": "Spara",
@@ -87,7 +87,7 @@
"more_users_and_guests": "%1 fler användare() och %2 gäst(er)",
"more_users": "%1 fler användare()",
"more_guests": "1% fler gäst(er)",
- "users_and_others": "%1 and %2 others",
+ "users_and_others": "%1 och %2 andra",
"sort_by": "Sortera på",
"oldest_to_newest": "Äldst till nyaste",
"newest_to_oldest": "Nyaste till äldst",
diff --git a/public/language/sv/user.json b/public/language/sv/user.json
index a6b3a753fb..e4e18aafaa 100644
--- a/public/language/sv/user.json
+++ b/public/language/sv/user.json
@@ -4,6 +4,8 @@
"username": "Användarnamn",
"email": "Epost",
"confirm_email": "Bekräfta epostadress ",
+ "delete_account": "Ta bort ämne",
+ "delete_account_confirm": "Are you sure you want to delete your account?
This action is irreversible and you will not be able to recover any of your data
Enter your username to confirm that you wish to destroy this account.",
"fullname": "Hela namnet",
"website": "Webbsida",
"location": "Plats",
@@ -50,6 +52,7 @@
"digest_daily": "Daligen",
"digest_weekly": "Veckovis",
"digest_monthly": "Månadsvis",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Denna användare har inga följare :(",
"follows_no_one": "Denna användare följer ingen :(",
"has_no_posts": "Denna användare har inte gjort några inlägg än.",
@@ -61,5 +64,7 @@
"posts_per_page": "Inlägg per sida",
"notification_sounds": "Spela ett ljud när du får en notis.",
"browsing": "Inställning för bläddring",
- "open_links_in_new_tab": "Öppna utgående länkar på ny flik?"
+ "open_links_in_new_tab": "Öppna utgående länkar på ny flik?",
+ "follow_topics_you_reply_to": "Följ ämnen so du svarat på.",
+ "follow_topics_you_create": "Följ ämnen du skapat."
}
\ No newline at end of file
diff --git a/public/language/th/category.json b/public/language/th/category.json
index 790f7752fc..31246e2a05 100644
--- a/public/language/th/category.json
+++ b/public/language/th/category.json
@@ -3,5 +3,6 @@
"no_topics": "ยังไม่มีกระทู้ในหมวดนี้
โพสต์กระทู้แรก?",
"browsing": "เรียกดู",
"no_replies": "ยังไม่มีใครตอบ",
- "share_this_category": "Share this category"
+ "share_this_category": "Share this category",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/th/email.json b/public/language/th/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/th/email.json
+++ b/public/language/th/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/th/error.json b/public/language/th/error.json
index 77c582b23f..f90d459cce 100644
--- a/public/language/th/error.json
+++ b/public/language/th/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Invalid Password",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "User banned",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
@@ -52,5 +55,9 @@
"upload-error": "Upload Error : %1",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json
index 4c33f78276..d78ad8e8f6 100644
--- a/public/language/th/notifications.json
+++ b/public/language/th/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "New Notification",
"you_have_unread_notifications": "You have unread notifications.",
"new_message_from": "New message from %1",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 has favourited your post.",
- "user_flagged_post": "%1 flagged a post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 has posted a reply to: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/th/recent.json b/public/language/th/recent.json
index c7a2e6bc19..05eec4d503 100644
--- a/public/language/th/recent.json
+++ b/public/language/th/recent.json
@@ -4,5 +4,6 @@
"week": "สัปดาห์",
"month": "เดือน",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "ไม่มีกระทู้ล่าสุด"
}
\ No newline at end of file
diff --git a/public/language/th/search.json b/public/language/th/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/th/search.json
+++ b/public/language/th/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/th/topic.json b/public/language/th/topic.json
index c72667cb33..0736d6be97 100644
--- a/public/language/th/topic.json
+++ b/public/language/th/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "กระทู้นี้จะถูกย้ายไปที่หมวดหมู่",
"fork_topic_instruction": "คลิกที่โพสที่คุณต้องการที่จะแยก",
"fork_no_pids": "ไม่มีโพสต์ที่เลือก!",
- "fork_success": "แยกกระทู้สำเร็จ",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "ป้อนชื่อกระทู้ของคุณที่นี่ ...",
"composer.discard": "ยกเลิก",
"composer.submit": "ส่ง",
diff --git a/public/language/th/user.json b/public/language/th/user.json
index 9f1e022fd1..7f75a2bcbb 100644
--- a/public/language/th/user.json
+++ b/public/language/th/user.json
@@ -4,6 +4,8 @@
"username": "ชื่อผู้ใช้",
"email": "อีเมล์",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "ชื่อเต็ม",
"website": "เว็บไซต์",
"location": "สถานที่",
@@ -50,6 +52,7 @@
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "ผู้ใช้รายนี้ไม่มีใครติดตาม :(",
"follows_no_one": "ผู้ใช้รายนี้ไม่ติดตามใคร :(",
"has_no_posts": "ผู้ใช้รายนี้ไม่ได้โพสต์อะไรเลย",
@@ -61,5 +64,7 @@
"posts_per_page": "จำนวนโพสต์ต่อหน้า",
"notification_sounds": "Play a sound when you receive a notification.",
"browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "open_links_in_new_tab": "Open outgoing links in new tab?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/tr/category.json b/public/language/tr/category.json
index 7ec2a32e14..9fae15699d 100644
--- a/public/language/tr/category.json
+++ b/public/language/tr/category.json
@@ -3,5 +3,6 @@
"no_topics": " Bu kategoride hiç konu yok.
Yeni bir konu açmak istemez misiniz?",
"browsing": "dolaşıyor",
"no_replies": "Kimse yanıtlamadı",
- "share_this_category": "Bu kategoriyi paylaş"
+ "share_this_category": "Bu kategoriyi paylaş",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/tr/email.json b/public/language/tr/email.json
index 96fd81431e..e1d294f543 100644
--- a/public/language/tr/email.json
+++ b/public/language/tr/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "En güncel konular",
"digest.cta": "Ziyaret etmek için buraya tıklayın",
"digest.unsub.info": "Bu e-posta seçtiğiniz ayarlar nedeniyle gönderildi.",
- "digest.unsub.cta": "Bu ayarları değiştirmek için buraya tıklayın",
"digest.daily.no_topics": "Geçtiğimiz gün içinde aktif bir konu yok.",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "Bu ileti NodeBB e-posta ayarlarınızın doğru çalışıp çalışmadığını kontrol etmek için gönderildi.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Teşekkürler!"
}
\ No newline at end of file
diff --git a/public/language/tr/error.json b/public/language/tr/error.json
index cec4db9683..86b7a7567d 100644
--- a/public/language/tr/error.json
+++ b/public/language/tr/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Geçersiz başlık!",
"invalid-user-data": "Geçersiz Kullancı Verisi",
"invalid-password": "Geçersiz Şifre",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "Geçersiz Sayfa Değeri",
"username-taken": "Kullanıcı İsmi Alınmış",
"email-taken": "E-posta Alınmış",
"email-not-confirmed": "E-postanız onaylanmamış, onaylamak için lütfen buraya tıklayın.",
"username-too-short": "Kullanıcı ismi çok kısa",
+ "username-too-long": "Username too long",
"user-banned": "Kullanıcı Yasaklı",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Kategori Yok",
"no-topic": "Başlık Yok",
"no-post": "İleti Yok",
@@ -52,5 +55,9 @@
"upload-error": "Yükleme Hatası : %1",
"signature-too-long": "İmza en fazla %1 karakter olabilir!",
"cant-chat-with-yourself": "Kendinizle sohbet edemezsiniz!",
- "not-enough-reputation-to-downvote": "Bu iletiyi aşagı oylamak için yeterince saygınlığınız yok."
+ "reputation-system-disabled": "Reputation system is disabled.",
+ "downvoting-disabled": "Downvoting is disabled",
+ "not-enough-reputation-to-downvote": "Bu iletiyi aşagı oylamak için yeterince saygınlığınız yok.",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json
index 3ff542c19a..8b5db97764 100644
--- a/public/language/tr/notifications.json
+++ b/public/language/tr/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Yeni bildirim",
"you_have_unread_notifications": "Okunmamış bildirimleriniz var.",
"new_message_from": "%1 size bir mesaj gönderdi",
- "upvoted_your_post": "%1 iletinizi beğendi.",
- "favourited_your_post": "%1 iletinizi favorilerine ekledi.",
- "user_flagged_post": "%1 bir iletiyi sakıncalı buldu.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 %2 başlığına bir ileti gönderdi.",
"user_mentioned_you_in": "%1 %2 başlığında sizden bahsetti.",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "E-posta onaylandı",
"email-confirmed-message": "E-postanızı onaylandığınız için teşekkürler. Hesabınız tamamen aktive edildi.",
"email-confirm-error": "Bir hata oluştu...",
diff --git a/public/language/tr/recent.json b/public/language/tr/recent.json
index 333a85f772..088eacdff1 100644
--- a/public/language/tr/recent.json
+++ b/public/language/tr/recent.json
@@ -4,5 +4,6 @@
"week": "Hafta",
"month": "Ay",
"year": "Yıl",
+ "alltime": "All Time",
"no_recent_topics": "Güncel konular yok."
}
\ No newline at end of file
diff --git a/public/language/tr/search.json b/public/language/tr/search.json
index b384c82c72..307b7cffb3 100644
--- a/public/language/tr/search.json
+++ b/public/language/tr/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 tane “%2“ bulundu (%3 saniye)"
+ "results_matching": "%1 tane “%2“ bulundu (%3 saniye)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json
index 0716b3e6f1..f4968ca57a 100644
--- a/public/language/tr/topic.json
+++ b/public/language/tr/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "Bu konu kategorisine taşınacak",
"fork_topic_instruction": "Ayırmak istediğiniz iletileri tıklayın",
"fork_no_pids": "Hiç bir ileti seçilmedi!",
- "fork_success": "Başlık başarıyla ayrıldı!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Başlık ismini buraya girin...",
"composer.discard": "Vazgeç",
"composer.submit": "Gönder",
diff --git a/public/language/tr/user.json b/public/language/tr/user.json
index f8b6b75e3c..1327933256 100644
--- a/public/language/tr/user.json
+++ b/public/language/tr/user.json
@@ -4,6 +4,8 @@
"username": "Kullanıcı Adı",
"email": "E-posta",
"confirm_email": "E-posta onayla",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "Tam Ad",
"website": "Websitesi",
"location": "Konum",
@@ -50,6 +52,7 @@
"digest_daily": "Günlük",
"digest_weekly": "Haftalık",
"digest_monthly": "Aylık",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Bu kullanıcının hiç takipçisi yok :(",
"follows_no_one": "Bu kullanıcı kimseyi takip etmiyor :(",
"has_no_posts": "Bu kullanıcı henüz birşey göndermedi.",
@@ -61,5 +64,7 @@
"posts_per_page": "Sayfa başına İletiler",
"notification_sounds": "Bildirim alındığında ses çal",
"browsing": "Tarayıcı Ayaları",
- "open_links_in_new_tab": "Dışarı giden bağlantıları yeni sekmede aç?"
+ "open_links_in_new_tab": "Dışarı giden bağlantıları yeni sekmede aç?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/language/vi/category.json b/public/language/vi/category.json
index 972df0d4f3..70ab036818 100644
--- a/public/language/vi/category.json
+++ b/public/language/vi/category.json
@@ -3,5 +3,6 @@
"no_topics": "Không có bài viết trong danh mục.
Hãy đăng một bài viết mới?",
"browsing": "đang duyệt",
"no_replies": "Chưa có ai bình luận",
- "share_this_category": "Chia sẻ phần mục này"
+ "share_this_category": "Chia sẻ phần mục này",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/vi/email.json b/public/language/vi/email.json
index 98e591ab02..60825a08d6 100644
--- a/public/language/vi/email.json
+++ b/public/language/vi/email.json
@@ -1,20 +1,23 @@
{
- "password-reset-requested": "Password Reset Requested - %1!",
- "welcome-to": "Welcome to %1",
- "greeting_no_name": "Hello",
- "greeting_with_name": "Hello %1",
- "welcome.text1": "Thank you for registering with %1!",
- "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
- "welcome.cta": "Click here to confirm your email address",
- "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
- "reset.text2": "To continue with the password reset, please click on the following link:",
- "reset.cta": "Click here to reset your password",
- "digest.notifications": "You have some unread notifications from %1:",
- "digest.latest_topics": "Latest topics from %1",
- "digest.cta": "Click here to visit %1",
- "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
- "digest.daily.no_topics": "There have been no active topics in the past day",
- "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
- "closing": "Thanks!"
+ "password-reset-requested": "Yêu cầu khởi tạo lại mật khẩu - %1!",
+ "welcome-to": "Chào mừng đến với %1",
+ "greeting_no_name": "Xin chào",
+ "greeting_with_name": "Xin chào %1",
+ "welcome.text1": "Cảm ơn bạn đã đăng ký tại %1!",
+ "welcome.text2": "Để kích hoạt đầy đủ tính năng của tài khoản, chúng tôi cần xác định rằng bạn là chủ của địa chỉ email mà bạn đã đăng ký.",
+ "welcome.cta": "Click vào đây để xác nhận địa chỉ email",
+ "reset.text1": "Chúng tôi nhận được yêu cầu khởi tạo lại mật khẩu của bạn, rất có thể vì bạn đã quên mất nó. Nếu không đúng, hãy bỏ qua email này.",
+ "reset.text2": "Để khởi tạo lại mật khẩu, hãy click vào liên kết sau:",
+ "reset.cta": "Click vào đây để khởi tạo lại mật khẩu",
+ "digest.notifications": "Bạn có vài thông báo chưa duyệt từ %1:",
+ "digest.latest_topics": "Chủ đề mới nhất từ %1",
+ "digest.cta": "Click vào đây để truy cập %1",
+ "digest.unsub.info": "Tập san này được gửi đến bạn dựa theo cài đặt theo dõi của bạn.",
+ "digest.daily.no_topics": "Không có chủ đề nào có hoạt động trong ngày hôm qua.",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
+ "test.text1": "Đây là email kiểm tra để xác nhận rằng trình gửi email đã được cài đặt một cách chính xác cho NodeBB của bạn.",
+ "unsub.cta": "Click here to alter those settings",
+ "closing": "Xin cảm ơn!"
}
\ No newline at end of file
diff --git a/public/language/vi/error.json b/public/language/vi/error.json
index 6b93d3cd98..c375b9fd51 100644
--- a/public/language/vi/error.json
+++ b/public/language/vi/error.json
@@ -1,23 +1,26 @@
{
"invalid-data": "Dữ liệu không hợp lệ",
"not-logged-in": "Bạn không được đăng nhập.",
- "account-locked": "Your account has been locked temporarily",
- "search-requires-login": "Searching requires an account! Please login or register!",
+ "account-locked": "Tài khoản của bạn đã tạm thời bị khóa",
+ "search-requires-login": "Bạn cần đăng nhập để thực hiện việc tìm kiếm! Xin hãy đăng nhập hoặc đăng ký!",
"invalid-cid": "Danh mục ID không hợp lệ",
"invalid-tid": "ID chủ đề không hợp lệ",
"invalid-pid": "ID bài viết không hợp lệ",
"invalid-uid": "ID tài khoản không hợp lệ",
"invalid-username": "Tên đăng nhập không hợp lệ",
"invalid-email": "Email không hợp lệ",
- "invalid-title": "Invalid title!",
+ "invalid-title": "Tiêu đề không hợp lệ!",
"invalid-user-data": "Dữ liệu tài khoản không hợp lệ",
"invalid-password": "Mật khẩu không hợp lệ",
+ "invalid-username-or-password": "Xin hãy nhập cả tên đăng nhập và mật khẩu",
"invalid-pagination-value": "Số trang không hợp lệ",
"username-taken": "Tên đăng nhập đã tồn tại",
"email-taken": "Email đã tồn tại",
- "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
- "username-too-short": "Username too short",
+ "email-not-confirmed": "Địa chỉ email của bạn chưa được xác nhận, hãy click vào đây để xác nhận email.",
+ "username-too-short": "Tên đăng nhập quá ngắn",
+ "username-too-long": "Tên đăng nhập quá dài",
"user-banned": "Tài khoản bị ban",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "Phần mục không tồn tại",
"no-topic": "Chủ đề không tồn tại",
"no-post": "Bài viết không tồn tại",
@@ -25,7 +28,7 @@
"no-user": "Tài khoản không tồn tại",
"no-teaser": "Teaser không tồn tại",
"no-privileges": "Bạn không đủ quyền cho hành động này",
- "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
+ "no-emailers-configured": "Không có trình cắm email nào được tải, vì vậy email kiểm tra không thể gửi được",
"category-disabled": "Danh mục bị disabled",
"topic-locked": "Chủ đề bị khóa",
"still-uploading": "Vui lòng chờ upload",
@@ -36,7 +39,7 @@
"file-too-big": "Kích thước file tối đa %1kb",
"cant-vote-self-post": "Bạn không thể vote cho chính bài viết của bạn",
"already-favourited": "Bạn đã bấm yêu thích cho bài viết này",
- "already-unfavourited": "You already unfavourited this post",
+ "already-unfavourited": "Bạn đã bỏ thích bài này",
"cant-ban-other-admins": "Bạn không thể ban được các admin khác",
"invalid-image-type": "Kiểu hình ảnh không hợp lệ",
"group-name-too-short": "Tên nhóm quá ngắn",
@@ -49,8 +52,12 @@
"topic-thumbnails-are-disabled": "Thumbnails cho chủ đề đã bị tắt",
"invalid-file": "File không hợp lệ",
"uploads-are-disabled": "Đã khóa lựa chọn tải lên",
- "upload-error": "Upload Error : %1",
+ "upload-error": "Lỗi tải lên : %1",
"signature-too-long": "Chứ ký không được dài quá %1 ký tự",
"cant-chat-with-yourself": "Bạn không thể chat với chính bạn!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "reputation-system-disabled": "Hệ thống tín nhiệm đã bị vô hiệu hóa.",
+ "downvoting-disabled": "Downvote đã bị tắt",
+ "not-enough-reputation-to-downvote": "Bạn không có đủ phiếu tín nhiệm để downvote bài này",
+ "not-enough-reputation-to-flag": "Bạn không đủ phiếu tín nhiệm để gắn cờ bài này",
+ "reload-failed": "NodeBB gặp lỗi trong khi tải lại: \"%1\". NodeBB sẽ tiếp tục hoạt động với dữ liệu trước đó, mặc dù vậy bạn nên tháo gỡ những gì bạn đã làm để trước khi tải lại."
}
\ No newline at end of file
diff --git a/public/language/vi/global.json b/public/language/vi/global.json
index 5554138a31..33447ba786 100644
--- a/public/language/vi/global.json
+++ b/public/language/vi/global.json
@@ -13,13 +13,13 @@
"please_log_in": "Xin hãy đăng nhập",
"logout": "Đăng xuất",
"posting_restriction_info": "Hiện giờ chỉ có các thành viên mới được quyền gửi bài viết, hãy nhấn vào đây để đăng nhập",
- "welcome_back": "Welcome Back",
+ "welcome_back": "Chào mừng bạn quay lại",
"you_have_successfully_logged_in": "Bạn đã đăng nhập thành công",
"save_changes": "Lưu thay đổi",
"close": "Đóng lại",
"pagination": "Số trang",
- "pagination.out_of": "%1 out of %2",
- "pagination.enter_index": "Enter index",
+ "pagination.out_of": "%1 trong số %2",
+ "pagination.enter_index": "Nhập khóa",
"header.admin": "Quản trị viên",
"header.recent": "Gần đây",
"header.unread": "Chưa đọc",
@@ -38,7 +38,7 @@
"alert.success": "Thành công",
"alert.error": "Lỗi",
"alert.banned": "Bị cấm",
- "alert.banned.message": "You have just been banned, you will now be logged out.",
+ "alert.banned.message": "Bạn vừa bị khóa tài khoản, bạn sẽ tự động thoát ra ngay bây giờ.",
"alert.unfollow": "Bạn đã không còn theo dõi %1!",
"alert.follow": "Bạn giờ đang theo dõi %1!",
"online": "Đang online",
@@ -70,6 +70,6 @@
"language": "Ngôn ngữ",
"guest": "Khách",
"guests": "Số khách",
- "updated.title": "Forum Updated",
- "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+ "updated.title": "Cập nhật diễn đàn",
+ "updated.message": "Diễn đàn đã được cập nhật bản mới nhất. Click vào đây để tải lại trang."
}
\ No newline at end of file
diff --git a/public/language/vi/groups.json b/public/language/vi/groups.json
index c00c111e11..2ae6844485 100644
--- a/public/language/vi/groups.json
+++ b/public/language/vi/groups.json
@@ -1,7 +1,7 @@
{
- "view_group": "View Group",
- "details.title": "Group Details",
- "details.members": "Member List",
- "details.has_no_posts": "This group's members have not made any posts.",
- "details.latest_posts": "Latest Posts"
+ "view_group": "Xem nhóm",
+ "details.title": "Chi tiết nhóm",
+ "details.members": "Danh sách thành viên",
+ "details.has_no_posts": "Nhóm thành viên này chưa viết bài viết nào.",
+ "details.latest_posts": "Bài mới nhất"
}
\ No newline at end of file
diff --git a/public/language/vi/login.json b/public/language/vi/login.json
index 25973cd323..0190bd059e 100644
--- a/public/language/vi/login.json
+++ b/public/language/vi/login.json
@@ -5,5 +5,5 @@
"alternative_logins": "Đăng nhập bằng tên khác",
"failed_login_attempt": "Đăng nhập thất bại, xin hãy thử lại",
"login_successful": "Bạn đã đăng nhập thành công!",
- "dont_have_account": "Don't have an account?"
+ "dont_have_account": "Chưa có tài khoản?"
}
\ No newline at end of file
diff --git a/public/language/vi/modules.json b/public/language/vi/modules.json
index 4795f64e74..6afe9ffa9c 100644
--- a/public/language/vi/modules.json
+++ b/public/language/vi/modules.json
@@ -1,18 +1,18 @@
{
"chat.chatting_with": "Chat với ",
- "chat.placeholder": "Type chat message here, press enter to send",
+ "chat.placeholder": "Nhập tin nhắn ở đây, nhấn enter để gửi",
"chat.send": "Gửi đi",
"chat.no_active": "Bạn hiện giờ không có cuộc chat nào",
"chat.user_typing": "%1b đang gõ",
- "chat.user_has_messaged_you": "%1 has messaged you.",
- "chat.see_all": "See all Chats",
- "chat.no-messages": "Please select a recipient to view chat message history",
- "chat.recent-chats": "Recent Chats",
- "chat.contacts": "Contacts",
- "chat.message-history": "Message History",
- "chat.pop-out": "Pop out chat",
- "chat.maximize": "Maximize",
- "composer.user_said_in": "%1 said in %2:",
- "composer.user_said": "%1 said:",
- "composer.discard": "Are you sure you wish to discard this post?"
+ "chat.user_has_messaged_you": "%1 đã gửi tin cho bạn.",
+ "chat.see_all": "Tất cả tin nhắn.",
+ "chat.no-messages": "Hãy chọn 1 tài khoản để xem lịch sử chat",
+ "chat.recent-chats": "Vừa chat",
+ "chat.contacts": "Liên hệ",
+ "chat.message-history": "Lịch sử tin nhắn",
+ "chat.pop-out": "Bật cửa sổ chat",
+ "chat.maximize": "Phóng to",
+ "composer.user_said_in": "%1 đã nói trong %2:",
+ "composer.user_said": "%1 đã nói:",
+ "composer.discard": "Bạn có chắc chắn hủy bỏ bài viết này?"
}
\ No newline at end of file
diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json
index 431305ad23..029eb60475 100644
--- a/public/language/vi/notifications.json
+++ b/public/language/vi/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "Thông báo mới",
"you_have_unread_notifications": "Bạn có thông báo chưa đọc",
"new_message_from": "Tin nhắn mới từ %1",
- "upvoted_your_post": "%1 đã hủy vote cho bài viết của bạn",
- "favourited_your_post": "%1 thích bài viết của bạn",
- "user_flagged_post": "%1 đã flag một bài viết",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 đã trả lời %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json
index a5ee695599..87143000ad 100644
--- a/public/language/vi/pages.json
+++ b/public/language/vi/pages.json
@@ -5,7 +5,7 @@
"recent": "Chủ đề gần đây",
"users": "Số người dùng đã đăng ký",
"notifications": "Thông báo",
- "tags": "Topics tagged under \"%1\"",
+ "tags": "Chủ đề được tag theo \"%1\"",
"user.edit": "Chỉnh sửa \"%1\"",
"user.following": "Người mà %1 theo dõi",
"user.followers": "Người đang theo dõi %1",
diff --git a/public/language/vi/recent.json b/public/language/vi/recent.json
index 907cf76923..544c3cefb2 100644
--- a/public/language/vi/recent.json
+++ b/public/language/vi/recent.json
@@ -4,5 +4,6 @@
"week": "Tuần",
"month": "Tháng",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "Không có chủ đề nào gần đây"
}
\ No newline at end of file
diff --git a/public/language/vi/search.json b/public/language/vi/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/vi/search.json
+++ b/public/language/vi/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/vi/tags.json b/public/language/vi/tags.json
index f065d4bbfa..e309559c94 100644
--- a/public/language/vi/tags.json
+++ b/public/language/vi/tags.json
@@ -1,6 +1,6 @@
{
- "no_tag_topics": "There are no topics with this tag.",
- "tags": "Tags",
- "enter_tags_here": "Enter tags here. Press enter after each tag.",
- "no_tags": "There are no tags yet."
+ "no_tag_topics": "Không có bài viết nào với nhãn này.",
+ "tags": "Nhãn",
+ "enter_tags_here": "Nhập nhãn ở đây. Nhấn enter sau mỗi nhãn.",
+ "no_tags": "Chưa có nhãn nào."
}
\ No newline at end of file
diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json
index 597c8cd4b9..baeccd2195 100644
--- a/public/language/vi/topic.json
+++ b/public/language/vi/topic.json
@@ -7,14 +7,14 @@
"post_is_deleted": "Bài gửi này đã bị xóa!",
"profile": "Hồ sơ",
"posted_by": "Được viết bởi %1",
- "posted_by_guest": "Posted by Guest",
+ "posted_by_guest": "Đăng bởi khách",
"chat": "Chat",
"notify_me": "Được thông báo khi có trả lời mới trong chủ đề này",
"quote": "Trích dẫn",
"reply": "Trả lời",
"edit": "Chỉnh sửa",
"delete": "Xóa",
- "purge": "Purge",
+ "purge": "Xóa hẳn",
"restore": "Phục hồi",
"move": "Chuyển đi",
"fork": "Fork",
@@ -23,7 +23,7 @@
"share": "Chia sẻ",
"tools": "Công cụ",
"flag": "Flag",
- "locked": "Locked",
+ "locked": "Khóa",
"bookmark_instructions": "Bấm vào đây để quay về hoặc đóng lại để hủy",
"flag_title": "Flag bài viết này để chỉnh sửa",
"flag_confirm": "Bạn có chắc là muốn flag bài viết này không?",
@@ -49,12 +49,12 @@
"thread_tools.delete_confirm": "Bạn có chắc là muốn hủy thread này không?",
"thread_tools.restore": "Phục hồi chủ đề",
"thread_tools.restore_confirm": "Bạn có chắc là muốn phục hồi thread này không",
- "thread_tools.purge": "Purge Topic",
- "thread_tools.purge_confirm": "Are you sure you want to purge this thread?",
+ "thread_tools.purge": "Xóa hẳn chủ đề",
+ "thread_tools.purge_confirm": "Bạn có chắc muốn xóa hẳn chủ đề này?",
"topic_move_success": "Đã chuyển thành công chủ đề này sang %1",
"post_delete_confirm": "Bạn có chắc là muốn xóa bài gửi này không?",
"post_restore_confirm": "Bạn có chắc là muốn phục hồi bài gửi này không?",
- "post_purge_confirm": "Are you sure you want to purge this post?",
+ "post_purge_confirm": "Bạn có chắc muốn xóa hẳn bài này?",
"load_categories": "Đang tải các phần mục",
"disabled_categories_note": "Các phần mục bị khóa đã được đánh xám",
"confirm_move": "Chuyển",
@@ -64,14 +64,14 @@
"favourites.has_no_favourites": "Bạn đang không có yêu thích nào. Hãy yêu thích một vài bài viết để thấy được chúng tại đây!",
"loading_more_posts": "Tải thêm các bài gửi khác",
"move_topic": "Chuyển chủ đề",
- "move_topics": "Move Topics",
+ "move_topics": "Di chuyển chủ đề",
"move_post": "Chuyển bài gửi",
"post_moved": "Đã chuyển bài gửi!",
"fork_topic": "Fork chủ đề",
"topic_will_be_moved_to": "Chủ đề này sẽ được chuyển tới phần mục",
"fork_topic_instruction": "Nhấp vào bài gửi mà bạn muốn fork",
"fork_no_pids": "Chưa chọn bài gửi nào!",
- "fork_success": "Đã fork chủ đề thành công!",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "Nhập tiêu đề cho chủ đề của bạn tại đây...",
"composer.discard": "Loại bỏ",
"composer.submit": "Gửi",
@@ -87,9 +87,9 @@
"more_users_and_guests": "%1 người dùng và %2 khách nữa",
"more_users": "%1 người dùng nữa",
"more_guests": "%1 khách nữa",
- "users_and_others": "%1 and %2 others",
- "sort_by": "Sort by",
- "oldest_to_newest": "Oldest to Newest",
- "newest_to_oldest": "Newest to Oldest",
- "most_votes": "Most votes"
+ "users_and_others": "%1 và%2 khác",
+ "sort_by": "Sắp xếp theo",
+ "oldest_to_newest": "Cũ đến mới",
+ "newest_to_oldest": "Mới đến cũ",
+ "most_votes": "Bình chọn nhiều nhất"
}
\ No newline at end of file
diff --git a/public/language/vi/user.json b/public/language/vi/user.json
index b30a8526d9..1aeac40d09 100644
--- a/public/language/vi/user.json
+++ b/public/language/vi/user.json
@@ -3,7 +3,9 @@
"offline": "Offline",
"username": "Tên truy cập",
"email": "Email",
- "confirm_email": "Confirm Email",
+ "confirm_email": "Xác nhận email",
+ "delete_account": "Xóa tài khoản",
+ "delete_account_confirm": "Are you sure you want to delete your account?
This action is irreversible and you will not be able to recover any of your data
Enter your username to confirm that you wish to destroy this account.",
"fullname": "Tên đầy đủ",
"website": "Website",
"location": "Địa điểm",
@@ -50,6 +52,7 @@
"digest_daily": "Hàng ngày",
"digest_weekly": "Hàng tuần",
"digest_monthly": "Hàng tháng",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "Người dùng này hiện chưa có ai theo dõi :(",
"follows_no_one": "Người dùng này hiện chưa theo dõi ai :(",
"has_no_posts": "Người dùng này chưa viết bài nào",
@@ -60,6 +63,8 @@
"topics_per_page": "Số chủ đề trong một trang",
"posts_per_page": "Số bài viết trong một trang",
"notification_sounds": "Xuất hiện âm thanh khi bạn nhận được một thông báo",
- "browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "browsing": "Đang xem cài đặt",
+ "open_links_in_new_tab": "Mở liên kết trong tab mới?",
+ "follow_topics_you_reply_to": "Theo dõi chủ đề mà bạn trả lời",
+ "follow_topics_you_create": "Theo dõi chủ đề bạn tạo"
}
\ No newline at end of file
diff --git a/public/language/vi/users.json b/public/language/vi/users.json
index 244b26154b..cda4f0b017 100644
--- a/public/language/vi/users.json
+++ b/public/language/vi/users.json
@@ -5,6 +5,6 @@
"search": "Tìm kiếm",
"enter_username": "Gõ tên người dùng để tìm kiếm",
"load_more": "Tải thêm",
- "user-not-found": "User not found!",
- "users-found-search-took": "%1 user(s) found! Search took %2 ms."
+ "user-not-found": "Tài khoản không tìm thấy!",
+ "users-found-search-took": "%1 tài khoản(s) tìm thấy! Tìm trong %2 mili giây."
}
\ No newline at end of file
diff --git a/public/language/zh_CN/category.json b/public/language/zh_CN/category.json
index aafcf3e407..933e12e3e1 100644
--- a/public/language/zh_CN/category.json
+++ b/public/language/zh_CN/category.json
@@ -3,5 +3,6 @@
"no_topics": "此版块还没有任何内容。
赶紧来发帖吧！",
"browsing": "正在浏览",
"no_replies": "尚无回复",
- "share_this_category": "分享此版块"
+ "share_this_category": "分享此版块",
+ "ignore": "忽略"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/email.json b/public/language/zh_CN/email.json
index ae359e04fb..77b5e00903 100644
--- a/public/language/zh_CN/email.json
+++ b/public/language/zh_CN/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "来自 %1 的最新主题",
"digest.cta": "点击这里访问 %1",
"digest.unsub.info": "根据您的订阅设置，为您发送此摘要。",
- "digest.unsub.cta": "点击这里修改这些设置",
"digest.daily.no_topics": "最近几天有一些未激活的主题",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "这是一封测试邮件，用来验证 NodeBB 的邮件配置是否设置正确。",
+ "unsub.cta": "Click here to alter those settings",
"closing": "谢谢！"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json
index b0678b8537..56c19a26b2 100644
--- a/public/language/zh_CN/error.json
+++ b/public/language/zh_CN/error.json
@@ -12,12 +12,15 @@
"invalid-title": "无效标题！",
"invalid-user-data": "无效用户数据",
"invalid-password": "无效密码",
+ "invalid-username-or-password": "请确认用户名和密码",
"invalid-pagination-value": "无效页码",
"username-taken": "用户名已注册",
"email-taken": "电子邮箱已注册",
"email-not-confirmed": "您的电子邮箱尚未确认，请点击这里确认您的电子邮箱。",
"username-too-short": "用户名太短",
+ "username-too-long": "用户名太长",
"user-banned": "用户已禁止",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "版块不存在",
"no-topic": "主题不存在",
"no-post": "帖子不存在",
@@ -52,5 +55,9 @@
"upload-error": "上传错误：%1",
"signature-too-long": "签名档不能超过 %1 字！",
"cant-chat-with-yourself": "您不能和自己聊天！",
- "not-enough-reputation-to-downvote": "您还没有足够的威望为此帖扣分"
+ "reputation-system-disabled": "威望系统已禁用。",
+ "downvoting-disabled": "反对功能已禁用",
+ "not-enough-reputation-to-downvote": "您还没有足够的威望为此帖扣分",
+ "not-enough-reputation-to-flag": "您没有足够的威望标记此帖",
+ "reload-failed": "NodeBB 重新加载时遇到问题: \"%1\"。NodeBB 会继续给已存在的客户端组件服务，虽然您应该撤销在重新加载前执行的操作。"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json
index e2054a17f7..13d533bc53 100644
--- a/public/language/zh_CN/notifications.json
+++ b/public/language/zh_CN/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "新通知",
"you_have_unread_notifications": "您有未读的通知。",
"new_message_from": "来自 %1 的新消息",
- "upvoted_your_post": "%1 赞了您的帖子。",
- "favourited_your_post": "%1 收藏了您的帖子。",
- "user_flagged_post": "%1 标记了一个帖子。",
+ "upvoted_your_post_in": "%1 在 %2 点赞了您的帖子。",
+ "moved_your_post": "%1 移动了您的帖子。",
+ "moved_your_topic": "%1 移动了您的主题帖。",
+ "favourited_your_post_in": "%1 在 %2 收藏了您的帖子。",
+ "user_flagged_post_in": "%1 在 %2 标记了一个帖子",
"user_posted_to": "%1 回复了：%2",
"user_mentioned_you_in": "%1 在 %2 中提到了您",
+ "user_started_following_you": "%1关注了您。",
"email-confirmed": "电子邮箱已确认",
"email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已全面激活。",
"email-confirm-error": "出错了.……",
diff --git a/public/language/zh_CN/pages.json b/public/language/zh_CN/pages.json
index 32c3ba5e56..28af9ea173 100644
--- a/public/language/zh_CN/pages.json
+++ b/public/language/zh_CN/pages.json
@@ -5,7 +5,7 @@
"recent": "最新主题",
"users": "已注册用户",
"notifications": "提醒",
- "tags": "Topics tagged under \"%1\"",
+ "tags": "话题为 \"%1\" 的主题",
"user.edit": "正在编辑 \"%1\"",
"user.following": "%1 关注",
"user.followers": "关注 %1 的人",
diff --git a/public/language/zh_CN/recent.json b/public/language/zh_CN/recent.json
index 6d9a34e12d..6b6df56f05 100644
--- a/public/language/zh_CN/recent.json
+++ b/public/language/zh_CN/recent.json
@@ -4,5 +4,6 @@
"week": "本周",
"month": "本月",
"year": "本年",
+ "alltime": "有史以来",
"no_recent_topics": "无最新主题。"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/search.json b/public/language/zh_CN/search.json
index acbed61943..3d8460e57b 100644
--- a/public/language/zh_CN/search.json
+++ b/public/language/zh_CN/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 条结果，匹配 \"%2\"，(耗时 %3 秒)"
+ "results_matching": "共 %1 条结果匹配 \"%2\"，(耗时 %3 秒)",
+ "no-matches": "没有找到帖子"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json
index 84275cb148..098584ec36 100644
--- a/public/language/zh_CN/topic.json
+++ b/public/language/zh_CN/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "此主题将被移动到版块",
"fork_topic_instruction": "点击将分割的帖子",
"fork_no_pids": "未选中帖子！",
- "fork_success": "已成功分割主题！",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "在此输入您主题的标题...",
"composer.discard": "撤销",
"composer.submit": "提交",
@@ -87,7 +87,7 @@
"more_users_and_guests": "%1 名会员和 %2 名游客",
"more_users": "%1 名会员",
"more_guests": "%1 名游客",
- "users_and_others": "%1 and %2 others",
+ "users_and_others": "%1 和 %2 其他人",
"sort_by": "排序",
"oldest_to_newest": "从旧到新",
"newest_to_oldest": "从新到旧",
diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json
index 173234796e..a1c9e34de2 100644
--- a/public/language/zh_CN/user.json
+++ b/public/language/zh_CN/user.json
@@ -4,6 +4,8 @@
"username": "用户名",
"email": "电子邮件",
"confirm_email": "确认电子邮箱",
+ "delete_account": "删除帐号",
+ "delete_account_confirm": "Are you sure you want to delete your account?
This action is irreversible and you will not be able to recover any of your data
Enter your username to confirm that you wish to destroy this account.",
"fullname": "姓名",
"website": "网站",
"location": "位置",
@@ -50,6 +52,7 @@
"digest_daily": "每天",
"digest_weekly": "每周",
"digest_monthly": "每月",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "此用户还没有粉丝 :(",
"follows_no_one": "此用户尚未关注任何人 :(",
"has_no_posts": "此用户尚未发布任何帖子。",
@@ -61,5 +64,7 @@
"posts_per_page": "每页帖子数",
"notification_sounds": "收到通知时播放提示音。",
"browsing": "浏览设置",
- "open_links_in_new_tab": "在新标签中打开外部链接？"
+ "open_links_in_new_tab": "在新标签中打开外部链接？",
+ "follow_topics_you_reply_to": "关注您回复的主题。",
+ "follow_topics_you_create": "关注您创建的主题。"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/category.json b/public/language/zh_TW/category.json
index f1e867bb47..3fb8b883ee 100644
--- a/public/language/zh_TW/category.json
+++ b/public/language/zh_TW/category.json
@@ -3,5 +3,6 @@
"no_topics": "這個版面還沒有任何內容。
趕緊來發文章吧！",
"browsing": "正在瀏覽",
"no_replies": "還沒有回覆",
- "share_this_category": "分享這類別"
+ "share_this_category": "分享這類別",
+ "ignore": "Ignore"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/email.json b/public/language/zh_TW/email.json
index 98e591ab02..fa93bc213e 100644
--- a/public/language/zh_TW/email.json
+++ b/public/language/zh_TW/email.json
@@ -13,8 +13,11 @@
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
- "digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
+ "notif.chat.subject": "New chat message received from %1",
+ "notif.chat.cta": "Click here to continue the conversation",
+ "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+ "unsub.cta": "Click here to alter those settings",
"closing": "Thanks!"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json
index a843fee3b9..544d11f42e 100644
--- a/public/language/zh_TW/error.json
+++ b/public/language/zh_TW/error.json
@@ -12,12 +12,15 @@
"invalid-title": "Invalid title!",
"invalid-user-data": "無效的使用者資料",
"invalid-password": "無效的密碼",
+ "invalid-username-or-password": "Please specify both a username and password",
"invalid-pagination-value": "無效的分頁數值",
"username-taken": "該使用者名稱已被使用",
"email-taken": "該信箱已被使用",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
+ "username-too-long": "Username too long",
"user-banned": "該使用者已被停用",
+ "user-too-new": "You need to wait %1 seconds before making your first post!",
"no-category": "類別並不存在",
"no-topic": "主題並不存在",
"no-post": "文章並不存在",
@@ -52,5 +55,9 @@
"upload-error": "Upload Error : %1",
"signature-too-long": "簽名檔長度不能超過 %1 字元！",
"cant-chat-with-yourself": "你不能與自己聊天！",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "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",
+ "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this post",
+ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading."
}
\ No newline at end of file
diff --git a/public/language/zh_TW/notifications.json b/public/language/zh_TW/notifications.json
index 56c9534641..e9132a07df 100644
--- a/public/language/zh_TW/notifications.json
+++ b/public/language/zh_TW/notifications.json
@@ -10,11 +10,14 @@
"new_notification": "新訊息通知",
"you_have_unread_notifications": "您有未讀的訊息！",
"new_message_from": "來自 %1 的新訊息",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 has favourited your post.",
- "user_flagged_post": "%1 flagged a post.",
+ "upvoted_your_post_in": "%1 has upvoted your post in %2.",
+ "moved_your_post": "%1 has moved your post.",
+ "moved_your_topic": "%1 has moved your topic.",
+ "favourited_your_post_in": "%1 has favourited your post in %2.",
+ "user_flagged_post_in": "%1 flagged a post in %2",
"user_posted_to": "%1 has posted a reply to: %2",
"user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_started_following_you": "%1 started following you.",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
diff --git a/public/language/zh_TW/recent.json b/public/language/zh_TW/recent.json
index f264357969..1b53b1220c 100644
--- a/public/language/zh_TW/recent.json
+++ b/public/language/zh_TW/recent.json
@@ -4,5 +4,6 @@
"week": "本周",
"month": "本月",
"year": "Year",
+ "alltime": "All Time",
"no_recent_topics": "最近沒新主題."
}
\ No newline at end of file
diff --git a/public/language/zh_TW/search.json b/public/language/zh_TW/search.json
index d0ffc64f36..e9eef4632a 100644
--- a/public/language/zh_TW/search.json
+++ b/public/language/zh_TW/search.json
@@ -1,3 +1,4 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
+ "no-matches": "No posts found"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json
index 696de46b27..bba85af9e6 100644
--- a/public/language/zh_TW/topic.json
+++ b/public/language/zh_TW/topic.json
@@ -71,7 +71,7 @@
"topic_will_be_moved_to": "這個主題將會被移動到",
"fork_topic_instruction": "點擊要作為主題的文章",
"fork_no_pids": "尚未選擇文章！",
- "fork_success": "成功將文章作為主題！",
+ "fork_success": "Succesfully forked topic! Click here to go to the forked topic.",
"composer.title_placeholder": "輸入標題...",
"composer.discard": "放棄",
"composer.submit": "發表",
diff --git a/public/language/zh_TW/user.json b/public/language/zh_TW/user.json
index b516f98795..d344fd7153 100644
--- a/public/language/zh_TW/user.json
+++ b/public/language/zh_TW/user.json
@@ -4,6 +4,8 @@
"username": "使用者名稱",
"email": "Email",
"confirm_email": "Confirm Email",
+ "delete_account": "Delete Account",
+ "delete_account_confirm": "Are you sure you want to delete your account?",
"fullname": "姓名",
"website": "網站",
"location": "地址",
@@ -50,6 +52,7 @@
"digest_daily": "每日",
"digest_weekly": "每週",
"digest_monthly": "每月",
+ "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
"has_no_follower": "該用戶還沒有被任何人關注。",
"follows_no_one": "該用戶還沒有關注過任何人。",
"has_no_posts": "尚未有任何貼文.",
@@ -61,5 +64,7 @@
"posts_per_page": "每頁的文章數",
"notification_sounds": "當收到新消息時播放提示音",
"browsing": "瀏覽設定",
- "open_links_in_new_tab": "在新的分頁開啟外部連結?"
+ "open_links_in_new_tab": "在新的分頁開啟外部連結?",
+ "follow_topics_you_reply_to": "Follow topics that you reply to.",
+ "follow_topics_you_create": "Follow topics you create."
}
\ No newline at end of file
diff --git a/public/src/forum/admin/categories.js b/public/src/forum/admin/categories.js
index c7851c1e7e..37a551ffef 100644
--- a/public/src/forum/admin/categories.js
+++ b/public/src/forum/admin/categories.js
@@ -239,6 +239,21 @@ define('forum/admin/categories', ['uploader', 'forum/admin/iconSelect'], functio
modal.find('select').val($(this).attr('data-parentCid'));
modal.attr('data-cid', cid).modal();
});
+
+ $('button[data-action="removeParent"]').on('click', function() {
+ var cid = $(this).parents('[data-cid]').attr('data-cid');
+ var payload= {};
+ payload[cid] = {
+ parentCid: 0
+ };
+ socket.emit('admin.categories.update', payload, function(err) {
+ if (err) {
+ return app.alertError(err.message);
+ }
+ ajaxify.go('admin/categories/active');
+ });
+ });
+
$('#setParent [data-cid]').on('click', function() {
var modalEl = $('#setParent'),
parentCid = $(this).attr('data-cid'),
diff --git a/public/src/forum/admin/index.js b/public/src/forum/admin/index.js
index b69bf3fc7a..6eb63dbf7f 100644
--- a/public/src/forum/admin/index.js
+++ b/public/src/forum/admin/index.js
@@ -1,7 +1,7 @@
"use strict";
/*global define, ajaxify, app, socket, RELATIVE_PATH*/
-define('forum/admin/index', function() {
+define('forum/admin/index', ['semver'], function(semver) {
var Admin = {};
Admin.init = function() {
@@ -19,6 +19,13 @@ define('forum/admin/index', function() {
});
$.get('https://api.github.com/repos/NodeBB/NodeBB/tags', function(releases) {
+ // Re-sort the releases, as they do not follow Semver (wrt pre-releases)
+ releases = releases.sort(function(a, b) {
+ a = a.name.replace(/^v/, '');
+ b = b.name.replace(/^v/, '');
+ return semver.lt(a, b) ? 1 : -1;
+ });
+
var version = $('#version').html(),
latestVersion = releases[0].name.slice(1),
checkEl = $('.version-check');
diff --git a/public/theme-rocket/cover/0231ab8358cc9079b8207bcc78b66c1d b/public/theme-rocket/cover/0231ab8358cc9079b8207bcc78b66c1d
deleted file mode 100644
index b88748ab3a..0000000000
Binary files a/public/theme-rocket/cover/0231ab8358cc9079b8207bcc78b66c1d and /dev/null differ
diff --git a/public/vendor/semver/semver.browser.js b/public/vendor/semver/semver.browser.js
new file mode 100644
index 0000000000..345d2b54c8
--- /dev/null
+++ b/public/vendor/semver/semver.browser.js
@@ -0,0 +1,1046 @@
+;(function(exports) {
+
+// export the class if we are in a Node-like system.
+if (typeof module === 'object' && module.exports === exports)
+ exports = module.exports = SemVer;
+
+// The debug function is excluded entirely from the minified version.
+
+// Note: this is the semver.org version of the spec that it implements
+// Not necessarily the package version of this code.
+exports.SEMVER_SPEC_VERSION = '2.0.0';
+
+// The actual regexps go on exports.re
+var re = exports.re = [];
+var src = exports.src = [];
+var R = 0;
+
+// The following Regular Expressions can be used for tokenizing,
+// validating, and parsing SemVer version strings.
+
+// ## Numeric Identifier
+// A single `0`, or a non-zero digit followed by zero or more digits.
+
+var NUMERICIDENTIFIER = R++;
+src[NUMERICIDENTIFIER] = '0|[1-9]\\d*';
+var NUMERICIDENTIFIERLOOSE = R++;
+src[NUMERICIDENTIFIERLOOSE] = '[0-9]+';
+
+
+// ## Non-numeric Identifier
+// Zero or more digits, followed by a letter or hyphen, and then zero or
+// more letters, digits, or hyphens.
+
+var NONNUMERICIDENTIFIER = R++;
+src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*';
+
+
+// ## Main Version
+// Three dot-separated numeric identifiers.
+
+var MAINVERSION = R++;
+src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+ '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+ '(' + src[NUMERICIDENTIFIER] + ')';
+
+var MAINVERSIONLOOSE = R++;
+src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+ '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+ '(' + src[NUMERICIDENTIFIERLOOSE] + ')';
+
+// ## Pre-release Version Identifier
+// A numeric identifier, or a non-numeric identifier.
+
+var PRERELEASEIDENTIFIER = R++;
+src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
+ '|' + src[NONNUMERICIDENTIFIER] + ')';
+
+var PRERELEASEIDENTIFIERLOOSE = R++;
+src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
+ '|' + src[NONNUMERICIDENTIFIER] + ')';
+
+
+// ## Pre-release Version
+// Hyphen, followed by one or more dot-separated pre-release version
+// identifiers.
+
+var PRERELEASE = R++;
+src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
+ '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))';
+
+var PRERELEASELOOSE = R++;
+src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
+ '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))';
+
+// ## Build Metadata Identifier
+// Any combination of digits, letters, or hyphens.
+
+var BUILDIDENTIFIER = R++;
+src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+';
+
+// ## Build Metadata
+// Plus sign, followed by one or more period-separated build metadata
+// identifiers.
+
+var BUILD = R++;
+src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
+ '(?:\\.' + src[BUILDIDENTIFIER] + ')*))';
+
+
+// ## Full Version String
+// A main version, followed optionally by a pre-release version and
+// build metadata.
+
+// Note that the only major, minor, patch, and pre-release sections of
+// the version string are capturing groups. The build metadata is not a
+// capturing group, because it should not ever be used in version
+// comparison.
+
+var FULL = R++;
+var FULLPLAIN = 'v?' + src[MAINVERSION] +
+ src[PRERELEASE] + '?' +
+ src[BUILD] + '?';
+
+src[FULL] = '^' + FULLPLAIN + '$';
+
+// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
+// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
+// common in the npm registry.
+var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] +
+ src[PRERELEASELOOSE] + '?' +
+ src[BUILD] + '?';
+
+var LOOSE = R++;
+src[LOOSE] = '^' + LOOSEPLAIN + '$';
+
+var GTLT = R++;
+src[GTLT] = '((?:<|>)?=?)';
+
+// Something like "2.*" or "1.2.x".
+// Note that "x.x" is a valid xRange identifer, meaning "any version"
+// Only the first item is strictly required.
+var XRANGEIDENTIFIERLOOSE = R++;
+src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*';
+var XRANGEIDENTIFIER = R++;
+src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*';
+
+var XRANGEPLAIN = R++;
+src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
+ '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+ '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+ '(?:(' + src[PRERELEASE] + ')' +
+ ')?)?)?';
+
+var XRANGEPLAINLOOSE = R++;
+src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+ '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+ '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+ '(?:(' + src[PRERELEASELOOSE] + ')' +
+ ')?)?)?';
+
+// >=2.x, for example, means >=2.0.0-0
+// <1.x would be the same as "<1.0.0-0", though.
+var XRANGE = R++;
+src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$';
+var XRANGELOOSE = R++;
+src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$';
+
+// Tilde ranges.
+// Meaning is "reasonably at or greater than"
+var LONETILDE = R++;
+src[LONETILDE] = '(?:~>?)';
+
+var TILDETRIM = R++;
+src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+';
+re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g');
+var tildeTrimReplace = '$1~';
+
+var TILDE = R++;
+src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$';
+var TILDELOOSE = R++;
+src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$';
+
+// Caret ranges.
+// Meaning is "at least and backwards compatible with"
+var LONECARET = R++;
+src[LONECARET] = '(?:\\^)';
+
+var CARETTRIM = R++;
+src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+';
+re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g');
+var caretTrimReplace = '$1^';
+
+var CARET = R++;
+src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$';
+var CARETLOOSE = R++;
+src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$';
+
+// A simple gt/lt/eq thing, or just "" to indicate "any version"
+var COMPARATORLOOSE = R++;
+src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$';
+var COMPARATOR = R++;
+src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$';
+
+
+// An expression to strip any whitespace between the gtlt and the thing
+// it modifies, so that `> 1.2.3` ==> `>1.2.3`
+var COMPARATORTRIM = R++;
+src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
+ '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')';
+
+// this one has to use the /g flag
+re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g');
+var comparatorTrimReplace = '$1$2$3';
+
+
+// Something like `1.2.3 - 1.2.4`
+// Note that these all use the loose form, because they'll be
+// checked against either the strict or loose comparator form
+// later.
+var HYPHENRANGE = R++;
+src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' +
+ '\\s+-\\s+' +
+ '(' + src[XRANGEPLAIN] + ')' +
+ '\\s*$';
+
+var HYPHENRANGELOOSE = R++;
+src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
+ '\\s+-\\s+' +
+ '(' + src[XRANGEPLAINLOOSE] + ')' +
+ '\\s*$';
+
+// Star ranges basically just allow anything at all.
+var STAR = R++;
+src[STAR] = '(<|>)?=?\\s*\\*';
+
+// Compile to actual regexp objects.
+// All are flag-free, unless they were created above with a flag.
+for (var i = 0; i < R; i++) {
+ ;
+ if (!re[i])
+ re[i] = new RegExp(src[i]);
+}
+
+exports.parse = parse;
+function parse(version, loose) {
+ var r = loose ? re[LOOSE] : re[FULL];
+ return (r.test(version)) ? new SemVer(version, loose) : null;
+}
+
+exports.valid = valid;
+function valid(version, loose) {
+ var v = parse(version, loose);
+ return v ? v.version : null;
+}
+
+
+exports.clean = clean;
+function clean(version, loose) {
+ var s = parse(version, loose);
+ return s ? s.version : null;
+}
+
+exports.SemVer = SemVer;
+
+function SemVer(version, loose) {
+ if (version instanceof SemVer) {
+ if (version.loose === loose)
+ return version;
+ else
+ version = version.version;
+ } else if (typeof version !== 'string') {
+ throw new TypeError('Invalid Version: ' + version);
+ }
+
+ if (!(this instanceof SemVer))
+ return new SemVer(version, loose);
+
+ ;
+ this.loose = loose;
+ var m = version.trim().match(loose ? re[LOOSE] : re[FULL]);
+
+ if (!m)
+ throw new TypeError('Invalid Version: ' + version);
+
+ this.raw = version;
+
+ // these are actually numbers
+ this.major = +m[1];
+ this.minor = +m[2];
+ this.patch = +m[3];
+
+ // numberify any prerelease numeric ids
+ if (!m[4])
+ this.prerelease = [];
+ else
+ this.prerelease = m[4].split('.').map(function(id) {
+ return (/^[0-9]+$/.test(id)) ? +id : id;
+ });
+
+ this.build = m[5] ? m[5].split('.') : [];
+ this.format();
+}
+
+SemVer.prototype.format = function() {
+ this.version = this.major + '.' + this.minor + '.' + this.patch;
+ if (this.prerelease.length)
+ this.version += '-' + this.prerelease.join('.');
+ return this.version;
+};
+
+SemVer.prototype.inspect = function() {
+ return '';
+};
+
+SemVer.prototype.toString = function() {
+ return this.version;
+};
+
+SemVer.prototype.compare = function(other) {
+ ;
+ if (!(other instanceof SemVer))
+ other = new SemVer(other, this.loose);
+
+ return this.compareMain(other) || this.comparePre(other);
+};
+
+SemVer.prototype.compareMain = function(other) {
+ if (!(other instanceof SemVer))
+ other = new SemVer(other, this.loose);
+
+ return compareIdentifiers(this.major, other.major) ||
+ compareIdentifiers(this.minor, other.minor) ||
+ compareIdentifiers(this.patch, other.patch);
+};
+
+SemVer.prototype.comparePre = function(other) {
+ if (!(other instanceof SemVer))
+ other = new SemVer(other, this.loose);
+
+ // NOT having a prerelease is > having one
+ if (this.prerelease.length && !other.prerelease.length)
+ return -1;
+ else if (!this.prerelease.length && other.prerelease.length)
+ return 1;
+ else if (!this.prerelease.length && !other.prerelease.length)
+ return 0;
+
+ var i = 0;
+ do {
+ var a = this.prerelease[i];
+ var b = other.prerelease[i];
+ ;
+ if (a === undefined && b === undefined)
+ return 0;
+ else if (b === undefined)
+ return 1;
+ else if (a === undefined)
+ return -1;
+ else if (a === b)
+ continue;
+ else
+ return compareIdentifiers(a, b);
+ } while (++i);
+};
+
+// preminor will bump the version up to the next minor release, and immediately
+// down to pre-release. premajor and prepatch work the same way.
+SemVer.prototype.inc = function(release) {
+ switch (release) {
+ case 'premajor':
+ this.inc('major');
+ this.inc('pre');
+ break;
+ case 'preminor':
+ this.inc('minor');
+ this.inc('pre');
+ break;
+ case 'prepatch':
+ // If this is already a prerelease, it will bump to the next version
+ // drop any prereleases that might already exist, since they are not
+ // relevant at this point.
+ this.prerelease.length = 0
+ this.inc('patch');
+ this.inc('pre');
+ break;
+ // If the input is a non-prerelease version, this acts the same as
+ // prepatch.
+ case 'prerelease':
+ if (this.prerelease.length === 0)
+ this.inc('patch');
+ this.inc('pre');
+ break;
+ case 'major':
+ this.major++;
+ this.minor = -1;
+ case 'minor':
+ this.minor++;
+ this.patch = 0;
+ this.prerelease = [];
+ break;
+ case 'patch':
+ // If this is not a pre-release version, it will increment the patch.
+ // If it is a pre-release it will bump up to the same patch version.
+ // 1.2.0-5 patches to 1.2.0
+ // 1.2.0 patches to 1.2.1
+ if (this.prerelease.length === 0)
+ this.patch++;
+ this.prerelease = [];
+ break;
+ // This probably shouldn't be used publically.
+ // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
+ case 'pre':
+ if (this.prerelease.length === 0)
+ this.prerelease = [0];
+ else {
+ var i = this.prerelease.length;
+ while (--i >= 0) {
+ if (typeof this.prerelease[i] === 'number') {
+ this.prerelease[i]++;
+ i = -2;
+ }
+ }
+ if (i === -1) // didn't increment anything
+ this.prerelease.push(0);
+ }
+ break;
+
+ default:
+ throw new Error('invalid increment argument: ' + release);
+ }
+ this.format();
+ return this;
+};
+
+exports.inc = inc;
+function inc(version, release, loose) {
+ try {
+ return new SemVer(version, loose).inc(release).version;
+ } catch (er) {
+ return null;
+ }
+}
+
+exports.compareIdentifiers = compareIdentifiers;
+
+var numeric = /^[0-9]+$/;
+function compareIdentifiers(a, b) {
+ var anum = numeric.test(a);
+ var bnum = numeric.test(b);
+
+ if (anum && bnum) {
+ a = +a;
+ b = +b;
+ }
+
+ return (anum && !bnum) ? -1 :
+ (bnum && !anum) ? 1 :
+ a < b ? -1 :
+ a > b ? 1 :
+ 0;
+}
+
+exports.rcompareIdentifiers = rcompareIdentifiers;
+function rcompareIdentifiers(a, b) {
+ return compareIdentifiers(b, a);
+}
+
+exports.compare = compare;
+function compare(a, b, loose) {
+ return new SemVer(a, loose).compare(b);
+}
+
+exports.compareLoose = compareLoose;
+function compareLoose(a, b) {
+ return compare(a, b, true);
+}
+
+exports.rcompare = rcompare;
+function rcompare(a, b, loose) {
+ return compare(b, a, loose);
+}
+
+exports.sort = sort;
+function sort(list, loose) {
+ return list.sort(function(a, b) {
+ return exports.compare(a, b, loose);
+ });
+}
+
+exports.rsort = rsort;
+function rsort(list, loose) {
+ return list.sort(function(a, b) {
+ return exports.rcompare(a, b, loose);
+ });
+}
+
+exports.gt = gt;
+function gt(a, b, loose) {
+ return compare(a, b, loose) > 0;
+}
+
+exports.lt = lt;
+function lt(a, b, loose) {
+ return compare(a, b, loose) < 0;
+}
+
+exports.eq = eq;
+function eq(a, b, loose) {
+ return compare(a, b, loose) === 0;
+}
+
+exports.neq = neq;
+function neq(a, b, loose) {
+ return compare(a, b, loose) !== 0;
+}
+
+exports.gte = gte;
+function gte(a, b, loose) {
+ return compare(a, b, loose) >= 0;
+}
+
+exports.lte = lte;
+function lte(a, b, loose) {
+ return compare(a, b, loose) <= 0;
+}
+
+exports.cmp = cmp;
+function cmp(a, op, b, loose) {
+ var ret;
+ switch (op) {
+ case '===': ret = a === b; break;
+ case '!==': ret = a !== b; break;
+ case '': case '=': case '==': ret = eq(a, b, loose); break;
+ case '!=': ret = neq(a, b, loose); break;
+ case '>': ret = gt(a, b, loose); break;
+ case '>=': ret = gte(a, b, loose); break;
+ case '<': ret = lt(a, b, loose); break;
+ case '<=': ret = lte(a, b, loose); break;
+ default: throw new TypeError('Invalid operator: ' + op);
+ }
+ return ret;
+}
+
+exports.Comparator = Comparator;
+function Comparator(comp, loose) {
+ if (comp instanceof Comparator) {
+ if (comp.loose === loose)
+ return comp;
+ else
+ comp = comp.value;
+ }
+
+ if (!(this instanceof Comparator))
+ return new Comparator(comp, loose);
+
+ ;
+ this.loose = loose;
+ this.parse(comp);
+
+ if (this.semver === ANY)
+ this.value = '';
+ else
+ this.value = this.operator + this.semver.version;
+}
+
+var ANY = {};
+Comparator.prototype.parse = function(comp) {
+ var r = this.loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
+ var m = comp.match(r);
+
+ if (!m)
+ throw new TypeError('Invalid comparator: ' + comp);
+
+ this.operator = m[1];
+ if (this.operator === '=')
+ this.operator = '';
+
+ // if it literally is just '>' or '' then allow anything.
+ if (!m[2])
+ this.semver = ANY;
+ else {
+ this.semver = new SemVer(m[2], this.loose);
+
+ // <1.2.3-rc DOES allow 1.2.3-beta (has prerelease)
+ // >=1.2.3 DOES NOT allow 1.2.3-beta
+ // <=1.2.3 DOES allow 1.2.3-beta
+ // However, <1.2.3 does NOT allow 1.2.3-beta,
+ // even though `1.2.3-beta < 1.2.3`
+ // The assumption is that the 1.2.3 version has something you
+ // *don't* want, so we push the prerelease down to the minimum.
+ if (this.operator === '<' && !this.semver.prerelease.length) {
+ this.semver.prerelease = ['0'];
+ this.semver.format();
+ }
+ }
+};
+
+Comparator.prototype.inspect = function() {
+ return '';
+};
+
+Comparator.prototype.toString = function() {
+ return this.value;
+};
+
+Comparator.prototype.test = function(version) {
+ ;
+ return (this.semver === ANY) ? true :
+ cmp(version, this.operator, this.semver, this.loose);
+};
+
+
+exports.Range = Range;
+function Range(range, loose) {
+ if ((range instanceof Range) && range.loose === loose)
+ return range;
+
+ if (!(this instanceof Range))
+ return new Range(range, loose);
+
+ this.loose = loose;
+
+ // First, split based on boolean or ||
+ this.raw = range;
+ this.set = range.split(/\s*\|\|\s*/).map(function(range) {
+ return this.parseRange(range.trim());
+ }, this).filter(function(c) {
+ // throw out any that are not relevant for whatever reason
+ return c.length;
+ });
+
+ if (!this.set.length) {
+ throw new TypeError('Invalid SemVer Range: ' + range);
+ }
+
+ this.format();
+}
+
+Range.prototype.inspect = function() {
+ return '';
+};
+
+Range.prototype.format = function() {
+ this.range = this.set.map(function(comps) {
+ return comps.join(' ').trim();
+ }).join('||').trim();
+ return this.range;
+};
+
+Range.prototype.toString = function() {
+ return this.range;
+};
+
+Range.prototype.parseRange = function(range) {
+ var loose = this.loose;
+ range = range.trim();
+ ;
+ // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
+ var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE];
+ range = range.replace(hr, hyphenReplace);
+ ;
+ // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
+ range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace);
+ ;
+
+ // `~ 1.2.3` => `~1.2.3`
+ range = range.replace(re[TILDETRIM], tildeTrimReplace);
+
+ // `^ 1.2.3` => `^1.2.3`
+ range = range.replace(re[CARETTRIM], caretTrimReplace);
+
+ // normalize spaces
+ range = range.split(/\s+/).join(' ');
+
+ // At this point, the range is completely trimmed and
+ // ready to be split into comparators.
+
+ var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
+ var set = range.split(' ').map(function(comp) {
+ return parseComparator(comp, loose);
+ }).join(' ').split(/\s+/);
+ if (this.loose) {
+ // in loose mode, throw out any that are not valid comparators
+ set = set.filter(function(comp) {
+ return !!comp.match(compRe);
+ });
+ }
+ set = set.map(function(comp) {
+ return new Comparator(comp, loose);
+ });
+
+ return set;
+};
+
+// Mostly just for testing and legacy API reasons
+exports.toComparators = toComparators;
+function toComparators(range, loose) {
+ return new Range(range, loose).set.map(function(comp) {
+ return comp.map(function(c) {
+ return c.value;
+ }).join(' ').trim().split(' ');
+ });
+}
+
+// comprised of xranges, tildes, stars, and gtlt's at this point.
+// already replaced the hyphen ranges
+// turn into a set of JUST comparators.
+function parseComparator(comp, loose) {
+ ;
+ comp = replaceCarets(comp, loose);
+ ;
+ comp = replaceTildes(comp, loose);
+ ;
+ comp = replaceXRanges(comp, loose);
+ ;
+ comp = replaceStars(comp, loose);
+ ;
+ return comp;
+}
+
+function isX(id) {
+ return !id || id.toLowerCase() === 'x' || id === '*';
+}
+
+// ~, ~> --> * (any, kinda silly)
+// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
+// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
+// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
+// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
+// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
+function replaceTildes(comp, loose) {
+ return comp.trim().split(/\s+/).map(function(comp) {
+ return replaceTilde(comp, loose);
+ }).join(' ');
+}
+
+function replaceTilde(comp, loose) {
+ var r = loose ? re[TILDELOOSE] : re[TILDE];
+ return comp.replace(r, function(_, M, m, p, pr) {
+ ;
+ var ret;
+
+ if (isX(M))
+ ret = '';
+ else if (isX(m))
+ ret = '>=' + M + '.0.0-0 <' + (+M + 1) + '.0.0-0';
+ else if (isX(p))
+ // ~1.2 == >=1.2.0- <1.3.0-
+ ret = '>=' + M + '.' + m + '.0-0 <' + M + '.' + (+m + 1) + '.0-0';
+ else if (pr) {
+ ;
+ if (pr.charAt(0) !== '-')
+ pr = '-' + pr;
+ ret = '>=' + M + '.' + m + '.' + p + pr +
+ ' <' + M + '.' + (+m + 1) + '.0-0';
+ } else
+ // ~1.2.3 == >=1.2.3-0 <1.3.0-0
+ ret = '>=' + M + '.' + m + '.' + p + '-0' +
+ ' <' + M + '.' + (+m + 1) + '.0-0';
+
+ ;
+ return ret;
+ });
+}
+
+// ^ --> * (any, kinda silly)
+// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
+// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
+// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
+// ^1.2.3 --> >=1.2.3 <2.0.0
+// ^1.2.0 --> >=1.2.0 <2.0.0
+function replaceCarets(comp, loose) {
+ return comp.trim().split(/\s+/).map(function(comp) {
+ return replaceCaret(comp, loose);
+ }).join(' ');
+}
+
+function replaceCaret(comp, loose) {
+ var r = loose ? re[CARETLOOSE] : re[CARET];
+ return comp.replace(r, function(_, M, m, p, pr) {
+ ;
+ var ret;
+
+ if (isX(M))
+ ret = '';
+ else if (isX(m))
+ ret = '>=' + M + '.0.0-0 <' + (+M + 1) + '.0.0-0';
+ else if (isX(p)) {
+ if (M === '0')
+ ret = '>=' + M + '.' + m + '.0-0 <' + M + '.' + (+m + 1) + '.0-0';
+ else
+ ret = '>=' + M + '.' + m + '.0-0 <' + (+M + 1) + '.0.0-0';
+ } else if (pr) {
+ ;
+ if (pr.charAt(0) !== '-')
+ pr = '-' + pr;
+ if (M === '0') {
+ if (m === '0')
+ ret = '=' + M + '.' + m + '.' + p + pr;
+ else
+ ret = '>=' + M + '.' + m + '.' + p + pr +
+ ' <' + M + '.' + (+m + 1) + '.0-0';
+ } else
+ ret = '>=' + M + '.' + m + '.' + p + pr +
+ ' <' + (+M + 1) + '.0.0-0';
+ } else {
+ if (M === '0') {
+ if (m === '0')
+ ret = '=' + M + '.' + m + '.' + p;
+ else
+ ret = '>=' + M + '.' + m + '.' + p + '-0' +
+ ' <' + M + '.' + (+m + 1) + '.0-0';
+ } else
+ ret = '>=' + M + '.' + m + '.' + p + '-0' +
+ ' <' + (+M + 1) + '.0.0-0';
+ }
+
+ ;
+ return ret;
+ });
+}
+
+function replaceXRanges(comp, loose) {
+ ;
+ return comp.split(/\s+/).map(function(comp) {
+ return replaceXRange(comp, loose);
+ }).join(' ');
+}
+
+function replaceXRange(comp, loose) {
+ comp = comp.trim();
+ var r = loose ? re[XRANGELOOSE] : re[XRANGE];
+ return comp.replace(r, function(ret, gtlt, M, m, p, pr) {
+ ;
+ var xM = isX(M);
+ var xm = xM || isX(m);
+ var xp = xm || isX(p);
+ var anyX = xp;
+
+ if (gtlt === '=' && anyX)
+ gtlt = '';
+
+ if (gtlt && anyX) {
+ // replace X with 0, and then append the -0 min-prerelease
+ if (xM)
+ M = 0;
+ if (xm)
+ m = 0;
+ if (xp)
+ p = 0;
+
+ if (gtlt === '>') {
+ // >1 => >=2.0.0-0
+ // >1.2 => >=1.3.0-0
+ // >1.2.3 => >= 1.2.4-0
+ gtlt = '>=';
+ if (xM) {
+ // no change
+ } else if (xm) {
+ M = +M + 1;
+ m = 0;
+ p = 0;
+ } else if (xp) {
+ m = +m + 1;
+ p = 0;
+ }
+ }
+
+
+ ret = gtlt + M + '.' + m + '.' + p + '-0';
+ } else if (xM) {
+ // allow any
+ ret = '*';
+ } else if (xm) {
+ // append '-0' onto the version, otherwise
+ // '1.x.x' matches '2.0.0-beta', since the tag
+ // *lowers* the version value
+ ret = '>=' + M + '.0.0-0 <' + (+M + 1) + '.0.0-0';
+ } else if (xp) {
+ ret = '>=' + M + '.' + m + '.0-0 <' + M + '.' + (+m + 1) + '.0-0';
+ }
+
+ ;
+
+ return ret;
+ });
+}
+
+// Because * is AND-ed with everything else in the comparator,
+// and '' means "any version", just remove the *s entirely.
+function replaceStars(comp, loose) {
+ ;
+ // Looseness is ignored here. star is always as loose as it gets!
+ return comp.trim().replace(re[STAR], '');
+}
+
+// This function is passed to string.replace(re[HYPHENRANGE])
+// M, m, patch, prerelease, build
+// 1.2 - 3.4.5 => >=1.2.0-0 <=3.4.5
+// 1.2.3 - 3.4 => >=1.2.0-0 <3.5.0-0 Any 3.4.x will do
+// 1.2 - 3.4 => >=1.2.0-0 <3.5.0-0
+function hyphenReplace($0,
+ from, fM, fm, fp, fpr, fb,
+ to, tM, tm, tp, tpr, tb) {
+
+ if (isX(fM))
+ from = '';
+ else if (isX(fm))
+ from = '>=' + fM + '.0.0-0';
+ else if (isX(fp))
+ from = '>=' + fM + '.' + fm + '.0-0';
+ else
+ from = '>=' + from;
+
+ if (isX(tM))
+ to = '';
+ else if (isX(tm))
+ to = '<' + (+tM + 1) + '.0.0-0';
+ else if (isX(tp))
+ to = '<' + tM + '.' + (+tm + 1) + '.0-0';
+ else if (tpr)
+ to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr;
+ else
+ to = '<=' + to;
+
+ return (from + ' ' + to).trim();
+}
+
+
+// if ANY of the sets match ALL of its comparators, then pass
+Range.prototype.test = function(version) {
+ if (!version)
+ return false;
+ for (var i = 0; i < this.set.length; i++) {
+ if (testSet(this.set[i], version))
+ return true;
+ }
+ return false;
+};
+
+function testSet(set, version) {
+ for (var i = 0; i < set.length; i++) {
+ if (!set[i].test(version))
+ return false;
+ }
+ return true;
+}
+
+exports.satisfies = satisfies;
+function satisfies(version, range, loose) {
+ try {
+ range = new Range(range, loose);
+ } catch (er) {
+ return false;
+ }
+ return range.test(version);
+}
+
+exports.maxSatisfying = maxSatisfying;
+function maxSatisfying(versions, range, loose) {
+ return versions.filter(function(version) {
+ return satisfies(version, range, loose);
+ }).sort(function(a, b) {
+ return rcompare(a, b, loose);
+ })[0] || null;
+}
+
+exports.validRange = validRange;
+function validRange(range, loose) {
+ try {
+ // Return '*' instead of '' so that truthiness works.
+ // This will throw if it's invalid anyway
+ return new Range(range, loose).range || '*';
+ } catch (er) {
+ return null;
+ }
+}
+
+// Determine if version is less than all the versions possible in the range
+exports.ltr = ltr;
+function ltr(version, range, loose) {
+ return outside(version, range, '<', loose);
+}
+
+// Determine if version is greater than all the versions possible in the range.
+exports.gtr = gtr;
+function gtr(version, range, loose) {
+ return outside(version, range, '>', loose);
+}
+
+exports.outside = outside;
+function outside(version, range, hilo, loose) {
+ version = new SemVer(version, loose);
+ range = new Range(range, loose);
+
+ var gtfn, ltefn, ltfn, comp, ecomp;
+ switch (hilo) {
+ case '>':
+ gtfn = gt;
+ ltefn = lte;
+ ltfn = lt;
+ comp = '>';
+ ecomp = '>=';
+ break;
+ case '<':
+ gtfn = lt;
+ ltefn = gte;
+ ltfn = gt;
+ comp = '<';
+ ecomp = '<=';
+ break;
+ default:
+ throw new TypeError('Must provide a hilo val of "<" or ">"');
+ }
+
+ // If it satisifes the range it is not outside
+ if (satisfies(version, range, loose)) {
+ return false;
+ }
+
+ // From now on, variable terms are as if we're in "gtr" mode.
+ // but note that everything is flipped for the "ltr" function.
+
+ for (var i = 0; i < range.set.length; ++i) {
+ var comparators = range.set[i];
+
+ var high = null;
+ var low = null;
+
+ comparators.forEach(function(comparator) {
+ high = high || comparator;
+ low = low || comparator;
+ if (gtfn(comparator.semver, high.semver, loose)) {
+ high = comparator;
+ } else if (ltfn(comparator.semver, low.semver, loose)) {
+ low = comparator;
+ }
+ });
+
+ // If the edge version comparator has a operator then our version
+ // isn't outside it
+ if (high.operator === comp || high.operator === ecomp) {
+ return false;
+ }
+
+ // If the lowest version comparator has an operator and our version
+ // is less than it then it isn't higher than the range
+ if ((!low.operator || low.operator === comp) &&
+ ltefn(version, low.semver)) {
+ return false;
+ } else if (low.operator === ecomp && ltfn(version, low.semver)) {
+ return false;
+ }
+ }
+ return true;
+}
+
+// Use the define() function if we're in AMD land
+if (typeof define === 'function' && define.amd)
+ define('semver', exports);
+
+})(
+ typeof exports === 'object' ? exports :
+ typeof define === 'function' && define.amd ? {} :
+ semver = {}
+);
diff --git a/src/categories.js b/src/categories.js
index 8043401830..473bf50c8a 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -366,7 +366,7 @@ var db = require('./database'),
if (categories[i]) {
categories[i]['unread-class'] = (parseInt(categories[i].topic_count, 10) === 0 || (hasRead[i] && uid !== 0)) ? '' : 'unread';
categories[i].children = results.children[i];
- categories[i].parent = results.parents[i];
+ categories[i].parent = results.parents[i] && !results.parents[i].disabled ? results.parents[i] : null;
}
}
@@ -402,9 +402,10 @@ var db = require('./database'),
Categories.getCategoriesData(cids, next);
},
function (categories, next) {
+ // Filter categories to isolate children, and remove disabled categories
async.map(cids, function(cid, next) {
next(null, categories.filter(function(category) {
- return parseInt(category.parentCid, 10) === parseInt(cid, 10);
+ return parseInt(category.parentCid, 10) === parseInt(cid, 10) && !category.disabled;
}));
}, next);
}
diff --git a/src/categories/update.js b/src/categories/update.js
index fa04d99deb..002628d723 100644
--- a/src/categories/update.js
+++ b/src/categories/update.js
@@ -13,7 +13,6 @@ module.exports = function(Categories) {
function updateCategory(cid, next) {
var category = modified[cid];
var fields = Object.keys(category);
- console.log('updating', cid, 'fields:', fields);
async.each(fields, function(key, next) {
updateCategoryField(cid, key, category[key], next);
diff --git a/src/controllers/index.js b/src/controllers/index.js
index 25b22fa270..47f6d01bf9 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -69,6 +69,11 @@ Controllers.home = function(req, res, next) {
return next(err);
}
+ // Remove child categories, as they don't belong on the home page
+ categoryData = categoryData.filter(function(categoryObj) {
+ return !categoryObj.parent;
+ });
+
categories.getRecentTopicReplies(categoryData, uid, function(err) {
next(err, categoryData);
});
diff --git a/src/meta/title.js b/src/meta/title.js
index 652001af97..0019cdb686 100644
--- a/src/meta/title.js
+++ b/src/meta/title.js
@@ -1,6 +1,7 @@
'use strict';
-var user = require('../user'),
+var winston = require('winston'),
+ user = require('../user'),
translator = require('../../public/src/translator');
module.exports = function(Meta) {
@@ -14,7 +15,14 @@ module.exports = function(Meta) {
};
Meta.title.build = function (urlFragment, language, callback) {
- Meta.title.parseFragment(decodeURIComponent(urlFragment), language, function(err, title) {
+ var uri = '';
+ try {
+ uri = decodeURIComponent(urlFragment);
+ } catch(e) {
+ winston.error('Invalid url fragment : ' + urlFragment, e.stack);
+ return callback(null, Meta.config.browserTitle || 'NodeBB');
+ }
+ Meta.title.parseFragment(uri, language, function(err, title) {
if (err) {
title = Meta.config.browserTitle || 'NodeBB';
} else {
diff --git a/src/middleware/index.js b/src/middleware/index.js
index 3e3e2f5b06..95dc5bfa4a 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -63,7 +63,15 @@ function routeCurrentTheme(app, themeId, themesData) {
}
// Theme's templates path
- nconf.set('theme_templates_path', themeObj.templates ? path.join(themesPath, themeObj.id, themeObj.templates) : nconf.get('base_templates_path'));
+ var themePath = nconf.get('base_templates_path'),
+ fallback = path.join(themesPath, themeObj.id, 'templates');
+ if (themeObj.templates) {
+ themePath = path.join(themesPath, themeObj.id, themeObj.templates);
+ } else if (fs.existsSync(fallback)) {
+ themePath = fallback;
+ }
+
+ nconf.set('theme_templates_path', themePath);
}
module.exports = function(app, data) {
diff --git a/src/posts.js b/src/posts.js
index 57a97e71ca..aab0577828 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -295,7 +295,7 @@ var async = require('async'),
}
posts = posts.filter(function(post) {
- return parseInt(results.topics[post.tid].deleted, 10) !== 1;
+ return results.topics[post.tid] && parseInt(results.topics[post.tid].deleted, 10) !== 1;
});
async.map(posts, function(post, next) {
diff --git a/src/topics.js b/src/topics.js
index 99a1c6b761..8fe3c9a520 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -173,9 +173,9 @@ var async = require('async'),
Topics.getTopicsData(tids, function(err, topics) {
function mapFilter(array, field) {
return array.map(function(topic) {
- return topic[field];
+ return topic && topic[field];
}).filter(function(value, index, array) {
- return array.indexOf(value) === index;
+ return value && array.indexOf(value) === index;
});
}
@@ -218,21 +218,23 @@ var async = require('async'),
});
for (var i=0; i