diff --git a/package.json b/package.json
index 2716eb6888..01592c9035 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
"validator": "~3.16.1",
"winston": "~0.7.2",
"xregexp": "~2.0.0",
- "templates.js": "0.0.12"
+ "templates.js": "0.0.13"
},
"devDependencies": {
"mocha": "~1.13.0"
diff --git a/public/language/ar/pages.json b/public/language/ar/pages.json
index 4624ca716b..c39934513a 100644
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -5,6 +5,7 @@
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Editing \"%1\"",
"user.following": "People %1 Follows",
"user.followers": "People who Follow %1",
diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json
index 50f8e43a59..930f642748 100644
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/cs/pages.json b/public/language/cs/pages.json
index 4624ca716b..c39934513a 100644
--- a/public/language/cs/pages.json
+++ b/public/language/cs/pages.json
@@ -5,6 +5,7 @@
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Editing \"%1\"",
"user.following": "People %1 Follows",
"user.followers": "People who Follow %1",
diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json
index 380ce53ff2..fd1e316089 100644
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/de/email.json b/public/language/de/email.json
index 98e591ab02..e3c67dc47b 100644
--- a/public/language/de/email.json
+++ b/public/language/de/email.json
@@ -1,20 +1,20 @@
{
- "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": "Zurücksetzung des Passworts beantragt - %1!",
+ "welcome-to": "Willkommen zu %1",
+ "greeting_no_name": "Hallo",
+ "greeting_with_name": "Hallo %1",
+ "welcome.text1": "Vielen Dank für die Registrierung mit %1!",
+ "welcome.text2": "Um dein Konto vollständig zu aktivieren, müssen wir überprüfen, ob du Besitzer der E-Mail-Adresse bist, mit der du dich registriert hast.",
+ "welcome.cta": "Klicke hier, um deine E-Mail-Adresse zu bestätigen.",
+ "reset.text1": "Wir haben eine Anfrage auf Zurücksetzung deines Passworts erhalten, wahrscheinlich, weil du es vergessen hast. Falls dies nicht der Fall ist, ignoriere bitte diese E-Mail.",
+ "reset.text2": "Klicke bitte auf den folgenden Link, um mit der Zurücksetzung deines Passworts fortzufahren:",
+ "reset.cta": "Klicke hier, um dein Passwort zurückzusetzen",
+ "digest.notifications": "Du hast einige ungelesene Benachrichtigungen vom %1:",
+ "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",
+ "test.text1": "Dies ist eine Test-E-Mail, um zu überprüfen, ob der E-Mailer deines NodeBB korrekt eingestellt wurde.",
+ "closing": "Danke!"
}
\ No newline at end of file
diff --git a/public/language/de/error.json b/public/language/de/error.json
index 2115517dcd..73e0f64c0e 100644
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -25,7 +25,7 @@
"no-user": "Der Benutzer existiert nicht",
"no-teaser": "Kurztext existiert nicht",
"no-privileges": "Du verfügst nicht über ausreichende Berechtigungen, um die Aktion durchzuführen.",
- "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
+ "no-emailers-configured": "Es wurde keine E-Mail-Plugins geladen, weshalb eine Test-E-Mail nicht gesendet werden konnte.",
"category-disabled": "Kategorie ist deaktiviert",
"topic-locked": "Thema ist gesperrt",
"still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.",
diff --git a/public/language/de/groups.json b/public/language/de/groups.json
index c00c111e11..445891944a 100644
--- a/public/language/de/groups.json
+++ b/public/language/de/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": "Gruppe betrachten",
+ "details.title": "Gruppendetails",
+ "details.members": "Mitgliederliste",
+ "details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.",
+ "details.latest_posts": "Aktuelle Beiträge"
}
\ No newline at end of file
diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json
index c89667bd8c..295796f5d6 100644
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -4,9 +4,9 @@
"see_all": "Alle Benachrichtigungen ansehen",
"back_to_home": "Zurück zu %1",
"outgoing_link": "Externer Link",
- "outgoing_link_message": "You are now leaving %1.",
- "continue_to": "Continue to %1",
- "return_to": "Return to %1",
+ "outgoing_link_message": "Du verlässt nun %1.",
+ "continue_to": "Fortfahren zu %1",
+ "return_to": "Kehre zurück zu %1",
"new_notification": "Neue Benachrichtigung",
"you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.",
"new_message_from": "Neue Nachricht von %1",
diff --git a/public/language/de/pages.json b/public/language/de/pages.json
index 41ddcbb35c..c49854a2a4 100644
--- a/public/language/de/pages.json
+++ b/public/language/de/pages.json
@@ -5,6 +5,7 @@
"recent": "Neueste Themen",
"users": "Registrierte User",
"notifications": "Benachrichtigungen",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Bearbeite \"%1\"",
"user.following": "Nutzer, die %1 folgt",
"user.followers": "Nutzer, die %1 folgen",
diff --git a/public/language/de/search.json b/public/language/de/search.json
index d0ffc64f36..47ca0be16b 100644
--- a/public/language/de/search.json
+++ b/public/language/de/search.json
@@ -1,3 +1,3 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)"
}
\ No newline at end of file
diff --git a/public/language/de/topic.json b/public/language/de/topic.json
index 5e3e4b7b7f..85edcd53c7 100644
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 weitere(r) Nutzer und %2 Gäste",
"more_users": "%1 weitere(r) Nutzer",
"more_guests": "%1 weitere Gäste",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sortieren nach",
"oldest_to_newest": "Älteste zuerst",
"newest_to_oldest": "Neuster zuerst",
diff --git a/public/language/en@pirate/pages.json b/public/language/en@pirate/pages.json
index 4624ca716b..c39934513a 100644
--- a/public/language/en@pirate/pages.json
+++ b/public/language/en@pirate/pages.json
@@ -5,6 +5,7 @@
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Editing \"%1\"",
"user.following": "People %1 Follows",
"user.followers": "People who Follow %1",
diff --git a/public/language/en@pirate/topic.json b/public/language/en@pirate/topic.json
index 1bc77817a0..aa69261f90 100644
--- a/public/language/en@pirate/topic.json
+++ b/public/language/en@pirate/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/en_US/pages.json b/public/language/en_US/pages.json
index 9925d77393..d235dcb87f 100644
--- a/public/language/en_US/pages.json
+++ b/public/language/en_US/pages.json
@@ -5,6 +5,7 @@
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Editing \"%1\"",
"user.following": "People %1 Follows",
"user.followers": "People who Follow %1",
diff --git a/public/language/en_US/topic.json b/public/language/en_US/topic.json
index c7909fb23b..8ffca481ab 100644
--- a/public/language/en_US/topic.json
+++ b/public/language/en_US/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/es/pages.json b/public/language/es/pages.json
index 8d3b12a377..4b79bc293f 100644
--- a/public/language/es/pages.json
+++ b/public/language/es/pages.json
@@ -5,6 +5,7 @@
"recent": "Temas Recientes",
"users": "Usuarios Registrado",
"notifications": "Notificaciones",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Editando \"%1\"",
"user.following": "Gente que sigue %1 ",
"user.followers": "Seguidores de %1",
diff --git a/public/language/es/topic.json b/public/language/es/topic.json
index 1809fa5344..ae3fa08fc1 100644
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 usuario(s) y %2 invitado(s) más",
"more_users": "%1 usuario(s) más",
"more_guests": "%1 invitado(s) más",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Ordenar por",
"oldest_to_newest": "Más antiguo a más nuevo",
"newest_to_oldest": "Más nuevo a más antiguo",
diff --git a/public/language/et/pages.json b/public/language/et/pages.json
index 10e7b528cd..9cc027eaaf 100644
--- a/public/language/et/pages.json
+++ b/public/language/et/pages.json
@@ -5,6 +5,7 @@
"recent": "Hiljutised teemad",
"users": "Registreeritud kasutajad",
"notifications": "Teated",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Muudan \"%1\"",
"user.following": "Kasutaja %1 jälgib",
"user.followers": "Kasutajad, kes jälgivad %1",
diff --git a/public/language/et/topic.json b/public/language/et/topic.json
index 2bb35ffe5a..dc4dcc62cb 100644
--- a/public/language/et/topic.json
+++ b/public/language/et/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 kasutaja(t) ja %2 külalist",
"more_users": "veel %1 kasutaja(t)",
"more_guests": "veel %1 külalist",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sorteeri",
"oldest_to_newest": "Vanematest uuemateni",
"newest_to_oldest": "Uuematest vanemateni",
diff --git a/public/language/fa_IR/pages.json b/public/language/fa_IR/pages.json
index cb5c9f00c8..94458a27a2 100644
--- a/public/language/fa_IR/pages.json
+++ b/public/language/fa_IR/pages.json
@@ -5,6 +5,7 @@
"recent": "جستارهای تازه",
"users": "کاربران نامنویسی شده",
"notifications": "آگاهسازیها",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "ویرایش \"%1\"",
"user.following": "%1 کاربر دنبال میکنند",
"user.followers": "کاربرانی که %1 را دنبال میکنند",
diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json
index 57218b749b..1c525fad8b 100644
--- a/public/language/fa_IR/topic.json
+++ b/public/language/fa_IR/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 کاربر() و %2 مهمان()",
"more_users": "1% کاربر()",
"more_guests": "1% مهمان()",
+ "users_and_others": "%1 and %2 others",
"sort_by": "مرتبسازی بر اساس",
"oldest_to_newest": "قدیمیترین به جدیدترین",
"newest_to_oldest": "جدیدترین به قدیمیترین",
diff --git a/public/language/fi/pages.json b/public/language/fi/pages.json
index 90f897fa57..899ce00bf2 100644
--- a/public/language/fi/pages.json
+++ b/public/language/fi/pages.json
@@ -5,6 +5,7 @@
"recent": "Viimeisimmät aiheet",
"users": "Rekisteröityneet käyttäjät",
"notifications": "Ilmoitukset",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Muokataan \"%1\"",
"user.following": "Käyttäjät, joita %1 seuraa",
"user.followers": "Käyttäjät, jotka seuraavat käyttäjää %1",
diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json
index ae13539de4..ad1ef0f1a0 100644
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/fr/pages.json b/public/language/fr/pages.json
index 994604a5b8..ad713d898b 100644
--- a/public/language/fr/pages.json
+++ b/public/language/fr/pages.json
@@ -5,6 +5,7 @@
"recent": "Sujets récents",
"users": "Utilisateurs enregistrés",
"notifications": "Notifications",
+ "tags": "Sujets contenant le mot-clé \"%1\"",
"user.edit": "Edite \"%1\"",
"user.following": "Personnes que %1 suit",
"user.followers": "Personnes qui suivent %1",
diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json
index 87d6eb4065..47473793ec 100644
--- a/public/language/fr/topic.json
+++ b/public/language/fr/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 autre(s) utilisateur(s) et %2 invité(s)",
"more_users": "%1 autre(s) utilisateur(s)",
"more_guests": "%1 autre(s) invité(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Trier",
"oldest_to_newest": "Du plus ancien au plus récent",
"newest_to_oldest": "Du plus récent au plus ancien",
diff --git a/public/language/he/pages.json b/public/language/he/pages.json
index 223dfd6d5d..d12dc6944f 100644
--- a/public/language/he/pages.json
+++ b/public/language/he/pages.json
@@ -5,6 +5,7 @@
"recent": "נושאים אחרונים",
"users": "משתמשים רשומים",
"notifications": "התראות",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "עורך את %1",
"user.following": "אנשים ש%1 עוקב אחריהם",
"user.followers": "אנשים שעוקבים אחרי %1",
diff --git a/public/language/he/topic.json b/public/language/he/topic.json
index 134317c2d8..8bff5a472c 100644
--- a/public/language/he/topic.json
+++ b/public/language/he/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/hu/pages.json b/public/language/hu/pages.json
index 5ea9bdd9a7..7057c11031 100644
--- a/public/language/hu/pages.json
+++ b/public/language/hu/pages.json
@@ -5,6 +5,7 @@
"recent": "Friss Topikok",
"users": "Regisztrált Felhasználók",
"notifications": "Értesítések",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Szerkesztés \"%1\"",
"user.following": "Tagok akiket %1 követ",
"user.followers": "Tagok akik követik %1 -t",
diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json
index bd8d405739..693d3466f5 100644
--- a/public/language/hu/topic.json
+++ b/public/language/hu/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/it/pages.json b/public/language/it/pages.json
index b60ecd15b3..68cf073ea7 100644
--- a/public/language/it/pages.json
+++ b/public/language/it/pages.json
@@ -5,6 +5,7 @@
"recent": "Argomenti Recenti",
"users": "Utenti Registrati",
"notifications": "Notifiche",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Modificando \"%1\"",
"user.following": "%1 Persone seguono",
"user.followers": "Persone che seguono %1",
diff --git a/public/language/it/topic.json b/public/language/it/topic.json
index bf4f5051e8..5f18f9cd39 100644
--- a/public/language/it/topic.json
+++ b/public/language/it/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json
index e9494c8d3f..36295b2fa5 100644
--- a/public/language/ja/pages.json
+++ b/public/language/ja/pages.json
@@ -5,6 +5,7 @@
"recent": "最新スレッド",
"users": "登録したユーザー",
"notifications": "通知",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "編集中 \"%1\"",
"user.following": "%1がフォロー中",
"user.followers": "%1のフォロワー",
diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json
index f2411f91c8..7d24e2e34f 100644
--- a/public/language/ja/topic.json
+++ b/public/language/ja/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/ko/error.json b/public/language/ko/error.json
index 8923760f72..fa961bc709 100644
--- a/public/language/ko/error.json
+++ b/public/language/ko/error.json
@@ -2,21 +2,21 @@
"invalid-data": "올바르지 않은 정보입니다.",
"not-logged-in": "로그인하지 않았습니다.",
"account-locked": "임시로 잠긴 계정입니다.",
- "search-requires-login": "Searching requires an account! Please login or register!",
+ "search-requires-login": "검색을 위해서는 계정이 필요합니다. 로그인하거나 회원가입 해 주십시오.",
"invalid-cid": "올바르지 않은 카테고리 ID입니다.",
"invalid-tid": "올바르지 않은 주제 ID입니다.",
"invalid-pid": "올바르지 않은 게시물 ID입니다.",
"invalid-uid": "올바르지 않은 사용자 ID입니다.",
"invalid-username": "올바르지 않은 사용자 이름입니다.",
"invalid-email": "올바르지 않은 이메일입니다.",
- "invalid-title": "Invalid title!",
+ "invalid-title": "올바르지 않은 제목입니다.",
"invalid-user-data": "올바르지 않은 사용자 정보입니다.",
"invalid-password": "올바르지 않은 비밀번호입니다.",
"invalid-pagination-value": "올바르지 않은 페이지입니다.",
"username-taken": "이미 사용 중인 사용자 이름입니다.",
"email-taken": "이미 사용 중인 이메일입니다.",
- "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
- "username-too-short": "Username too short",
+ "email-not-confirmed": "아직 이메일이 인증되지 않았습니다. 여기를 누르면 인증 메일을 발송할 수 있습니다.",
+ "username-too-short": "사용자 이름이 너무 짧습니다.",
"user-banned": "차단된 사용자입니다.",
"no-category": "존재하지 않는 카테고리입니다.",
"no-topic": "존재하지 않는 주제입니다.",
@@ -25,7 +25,7 @@
"no-user": "존재하지 않는 사용자입니다.",
"no-teaser": "존재하지 않는 미리보기입니다.",
"no-privileges": "이 작업을 할 수 있는 권한이 없습니다.",
- "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
+ "no-emailers-configured": "이메일 추가기능이 로드되지 않았으므로 테스트 메일을 발송할 수 없습니다.",
"category-disabled": "비활성화된 카테고리입니다.",
"topic-locked": "잠긴 주제입니다.",
"still-uploading": "업로드가 끝날 때까지 기다려 주세요.",
@@ -34,9 +34,9 @@
"title-too-long": "제목은 최대 %1자로 제한됩니다.",
"too-many-posts": "새 게시물 작성은 %1초 간격으로 제한됩니다",
"file-too-big": "파일의 크기는 최대 %1KB로 제한됩니다.",
- "cant-vote-self-post": "자신의 게시물은 추천할 수 없습니다.",
+ "cant-vote-self-post": "자신의 게시물에는 투표할 수 없습니다.",
"already-favourited": "이미 이 게시물을 좋아하는 중입니다.",
- "already-unfavourited": "You already unfavourited this post",
+ "already-unfavourited": "이미 이 게시물을 좋아하고 있지 않습니다.",
"cant-ban-other-admins": "다른 관리자를 차단할 수 없습니다.",
"invalid-image-type": "올바르지 않은 이미지입니다.",
"group-name-too-short": "그룹 이름이 너무 짧습니다.",
@@ -49,8 +49,8 @@
"topic-thumbnails-are-disabled": "주제 섬네일이 이미 해제되었습니다.",
"invalid-file": "올바르지 않은 파일입니다.",
"uploads-are-disabled": "업로드는 비활성화되어 있습니다.",
- "upload-error": "Upload Error : %1",
+ "upload-error": "업로드 오류가 발생했습니다. : %1",
"signature-too-long": "서명은 최대 %1자로 제한됩니다.",
"cant-chat-with-yourself": "자신과는 채팅할 수 없습니다.",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "not-enough-reputation-to-downvote": "인기도가 낮아 이 게시물에 반대할 수 없습니다."
}
\ No newline at end of file
diff --git a/public/language/ko/global.json b/public/language/ko/global.json
index 8f95e8602a..0a124a111c 100644
--- a/public/language/ko/global.json
+++ b/public/language/ko/global.json
@@ -13,17 +13,17 @@
"please_log_in": "로그인해 주세요.",
"logout": "로그아웃",
"posting_restriction_info": "게시물 작성은 현재 회원에게만 제한되고 있습니다. 여기를 누르면 로그인 페이지로 이동합니다.",
- "welcome_back": "Welcome Back",
+ "welcome_back": "환영합니다.",
"you_have_successfully_logged_in": "성공적으로 로그인했습니다.",
"save_changes": "저장",
"close": "닫기",
"pagination": "페이지",
"pagination.out_of": "%1개 중 %2개",
- "pagination.enter_index": "Enter index",
+ "pagination.enter_index": "이동할 게시물 번호를 입력하세요.",
"header.admin": "관리자",
"header.recent": "최근 주제",
"header.unread": "읽지 않은 주제",
- "header.tags": "Tags",
+ "header.tags": "태그",
"header.popular": "인기 주제",
"header.users": "사용자",
"header.chats": "채팅",
@@ -70,6 +70,6 @@
"language": "언어",
"guest": "익명 사용자",
"guests": "익명 사용자",
- "updated.title": "Forum Updated",
- "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+ "updated.title": "포럼이 업데이트 되었습니다.",
+ "updated.message": "이 포럼은 지금 최신 버전으로 업데이트 되었습니다. 여기를 누르면 페이지를 새로고침합니다."
}
\ No newline at end of file
diff --git a/public/language/ko/pages.json b/public/language/ko/pages.json
index 230a012757..e72e0b57c0 100644
--- a/public/language/ko/pages.json
+++ b/public/language/ko/pages.json
@@ -5,6 +5,7 @@
"recent": "최근 주제",
"users": "사용자",
"notifications": "알림",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "%1님의 프로필 수정",
"user.following": "%1님이 팔로우하는 사용자",
"user.followers": "%1님을 팔로우하는 사용자",
diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json
index e881cd9285..3619cdc736 100644
--- a/public/language/ko/topic.json
+++ b/public/language/ko/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1명 이상의 회원과 %2명의 익명 사용자",
"more_users": "%1명 이상의 회원",
"more_guests": "%1명 이상의 익명 사용자",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/ko/user.json b/public/language/ko/user.json
index af07583300..baf5183211 100644
--- a/public/language/ko/user.json
+++ b/public/language/ko/user.json
@@ -3,7 +3,7 @@
"offline": "오프라인",
"username": "사용자 이름",
"email": "이메일",
- "confirm_email": "Confirm Email",
+ "confirm_email": "이메일 확인",
"fullname": "이름",
"website": "웹 사이트",
"location": "거주지",
diff --git a/public/language/lt/pages.json b/public/language/lt/pages.json
index 78be933e04..4e62692bd3 100644
--- a/public/language/lt/pages.json
+++ b/public/language/lt/pages.json
@@ -5,6 +5,7 @@
"recent": "Paskutinės temos",
"users": "Registruoti vartotojai",
"notifications": "Pranešimai",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Redaguojama \"%1\"",
"user.following": "Vartotojas %1 seka",
"user.followers": "Žmonės, kurie seka %1",
diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json
index 2642f0dd00..2eb059c363 100644
--- a/public/language/lt/topic.json
+++ b/public/language/lt/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "dar %1 vartotojai(-ų) ir %2 svečiai(-ių)",
"more_users": "dar %1 vartotojai(-ų)",
"more_guests": "dar %1 svečiai(-ių)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Rūšiuoti pagal",
"oldest_to_newest": "Nuo seniausių iki naujausių",
"newest_to_oldest": "Nuo naujausių iki seniausių",
diff --git a/public/language/ms/email.json b/public/language/ms/email.json
index 98e591ab02..3126f0da9d 100644
--- a/public/language/ms/email.json
+++ b/public/language/ms/email.json
@@ -1,6 +1,6 @@
{
"password-reset-requested": "Password Reset Requested - %1!",
- "welcome-to": "Welcome to %1",
+ "welcome-to": "Selemat datang ke %1",
"greeting_no_name": "Hello",
"greeting_with_name": "Hello %1",
"welcome.text1": "Thank you for registering with %1!",
@@ -16,5 +16,5 @@
"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!"
+ "closing": "Terima Kasih!"
}
\ No newline at end of file
diff --git a/public/language/ms/error.json b/public/language/ms/error.json
index 77c582b23f..c76dc586f1 100644
--- a/public/language/ms/error.json
+++ b/public/language/ms/error.json
@@ -11,12 +11,12 @@
"invalid-email": "Invalid Email",
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
- "invalid-password": "Invalid Password",
+ "invalid-password": "Password salah!",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
- "username-too-short": "Username too short",
+ "username-too-short": "Nama pengunna terlalu pendek",
"user-banned": "User banned",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
diff --git a/public/language/ms/pages.json b/public/language/ms/pages.json
index 4c5ed0a755..0d1ab9ca76 100644
--- a/public/language/ms/pages.json
+++ b/public/language/ms/pages.json
@@ -5,6 +5,7 @@
"recent": "Topik Baru",
"users": "Pengguna Berdaftar",
"notifications": "Makluman",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Menyunting \"%1\"",
"user.following": "Pengguna yang %1 Ikuti",
"user.followers": "Pengguna yang Mengikuti %1",
diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json
index e18961bfc9..a40da8e224 100644
--- a/public/language/ms/topic.json
+++ b/public/language/ms/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/nb/pages.json b/public/language/nb/pages.json
index 614bbaa676..b0b5326983 100644
--- a/public/language/nb/pages.json
+++ b/public/language/nb/pages.json
@@ -5,6 +5,7 @@
"recent": "Seneste emner",
"users": "Registrerte brukere",
"notifications": "Varsler",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Endrer \"%1\"",
"user.following": "Personer %1 følger",
"user.followers": "Personer som følger %1",
diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json
index 7bc2eeff46..9aeddb6ecf 100644
--- a/public/language/nb/topic.json
+++ b/public/language/nb/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/nl/category.json b/public/language/nl/category.json
index d2dae2aa81..59ca9e6530 100644
--- a/public/language/nl/category.json
+++ b/public/language/nl/category.json
@@ -3,5 +3,5 @@
"no_topics": "Er zijn geen onderwerpen in deze categorie.
Waarom maak je er niet een aan?",
"browsing": "verkennen",
"no_replies": "Niemand heeft gereageerd",
- "share_this_category": "Share this category"
+ "share_this_category": "Deel deze categorie"
}
\ No newline at end of file
diff --git a/public/language/nl/email.json b/public/language/nl/email.json
index 98e591ab02..a4bd403e2a 100644
--- a/public/language/nl/email.json
+++ b/public/language/nl/email.json
@@ -1,20 +1,20 @@
{
- "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": "Wachtwoord Reset Aangevraagd - %1!",
+ "welcome-to": "Welkom bij %1",
+ "greeting_no_name": "Hallo",
+ "greeting_with_name": "Hallo %1",
+ "welcome.text1": "Bedank voor het registreren met %1!",
+ "welcome.text2": "Om u account volledig te activeren, moet u op de link klikken die u heeft ontvangen in uw inbox",
+ "welcome.cta": "Klik hier om te bevestigen met uw email adres",
+ "reset.text1": "Wij ontvingen een verzoek van u om uw wachtwoord te resetten. Als dat niet het geval is, kunt u deze mail negeren ",
+ "reset.text2": "Om uw wachtwoord te resetten, klik op de volgende link",
+ "reset.cta": "Klik hier om u wachtwoord te resetten",
+ "digest.notifications": "U heeft ongelezen notificaties van %1:",
+ "digest.latest_topics": "De laatste onderwerpen van %1",
+ "digest.cta": "Klik hier om deze website te bezoeken %1 ",
+ "digest.unsub.info": "Deze overzicht was verzonden naar jou vanwege je abbonement instellingen",
+ "digest.unsub.cta": "Klik hier om u instellingen te wijzigen",
+ "digest.daily.no_topics": "Er zijn geen actieve topics vandaag",
+ "test.text1": "Dit is een test email om te verifiëren dat de email service correct is opgezet voor jou NodeBB",
+ "closing": "Bedankt!"
}
\ No newline at end of file
diff --git a/public/language/nl/error.json b/public/language/nl/error.json
index 77c582b23f..b6a85567d1 100644
--- a/public/language/nl/error.json
+++ b/public/language/nl/error.json
@@ -1,56 +1,56 @@
{
- "invalid-data": "Invalid Data",
- "not-logged-in": "You don't seem to be logged in.",
- "account-locked": "Your account has been locked temporarily",
- "search-requires-login": "Searching requires an account! Please login or register!",
- "invalid-cid": "Invalid Category ID",
- "invalid-tid": "Invalid Topic ID",
- "invalid-pid": "Invalid Post ID",
- "invalid-uid": "Invalid User ID",
- "invalid-username": "Invalid Username",
- "invalid-email": "Invalid Email",
- "invalid-title": "Invalid title!",
- "invalid-user-data": "Invalid User Data",
- "invalid-password": "Invalid Password",
- "invalid-pagination-value": "Invalid pagination value",
- "username-taken": "Username taken",
- "email-taken": "Email taken",
- "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
- "username-too-short": "Username too short",
- "user-banned": "User banned",
- "no-category": "Category doesn't exist",
- "no-topic": "Topic doesn't exist",
- "no-post": "Post doesn't exist",
- "no-group": "Group doesn't exist",
- "no-user": "User doesn't exist",
- "no-teaser": "Teaser doesn't exist",
- "no-privileges": "You don't have enough privileges for this action.",
- "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
- "category-disabled": "Category disabled",
- "topic-locked": "Topic Locked",
- "still-uploading": "Please wait for uploads to complete.",
- "content-too-short": "Please enter a longer post. At least %1 characters.",
- "title-too-short": "Please enter a longer title. At least %1 characters.",
- "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
- "too-many-posts": "You can only post every %1 seconds.",
- "file-too-big": "Maximum allowed file size is %1 kbs",
- "cant-vote-self-post": "You cannot vote for your own post",
- "already-favourited": "You already favourited this post",
- "already-unfavourited": "You already unfavourited this post",
- "cant-ban-other-admins": "You can't ban other admins!",
- "invalid-image-type": "Invalid image type",
- "group-name-too-short": "Group name too short",
- "group-already-exists": "Group already exists",
- "group-name-change-not-allowed": "Group name change not allowed",
- "post-already-deleted": "Post already deleted",
- "post-already-restored": "Post already restored",
- "topic-already-deleted": "Topic already deleted",
- "topic-already-restored": "Topic already restored",
- "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
- "invalid-file": "Invalid File",
- "uploads-are-disabled": "Uploads are disabled",
- "upload-error": "Upload Error : %1",
- "signature-too-long": "Signature can't be longer than %1 characters!",
- "cant-chat-with-yourself": "You can't chat with yourself!",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "invalid-data": "Ongeldige Data",
+ "not-logged-in": "Het lijkt dat je niet bent ingelogd.",
+ "account-locked": "U account is tijdelijk geblockt",
+ "search-requires-login": "Het zoeken naar berichten of topics vereist een account. Registreer een account of meld u aan.",
+ "invalid-cid": "Ongeldig Categorie ID",
+ "invalid-tid": "Ongeldig Onderwerp ID",
+ "invalid-pid": "Ongeldig Bericht ID",
+ "invalid-uid": "Ongeldig Gebruikers ID",
+ "invalid-username": "Ongeldig Gebruikersnaam",
+ "invalid-email": "Ongeldig Email Adres",
+ "invalid-title": "Ongeldig Titel!",
+ "invalid-user-data": "Ongeldig Gebruikersdata",
+ "invalid-password": "Ongeldig wachtwoord",
+ "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",
+ "user-banned": "Gebruiker verbannen",
+ "no-category": "Categorie bestaat niet",
+ "no-topic": "Onderwerp bestaat niet",
+ "no-post": "Bericht bestaat niet",
+ "no-group": "Groep bestaat niet",
+ "no-user": "Gebruiker bestaat niet",
+ "no-teaser": "kort bericht bestaat niet",
+ "no-privileges": "U heeft niet voldoende rechten om deze actie te doen",
+ "no-emailers-configured": "Er zijn geen email plugins geladen, een test email kan dus niet verzonden worden",
+ "category-disabled": "Categorie uitgeschakeld",
+ "topic-locked": "Onderwerp gesloten",
+ "still-uploading": "Heb even geduld totdat de alle bestanden geüpload zijn",
+ "content-too-short": "Maak de bericht wat langer. Op z'n minst %1 karakters",
+ "title-too-short": "Maak de titel wat langer. Op z'n minst %1 karakters",
+ "title-too-long": "Maak de titel wat korter. Het kan niet langer zijn dan %1 karakters",
+ "too-many-posts": "Je kan elke %1 seconden een bericht aanmaken",
+ "file-too-big": "De maximale bestandsgrootte is %1 kbs",
+ "cant-vote-self-post": "Je kan niet op je eigen berichten stemmen",
+ "already-favourited": "U heeft al dit bericht in uw favorieten staan",
+ "already-unfavourited": "U heeft al dit bericht uit uw favorieten gehaald",
+ "cant-ban-other-admins": "U kunt niet de andere admins bannen!",
+ "invalid-image-type": "Ongeldig foto type",
+ "group-name-too-short": "De groepsnaam is te kort",
+ "group-already-exists": "Deze groep bestaat al",
+ "group-name-change-not-allowed": "Het veranderen van de groepsnaam is niet toegestaan!",
+ "post-already-deleted": "Bericht is al verwijderd",
+ "post-already-restored": "Bericht is al hersteld",
+ "topic-already-deleted": "Onderwerp is al verwijderd",
+ "topic-already-restored": "Onderwerp is al hersteld",
+ "topic-thumbnails-are-disabled": "Onderwerp thumbnails zijn uitgeschakeld",
+ "invalid-file": "Ongeldig bestand",
+ "uploads-are-disabled": "Uploads zijn uitgeschakeld",
+ "upload-error": "Upload Fout : %1",
+ "signature-too-long": "Deze handtekening kan niet groter zijn dan %1 karakters!",
+ "cant-chat-with-yourself": "Je kan niet met jezelf chatten!",
+ "not-enough-reputation-to-downvote": "U heeft niet de benodigde reputatie om dit bericht te downvoten"
}
\ No newline at end of file
diff --git a/public/language/nl/global.json b/public/language/nl/global.json
index 9bee43800a..94f5da88ba 100644
--- a/public/language/nl/global.json
+++ b/public/language/nl/global.json
@@ -13,13 +13,13 @@
"please_log_in": "Log a.u.b. In",
"logout": "Uitloggen",
"posting_restriction_info": "Reageren is momenteel beperkt tot geregistreerde leden, klik hier om in te loggen.",
- "welcome_back": "Welcome Back",
+ "welcome_back": "Welkom Terug",
"you_have_successfully_logged_in": "Je bent succesvol ingelogd",
"save_changes": "Aanpassingen Opslaan",
"close": "Sluiten",
"pagination": "Paginering",
- "pagination.out_of": "%1 out of %2",
- "pagination.enter_index": "Enter index",
+ "pagination.out_of": "%1 van %2",
+ "pagination.enter_index": "Vul index in",
"header.admin": "Admin",
"header.recent": "Recent",
"header.unread": "Ongelezen",
@@ -38,38 +38,38 @@
"alert.success": "Succes",
"alert.error": "Fout",
"alert.banned": "Verbannen",
- "alert.banned.message": "You have just been banned, you will now be logged out.",
+ "alert.banned.message": "U bent verbannen en zal automatisch worden uitgelogd.",
"alert.unfollow": "Je volgt niet langer %1!",
"alert.follow": "Je volgt nu %1!",
"online": "Online",
- "users": "Users",
+ "users": "Gebruikers",
"topics": "Topics",
"posts": "Berichten",
"views": "Weergaven",
- "reputation": "Reputation",
- "read_more": "read more",
- "posted_ago_by_guest": "posted %1 by Guest",
- "posted_ago_by": "posted %1 by %2",
- "posted_ago": "posted %1",
- "posted_in_ago_by_guest": "posted in %1 %2 by Guest",
- "posted_in_ago_by": "posted in %1 %2 by %3",
- "posted_in_ago": "posted in %1 %2",
- "replied_ago": "replied %1",
- "user_posted_ago": "%1 posted %2",
- "guest_posted_ago": "Guest posted %1",
- "last_edited_by_ago": "last edited by %1 %2",
- "norecentposts": "No Recent Posts",
- "norecenttopics": "No Recent Topics",
+ "reputation": "Reputatie",
+ "read_more": "Lees meer",
+ "posted_ago_by_guest": "geplaatst %1 door gast",
+ "posted_ago_by": "geplaatst %1 door %2",
+ "posted_ago": "geplaatst %1",
+ "posted_in_ago_by_guest": "geplaatst in % 1 %2 door gast",
+ "posted_in_ago_by": "geplaatst in %1 %2 door %3",
+ "posted_in_ago": "geplaatst in %1 %2",
+ "replied_ago": "gereageerd %1",
+ "user_posted_ago": "%1 geplaatst %2",
+ "guest_posted_ago": "Gast plaatste %1",
+ "last_edited_by_ago": "voor het laatst aangepast door %1 %2",
+ "norecentposts": "Geen Recente Berichten",
+ "norecenttopics": "Geen Recente Topics",
"recentposts": "Recente Berichten",
"recentips": "Recente Ingelogde IPs",
"away": "Afwezig",
"dnd": "Niet Storen",
"invisible": "Onzichtbaar",
"offline": "Offline",
- "email": "Email",
- "language": "Language",
- "guest": "Guest",
- "guests": "Guests",
- "updated.title": "Forum Updated",
- "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
+ "email": "Email Adres",
+ "language": "Taal",
+ "guest": "Gast",
+ "guests": "Gasten",
+ "updated.title": "Forum geüpdatet",
+ "updated.message": "Dit forum is zojuist geüpdatet naar de laatste versie. Klik hier om de pagina te verversen"
}
\ No newline at end of file
diff --git a/public/language/nl/groups.json b/public/language/nl/groups.json
index c00c111e11..bc1f6d2d7f 100644
--- a/public/language/nl/groups.json
+++ b/public/language/nl/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": "Bekijk Groep",
+ "details.title": "Groep Details",
+ "details.members": "Ledenlijst",
+ "details.has_no_posts": "Deze groepleden hebben nog geen berichten geplaatst",
+ "details.latest_posts": "Nieuwste Berichten"
}
\ No newline at end of file
diff --git a/public/language/nl/login.json b/public/language/nl/login.json
index b23c3742a3..ea7a6e3bcd 100644
--- a/public/language/nl/login.json
+++ b/public/language/nl/login.json
@@ -1,9 +1,9 @@
{
- "username": "Username / Email",
+ "username": "Gebruikersnaam / Emailadres",
"remember_me": "Mij Onthouden?",
"forgot_password": "Wachtwoord Vergeten?",
"alternative_logins": "Alternatieve Logins",
"failed_login_attempt": "Mislukte inlog poging, probeer het later opnieuw.",
"login_successful": "Je bent succesvol ingelogd!",
- "dont_have_account": "Don't have an account?"
+ "dont_have_account": "Heeft u nog geen account?"
}
\ No newline at end of file
diff --git a/public/language/nl/modules.json b/public/language/nl/modules.json
index f499ce34e5..caaae8472f 100644
--- a/public/language/nl/modules.json
+++ b/public/language/nl/modules.json
@@ -1,18 +1,18 @@
{
"chat.chatting_with": "Chat met ",
- "chat.placeholder": "Type chat message here, press enter to send",
+ "chat.placeholder": "Type chat bericht hier, druk op enter om te verzenden",
"chat.send": "Verzenden",
"chat.no_active": "Je hebt geen actieve chats.",
- "chat.user_typing": "%1 is typing ...",
- "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_typing": "%1 is aan het typen ...",
+ "chat.user_has_messaged_you": "%1 heeft een bericht naar u gestuurd",
+ "chat.see_all": "Bekijk alle gesprekken",
+ "chat.no-messages": "Selecteer een ontvanger om de geschiedenis van het gesprek te bekijken",
+ "chat.recent-chats": "Recente Gesprekken",
+ "chat.contacts": "Contacten",
+ "chat.message-history": "Berichten Geschiedenis",
+ "chat.pop-out": "tevoorschijn halen gesprek",
+ "chat.maximize": "Maximaliseren",
+ "composer.user_said_in": "%1 zegt in %2:",
+ "composer.user_said": "%1 zegt:",
+ "composer.discard": "Weet u het zeker dat u dit bericht niet wilt plaatsen?"
}
\ No newline at end of file
diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json
index 9c35d2e8d3..6758b7959f 100644
--- a/public/language/nl/notifications.json
+++ b/public/language/nl/notifications.json
@@ -2,22 +2,22 @@
"title": "Notificaties",
"no_notifs": "Je hebt geen nieuwe notificaties",
"see_all": "Bekijk alle Notificaties",
- "back_to_home": "Back to %1",
+ "back_to_home": "Terug naar %1",
"outgoing_link": "Uitgaande Link",
- "outgoing_link_message": "You are now leaving %1.",
- "continue_to": "Continue to %1",
- "return_to": "Return to %1",
- "new_notification": "New Notification",
- "you_have_unread_notifications": "You have unread notifications.",
- "new_message_from": "New message from %1",
- "upvoted_your_post": "%1 has upvoted your post.",
- "favourited_your_post": "%1 has favourited your post.",
- "user_flagged_post": "%1 flagged a post.",
- "user_posted_to": "%1 has posted a reply to: %2",
- "user_mentioned_you_in": "%1 mentioned you in %2",
- "email-confirmed": "Email Confirmed",
- "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
- "email-confirm-error": "An error occurred...",
- "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.",
- "email-confirm-sent": "Confirmation email sent."
+ "outgoing_link_message": "Je verlaat nu %1",
+ "continue_to": "Doorgaan naar %1",
+ "return_to": "Teruggaan naar %1",
+ "new_notification": "een nieuwe notificatie",
+ "you_have_unread_notifications": "U heeft ongelezen notificaties",
+ "new_message_from": "Nieuw bericht van %1",
+ "upvoted_your_post": "%1 heeft uw bericht geupvote",
+ "favourited_your_post": "%1 heeft uw bericht aan zijn favorieten toegevoegd",
+ "user_flagged_post": "%1 rapporteert uw bericht",
+ "user_posted_to": "%1 heeft een reactie op het bericht gegeven aan %2",
+ "user_mentioned_you_in": "%1 heeft u genoemd in %2",
+ "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",
+ "email-confirm-error-message": "Er was een probleem met het bevestigen van uw email adres. Misschien was de code niet goed of was door de tijd verstreken.",
+ "email-confirm-sent": "Bevestigings email verstuurd"
}
\ No newline at end of file
diff --git a/public/language/nl/pages.json b/public/language/nl/pages.json
index c1e46c21a6..3a82ff7af7 100644
--- a/public/language/nl/pages.json
+++ b/public/language/nl/pages.json
@@ -5,11 +5,12 @@
"recent": "Recente Onderwerpen",
"users": "Geregistreerde Gebruikers",
"notifications": "Notificaties",
+ "tags": "Onderwerpen getagd onder \"%1\"",
"user.edit": "\"%1\" aanpassen",
"user.following": "Mensen %1 Volgt",
"user.followers": "Mensen die %1 Volgen",
"user.posts": "Berichten geplaatst door %1",
- "user.topics": "Topics created by %1",
+ "user.topics": "Topics gecreëerd door %1",
"user.favourites": "%1's Favoriete Berichten",
"user.settings": "Gebruikersinstellingen"
}
\ No newline at end of file
diff --git a/public/language/nl/recent.json b/public/language/nl/recent.json
index b5181aa778..2bfc4af744 100644
--- a/public/language/nl/recent.json
+++ b/public/language/nl/recent.json
@@ -3,6 +3,6 @@
"day": "Dag",
"week": "Week",
"month": "Maand",
- "year": "Year",
+ "year": "Jaar",
"no_recent_topics": "Er zijn geen recente reacties."
}
\ No newline at end of file
diff --git a/public/language/nl/reset_password.json b/public/language/nl/reset_password.json
index fc49520840..a529b6b8f8 100644
--- a/public/language/nl/reset_password.json
+++ b/public/language/nl/reset_password.json
@@ -8,7 +8,7 @@
"new_password": "Nieuw Wachtwoord",
"repeat_password": "Bevestig Wachtwoord",
"enter_email": "Vul a.u.b. je email address in en we versturen je een email met de stappen hoe je je account reset.",
- "enter_email_address": "Enter Email Address",
+ "enter_email_address": "Vul uw Email Adres in",
"password_reset_sent": "Wachtwoord Reset Verzonden",
"invalid_email": "Fout Email Adres / Email Adres bestaat niet!"
}
\ No newline at end of file
diff --git a/public/language/nl/search.json b/public/language/nl/search.json
index d0ffc64f36..b7035add16 100644
--- a/public/language/nl/search.json
+++ b/public/language/nl/search.json
@@ -1,3 +1,3 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 resulta(a)ten was een match \"%2\", (%3 seconds)"
}
\ No newline at end of file
diff --git a/public/language/nl/success.json b/public/language/nl/success.json
index fde8a77044..f8fd81d695 100644
--- a/public/language/nl/success.json
+++ b/public/language/nl/success.json
@@ -1,6 +1,6 @@
{
"success": "Success",
- "topic-post": "You have successfully posted.",
- "authentication-successful": "Authentication Successful",
- "settings-saved": "Settings saved!"
+ "topic-post": "U heeft succesvol een bericht geplaatst",
+ "authentication-successful": "Het inloggen is succesvol",
+ "settings-saved": "Instellingen opgeslagen!"
}
\ No newline at end of file
diff --git a/public/language/nl/tags.json b/public/language/nl/tags.json
index f065d4bbfa..b657763651 100644
--- a/public/language/nl/tags.json
+++ b/public/language/nl/tags.json
@@ -1,6 +1,6 @@
{
- "no_tag_topics": "There are no topics with this tag.",
+ "no_tag_topics": "Er zijn geen onderwerpen met deze tag",
"tags": "Tags",
- "enter_tags_here": "Enter tags here. Press enter after each tag.",
- "no_tags": "There are no tags yet."
+ "enter_tags_here": "Voer hier uw tags in. Druk op enter na elke tag ingevoerd te hebben",
+ "no_tags": "Er zijn nog geen tags te vinden"
}
\ No newline at end of file
diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json
index 4e91a3c4ae..800d6348ca 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -1,20 +1,20 @@
{
"topic": "Onderwerp",
- "topic_id": "Topic ID",
- "topic_id_placeholder": "Enter topic ID",
+ "topic_id": "Onderwerp ID",
+ "topic_id_placeholder": "Vul Onderwerp ID in",
"no_topics_found": "Geen onderwerpen gevonden!",
"no_posts_found": "Geen berichten gevonden!",
- "post_is_deleted": "This post is deleted!",
+ "post_is_deleted": "Dit bericht is verwijderd!",
"profile": "Profiel",
- "posted_by": "Posted by %1",
- "posted_by_guest": "Posted by Guest",
+ "posted_by": "Geplaatst door %1",
+ "posted_by_guest": "Geplaatst door Gast",
"chat": "Chat",
"notify_me": "Krijg notificaties van nieuwe reacties op dit onderwerp",
"quote": "Citeren",
"reply": "Reageren",
"edit": "Aanpassen",
"delete": "Verwijderen",
- "purge": "Purge",
+ "purge": "weggooien",
"restore": "Herstellen",
"move": "Verplaatsen",
"fork": "Fork",
@@ -23,18 +23,18 @@
"share": "Delen",
"tools": "Gereedschap",
"flag": "Markeren",
- "locked": "Locked",
+ "locked": "gesloten",
"bookmark_instructions": "Klik hier om terug te gaan naar je laatste positie of sluiten om te annuleren.",
"flag_title": "Dit bericht markeren voor moderatie",
- "flag_confirm": "Are you sure you want to flag this post?",
- "flag_success": "This post has been flagged for moderation.",
+ "flag_confirm": "Weet u het zeker dat u dit bericht wilt rapporteren?",
+ "flag_success": "Dit bericht is gerapporteerd aan de admins",
"deleted_message": "Dit onderwerp is verwijderd. Alleen gebruikers met onderwerp management privileges kunnen dit onderwerp zien.",
"following_topic.message": "Je zult nu notificaties ontvangen wanneer iemand reageert op dit onderwerp.",
"not_following_topic.message": "Je zult niet langer notificaties ontvangen van dit onderwerp.",
"login_to_subscribe": "Log a.u.b. in om op dit onderwerp te abonneren.",
"markAsUnreadForAll.success": "Onderwerp gemarkeerd als gelezen voor iedereen.",
"watch": "Volgen",
- "watch.title": "Be notified of new replies in this topic",
+ "watch.title": "Krijg notificaties van nieuwe reacties op dit onderwerp",
"share_this_post": "Deel dit Bericht",
"thread_tools.title": "Thread Gereedschap",
"thread_tools.markAsUnreadForAll": "Ongelezen Markeren",
@@ -43,18 +43,18 @@
"thread_tools.lock": "Onderwerp Sluiten",
"thread_tools.unlock": "Onderwerp Openen",
"thread_tools.move": "Onderwerp Verplaatsen",
- "thread_tools.move_all": "Move All",
+ "thread_tools.move_all": "Verplaats alles",
"thread_tools.fork": "Onderwerp Forken",
"thread_tools.delete": "Onderwerp Verwijderen",
- "thread_tools.delete_confirm": "Are you sure you want to delete this thread?",
+ "thread_tools.delete_confirm": "Weet u het zeker dat u dit onderwerp wilt verwijderen?",
"thread_tools.restore": "Onderwerp Herstellen",
- "thread_tools.restore_confirm": "Are you sure you want to restore this thread?",
- "thread_tools.purge": "Purge Topic",
- "thread_tools.purge_confirm": "Are you sure you want to purge this thread?",
- "topic_move_success": "This topic has been successfully moved to %1",
- "post_delete_confirm": "Are you sure you want to delete this post?",
- "post_restore_confirm": "Are you sure you want to restore this post?",
- "post_purge_confirm": "Are you sure you want to purge this post?",
+ "thread_tools.restore_confirm": "Weet u het zeker dat u het onderwerp wilt herstellen?",
+ "thread_tools.purge": "Gooi onderwerp weg",
+ "thread_tools.purge_confirm": "Weet u het zeker dat u dit onderwerp wilt weggooien?",
+ "topic_move_success": "Deze onderwerp is succesvol verplaatst naar %1",
+ "post_delete_confirm": "Weet u het zeker dat u dit bericht wilt verwijderen?",
+ "post_restore_confirm": "Weet u het zeker dat u dit bericht wilt herstellen?",
+ "post_purge_confirm": "Weet u het zeker dat u dit bericht wilt weggooien?",
"load_categories": "Categorieën Laden",
"disabled_categories_note": "Uitgeschakelde Categorieën zijn grijs",
"confirm_move": "Verplaatsen",
@@ -64,9 +64,9 @@
"favourites.has_no_favourites": "Je hebt geen favorieten, sla een aantal berichten op als favoriet om ze hier te zien!",
"loading_more_posts": "Meer Berichten Laden",
"move_topic": "Onderwerp Verplaatsen",
- "move_topics": "Move Topics",
+ "move_topics": "Verplaats onderwerpen",
"move_post": "Bericht Verplaatsen",
- "post_moved": "Post moved!",
+ "post_moved": "Bericht verplaatst!",
"fork_topic": "Onderwerp Forken",
"topic_will_be_moved_to": "Dit onderwerp zal verplaatst worden naar de categorie",
"fork_topic_instruction": "Klik op de berichten die je wilt forken",
@@ -75,7 +75,7 @@
"composer.title_placeholder": "Vul de titel voor het onderwerp hier in...",
"composer.discard": "Annuleren",
"composer.submit": "Opslaan",
- "composer.replying_to": "Replying to %1",
+ "composer.replying_to": "Reageren op %1",
"composer.new_topic": "Nieuw Onderwerp",
"composer.uploading": "uploaden...",
"composer.thumb_url_label": "Plak een onderwerp thumbnail URL",
@@ -84,11 +84,12 @@
"composer.thumb_file_label": "Of upload een bestand",
"composer.thumb_remove": "Velden leegmaken",
"composer.drag_and_drop_images": "Sleep en Zet Afbeeldingen Hier",
- "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
- "more_users": "%1 more user(s)",
- "more_guests": "%1 more guest(s)",
- "sort_by": "Sort by",
- "oldest_to_newest": "Oldest to Newest",
- "newest_to_oldest": "Newest to Oldest",
- "most_votes": "Most votes"
+ "more_users_and_guests": "%1 meer gebruiker(s) en %2 gast(en)",
+ "more_users": "%1 meer gebruiker(s)",
+ "more_guests": "%1 meer gast(en)",
+ "users_and_others": "%1 en %2 anderen",
+ "sort_by": "gesorteerd op",
+ "oldest_to_newest": "Oud naar Nieuw",
+ "newest_to_oldest": "Nieuw naar Oud",
+ "most_votes": "Meeste stemmen"
}
\ No newline at end of file
diff --git a/public/language/nl/unread.json b/public/language/nl/unread.json
index efee7eb23c..35938c3a72 100644
--- a/public/language/nl/unread.json
+++ b/public/language/nl/unread.json
@@ -2,8 +2,8 @@
"title": "Ongelezen",
"no_unread_topics": "Er zijn geen ongelezen onderwerpen",
"load_more": "Meer Laden",
- "mark_as_read": "Mark as Read",
- "selected": "Selected",
- "all": "All",
- "topics_marked_as_read.success": "Topics marked as read!"
+ "mark_as_read": "Markeer als Gelezen",
+ "selected": "Geselecteerd",
+ "all": "Alles",
+ "topics_marked_as_read.success": "Onderwerp gemarkeerd als gelezen!"
}
\ No newline at end of file
diff --git a/public/language/nl/user.json b/public/language/nl/user.json
index f75336c234..37103e7644 100644
--- a/public/language/nl/user.json
+++ b/public/language/nl/user.json
@@ -3,7 +3,7 @@
"offline": "Offline",
"username": "Gebruikersnaam",
"email": "Email",
- "confirm_email": "Confirm Email",
+ "confirm_email": "Bevestig uw email adres",
"fullname": "Volledige Naam",
"website": "Website",
"location": "Locatie",
@@ -22,44 +22,44 @@
"chat": "Chat",
"follow": "Volgen",
"unfollow": "Ontvolgen",
- "profile_update_success": "Profile has been updated successfully!",
+ "profile_update_success": "Uw profiel is succesvol geüpdatet",
"change_picture": "Afbeelding Aanpassen",
"edit": "Aanpassen",
"uploaded_picture": "Afbeelding Uploaden",
"upload_new_picture": "Nieuwe Afbeelding Uploaden",
"current_password": "Huidige Wachtwoord",
"change_password": "Wachtwoord Aanpassen",
- "change_password_error": "Invalid Password!",
- "change_password_error_wrong_current": "Your current password is not correct!",
- "change_password_error_length": "Password too short!",
- "change_password_error_match": "Passwords must match!",
- "change_password_error_privileges": "You do not have the rights to change this password.",
- "change_password_success": "Your password is updated!",
+ "change_password_error": "Ongeldig wachtwoord!",
+ "change_password_error_wrong_current": "Uw huidige wachtwoord is niet correct!",
+ "change_password_error_length": "Wachtwoord is te kort!",
+ "change_password_error_match": "Het wachtwoord wat uw eerder heeft opgegeven moet matchen!",
+ "change_password_error_privileges": "Uw heeft niet de bevoegdheden om dit wachtwoord te veranderen",
+ "change_password_success": "Uw wachtwoord is geüpdatet!",
"confirm_password": "Bevestig Wachtwoord",
"password": "Wachtwoord",
- "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as %1",
+ "username_taken_workaround": "Gebruikersnaam dat u wilde is al in gebruik, dus hebben we het een beetje aangepast naar %1",
"upload_picture": "Afbeelding Uploaden",
"upload_a_picture": "Upload een afbeelding",
"image_spec": "Je mag alleen PNG, JPG, of GIF bestanden uploaden.",
"max": "max.",
"settings": "Instellingen",
"show_email": "Laat Mijn Email Zien",
- "digest_label": "Subscribe to Digest",
- "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
- "digest_off": "Off",
- "digest_daily": "Daily",
- "digest_weekly": "Weekly",
- "digest_monthly": "Monthly",
+ "digest_label": "Abonneer op de overzicht",
+ "digest_description": "Abonneer op de email updates van dit forum ( nieuwe notificaties en onderwerpen) volgens een tijdsschema",
+ "digest_off": "Uit",
+ "digest_daily": "Dagelijks",
+ "digest_weekly": "Weekelijks",
+ "digest_monthly": "Maandelijks",
"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",
- "has_no_topics": "This user didn't post any topics yet.",
+ "has_no_topics": "Deze gebruiker heeft nog geen berichten geplaatst",
"email_hidden": "Email Verborgen",
"hidden": "verborgen",
"paginate_description": "Blader door onderwerpen en berichten in plaats van oneindig scrollen.",
"topics_per_page": "Onderwerpen per Pagina",
"posts_per_page": "Berichten per Pagina",
- "notification_sounds": "Play a sound when you receive a notification.",
- "browsing": "Browsing Settings",
- "open_links_in_new_tab": "Open outgoing links in new tab?"
+ "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?"
}
\ No newline at end of file
diff --git a/public/language/nl/users.json b/public/language/nl/users.json
index 27bffb5a41..2a590dfbd3 100644
--- a/public/language/nl/users.json
+++ b/public/language/nl/users.json
@@ -5,6 +5,6 @@
"search": "Zoeken",
"enter_username": "Vul een gebruikersnaam in om te zoeken",
"load_more": "Meer Laden",
- "user-not-found": "User not found!",
- "users-found-search-took": "%1 user(s) found! Search took %2 ms."
+ "user-not-found": "Gebruiker niet gevonden!",
+ "users-found-search-took": "%1 gebruiker(s) gevonden! Zoekactie duurde %2 ms."
}
\ No newline at end of file
diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json
index 155c4619a1..fb43e50c1a 100644
--- a/public/language/pl/pages.json
+++ b/public/language/pl/pages.json
@@ -5,6 +5,7 @@
"recent": "Ostatnie wątki",
"users": "Zarejestrowani użytkownicy",
"notifications": "Powiadomienia",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Edytowanie \"%1\"",
"user.following": "Obserwowani przez %1",
"user.followers": "Obserwujący %1",
diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json
index 30290807ea..bcb2ad0721 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 więcej użytkownik(ów) i %2 gośc(i)",
"more_users": "%1 więcej użytkownik(ów)",
"more_guests": "%1 więcej gośc(i)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/pt_BR/pages.json b/public/language/pt_BR/pages.json
index c8bda7e9cc..b700cccb53 100644
--- a/public/language/pt_BR/pages.json
+++ b/public/language/pt_BR/pages.json
@@ -5,6 +5,7 @@
"recent": "Tópicos Recentes",
"users": "Usuários Registrados",
"notifications": "Notificações",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Editando \"%1\"",
"user.following": "Seguidos por %1",
"user.followers": "Seguidores de %1",
diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json
index fabe31247a..eaa541ed33 100644
--- a/public/language/pt_BR/topic.json
+++ b/public/language/pt_BR/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 mais usuário(s) e %2 visitante(s)",
"more_users": "%1 mais usuário(s)",
"more_guests": "%1 mais visitante(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Ordenar por",
"oldest_to_newest": "Mais Antigo para Recente",
"newest_to_oldest": "Recente para mais Antigo",
diff --git a/public/language/ro/pages.json b/public/language/ro/pages.json
index 7211444934..3b69d67327 100644
--- a/public/language/ro/pages.json
+++ b/public/language/ro/pages.json
@@ -5,6 +5,7 @@
"recent": "Subiecte Noi",
"users": "Utilizatori înregistrați",
"notifications": "Notificări",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Editează \"%1\"",
"user.following": "Utilizatori urmăriți de %1",
"user.followers": "Utilizatori care îl urmăresc pe %1",
diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json
index 95d8bfd4a7..eccb976288 100644
--- a/public/language/ro/topic.json
+++ b/public/language/ro/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 utlizator(i) și %2 vizitator(i)",
"more_users": "%1 utilizator(i)",
"more_guests": "%1 vizitator(i)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sortează de la",
"oldest_to_newest": "Vechi la Noi",
"newest_to_oldest": "Noi la Vechi",
diff --git a/public/language/ru/global.json b/public/language/ru/global.json
index e83c49da26..e75eaadf5a 100644
--- a/public/language/ru/global.json
+++ b/public/language/ru/global.json
@@ -14,7 +14,7 @@
"logout": "Выйти",
"posting_restriction_info": "Сообщения могут оставлять только зарегистрированные пользователи, нажмите сюда, чтобы войти",
"welcome_back": "С возвращением",
- "you_have_successfully_logged_in": "Вы вышли из аккаунта",
+ "you_have_successfully_logged_in": "Вы успешно вошли на форум",
"save_changes": "Сохранить изменения",
"close": "Закрыть",
"pagination": "Пагинация",
diff --git a/public/language/ru/pages.json b/public/language/ru/pages.json
index 9fadc51c13..adf2827471 100644
--- a/public/language/ru/pages.json
+++ b/public/language/ru/pages.json
@@ -5,6 +5,7 @@
"recent": "Последние темы",
"users": "Зарегистрированные пользователи",
"notifications": "Уведомления",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Редактирование \"%1\"",
"user.following": "%1 читает",
"user.followers": "Читают %1",
diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json
index 554d1371de..9757210077 100644
--- a/public/language/ru/topic.json
+++ b/public/language/ru/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "еще %1 пользователя(ей) и %2 гостя(ей)",
"more_users": "еще %1 пользователя(ей)",
"more_guests": "еще %1 гостя(ей)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Сортировать",
"oldest_to_newest": "От Старых к Новым",
"newest_to_oldest": "От Новых к Старым",
diff --git a/public/language/sc/pages.json b/public/language/sc/pages.json
index d64f46318e..2f975b787d 100644
--- a/public/language/sc/pages.json
+++ b/public/language/sc/pages.json
@@ -5,6 +5,7 @@
"recent": "Ùrtimas Arresonadas",
"users": "Impitadores Registrados",
"notifications": "Notìficas",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Acontzende \"%1\"",
"user.following": "Gente chi %1 Sighit",
"user.followers": "Gente chi Sighit %1",
diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json
index 59c79f3b96..afc9d94ddd 100644
--- a/public/language/sc/topic.json
+++ b/public/language/sc/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/sk/pages.json b/public/language/sk/pages.json
index 5901e7bec1..764229a282 100644
--- a/public/language/sk/pages.json
+++ b/public/language/sk/pages.json
@@ -5,6 +5,7 @@
"recent": "Najnovšie príspevky",
"users": "Prihlásení uživatelia",
"notifications": "Notifikácie",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Uprav \"%1\"",
"user.following": "Užívatelia %1 následujú",
"user.followers": "Užívatelia následujúci %1",
diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json
index 382ac83e71..697c0880ca 100644
--- a/public/language/sk/topic.json
+++ b/public/language/sk/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 užívateľ(ov) a %2 hostí.",
"more_users": "%1 a viac host(í)",
"more_guests": "%1 a viac host(í)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/sv/email.json b/public/language/sv/email.json
index 98e591ab02..2a6f643862 100644
--- a/public/language/sv/email.json
+++ b/public/language/sv/email.json
@@ -1,20 +1,20 @@
{
- "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": "Återställning av lösenord efterfrågat - %1!",
+ "welcome-to": "Välkommen till %1",
+ "greeting_no_name": "Hej",
+ "greeting_with_name": "Hej %1",
+ "welcome.text1": "Tack för att du registerar dig på %1!",
+ "welcome.text2": "För att slutföra aktivering av ditt konto, behöver vi verifiera att du har tillgång till epostadressen du registererade.",
+ "welcome.cta": "Klicka här för att bekräfta din epostadress ",
+ "reset.text1": "Vi fick en förfrågan att återställa ditt lösenord, kanske för att du glömt det. Om det inte är så, så kan du ignorera det här epostmeddelandet. ",
+ "reset.text2": "För att fortsätta med återställning av lösenordet så kan du klicka på följande länk:",
+ "reset.cta": "Klicka här för att återställa ditt lösenord",
+ "digest.notifications": "Du har några olästa notiser från %1:",
+ "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 ",
+ "test.text1": "\nDet här är ett textmeddelande som verifierar att eposten är korrekt installerat för din NodeBB. ",
+ "closing": "Tack!"
}
\ No newline at end of file
diff --git a/public/language/sv/error.json b/public/language/sv/error.json
index d5a21fe09c..8de10daaae 100644
--- a/public/language/sv/error.json
+++ b/public/language/sv/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Ogiltig data",
"not-logged-in": "Du verkar inte vara inloggad.",
"account-locked": "Ditt konto har tillfälligt blivit låst",
- "search-requires-login": "Searching requires an account! Please login or register!",
+ "search-requires-login": "Sökningar kräver att du har ett konto. Logga in eller registrera dig. ",
"invalid-cid": "Ogiltigt id för kategori",
"invalid-tid": "Ogiltigt id för ämne",
"invalid-pid": "Ogiltigt id för inlägg",
@@ -15,8 +15,8 @@
"invalid-pagination-value": "Ogiltigt sidnummer",
"username-taken": "Användarnamn upptaget",
"email-taken": "Epostadress upptagen",
- "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
- "username-too-short": "Username too short",
+ "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",
"user-banned": "Användare bannad",
"no-category": "Kategori hittades inte",
"no-topic": "Ämne hittades inte",
@@ -25,7 +25,7 @@
"no-user": "Användare hittades inte",
"no-teaser": "Förtexten hittades inte",
"no-privileges": "Du har inte rättigheter nog för den här åtgärden.",
- "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
+ "no-emailers-configured": "Inga tillägg för epostadress har laddats, så något textmeddelande kunde inte skickas",
"category-disabled": "Kategorin inaktiverad",
"topic-locked": "Ämnet låst",
"still-uploading": "Vänta medan uppladdningen slutförs.",
@@ -36,7 +36,7 @@
"file-too-big": "Maximalt antal filstorlek är %1 kilobits.",
"cant-vote-self-post": "Du kan in rösta på ditt eget inlägg.",
"already-favourited": "Du har redan favoriserat det här inlägget",
- "already-unfavourited": "You already unfavourited this post",
+ "already-unfavourited": "Du har redan avfavoriserat det här meddelandet ",
"cant-ban-other-admins": "Du kan inte banna andra administratörer.",
"invalid-image-type": "Ogiltigt bildformat",
"group-name-too-short": "Gruppnamnet är för kort",
@@ -52,5 +52,5 @@
"upload-error": "Fel vid uppladdning: %1",
"signature-too-long": "Signaturer kan inte vara längre än %1 tecken.",
"cant-chat-with-yourself": "Du kan inte chatta med dig själv.",
- "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
+ "not-enough-reputation-to-downvote": "Du har inte tillräckligt förtroende för att rösta ner det här meddelandet"
}
\ No newline at end of file
diff --git a/public/language/sv/global.json b/public/language/sv/global.json
index d5c66387ab..20a457bc73 100644
--- a/public/language/sv/global.json
+++ b/public/language/sv/global.json
@@ -13,13 +13,13 @@
"please_log_in": "Var god logga in",
"logout": "Logga ut",
"posting_restriction_info": "Man måste vara inloggad för att kunna skapa inlägg, klicka här för att logga in.",
- "welcome_back": "Welcome Back",
+ "welcome_back": "Välkommen tillbaka ",
"you_have_successfully_logged_in": "Inloggningen lyckades",
"save_changes": "Spara ändringar",
"close": "Stäng",
"pagination": "Siduppdelning",
"pagination.out_of": "%1 av %2",
- "pagination.enter_index": "Enter index",
+ "pagination.enter_index": "Skriv in index ",
"header.admin": "Admin",
"header.recent": "Senaste",
"header.unread": "Olästa",
diff --git a/public/language/sv/groups.json b/public/language/sv/groups.json
index c00c111e11..e82144f093 100644
--- a/public/language/sv/groups.json
+++ b/public/language/sv/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": "Visa grupp ",
+ "details.title": "Detaljer för gruppen ",
+ "details.members": "Medlemmar",
+ "details.has_no_posts": "Den här gruppens medlemmar har inte skrivit några inlägg.",
+ "details.latest_posts": "Senaste inlägg"
}
\ No newline at end of file
diff --git a/public/language/sv/modules.json b/public/language/sv/modules.json
index cefc297e4d..a996e30676 100644
--- a/public/language/sv/modules.json
+++ b/public/language/sv/modules.json
@@ -1,18 +1,18 @@
{
"chat.chatting_with": "Chatta med ",
- "chat.placeholder": "Type chat message here, press enter to send",
+ "chat.placeholder": "Skriv chatmeddelande här och tryck sen enter för att skicka ",
"chat.send": "Skicka",
"chat.no_active": "Du har inte några aktiva chattar.",
"chat.user_typing": "%1 skriver ...",
"chat.user_has_messaged_you": "%1 har skickat ett medelande till dig.",
"chat.see_all": "Visa alla chattar",
- "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.no-messages": "Välj mottagare för att visa historik för chatmeddelande",
+ "chat.recent-chats": "Senaste chattarna",
+ "chat.contacts": "Kontakter ",
+ "chat.message-history": "Historik för meddelande",
+ "chat.pop-out": "Utskjutande chatt",
+ "chat.maximize": "Maximera",
+ "composer.user_said_in": "%1 sa i %2:",
+ "composer.user_said": "%1 sa:",
+ "composer.discard": "Är du säker på att du vill förkasta det här inlägget?"
}
\ No newline at end of file
diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json
index 9f2669e4b2..9f262b008a 100644
--- a/public/language/sv/notifications.json
+++ b/public/language/sv/notifications.json
@@ -2,11 +2,11 @@
"title": "Notiser",
"no_notifs": "Du har inga nya notiser",
"see_all": "Visa alla notiser",
- "back_to_home": "Back to %1",
+ "back_to_home": "Tillbaka till %1",
"outgoing_link": "Utgående länk",
- "outgoing_link_message": "You are now leaving %1.",
- "continue_to": "Continue to %1",
- "return_to": "Return to %1",
+ "outgoing_link_message": "Du lämnar nu %1. ",
+ "continue_to": "Fortsätt till %1",
+ "return_to": "Återgå till %1",
"new_notification": "Ny notis",
"you_have_unread_notifications": "Du har olästa notiser.",
"new_message_from": "Nytt medelande från %1",
@@ -14,7 +14,7 @@
"favourited_your_post": "%1 har favoriserat ditt inlägg.",
"user_flagged_post": "%1 flaggade ett inlägg.",
"user_posted_to": "%1 har skrivit ett svar på: %2",
- "user_mentioned_you_in": "%1 mentioned you in %2",
+ "user_mentioned_you_in": "%1 nämnde dig i %2",
"email-confirmed": "Epost bekräftad",
"email-confirmed-message": "Tack för att du bekräftat din epostadress. Ditt konto är nu fullt ut aktiverat.",
"email-confirm-error": "Ett fel uppstod...",
diff --git a/public/language/sv/pages.json b/public/language/sv/pages.json
index 09116fe68c..c4c0efc382 100644
--- a/public/language/sv/pages.json
+++ b/public/language/sv/pages.json
@@ -5,6 +5,7 @@
"recent": "Senaste ämnena",
"users": "Registrerade användare",
"notifications": "Notiser",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "Ändrar \"%1\"",
"user.following": "Personer %1 Följer",
"user.followers": "Personer som följer %1",
diff --git a/public/language/sv/recent.json b/public/language/sv/recent.json
index 5edc33a830..4478c47921 100644
--- a/public/language/sv/recent.json
+++ b/public/language/sv/recent.json
@@ -3,6 +3,6 @@
"day": "Dag",
"week": "Vecka",
"month": "Månad",
- "year": "Year",
+ "year": "År",
"no_recent_topics": "Det finns inga olästa ämnen."
}
\ No newline at end of file
diff --git a/public/language/sv/search.json b/public/language/sv/search.json
index d0ffc64f36..996a7d81fd 100644
--- a/public/language/sv/search.json
+++ b/public/language/sv/search.json
@@ -1,3 +1,3 @@
{
- "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
+ "results_matching": "%1 resultat matchar \"%2\", (%3 sekunder)"
}
\ No newline at end of file
diff --git a/public/language/sv/tags.json b/public/language/sv/tags.json
index f065d4bbfa..e7f66208a8 100644
--- a/public/language/sv/tags.json
+++ b/public/language/sv/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": "Det finns inga ämnen med detta märkord.",
+ "tags": "Märkord",
+ "enter_tags_here": "Skriv in märkord här. Tryck på enter efter varje märkord.",
+ "no_tags": "Det finns inga märkord ännu."
}
\ No newline at end of file
diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json
index 50c9cfed07..8615e49c77 100644
--- a/public/language/sv/topic.json
+++ b/public/language/sv/topic.json
@@ -14,7 +14,7 @@
"reply": "Svara",
"edit": "Ändra",
"delete": "Ta bort",
- "purge": "Purge",
+ "purge": "Rensa",
"restore": "Återställ",
"move": "Flytta",
"fork": "Grena",
@@ -23,7 +23,7 @@
"share": "Dela",
"tools": "Verktyg",
"flag": "Rapportera",
- "locked": "Locked",
+ "locked": "Låst",
"bookmark_instructions": "Klicka här för att återgå till den senaste positionen eller stäng för att kasta.",
"flag_title": "Rapportera detta inlägg för granskning",
"flag_confirm": "Är du säker på att du vill flagga det här inlägget?",
@@ -49,12 +49,12 @@
"thread_tools.delete_confirm": "Är du säker på att du vill ta bort den här tråden?",
"thread_tools.restore": "Återställ ämne",
"thread_tools.restore_confirm": "Är du säker på att du vill återställa den här tråden?",
- "thread_tools.purge": "Purge Topic",
- "thread_tools.purge_confirm": "Are you sure you want to purge this thread?",
+ "thread_tools.purge": "Rensa ämne",
+ "thread_tools.purge_confirm": "Är du säker att du vill rensa ut den här tråden?",
"topic_move_success": "Det här ämnet har flyttats till %1",
"post_delete_confirm": "Är du säker på att du vill ta bort det här inlägget?",
"post_restore_confirm": "Är du säker på att du vill återställa det här inlägget?",
- "post_purge_confirm": "Are you sure you want to purge this post?",
+ "post_purge_confirm": "Är du säker att du vill rensa ut det här inlägget?",
"load_categories": "Laddar kategorier",
"disabled_categories_note": "Inaktiverade kategorier är utgråade",
"confirm_move": "Flytta",
@@ -87,8 +87,9 @@
"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)",
- "sort_by": "Sort by",
- "oldest_to_newest": "Oldest to Newest",
- "newest_to_oldest": "Newest to Oldest",
- "most_votes": "Most votes"
+ "users_and_others": "%1 and %2 others",
+ "sort_by": "Sortera på",
+ "oldest_to_newest": "Äldst till nyaste",
+ "newest_to_oldest": "Nyaste till äldst",
+ "most_votes": "Mest röster"
}
\ No newline at end of file
diff --git a/public/language/sv/user.json b/public/language/sv/user.json
index 3eb6a04a81..a6b3a753fb 100644
--- a/public/language/sv/user.json
+++ b/public/language/sv/user.json
@@ -3,7 +3,7 @@
"offline": "Offline",
"username": "Användarnamn",
"email": "Epost",
- "confirm_email": "Confirm Email",
+ "confirm_email": "Bekräfta epostadress ",
"fullname": "Hela namnet",
"website": "Webbsida",
"location": "Plats",
diff --git a/public/language/sv/users.json b/public/language/sv/users.json
index 2085529ffe..a1d5a36410 100644
--- a/public/language/sv/users.json
+++ b/public/language/sv/users.json
@@ -5,6 +5,6 @@
"search": "Sök",
"enter_username": "Ange ett användarnamn för att söka",
"load_more": "Ladda fler",
- "user-not-found": "User not found!",
- "users-found-search-took": "%1 user(s) found! Search took %2 ms."
+ "user-not-found": "Användare hittades inte.",
+ "users-found-search-took": "%1 användare hittades! Sökningen tog %2 ms."
}
\ No newline at end of file
diff --git a/public/language/th/pages.json b/public/language/th/pages.json
index 8b031c9dec..b6cb79bcc3 100644
--- a/public/language/th/pages.json
+++ b/public/language/th/pages.json
@@ -5,6 +5,7 @@
"recent": "กระทู้ล่าสุด",
"users": "ผู้ใช้ที่ลงทะเบียน",
"notifications": "แจ้งเตือน",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "แก้ไข \"%1\"",
"user.following": "ผู้ใช้ที่ %1 ติดตาม",
"user.followers": "ผู้ใช้ที่ติดตาม %1",
diff --git a/public/language/th/topic.json b/public/language/th/topic.json
index e3892710d6..c72667cb33 100644
--- a/public/language/th/topic.json
+++ b/public/language/th/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/language/tr/pages.json b/public/language/tr/pages.json
index 44d85b553b..582a524b6b 100644
--- a/public/language/tr/pages.json
+++ b/public/language/tr/pages.json
@@ -5,6 +5,7 @@
"recent": "Güncel Konular",
"users": "Kayıtlı Kullanıcılar",
"notifications": "Bildirimler",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "\"% 1\" düzenleniyor",
"user.following": "İnsanlar %1 Takip Ediyor",
"user.followers": "%1 takip edenler",
diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json
index 24e2efc337..0716b3e6f1 100644
--- a/public/language/tr/topic.json
+++ b/public/language/tr/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 tane daha kullanıcı ve %2 ziyaretçi",
"more_users": "%1 tane daha kullanıcı",
"more_guests": "%1 tane daha ziyaretçi",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sırala",
"oldest_to_newest": "En eskiden en yeniye",
"newest_to_oldest": "En yeniden en eskiye",
diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json
index 36cb72eb47..a5ee695599 100644
--- a/public/language/vi/pages.json
+++ b/public/language/vi/pages.json
@@ -5,6 +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\"",
"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/topic.json b/public/language/vi/topic.json
index fd1dac9881..597c8cd4b9 100644
--- a/public/language/vi/topic.json
+++ b/public/language/vi/topic.json
@@ -87,6 +87,7 @@
"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",
diff --git a/public/language/zh_CN/pages.json b/public/language/zh_CN/pages.json
index 89eff2ecd1..32c3ba5e56 100644
--- a/public/language/zh_CN/pages.json
+++ b/public/language/zh_CN/pages.json
@@ -5,6 +5,7 @@
"recent": "最新主题",
"users": "已注册用户",
"notifications": "提醒",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "正在编辑 \"%1\"",
"user.following": "%1 关注",
"user.followers": "关注 %1 的人",
diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json
index 579b2c062a..84275cb148 100644
--- a/public/language/zh_CN/topic.json
+++ b/public/language/zh_CN/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 名会员和 %2 名游客",
"more_users": "%1 名会员",
"more_guests": "%1 名游客",
+ "users_and_others": "%1 and %2 others",
"sort_by": "排序",
"oldest_to_newest": "从旧到新",
"newest_to_oldest": "从新到旧",
diff --git a/public/language/zh_TW/pages.json b/public/language/zh_TW/pages.json
index c96d8d357e..dc1bcacfe0 100644
--- a/public/language/zh_TW/pages.json
+++ b/public/language/zh_TW/pages.json
@@ -5,6 +5,7 @@
"recent": "近期的主題",
"users": "已註冊的使用者",
"notifications": "新訊息通知",
+ "tags": "Topics tagged under \"%1\"",
"user.edit": "編輯中 \"%1\"",
"user.following": "People %1 Follows",
"user.followers": "People who Follow %1",
diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json
index 948e56a8a7..696de46b27 100644
--- a/public/language/zh_TW/topic.json
+++ b/public/language/zh_TW/topic.json
@@ -87,6 +87,7 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
+ "users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
diff --git a/public/src/app.js b/public/src/app.js
index d84d89e99a..64e5e3e15c 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -413,8 +413,8 @@ var socket,
if (utils.findBootstrapEnvironment() === 'xs') {
return;
}
- $('#header-menu li i[title]').each(function() {
- $(this).parents('a').tooltip({
+ $('#header-menu li [title]').each(function() {
+ $(this).tooltip({
placement: 'bottom',
title: $(this).attr('title')
});
diff --git a/public/src/templates.js b/public/src/templates.js
index fc81b14e29..b629b03d0b 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -95,7 +95,7 @@ Please use the npm module instead - require('templates.js')
}
function makeStatementRegex(key) {
- return new RegExp('([\\s]*)|([\\s]*)', 'g');
+ return new RegExp('()|()', 'g');
}
function registerGlobals(obj) {
@@ -114,8 +114,8 @@ Please use the npm module instead - require('templates.js')
if (matches !== null) {
for (var i = 0, ii = matches.length; i < ii; i++) {
var statement = makeStatementRegex(key),
- nestedConditionals = matches[i].match(/(?!^)(?!$)/),
- match = matches[i].replace(statement, '').replace(/(?!^)/gi, ''),
+ nestedConditionals = matches[i].match(/(?!^)(?!$)/gi),
+ match = matches[i].replace(statement, '').replace(/(?!^)(?!$)/gi, ''),
conditionalBlock = match.split(/[\r\n?\n]*?[\r\n?\n]*?/);
if (conditionalBlock[1]) {