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 feb589fd8f..6e6956b0ec 100644
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -20,6 +20,7 @@
"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",
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 a1aa9dc80f..f5a6be3c14 100644
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -52,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.",
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 26e3c9d80c..f90d459cce 100644
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -20,6 +20,7 @@
"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",
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 13be6ba018..48e9c3655b 100644
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -52,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.",
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 4217b44a31..ddf1509f60 100644
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -12,14 +12,15 @@
"invalid-title": "Ungültiger Titel",
"invalid-user-data": "Ungültige Benutzerdaten",
"invalid-password": "Ungültiges Passwort",
- "invalid-username-or-password": "Please specify both a username and password",
+ "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": "Username too long",
+ "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",
@@ -54,9 +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!",
- "reputation-system-disabled": "Reputation system is disabled.",
- "downvoting-disabled": "Downvoting is disabled",
+ "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": "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."
+ "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/topic.json b/public/language/de/topic.json
index c3642ea0bd..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",
diff --git a/public/language/de/user.json b/public/language/de/user.json
index c264b87190..d3b4e12d45 100644
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -4,8 +4,8 @@
"username": "Nutzername",
"email": "E-Mail",
"confirm_email": "E-Mail bestätigen",
- "delete_account": "Delete Account",
- "delete_account_confirm": "Are you sure you want to delete your account?",
+ "delete_account": "Konto löschen",
+ "delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your username to confirm that you wish to destroy this account.",
"fullname": "Kompletter Name",
"website": "Homepage",
"location": "Wohnort",
@@ -52,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.",
@@ -64,6 +65,6 @@
"notification_sounds": "Ton abspielen, wenn ich eine Benachrichtigung erhalte.",
"browsing": "Browser Einstellungen",
"open_links_in_new_tab": "Externe Links in neuem Tab öffnen?",
- "follow_topics_you_reply_to": "Follow topics that you reply to.",
- "follow_topics_you_create": "Follow topics you create."
+ "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/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 26e3c9d80c..f90d459cce 100644
--- a/public/language/en@pirate/error.json
+++ b/public/language/en@pirate/error.json
@@ -20,6 +20,7 @@
"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",
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 a8efc3d857..fb50580f31 100644
--- a/public/language/en@pirate/user.json
+++ b/public/language/en@pirate/user.json
@@ -52,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.",
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 200ce83066..c63073194a 100644
--- a/public/language/en_US/error.json
+++ b/public/language/en_US/error.json
@@ -20,6 +20,7 @@
"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",
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 50848c7f83..58ea366320 100644
--- a/public/language/en_US/user.json
+++ b/public/language/en_US/user.json
@@ -52,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.",
diff --git a/public/language/es/email.json b/public/language/es/email.json
index b791157e63..c83494b565 100644
--- a/public/language/es/email.json
+++ b/public/language/es/email.json
@@ -13,8 +13,11 @@
"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.unsub.cta": "Cliquea aquí para alterar estos ajustes",
"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 d3fa14fe91..79fd819d2f 100644
--- a/public/language/es/error.json
+++ b/public/language/es/error.json
@@ -20,6 +20,7 @@
"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",
diff --git a/public/language/es/topic.json b/public/language/es/topic.json
index 1522291a09..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",
diff --git a/public/language/es/user.json b/public/language/es/user.json
index 3d711138d2..32a7fe7340 100644
--- a/public/language/es/user.json
+++ b/public/language/es/user.json
@@ -52,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.",
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 459b749ca0..51926c86b5 100644
--- a/public/language/et/error.json
+++ b/public/language/et/error.json
@@ -20,6 +20,7 @@
"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",
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 4ecb16dac4..edde90c4cf 100644
--- a/public/language/et/user.json
+++ b/public/language/et/user.json
@@ -52,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.",
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 29caeaa0c1..64f4d35823 100644
--- a/public/language/fa_IR/error.json
+++ b/public/language/fa_IR/error.json
@@ -20,6 +20,7 @@
"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": "چنین دیدگاهی وجود ندارد.",
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 f0212723e2..f460e31c7b 100644
--- a/public/language/fa_IR/user.json
+++ b/public/language/fa_IR/user.json
@@ -52,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": "این کاربر هنوز هیچ دیدگاهی نگذاشته است.",
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 738eb62699..73febab0c3 100644
--- a/public/language/fi/error.json
+++ b/public/language/fi/error.json
@@ -20,6 +20,7 @@
"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",
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 d008e94b62..d8aecf0e3d 100644
--- a/public/language/fi/user.json
+++ b/public/language/fi/user.json
@@ -52,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.",
diff --git a/public/language/fr/category.json b/public/language/fr/category.json
index c680ae7db9..47b8ebb764 100644
--- a/public/language/fr/category.json
+++ b/public/language/fr/category.json
@@ -4,5 +4,5 @@
"browsing": "parcouru par",
"no_replies": "Personne n'a répondu",
"share_this_category": "Partager cette catégorie",
- "ignore": "Ignore"
+ "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 821061cee1..bcc272f6d8 100644
--- a/public/language/fr/error.json
+++ b/public/language/fr/error.json
@@ -20,6 +20,7 @@
"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",
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 68a99a577e..76667e98ed 100644
--- a/public/language/fr/user.json
+++ b/public/language/fr/user.json
@@ -52,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",
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 2df9c1b918..28cd04e663 100644
--- a/public/language/he/error.json
+++ b/public/language/he/error.json
@@ -20,6 +20,7 @@
"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": "פוסט אינו קיים",
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 292d31f90b..badb2cf544 100644
--- a/public/language/he/user.json
+++ b/public/language/he/user.json
@@ -52,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": "המשתמש הזה עוד לא פרסם כלום.",
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 26e3c9d80c..f90d459cce 100644
--- a/public/language/hu/error.json
+++ b/public/language/hu/error.json
@@ -20,6 +20,7 @@
"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",
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 909e4ad553..fd14fd271c 100644
--- a/public/language/hu/user.json
+++ b/public/language/hu/user.json
@@ -52,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.",
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 26e3c9d80c..f90d459cce 100644
--- a/public/language/it/error.json
+++ b/public/language/it/error.json
@@ -20,6 +20,7 @@
"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",
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 d490e3e1ef..18acd1c232 100644
--- a/public/language/it/user.json
+++ b/public/language/it/user.json
@@ -52,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.",
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 3d88578169..0d6aad1afd 100644
--- a/public/language/ja/error.json
+++ b/public/language/ja/error.json
@@ -20,6 +20,7 @@
"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": "ポストが存在しない",
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 ddb43c4dd5..0c683c1b86 100644
--- a/public/language/ja/user.json
+++ b/public/language/ja/user.json
@@ -52,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": "まだポストを投稿したことありません。",
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 fd74542ee3..be2363f55a 100644
--- a/public/language/ko/error.json
+++ b/public/language/ko/error.json
@@ -20,6 +20,7 @@
"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": "존재하지 않는 게시물입니다.",
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 e3b7b29e83..fb0625f04f 100644
--- a/public/language/ko/user.json
+++ b/public/language/ko/user.json
@@ -52,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": "이 사용자는 게시물을 작성하지 않았습니다.",
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 f41fc62c24..48edfbb72a 100644
--- a/public/language/lt/error.json
+++ b/public/language/lt/error.json
@@ -20,6 +20,7 @@
"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",
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 1902cdd399..2823f89e95 100644
--- a/public/language/lt/user.json
+++ b/public/language/lt/user.json
@@ -52,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.",
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 6c9f213d94..b6ad0bd586 100644
--- a/public/language/ms/error.json
+++ b/public/language/ms/error.json
@@ -20,6 +20,7 @@
"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",
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 74fffdbd04..cff395f87a 100644
--- a/public/language/ms/user.json
+++ b/public/language/ms/user.json
@@ -52,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",
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 26e3c9d80c..f90d459cce 100644
--- a/public/language/nb/error.json
+++ b/public/language/nb/error.json
@@ -20,6 +20,7 @@
"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",
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 5f3f3db9ab..7575e7f77f 100644
--- a/public/language/nb/user.json
+++ b/public/language/nb/user.json
@@ -52,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.",
diff --git a/public/language/nl/category.json b/public/language/nl/category.json
index 7c6651aa9a..45dbbf4d4d 100644
--- a/public/language/nl/category.json
+++ b/public/language/nl/category.json
@@ -4,5 +4,5 @@
"browsing": "verkennen",
"no_replies": "Niemand heeft gereageerd",
"share_this_category": "Deel deze categorie",
- "ignore": "Ignore"
+ "ignore": "Negeren"
}
\ No newline at end of file
diff --git a/public/language/nl/email.json b/public/language/nl/email.json
index e662dce397..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 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 173db65af9..d27566d742 100644
--- a/public/language/nl/error.json
+++ b/public/language/nl/error.json
@@ -12,14 +12,15 @@
"invalid-title": "Ongeldige Titel!",
"invalid-user-data": "Ongeldig Gebruikersdata",
"invalid-password": "Ongeldig wachtwoord",
- "invalid-username-or-password": "Please specify both a username and password",
+ "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": "Username too long",
+ "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",
@@ -54,9 +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!",
- "reputation-system-disabled": "Reputation system is disabled.",
- "downvoting-disabled": "Downvoting is disabled",
+ "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": "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."
+ "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/notifications.json b/public/language/nl/notifications.json
index 6559d5df3e..4c51c977b5 100644
--- a/public/language/nl/notifications.json
+++ b/public/language/nl/notifications.json
@@ -10,14 +10,14 @@
"new_notification": "een nieuwe notificatie",
"you_have_unread_notifications": "U heeft ongelezen notificaties",
"new_message_from": "Nieuw bericht van <strong>%1</strong>",
- "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
- "moved_your_post": "<strong>%1<strong> has moved your post.",
- "moved_your_topic": "<strong>%1<strong> has moved your topic.",
- "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
- "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+ "upvoted_your_post_in": "<strong>%1</strong> heeft uw bericht geupvote in <strong>%2</strong>.",
+ "moved_your_post": "<strong>%1<strong> heeft uw bericht verplaatst",
+ "moved_your_topic": "<strong>%1<strong> heeft uw onderwerp verplaatst.",
+ "favourited_your_post_in": "<strong>%1</strong> heeft uw bericht gefavoriet in <strong>%2</strong>.",
+ "user_flagged_post_in": "<strong>%1</strong> rapporteerde een bericht in <strong>%2</strong>",
"user_posted_to": "<strong>%1</strong> heeft een reactie op het bericht gegeven aan <strong>%2</strong>",
"user_mentioned_you_in": "<strong>%1</strong> heeft u genoemd in <strong>%2</strong>",
- "user_started_following_you": "<strong>%1</strong> started following you.",
+ "user_started_following_you": "<strong>%1</strong> 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 f111931b98..fbbfaaeb52 100644
--- a/public/language/nl/recent.json
+++ b/public/language/nl/recent.json
@@ -4,6 +4,6 @@
"week": "Week",
"month": "Maand",
"year": "Jaar",
- "alltime": "All Time",
+ "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 7b1aab07ca..cb61065a4e 100644
--- a/public/language/nl/search.json
+++ b/public/language/nl/search.json
@@ -1,4 +1,4 @@
{
"results_matching": "%1 resulta(a)ten was een match \"%2\", (%3 seconds)",
- "no-matches": "No posts found"
+ "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 9a9d1a2f81..0530a16f5c 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -71,7 +71,7 @@
"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 gesplitst!",
+ "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",
diff --git a/public/language/nl/user.json b/public/language/nl/user.json
index df0f112c6f..e91b069cae 100644
--- a/public/language/nl/user.json
+++ b/public/language/nl/user.json
@@ -4,8 +4,8 @@
"username": "Gebruikersnaam",
"email": "Email",
"confirm_email": "Bevestig uw email adres",
- "delete_account": "Delete Account",
- "delete_account_confirm": "Are you sure you want to delete your account?",
+ "delete_account": "Account Verwijderen",
+ "delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your username to confirm that you wish to destroy this account.",
"fullname": "Volledige Naam",
"website": "Website",
"location": "Locatie",
@@ -52,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",
@@ -64,6 +65,6 @@
"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?",
- "follow_topics_you_reply_to": "Follow topics that you reply to.",
- "follow_topics_you_create": "Follow topics you create."
+ "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/email.json b/public/language/pl/email.json
index 2e5df85e6a..9a154171c0 100644
--- a/public/language/pl/email.json
+++ b/public/language/pl/email.json
@@ -13,8 +13,11 @@
"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.unsub.cta": "Kliknij tutaj, aby je zmienić",
"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 75fd7e8daa..c91c2ad906 100644
--- a/public/language/pl/error.json
+++ b/public/language/pl/error.json
@@ -12,14 +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": "Please specify both a username and password",
+ "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": "Username too long",
+ "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",
@@ -54,9 +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ą",
- "reputation-system-disabled": "Reputation system is disabled.",
- "downvoting-disabled": "Downvoting is disabled",
+ "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": "Yo do not have enough reputation to flag this 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/topic.json b/public/language/pl/topic.json
index 6ef02c02a4..25ae1af224 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -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",
diff --git a/public/language/pl/user.json b/public/language/pl/user.json
index 65a0258933..82b79963f7 100644
--- a/public/language/pl/user.json
+++ b/public/language/pl/user.json
@@ -4,8 +4,8 @@
"username": "Nazwa użytkownika",
"email": "Adres e-mail",
"confirm_email": "Potwierdź e-mail",
- "delete_account": "Delete Account",
- "delete_account_confirm": "Are you sure you want to delete your account?",
+ "delete_account": "Skasuj konto",
+ "delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your username to confirm that you wish to destroy this account.",
"fullname": "Pełna nazwa",
"website": "Strona WWW",
"location": "Położenie",
@@ -52,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.",
@@ -64,6 +65,6 @@
"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?",
- "follow_topics_you_reply_to": "Follow topics that you reply to.",
- "follow_topics_you_create": "Follow topics you create."
+ "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/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 dd6fe32c3c..d6e0da1ede 100644
--- a/public/language/pt_BR/error.json
+++ b/public/language/pt_BR/error.json
@@ -20,6 +20,7 @@
"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",
diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json
index 8a4912a100..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",
diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json
index 366c291a5d..78084398dd 100644
--- a/public/language/pt_BR/user.json
+++ b/public/language/pt_BR/user.json
@@ -52,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.",
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 f8346aa636..a40ac5f0d0 100644
--- a/public/language/ro/error.json
+++ b/public/language/ro/error.json
@@ -20,6 +20,7 @@
"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ă",
diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json
index 0463625d25..3bcdf5805e 100644
--- a/public/language/ro/topic.json
+++ b/public/language/ro/topic.json
@@ -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",
diff --git a/public/language/ro/user.json b/public/language/ro/user.json
index 124f9076b6..1719ecce2e 100644
--- a/public/language/ro/user.json
+++ b/public/language/ro/user.json
@@ -52,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.",
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 875a018f95..a715f9c9a2 100644
--- a/public/language/ru/error.json
+++ b/public/language/ru/error.json
@@ -20,6 +20,7 @@
"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": "Несуществующая запись",
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 6da3902849..e1902b30ee 100644
--- a/public/language/ru/user.json
+++ b/public/language/ru/user.json
@@ -52,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": "Это пользователь еще ничего не написал.",
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 26e3c9d80c..f90d459cce 100644
--- a/public/language/sc/error.json
+++ b/public/language/sc/error.json
@@ -20,6 +20,7 @@
"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",
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 7c8781dfb8..826a3a82be 100644
--- a/public/language/sc/user.json
+++ b/public/language/sc/user.json
@@ -52,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.",
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 08c0106813..60262ff3e4 100644
--- a/public/language/sk/error.json
+++ b/public/language/sk/error.json
@@ -20,6 +20,7 @@
"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",
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 cefdf45dfe..7b10ab4040 100644
--- a/public/language/sk/user.json
+++ b/public/language/sk/user.json
@@ -52,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",
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 2c10713a84..6f118116f3 100644
--- a/public/language/sv/error.json
+++ b/public/language/sv/error.json
@@ -12,14 +12,15 @@
"invalid-title": "Ogiltig rubrik.",
"invalid-user-data": "Ogiltig användardata",
"invalid-password": "Ogiltigt lösenord",
- "invalid-username-or-password": "Please specify both a username and password",
+ "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": "Username too long",
+ "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",
@@ -54,9 +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.",
- "reputation-system-disabled": "Reputation system is disabled.",
- "downvoting-disabled": "Downvoting is disabled",
+ "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": "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."
+ "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/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/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 e4e4c01dcb..e4e18aafaa 100644
--- a/public/language/sv/user.json
+++ b/public/language/sv/user.json
@@ -4,8 +4,8 @@
"username": "Användarnamn",
"email": "Epost",
"confirm_email": "Bekräfta epostadress ",
- "delete_account": "Delete Account",
- "delete_account_confirm": "Are you sure you want to delete your account?",
+ "delete_account": "Ta bort ämne",
+ "delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your username to confirm that you wish to destroy this account.",
"fullname": "Hela namnet",
"website": "Webbsida",
"location": "Plats",
@@ -52,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.",
@@ -64,6 +65,6 @@
"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?",
- "follow_topics_you_reply_to": "Follow topics that you reply to.",
- "follow_topics_you_create": "Follow topics you create."
+ "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/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 26e3c9d80c..f90d459cce 100644
--- a/public/language/th/error.json
+++ b/public/language/th/error.json
@@ -20,6 +20,7 @@
"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",
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 f6d6861e31..7f75a2bcbb 100644
--- a/public/language/th/user.json
+++ b/public/language/th/user.json
@@ -52,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": "ผู้ใช้รายนี้ไม่ได้โพสต์อะไรเลย",
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 6c6a37053a..86b7a7567d 100644
--- a/public/language/tr/error.json
+++ b/public/language/tr/error.json
@@ -20,6 +20,7 @@
"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",
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 fb1316fd7e..1327933256 100644
--- a/public/language/tr/user.json
+++ b/public/language/tr/user.json
@@ -52,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.",
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 189c8de1a5..c375b9fd51 100644
--- a/public/language/vi/error.json
+++ b/public/language/vi/error.json
@@ -1,25 +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": "Please specify both a username and password",
+ "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",
- "username-too-long": "Username too long",
+ "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",
@@ -27,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",
@@ -38,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",
@@ -51,12 +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!",
- "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."
+ "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 <span id=\"chat-with-name\"></span>",
- "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/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/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 1f5cb24b9a..1aeac40d09 100644
--- a/public/language/vi/user.json
+++ b/public/language/vi/user.json
@@ -3,9 +3,9 @@
"offline": "Offline",
"username": "Tên truy cập",
"email": "Email",
- "confirm_email": "Confirm Email",
- "delete_account": "Delete Account",
- "delete_account_confirm": "Are you sure you want to delete your account?",
+ "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? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your username to confirm that you wish to destroy this account.",
"fullname": "Tên đầy đủ",
"website": "Website",
"location": "Địa điểm",
@@ -52,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",
@@ -62,8 +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?",
- "follow_topics_you_reply_to": "Follow topics that you reply to.",
- "follow_topics_you_create": "Follow topics you create."
+ "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 2f776788d1..933e12e3e1 100644
--- a/public/language/zh_CN/category.json
+++ b/public/language/zh_CN/category.json
@@ -4,5 +4,5 @@
"browsing": "正在浏览",
"no_replies": "尚无回复",
"share_this_category": "分享此版块",
- "ignore": "Ignore"
+ "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 561c57a0da..56c19a26b2 100644
--- a/public/language/zh_CN/error.json
+++ b/public/language/zh_CN/error.json
@@ -12,14 +12,15 @@
"invalid-title": "无效标题！",
"invalid-user-data": "无效用户数据",
"invalid-password": "无效密码",
- "invalid-username-or-password": "Please specify both a username and password",
+ "invalid-username-or-password": "请确认用户名和密码",
"invalid-pagination-value": "无效页码",
"username-taken": "用户名已注册",
"email-taken": "电子邮箱已注册",
"email-not-confirmed": "您的电子邮箱尚未确认，请点击这里确认您的电子邮箱。",
"username-too-short": "用户名太短",
- "username-too-long": "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": "帖子不存在",
@@ -54,9 +55,9 @@
"upload-error": "上传错误：%1",
"signature-too-long": "签名档不能超过 %1 字！",
"cant-chat-with-yourself": "您不能和自己聊天！",
- "reputation-system-disabled": "Reputation system is disabled.",
- "downvoting-disabled": "Downvoting is disabled",
+ "reputation-system-disabled": "威望系统已禁用。",
+ "downvoting-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."
+ "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 6e4faf216f..13d533bc53 100644
--- a/public/language/zh_CN/notifications.json
+++ b/public/language/zh_CN/notifications.json
@@ -10,14 +10,14 @@
"new_notification": "新通知",
"you_have_unread_notifications": "您有未读的通知。",
"new_message_from": "来自 <strong>%1</strong> 的新消息",
- "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
- "moved_your_post": "<strong>%1<strong> has moved your post.",
- "moved_your_topic": "<strong>%1<strong> has moved your topic.",
- "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
- "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
+ "upvoted_your_post_in": "<strong>%1</strong> 在 <strong>%2</strong> 点赞了您的帖子。",
+ "moved_your_post": "<strong>%1</strong> 移动了您的帖子。",
+ "moved_your_topic": "<strong>%1</strong> 移动了您的主题帖。",
+ "favourited_your_post_in": "<strong>%1</strong> 在 <strong>%2</strong> 收藏了您的帖子。",
+ "user_flagged_post_in": "<strong>%1</strong> 在 <strong>%2</strong> 标记了一个帖子",
"user_posted_to": "<strong>%1</strong> 回复了：<strong>%2</strong>",
"user_mentioned_you_in": "<strong>%1</strong> 在 <strong>%2</strong> 中提到了您",
- "user_started_following_you": "<strong>%1</strong> started following you.",
+ "user_started_following_you": "<strong>%1</strong>关注了您。",
"email-confirmed": "电子邮箱已确认",
"email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已全面激活。",
"email-confirm-error": "出错了.……",
diff --git a/public/language/zh_CN/recent.json b/public/language/zh_CN/recent.json
index c363d4921c..6b6df56f05 100644
--- a/public/language/zh_CN/recent.json
+++ b/public/language/zh_CN/recent.json
@@ -4,6 +4,6 @@
"week": "本周",
"month": "本月",
"year": "本年",
- "alltime": "All Time",
+ "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 484acb3626..3d8460e57b 100644
--- a/public/language/zh_CN/search.json
+++ b/public/language/zh_CN/search.json
@@ -1,4 +1,4 @@
{
"results_matching": "共 %1 条结果匹配 \"%2\"，(耗时 %3 秒)",
- "no-matches": "No posts found"
+ "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 183cbfcc23..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": "提交",
diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json
index 51d0b25817..a1c9e34de2 100644
--- a/public/language/zh_CN/user.json
+++ b/public/language/zh_CN/user.json
@@ -4,8 +4,8 @@
"username": "用户名",
"email": "电子邮件",
"confirm_email": "确认电子邮箱",
- "delete_account": "Delete Account",
- "delete_account_confirm": "Are you sure you want to delete your account?",
+ "delete_account": "删除帐号",
+ "delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your username to confirm that you wish to destroy this account.",
"fullname": "姓名",
"website": "网站",
"location": "位置",
@@ -52,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": "此用户尚未发布任何帖子。",
@@ -64,6 +65,6 @@
"notification_sounds": "收到通知时播放提示音。",
"browsing": "浏览设置",
"open_links_in_new_tab": "在新标签中打开外部链接？",
- "follow_topics_you_reply_to": "Follow topics that you reply to.",
- "follow_topics_you_create": "Follow topics you create."
+ "follow_topics_you_reply_to": "关注您回复的主题。",
+ "follow_topics_you_create": "关注您创建的主题。"
}
\ 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 d965ca117e..544d11f42e 100644
--- a/public/language/zh_TW/error.json
+++ b/public/language/zh_TW/error.json
@@ -20,6 +20,7 @@
"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": "文章並不存在",
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 f73d573c02..d344fd7153 100644
--- a/public/language/zh_TW/user.json
+++ b/public/language/zh_TW/user.json
@@ -52,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": "尚未有任何貼文.",