diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c602661541..5223929285 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -50,6 +50,15 @@ $ git rev-parse HEAD
If you have downloaded the `.zip` or `.tar.gz` packages from GitHub (or elsewhere), please let us know.
+## Provide theme versions if issue is related to the theme/display
+
+``` bash
+$ npm ls nodebb-theme-vanilla nodebb-theme-lavender
+nodebb@0.7.0-dev /home/julian/Projects/nodebb/forum
+├── nodebb-theme-lavender@0.2.13
+└── nodebb-theme-vanilla@0.2.35
+```
+
## Attempt to use `git bisect`
If you have installed NodeBB via GitHub clone, are familiar with utilising git, and are willing to help us narrow down the specific commit that causes a bug, consider running `git bisect`.
diff --git a/package.json b/package.json
index 6f38b87f0d..24bc90bef9 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
"heapdump": "^0.3.0",
"less": "^2.0.0",
"logrotate-stream": "^0.2.3",
+ "lru-cache": "^2.5.0",
"mime": "^1.3.4",
"mkdirp": "~0.5.0",
"mmmagic": "^0.3.13",
@@ -41,7 +42,7 @@
"nodebb-plugin-dbsearch": "^0.1.0",
"nodebb-plugin-emoji-extended": "^0.4.1-4",
"nodebb-plugin-markdown": "^1.0.0",
- "nodebb-plugin-mentions": "^0.9.0",
+ "nodebb-plugin-mentions": "^0.10.0",
"nodebb-plugin-soundpack-default": "~0.1.1",
"nodebb-plugin-spam-be-gone": "^0.4.0",
"nodebb-theme-lavender": "^1.0.6",
@@ -63,7 +64,7 @@
"socket.io-redis": "^0.1.3",
"socketio-wildcard": "~0.1.1",
"string": "^3.0.0",
- "templates.js": "^0.1.23",
+ "templates.js": "^0.1.28",
"uglify-js": "git+https://github.com/julianlam/UglifyJS2.git",
"underscore": "~1.7.0",
"validator": "^3.30.0",
diff --git a/public/language/ar/category.json b/public/language/ar/category.json
index b4f3a40f7a..456ba908c2 100644
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -1,6 +1,6 @@
{
"new_topic_button": "موضوع جديد",
- "guest-login-post": "Log in to post",
+ "guest-login-post": "المرجو تسجيل الدخول أوَّلا",
"no_topics": "لا توجد مواضيع في هذه الفئةلم لا تحاول إنشاء موضوع؟ ",
"browsing": "تصفح",
"no_replies": "لم يرد أحد",
diff --git a/public/language/ar/email.json b/public/language/ar/email.json
index 98cb9c0b0d..d295a3a70f 100644
--- a/public/language/ar/email.json
+++ b/public/language/ar/email.json
@@ -9,9 +9,9 @@
"reset.text1": "لقد توصلنا بطلب إعادة تعيين كلمة السرالخاصة بك، ربما لكونك قد نسيتها, إن لم يكن الأمر كذلك، المرجو تجاهل هذه الرسالة.",
"reset.text2": "لمواصلة طلب إعاة تعيين كلمة السر، المرجو تتبع هذا الرابط.",
"reset.cta": "انقر هنا لإعادة تعيين كلمة السر الخاصة بك.",
- "reset.notify.subject": "Password successfully changed",
- "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
- "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
+ "reset.notify.subject": "تم تغيير كلمة المرور بنجاح",
+ "reset.notify.text1": "نحيطك علما أن كلمة مرورك قد تم تغييرها في %1",
+ "reset.notify.text2": "إن لم يكن لديك علم بهذا، المرجو إشعار مدبر النظام بأسرع مايمكن.",
"digest.notifications": "لديك تنبيهات غير مقروءة من طرف %1:",
"digest.latest_topics": "آخر المستجدات من %1",
"digest.cta": "انقر هنا لمشاهدة %1",
@@ -20,8 +20,8 @@
"notif.chat.subject": "هناك محادثة جديدة من %1",
"notif.chat.cta": "انقر هنا لمتابعة المحادثة",
"notif.chat.unsub.info": "تم إرسال هذا الإشعار بوجودة محادثة جديدة وفقا لخيارات تسجيلك.",
- "notif.post.cta": "Click here to read the full topic",
- "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+ "notif.post.cta": "انقر هنا لقراءة الموضوع بأكمله",
+ "notif.post.unsub.info": "تم إشعارك بهذه المشاركة بناءً على الخيارات التي سبق وأن حددتها.",
"test.text1": "هذه رسالة تجريبية للتأكد من صحة إعدادت الرسائل الإلكترونية في منتدى NodeBB خاصتك.",
"unsub.cta": "انقر هنا لتغيير تلك الإعدادات",
"closing": "شكرًا لك!"
diff --git a/public/language/ar/error.json b/public/language/ar/error.json
index 51993e5f98..e5d2f8c856 100644
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -18,9 +18,9 @@
"username-taken": "اسم المستخدم مأخوذ",
"email-taken": "البريد الالكتروني مأخوذ",
"email-not-confirmed": "عنوان بريدك الإلكتروني غير مفعل بعد. انقر هنا لتفعيله من فضلك.",
- "email-not-confirmed-chat": "You are unable to chat until your email is confirmed",
- "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
- "email-confirm-failed": "We could not confirm your email, please try again later.",
+ "email-not-confirmed-chat": "لايمكنك الدردشة إلا بعد تفعيل بريدك الإلكتروني",
+ "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.",
+ "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
"username-too-short": "اسم المستخدم قصير.",
"username-too-long": "اسم المستخدم طويل",
"user-banned": "المستخدم محظور",
@@ -35,10 +35,10 @@
"no-emailers-configured": "لا يمكن إرسال رسالة إلكترونية تجريبية لعدم وجود قوالب خاصة بالرسائل الإلكترونية،",
"category-disabled": "قائمة معطلة",
"topic-locked": "الموضوع مقفول",
- "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting",
+ "post-edit-duration-expired": "لايمكنك تعديل مشاركتك بعد مرور أكثر من %1 ثانية على كتابتها.",
"still-uploading": "الرجاء انتظار الرفع",
"content-too-short": "المرجو إدخال موضوع أطول من هذا. يجب أن تتوفر المواضيع على %1 حروف على الأقل.",
- "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
+ "content-too-long": "لا يمكن للمشاركات أن تتجاوز %1 حرفًا/أحرف.",
"title-too-short": "المرجو إدخال عنوان أطول من هذا. يجب أن تتوفر العناوين على %1 حروف على الأقل.",
"title-too-long": "المرجو إدخال عنوان أقصر من هذا. يجب ألا تتجاوز العناوين %1 حرفًا.",
"too-many-posts": "يمكنك إنشاء المواضيع بمعدل موضوع واحد كل %1 ثانية - المرجو الانتظار قليلا.",
diff --git a/public/language/ar/groups.json b/public/language/ar/groups.json
index 0975ca84ca..1c6a8f90e5 100644
--- a/public/language/ar/groups.json
+++ b/public/language/ar/groups.json
@@ -1,34 +1,34 @@
{
"groups": "المجموعات",
"view_group": "معاينة المجموعة",
- "owner": "Group Owner",
- "new_group": "Create New Group",
- "no_groups_found": "There are no groups to see",
- "pending.accept": "Accept",
- "pending.reject": "Reject",
- "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save",
- "cover-change": "Change",
- "cover-save": "Save",
- "cover-saving": "Saving",
+ "owner": "مالك المجموعة",
+ "new_group": "أنشئ مجموعة جديدة",
+ "no_groups_found": "لاوجدود لمجموعات يمكن معاينتها",
+ "pending.accept": "موافق",
+ "pending.reject": "رفض",
+ "cover-instructions": "اسحب وأسقِط صورة، اسحبها للموضع المرغوب، وانقر على حفظ",
+ "cover-change": "تغيير",
+ "cover-save": "حفظ",
+ "cover-saving": "جاري الحفظ",
"details.title": "تفاصيل المجموعة",
"details.members": "لائحة الأعضاء",
- "details.pending": "Pending Members",
+ "details.pending": "المستخدمون في الانتظار",
"details.has_no_posts": "أعضاء هذه المجموعة لم يضيفوا أية مشاركة",
"details.latest_posts": "آخر المشاركات",
- "details.private": "Private",
- "details.grant": "Grant/Rescind Ownership",
- "details.kick": "Kick",
- "details.owner_options": "Group Administration",
- "details.group_name": "Group Name",
- "details.description": "Description",
- "details.badge_preview": "Badge Preview",
- "details.change_icon": "Change Icon",
- "details.change_colour": "Change Colour",
- "details.badge_text": "Badge Text",
- "details.userTitleEnabled": "Show Badge",
- "details.private_help": "If enabled, joining of groups requires approval from a group owner",
- "details.hidden": "Hidden",
- "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
- "event.updated": "Group details have been updated",
- "event.deleted": "The group \"%1\" has been deleted"
+ "details.private": "خاص",
+ "details.grant": "منح/سحب المِلكية",
+ "details.kick": "طرد",
+ "details.owner_options": "تدبير المجموعة",
+ "details.group_name": "اسم المجموعة",
+ "details.description": "الوصف",
+ "details.badge_preview": "معاينة الوسام",
+ "details.change_icon": "تغيير الأيقونة",
+ "details.change_colour": "تغيير اللون",
+ "details.badge_text": "نص الوسام",
+ "details.userTitleEnabled": "إظهار الوسام",
+ "details.private_help": "في حالة تفعيل الخيار، الانضمام إلى المجموعة يستلزم قبول مالكها",
+ "details.hidden": "مخفي",
+ "details.hidden_help": "في حالة تفعيل الخيار، لن تظهر المجموعة للعموم والإنضمام إليها سيتلزم دعوة يدوية.",
+ "event.updated": "تم تحديث بيانات المجموعة",
+ "event.deleted": "تم حذف المجموعة %1"
}
\ No newline at end of file
diff --git a/public/language/ar/login.json b/public/language/ar/login.json
index f6575cf40a..878a32533c 100644
--- a/public/language/ar/login.json
+++ b/public/language/ar/login.json
@@ -1,7 +1,7 @@
{
- "username-email": "Username / Email",
- "username": "Username",
- "email": "Email",
+ "username-email": "اسم المستخدم / البريد الإلكتروني",
+ "username": "اسم المستخدم",
+ "email": "البريد الإلكتروني",
"remember_me": "تذكرني؟",
"forgot_password": "نسيت كلمة المرور؟",
"alternative_logins": "تسجيلات الدخول البديلة",
diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json
index 711a1a4450..98890331a5 100644
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -2,7 +2,7 @@
"title": "تنبيهات",
"no_notifs": "ليس لديك أية تنبيهات جديدة",
"see_all": "معاينة كل التنبيهات",
- "mark_all_read": "Mark all notifications read",
+ "mark_all_read": "اجعل كل التنبيهات مقروءة",
"back_to_home": "عودة إلى %1",
"outgoing_link": "رابط خارجي",
"outgoing_link_message": "أنت تغادر %1 حاليا.",
diff --git a/public/language/de/error.json b/public/language/de/error.json
index a05417d878..f5c852c661 100644
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -19,12 +19,12 @@
"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.",
"email-not-confirmed-chat": "Der Chat ist deaktiviert bis Du deine E-Mail bestätigt hast",
- "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
- "email-confirm-failed": "We could not confirm your email, please try again later.",
+ "no-email-to-confirm": "Dieses Forum setzt E-Mail-Bestätigung voraus, bitte klick hier um eine E-Mail-Adresse einzugeben",
+ "email-confirm-failed": "Wir konnten deine E-Mail-Adresse nicht bestätigen, bitte versuch es später noch einmal",
"username-too-short": "Benutzername ist zu kurz",
"username-too-long": "Der Benutzername ist zu lang",
"user-banned": "Der Benutzer ist gesperrt",
- "user-too-new": "Entschuldigung, du musst %1 Sekunden warten, bevor du deinen ersten Beitrag verfassen kannst!",
+ "user-too-new": "Tut uns leid, du musst %1 Sekunden warten, bevor du deinen ersten Beitrag verfassen kannst!",
"no-category": "Die Kategorie existiert nicht",
"no-topic": "Das Thema existiert nicht",
"no-post": "Der Beitrag existiert nicht",
@@ -35,7 +35,7 @@
"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",
- "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting",
+ "post-edit-duration-expired": "Du darfst Beiträge lediglich innerhalb von %1 Sekunden nach dem erstellen editieren",
"still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.",
"content-too-short": "Bitte gib einen längeren Beitrag ein. Beiträge sollten mindestens %1 Zeichen enthalten.",
"content-too-long": "Bitte schreibe einen kürzeren Beitrag. Beiträge können nicht mehr als %1 Zeichen enthalten.",
@@ -43,16 +43,16 @@
"title-too-long": "Der Titel darf maximal %1 Zeichen enthalten.",
"too-many-posts": "Du kannst maximal alle %1 Sekunden einen Beitrag erstellen - bitte warte, bevor du einen neuen Beitrag erstellst",
"too-many-posts-newbie": "Als neuer Benutzer kannst du nur alle %1 Sekunden einen Beitrag verfassen, bis du %2 Reputationspunkte hast - Bitte warte etwas, bevor du erneut einen Beitrag verfasst",
- "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters",
- "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters",
- "file-too-big": "Die maximale Dateigröße beträgt %1 kbs - bitte lade eine kleinere Datei hoch",
- "cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten.",
+ "tag-too-short": "Bitte gib ein längeres Stichwort an. Stichwörter sollten aus mindestens %1 Zeichen bestehen.",
+ "tag-too-long": "Bitte gib ein kürzeres Stichwort ein. Stichwörter können nicht länger als %1 Zeichen sein.",
+ "file-too-big": "Die maximale Dateigröße beträgt %1 kB - bitte lade eine kleinere Datei hoch",
+ "cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten",
"already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten",
"already-unfavourited": "Du hast diesen Beitrag bereits aus deinen Favoriten entfernt",
"cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!",
"invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1",
"invalid-image-extension": "Ungültige Dateinamenerweiterung",
- "invalid-file-type": "Invalid file type. Allowed types are: %1",
+ "invalid-file-type": "Ungültiger Dateityp. Erlaubte Typen sind: %1",
"group-name-too-short": "Gruppenname zu kurz",
"group-already-exists": "Gruppe existiert bereits",
"group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern",
@@ -75,7 +75,7 @@
"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.",
"registration-error": "Registrierungsfehler",
- "parse-error": "Ein Fehler ist beim Parsen der Server-Antwort aufgetreten",
- "wrong-login-type-email": "Please use your email to login",
- "wrong-login-type-username": "Please use your username to login"
+ "parse-error": "Beim auswerten der Serverantwort ist etwas schiefgegangen",
+ "wrong-login-type-email": "Bitte nutze deine E-Mail-Adresse zum einloggen",
+ "wrong-login-type-username": "Bitte nutze deinen Benutzernamen zum einloggen"
}
\ No newline at end of file
diff --git a/public/language/de/groups.json b/public/language/de/groups.json
index 3f81c9bfea..52fa359f53 100644
--- a/public/language/de/groups.json
+++ b/public/language/de/groups.json
@@ -4,31 +4,31 @@
"owner": "Gruppenbesitzer",
"new_group": "Neue Gruppe erstellen",
"no_groups_found": "Es sind keine Gruppen vorhanden",
- "pending.accept": "Accept",
- "pending.reject": "Reject",
- "cover-instructions": "Drag and Drop ein Foto, bewege es in Position, dann drücke Speichern",
+ "pending.accept": "Annehmen",
+ "pending.reject": "Abweisen",
+ "cover-instructions": "Foto auf eine Position bewegen, und Speichern drücken",
"cover-change": "Ändern",
"cover-save": "Speichern",
- "cover-saving": "Am speichern",
+ "cover-saving": "Speicherung läuft",
"details.title": "Gruppendetails",
"details.members": "Mitgliederliste",
- "details.pending": "Ausstehende Mitglieder",
+ "details.pending": "Mitglieder in Schwebe",
"details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.",
- "details.latest_posts": "Aktuelle Beiträge",
- "details.private": "Private",
- "details.grant": "Gewähre/Widerrufe Besitz",
+ "details.latest_posts": "Neueste Beiträge",
+ "details.private": "Privat",
+ "details.grant": "Gewähre/widerrufe Besitz",
"details.kick": "Kick",
"details.owner_options": "Gruppenadministration",
- "details.group_name": "Group Name",
- "details.description": "Description",
- "details.badge_preview": "Badge Preview",
- "details.change_icon": "Change Icon",
- "details.change_colour": "Change Colour",
- "details.badge_text": "Badge Text",
- "details.userTitleEnabled": "Show Badge",
- "details.private_help": "If enabled, joining of groups requires approval from a group owner",
- "details.hidden": "Hidden",
- "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
+ "details.group_name": "Gruppenname",
+ "details.description": "Beschreibung",
+ "details.badge_preview": "Abzeichenvorschau",
+ "details.change_icon": "Symbol ändern",
+ "details.change_colour": "Farbe ändern",
+ "details.badge_text": "Text für das Abzeichen",
+ "details.userTitleEnabled": "Abzeichen anzeigen",
+ "details.private_help": "Wenn aktiviert, setzt ein Gruppenbeitritt die Zustimmung eines Gruppenbesitzers voraus",
+ "details.hidden": "Versteckt",
+ "details.hidden_help": "Wenn aktiviert, wird diese Gruppe in der Gruppenliste nicht zu finden sein, und Benutzer werden manuell eingeladen werden müssen.",
"event.updated": "Gruppendetails wurden aktualisiert",
- "event.deleted": "Die Gruppe \"% 1\" wurde gelöscht"
+ "event.deleted": "Die Gruppe \"%1\" wurde gelöscht."
}
\ No newline at end of file
diff --git a/public/language/de/login.json b/public/language/de/login.json
index 4099772d0d..33d68113ca 100644
--- a/public/language/de/login.json
+++ b/public/language/de/login.json
@@ -1,10 +1,10 @@
{
- "username-email": "Username / Email",
- "username": "Username",
- "email": "Email",
+ "username-email": "Benutzername / E-Mail-Adresse",
+ "username": "Benutzername",
+ "email": "E-Mail",
"remember_me": "Eingeloggt bleiben?",
"forgot_password": "Passwort vergessen?",
- "alternative_logins": "Login Alternativen",
+ "alternative_logins": "Alternative Logins",
"failed_login_attempt": " Anmeldeversuch fehlgeschlagen, versuche es erneut.",
"login_successful": "Du hast dich erfolgreich eingeloggt!",
"dont_have_account": "Sie haben noch kein Konto?"
diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json
index f032f7151e..f500eefe5b 100644
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -2,7 +2,7 @@
"title": "Benachrichtigungen",
"no_notifs": "Du hast keine neuen Benachrichtigungen",
"see_all": "Alle Benachrichtigungen ansehen",
- "mark_all_read": "Mark all notifications read",
+ "mark_all_read": "Alle Benachrichtigungen als gelesen markieren",
"back_to_home": "Zurück zu %1",
"outgoing_link": "Externer Link",
"outgoing_link_message": "Du verlässt nun %1.",
diff --git a/public/language/de/recent.json b/public/language/de/recent.json
index 3fb6fc7ea7..e64846b674 100644
--- a/public/language/de/recent.json
+++ b/public/language/de/recent.json
@@ -6,7 +6,7 @@
"year": "Jahr",
"alltime": "Gesamter Zeitraum",
"no_recent_topics": "Es gibt keine aktuellen Themen.",
- "no_popular_topics": "There are no popular topics.",
+ "no_popular_topics": "Es gibt keine beliebten Themen.",
"there-is-a-new-topic": "Es gibt ein neues Thema.",
"there-is-a-new-topic-and-a-new-post": "Es gibt ein neues Thema und einen neuen Beitrag.",
"there-is-a-new-topic-and-new-posts": "Es gibt ein neues Thema und %1 neue Beiträge.",
@@ -15,5 +15,5 @@
"there-are-new-topics-and-new-posts": "Es gibt %1 neue Themen und %2 neue Beiträge.",
"there-is-a-new-post": "Es gibt einen neuen Beitrag.",
"there-are-new-posts": "Es gibt %1 neue Beiträge.",
- "click-here-to-reload": "Hier klicken um neu zu laden."
+ "click-here-to-reload": "Hier klicken um zu aktualisieren."
}
\ No newline at end of file
diff --git a/public/language/de/search.json b/public/language/de/search.json
index 29a51edbe3..b803315a9d 100644
--- a/public/language/de/search.json
+++ b/public/language/de/search.json
@@ -1,5 +1,5 @@
{
- "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)",
+ "results_matching": "%1 Ergebnis(se) stimmen mit \"%2\" überein, (%3 Sekunden)",
"no-matches": "Keine Ergebnisse gefunden",
"in": "In",
"by": "Bei",
@@ -8,13 +8,13 @@
"posted-by": "Geschrieben von",
"in-categories": "In Kategorien",
"search-child-categories": "Suche in Unterkategorien",
- "reply-count": "Antwort Anzahl",
+ "reply-count": "Anzahl Antworten",
"at-least": "Mindestens",
"at-most": "Höchstens",
- "post-time": "Beitrags Zeit",
+ "post-time": "Verfaßt am",
"newer-than": "Neuer als",
"older-than": "Älter als",
- "any-date": "Jeder Zeitpunkt",
+ "any-date": "Beliebiger Zeitpunkt",
"yesterday": "Gestern",
"one-week": "Eine Woche",
"two-weeks": "Zwei Wochen",
@@ -23,18 +23,18 @@
"six-months": "Sechs Monate",
"one-year": "Ein Jahr",
"sort-by": "Sortieren nach",
- "last-reply-time": "Letzter Antwort Zeitpunkt",
+ "last-reply-time": "Zeitpunkt der letzten Antwort",
"topic-title": "Thementitel",
- "number-of-replies": "Anzahl von Antworten",
+ "number-of-replies": "Anzahl an Antworten",
"number-of-views": "Anzahl der Aufrufe",
- "topic-start-date": "Thema Startdatum",
+ "topic-start-date": "Erstelldatum des Themas",
"username": "Benutzername",
"category": "Kategorie",
"descending": "In absteigender Reihenfolge",
"ascending": "In aufsteigender Reihenfolge",
- "save-preferences": "Save preferences",
- "clear-preferences": "Clear preferences",
- "search-preferences-saved": "Search preferences saved",
- "search-preferences-cleared": "Search preferences cleared",
- "show-results-as": "Show results as"
+ "save-preferences": "Einstellungen speichern",
+ "clear-preferences": "Einstellungen löschen",
+ "search-preferences-saved": "Sucheinstellungen gespeichert",
+ "search-preferences-cleared": "Sucheinstellungen gelöscht",
+ "show-results-as": "Ergebnisse anzeigen als"
}
\ No newline at end of file
diff --git a/public/language/de/tags.json b/public/language/de/tags.json
index 7e7e548c8f..9c40b9cc9e 100644
--- a/public/language/de/tags.json
+++ b/public/language/de/tags.json
@@ -1,7 +1,7 @@
{
- "no_tag_topics": "Es gibt keine Themen mit diesem Tag.",
- "tags": "Tags",
- "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
- "enter_tags_here_short": "Gib Tags ein...",
- "no_tags": "Es gibt bisher keine Tags."
+ "no_tag_topics": "Es gibt keine Themen mit diesem Stichwort.",
+ "tags": "Stichwörter",
+ "enter_tags_here": "Gib hier Stichwörter ein. %1-%2 Zeichen. Drücke Enter nach jedem Stichwort.",
+ "enter_tags_here_short": "Gib Stichwörter ein...",
+ "no_tags": "Es gibt bisher keine Stichwörter."
}
\ No newline at end of file
diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json
index 8bb83071fc..a8d4c042b5 100644
--- a/public/language/en_GB/error.json
+++ b/public/language/en_GB/error.json
@@ -23,7 +23,7 @@
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
- "email-not-confirmed-chat": "You are unable to chat until your email is confirmed",
+ "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
"no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
"email-confirm-failed": "We could not confirm your email, please try again later.",
diff --git a/public/language/en_GB/tags.json b/public/language/en_GB/tags.json
index a3f75bb2e6..c74b9759cf 100644
--- a/public/language/en_GB/tags.json
+++ b/public/language/en_GB/tags.json
@@ -1,7 +1,7 @@
{
"no_tag_topics": "There are no topics with this tag.",
"tags": "Tags",
- "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+ "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
"enter_tags_here_short": "Enter tags...",
"no_tags": "There are no tags yet."
}
\ No newline at end of file
diff --git a/public/language/es/category.json b/public/language/es/category.json
index ec2fdadcdc..8c6b0fd5ca 100644
--- a/public/language/es/category.json
+++ b/public/language/es/category.json
@@ -1,6 +1,6 @@
{
"new_topic_button": "Nuevo tema",
- "guest-login-post": "Log in to post",
+ "guest-login-post": "Acceder para poder escribir un mensaje",
"no_topics": "No hay temas en esta categoría. ¿Por que no te animas y publicas uno?",
"browsing": "viendo ahora",
"no_replies": "Nadie ha respondido aún",
diff --git a/public/language/es/error.json b/public/language/es/error.json
index 1fd31a5b00..8be673f77d 100644
--- a/public/language/es/error.json
+++ b/public/language/es/error.json
@@ -19,8 +19,8 @@
"email-taken": "Correo electrónico ocupado",
"email-not-confirmed": "Su cuenta de correo electrónico no ha sido confirmada aún, por favor haga click aquí para confirmarla.",
"email-not-confirmed-chat": "No puedes hacer uso del chat hasta que confirmes tu email",
- "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
- "email-confirm-failed": "We could not confirm your email, please try again later.",
+ "no-email-to-confirm": "Este foro requiere confirmación de su email, por favor pulse aquí para introducir un email",
+ "email-confirm-failed": "No se ha podido confirmar su email, por favor inténtelo de nuevo más tarde.",
"username-too-short": "Nombre de usuario es demasiado corto",
"username-too-long": "Nombre de usuario demasiado largo",
"user-banned": "Usuario baneado",
@@ -35,7 +35,7 @@
"no-emailers-configured": "No se ha cargado ningún plugin de email, así que no se pudo enviar el email de prueba.",
"category-disabled": "Categoría deshabilitada",
"topic-locked": "Tema bloqueado",
- "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting",
+ "post-edit-duration-expired": "Sólo puedes editar mensajes durante %1 segundos después de haberlo escrito",
"still-uploading": "Por favor, espera a que terminen las subidas.",
"content-too-short": "Por favor introduzca una publicación más larga. Las publicaciones deben contener al menos %1 caracteres.",
"content-too-long": "Por favor introduzca un mensaje más corto. Los mensajes no pueden exceder los %1 caracteres.",
@@ -43,8 +43,8 @@
"title-too-long": "Por favor, introduce un título más corto, que no sobrepase los %1 caracteres.",
"too-many-posts": "Solo puedes publicar una vez cada %1 segundos - por favor espere antes de volver a publicar",
"too-many-posts-newbie": "Como nuevo usuario, solo puedes publicar una vez cada %1 segundos hasta hayas ganado una reputación de %2 - por favor espere antes de volver a publicar",
- "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters",
- "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters",
+ "tag-too-short": "Por favor introduce una etiqueta más larga. Las etiquetas deben contener por lo menos %1 caracteres",
+ "tag-too-long": "Por favor introduce una etiqueta más pequeña. Las etiquetas no pueden exceder los %1 caracteres",
"file-too-big": "El tamaño de fichero máximo es de %1 kbs - por favor, suba un fichero más pequeño",
"cant-vote-self-post": "No puedes votar tus propios posts",
"already-favourited": "Ya ha marcado esta publicación como favorita",
@@ -52,7 +52,7 @@
"cant-ban-other-admins": "¡No puedes expulsar a otros administradores!",
"invalid-image-type": "Tipo de imagen inválido. Los tipos permitidos son: %1",
"invalid-image-extension": "Extensión de imagen inválida",
- "invalid-file-type": "Invalid file type. Allowed types are: %1",
+ "invalid-file-type": "Tipo de fichero inválido. Los tipos permitidos son: %1",
"group-name-too-short": "Nombre del grupo es demasiado corto.",
"group-already-exists": "El grupo ya existe.",
"group-name-change-not-allowed": "El nombre del grupo deseado no está permitido.",
@@ -76,6 +76,6 @@
"reload-failed": "NodeBB encontró un problema al refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste justo antes.",
"registration-error": "Error de registro",
"parse-error": "Algo ha ido mal mientras se parseaba la respuesta del servidor",
- "wrong-login-type-email": "Please use your email to login",
- "wrong-login-type-username": "Please use your username to login"
+ "wrong-login-type-email": "Por favor emplea tu email para acceder",
+ "wrong-login-type-username": "Por favor introduce tu nombre de usuario para acceder"
}
\ No newline at end of file
diff --git a/public/language/es/groups.json b/public/language/es/groups.json
index 112cce2994..22a80ba19a 100644
--- a/public/language/es/groups.json
+++ b/public/language/es/groups.json
@@ -4,8 +4,8 @@
"owner": "Propietario del Grupo",
"new_group": "Crear Nuevo Grupo",
"no_groups_found": "No hay grupos que ver",
- "pending.accept": "Accept",
- "pending.reject": "Reject",
+ "pending.accept": "Aceptar",
+ "pending.reject": "Rechazar",
"cover-instructions": "Arrastra y suelta una foto, arrastra a la posición, y pulsa Guardar ",
"cover-change": "Cambiar",
"cover-save": "Guardar",
@@ -15,20 +15,20 @@
"details.pending": "Miembros Pendientes",
"details.has_no_posts": "Los miembros de este grupo no han hecho ninguna publicación.",
"details.latest_posts": "Últimas Publicaciones",
- "details.private": "Private",
- "details.grant": "Grant/Rescind Ownership",
- "details.kick": "Kick",
+ "details.private": "Privado",
+ "details.grant": "Conceder/Rescindir Propiedad",
+ "details.kick": "Expulsar",
"details.owner_options": "Administración De Grupo",
- "details.group_name": "Group Name",
- "details.description": "Description",
- "details.badge_preview": "Badge Preview",
- "details.change_icon": "Change Icon",
- "details.change_colour": "Change Colour",
- "details.badge_text": "Badge Text",
- "details.userTitleEnabled": "Show Badge",
- "details.private_help": "If enabled, joining of groups requires approval from a group owner",
- "details.hidden": "Hidden",
- "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
+ "details.group_name": "Nombre de Grupo",
+ "details.description": "Descripción",
+ "details.badge_preview": "Previsualización de Insignia",
+ "details.change_icon": "Cambiar Icono",
+ "details.change_colour": "Cambiar Color",
+ "details.badge_text": "Texto de Insignia",
+ "details.userTitleEnabled": "Mostrar Insignia",
+ "details.private_help": "Si está habilitado, entrar en los grupos requiere aprobación de sus propietarios",
+ "details.hidden": "Oculto",
+ "details.hidden_help": "Si está habilitado, este grupo no aparecerá en los listados de grupos, y los usuarios tendrán que ser invitados manualmente",
"event.updated": "Los detalles del grupo han sido actualizados",
"event.deleted": "El grupo \"%1\" ha sido eliminado"
}
\ No newline at end of file
diff --git a/public/language/es/login.json b/public/language/es/login.json
index e30f15dff4..448ce31f43 100644
--- a/public/language/es/login.json
+++ b/public/language/es/login.json
@@ -1,7 +1,7 @@
{
- "username-email": "Username / Email",
- "username": "Username",
- "email": "Email",
+ "username-email": "Usuario / Email",
+ "username": "Usuario",
+ "email": "Correo Electrónico",
"remember_me": "¿Recordarme?",
"forgot_password": "¿Olvidaste tu contraseña?",
"alternative_logins": "Métodos alternativos",
diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json
index 630e9376fe..3a9e36bccb 100644
--- a/public/language/es/notifications.json
+++ b/public/language/es/notifications.json
@@ -2,7 +2,7 @@
"title": "Notificaciones",
"no_notifs": "No tiene nuevas notificaciones",
"see_all": "Ver todas las notificaciones",
- "mark_all_read": "Mark all notifications read",
+ "mark_all_read": "Marcar todas las notificaciones cómo leídas",
"back_to_home": "Volver a %1",
"outgoing_link": "Enlace externo",
"outgoing_link_message": "Ahora estás saliendo de %1.",
diff --git a/public/language/es/recent.json b/public/language/es/recent.json
index 1ff9669e51..fbfb6238c0 100644
--- a/public/language/es/recent.json
+++ b/public/language/es/recent.json
@@ -6,7 +6,7 @@
"year": "Año",
"alltime": "Siempre",
"no_recent_topics": "No hay publicaciones recientes.",
- "no_popular_topics": "There are no popular topics.",
+ "no_popular_topics": "No hay tópicos populares",
"there-is-a-new-topic": "Hay una nueva publicación.",
"there-is-a-new-topic-and-a-new-post": "hay una nueva publicación y un nuevo mensaje.",
"there-is-a-new-topic-and-new-posts": "Hay una nueva publicación y %1 nuevos mensajes.",
diff --git a/public/language/es/search.json b/public/language/es/search.json
index 2378430561..135144c2b3 100644
--- a/public/language/es/search.json
+++ b/public/language/es/search.json
@@ -32,9 +32,9 @@
"category": "Categoría",
"descending": "En orden descendente",
"ascending": "En orden ascendente",
- "save-preferences": "Save preferences",
- "clear-preferences": "Clear preferences",
- "search-preferences-saved": "Search preferences saved",
- "search-preferences-cleared": "Search preferences cleared",
- "show-results-as": "Show results as"
+ "save-preferences": "Guardar preferencias",
+ "clear-preferences": "Descartar preferencias",
+ "search-preferences-saved": "Preferencias de búsqueda guardadas",
+ "search-preferences-cleared": "Preferencias de búsqueda descartadas",
+ "show-results-as": "Mostrar resultados como"
}
\ No newline at end of file
diff --git a/public/language/es/tags.json b/public/language/es/tags.json
index 3a86bb7da7..dc1f26a0ba 100644
--- a/public/language/es/tags.json
+++ b/public/language/es/tags.json
@@ -1,7 +1,7 @@
{
"no_tag_topics": "No hay temas con esta etiqueta.",
"tags": "Etiquetas",
- "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+ "enter_tags_here": "Introduce las etiquetas aquí. %1-%2 caracteres. Presiona enter después de cada etiqueta.",
"enter_tags_here_short": "Introduzca las etiquetas...",
"no_tags": "Aún no hay etiquetas."
}
\ No newline at end of file
diff --git a/public/language/es/topic.json b/public/language/es/topic.json
index 576220f99d..1938b05c7d 100644
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -12,7 +12,7 @@
"notify_me": "Serás notificado cuando haya nuevas respuestas en este tema",
"quote": "Citar",
"reply": "Responder",
- "guest-login-reply": "Log in to reply",
+ "guest-login-reply": "Accede para responder",
"edit": "Editar",
"delete": "Borrar",
"purge": "Purgar",
diff --git a/public/language/fr/error.json b/public/language/fr/error.json
index f6354486ff..51f03aa33f 100644
--- a/public/language/fr/error.json
+++ b/public/language/fr/error.json
@@ -19,8 +19,8 @@
"email-taken": "Email déjà utilisé",
"email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquez ici pour la valider.",
"email-not-confirmed-chat": "Vous ne pouver discuter tant que votre email n'est pas confirmé",
- "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
- "email-confirm-failed": "We could not confirm your email, please try again later.",
+ "no-email-to-confirm": "Ce forum requiert une vérification de votre adresse email. Veuillez cliquer ici pour entrer une adresse.",
+ "email-confirm-failed": "Votre adresse email n'a pas pu être vérifiée. Veuillez ré-essayer plus tard.",
"username-too-short": "Nom d'utilisateur trop court",
"username-too-long": "Nom d'utilisateur trop long",
"user-banned": "Utilisateur banni",
@@ -35,7 +35,7 @@
"no-emailers-configured": "Un email de test n'a pas pu être envoyé car aucun plugin de gestion des emails n'était chargé",
"category-disabled": "Catégorie désactivée",
"topic-locked": "Sujet verrouillé",
- "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting",
+ "post-edit-duration-expired": "Vous ne pouvez modifier un post que %1 secondes après l'avoir posté.",
"still-uploading": "Veuillez patienter pendant le téléchargement.",
"content-too-short": "Veuillez entrer un message plus long. %1 caractères minimum.",
"content-too-long": "Veuillez poster un message plus cours. Les messages ne peuvent être plus long que %1 caractères.",
@@ -43,8 +43,8 @@
"title-too-long": "Veuillez entrer un titre plus court. Les titres ne peuvent excéder %1 caractères.",
"too-many-posts": "Vous ne pouvez poster que toutes les %1 secondes.",
"too-many-posts-newbie": "En tant que nouvel utilisateur, vous ne pouvez poster que toutes les %1 secondes jusqu'à ce que vous obteniez une réputation de %2 - patientez avant de publier de nouveau. ",
- "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters",
- "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters",
+ "tag-too-short": "Veuillez entrer un mot-clé plus long. Les mots-clés devraient contenir au moins %1 caractères.",
+ "tag-too-long": "Veuillez entrer un mot-clé plus court. Les mot-clés ne peuvent faire plus de %1 caractères.",
"file-too-big": "La taille maximum des fichiers est de %1 kbs.",
"cant-vote-self-post": "Vous ne pouvez pas voter pour vos propres messages",
"already-favourited": "Vous avez déjà mis ce message en favoris",
@@ -52,7 +52,7 @@
"cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !",
"invalid-image-type": "Type d'image invalide. Les types autorisés sont: %1",
"invalid-image-extension": "Extension d'image invalide",
- "invalid-file-type": "Invalid file type. Allowed types are: %1",
+ "invalid-file-type": "Type de fichier non valide. Les types autorisés sont : %1",
"group-name-too-short": "Nom de groupe trop court",
"group-already-exists": "Ce groupe existe déjà",
"group-name-change-not-allowed": "Modification du nom de groupe non permise",
@@ -76,6 +76,6 @@
"reload-failed": "NodeBB a rencontré un problème lors du rechargement : \"% 1\" . NodeBB continuera de fonctionner côté client, même si vous devez annuler ce que vous avez fait juste avant de recharger .",
"registration-error": "Erreur d'enregistrement",
"parse-error": "Une erreur est survenue en analysant la réponse du serveur",
- "wrong-login-type-email": "Please use your email to login",
- "wrong-login-type-username": "Please use your username to login"
+ "wrong-login-type-email": "Veuillez utiliser votre adresse email pour vous connecter",
+ "wrong-login-type-username": "Veuillez utiliser votre identifiant pour vous connecter"
}
\ No newline at end of file
diff --git a/public/language/fr/groups.json b/public/language/fr/groups.json
index 03b25aebc8..ce980d472e 100644
--- a/public/language/fr/groups.json
+++ b/public/language/fr/groups.json
@@ -4,8 +4,8 @@
"owner": "Propriétaire du groupe",
"new_group": "Créer un nouveau groupe",
"no_groups_found": "Il n'y a aucun groupe",
- "pending.accept": "Accept",
- "pending.reject": "Reject",
+ "pending.accept": "Accepter",
+ "pending.reject": "Refuser",
"cover-instructions": "Glissez-déposez une image, ajustez la position, et cliquez sur Enregistrer",
"cover-change": "Modifier",
"cover-save": "Enregistrer",
@@ -15,20 +15,20 @@
"details.pending": "Membres en attente",
"details.has_no_posts": "Les membres de ce groupe n'ont envoyé aucun message.",
"details.latest_posts": "Derniers messages",
- "details.private": "Private",
+ "details.private": "Privé",
"details.grant": "Promouvoir/rétrograder comme propriétaire",
"details.kick": "Exclure",
"details.owner_options": "Administration du groupe",
- "details.group_name": "Group Name",
+ "details.group_name": "Nom du groupe",
"details.description": "Description",
- "details.badge_preview": "Badge Preview",
- "details.change_icon": "Change Icon",
- "details.change_colour": "Change Colour",
- "details.badge_text": "Badge Text",
- "details.userTitleEnabled": "Show Badge",
- "details.private_help": "If enabled, joining of groups requires approval from a group owner",
- "details.hidden": "Hidden",
- "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
+ "details.badge_preview": "Aperçu du badge",
+ "details.change_icon": "Modifier l'icône",
+ "details.change_colour": "Modifier la couleur",
+ "details.badge_text": "Texte du badge",
+ "details.userTitleEnabled": "Afficher le badge",
+ "details.private_help": "Si cette case est cochée, rejoindre un groupe nécessite l'accord d'un propriétaire du groupe.",
+ "details.hidden": "Masqué",
+ "details.hidden_help": "Si cette case est cochée, ce groupe n'est pas affiché dans la liste des groupes, et les utilisateurs devront être invités manuellement.",
"event.updated": "Les détails du groupe ont été mis à jour",
"event.deleted": "Le groupe é%1\" a été supprimé"
}
\ No newline at end of file
diff --git a/public/language/fr/login.json b/public/language/fr/login.json
index b34dda64b5..6470717691 100644
--- a/public/language/fr/login.json
+++ b/public/language/fr/login.json
@@ -1,6 +1,6 @@
{
- "username-email": "Username / Email",
- "username": "Username",
+ "username-email": "Identifiant ou email",
+ "username": "Identifiant",
"email": "Email",
"remember_me": "Se souvenir de moi ?",
"forgot_password": "Mot de passe oublié ?",
diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json
index 139b0a30da..e6c533a20e 100644
--- a/public/language/fr/notifications.json
+++ b/public/language/fr/notifications.json
@@ -2,7 +2,7 @@
"title": "Notifications",
"no_notifs": "Vous n'avez aucune notification",
"see_all": "Voir toutes les notifications.",
- "mark_all_read": "Mark all notifications read",
+ "mark_all_read": "Marquer toutes les notifications comme lues",
"back_to_home": "Revenir à %1",
"outgoing_link": "Lien sortant",
"outgoing_link_message": "Vous quittez %1.",
diff --git a/public/language/fr/recent.json b/public/language/fr/recent.json
index bd3b216df0..6103856ee0 100644
--- a/public/language/fr/recent.json
+++ b/public/language/fr/recent.json
@@ -6,7 +6,7 @@
"year": "An",
"alltime": "Toujours",
"no_recent_topics": "Il n'y a aucun sujet récent.",
- "no_popular_topics": "There are no popular topics.",
+ "no_popular_topics": "Il n'y a pas de sujet populaire.",
"there-is-a-new-topic": "Il y a un nouveau sujet.",
"there-is-a-new-topic-and-a-new-post": "Il y a un nouveau sujet et un nouveau message.",
"there-is-a-new-topic-and-new-posts": "Il y a un nouveau sujet et %1 nouveaux messages.",
diff --git a/public/language/fr/search.json b/public/language/fr/search.json
index cd5f207136..f05eec953d 100644
--- a/public/language/fr/search.json
+++ b/public/language/fr/search.json
@@ -32,9 +32,9 @@
"category": "Catégorie",
"descending": "Par ordre décroissant",
"ascending": "Par ordre croissant",
- "save-preferences": "Save preferences",
- "clear-preferences": "Clear preferences",
- "search-preferences-saved": "Search preferences saved",
- "search-preferences-cleared": "Search preferences cleared",
- "show-results-as": "Show results as"
+ "save-preferences": "Enregistrer les préférences",
+ "clear-preferences": "Réinitialiser les préférences",
+ "search-preferences-saved": "Préférences de recherche enregistrées",
+ "search-preferences-cleared": "Préférences de recherche réinitialisées",
+ "show-results-as": "Affichez les résultats comme"
}
\ No newline at end of file
diff --git a/public/language/fr/tags.json b/public/language/fr/tags.json
index 8c533e76ca..ef226f2efe 100644
--- a/public/language/fr/tags.json
+++ b/public/language/fr/tags.json
@@ -1,7 +1,7 @@
{
"no_tag_topics": "Il n'y a aucun sujet ayant ce mot-clé",
"tags": "Mots-clés",
- "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+ "enter_tags_here": "Entrez les mots-clés ici. %1-%2 caractères. Tapez sur \"Entrée\" après chaque mot-clé.",
"enter_tags_here_short": "Entrez des mots-clés...",
"no_tags": "Il n'y a pas encore de mots-clés."
}
\ No newline at end of file
diff --git a/public/language/pl/category.json b/public/language/pl/category.json
index 09164c69bb..a6e6ec1b0f 100644
--- a/public/language/pl/category.json
+++ b/public/language/pl/category.json
@@ -1,6 +1,6 @@
{
"new_topic_button": "Nowy wątek",
- "guest-login-post": "Log in to post",
+ "guest-login-post": "Zaloguj się, aby napisać.",
"no_topics": "W tej kategorii nie ma jeszcze żadnych wątków. Dlaczego ty nie utworzysz jakiegoś?",
"browsing": "przegląda",
"no_replies": "Nikt jeszcze nie odpowiedział",
diff --git a/public/language/pl/error.json b/public/language/pl/error.json
index c09640123e..c967749eeb 100644
--- a/public/language/pl/error.json
+++ b/public/language/pl/error.json
@@ -19,8 +19,8 @@
"email-taken": "E-mail zajęty.",
"email-not-confirmed": "Twój email nie został jeszcze potwierdzony. Proszę kliknąć tutaj by go potwierdzić.",
"email-not-confirmed-chat": "Nie możesz rozmawiać do czasu, gdy twój email zostanie potwierdzony.",
- "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
- "email-confirm-failed": "We could not confirm your email, please try again later.",
+ "no-email-to-confirm": "To forum wymaga weryfikacji przez email. Proszę kliknąć tutaj, aby wprowadzić adres.",
+ "email-confirm-failed": "Nie byliśmy w stanie potwierdzić twojego email-a. Proszę spróbować później.",
"username-too-short": "Nazwa użytkownika za krótka.",
"username-too-long": "Zbyt długa nazwa użytkownika",
"user-banned": "Użytkownik zbanowany",
@@ -35,7 +35,7 @@
"no-emailers-configured": "Nie zainstalowano żadnego dodatku obsługującego e-mail, więc nie można wysłać testowej wiadomości.",
"category-disabled": "Kategoria wyłączona.",
"topic-locked": "Temat zamknięty",
- "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting",
+ "post-edit-duration-expired": "Możesz edytować posty przez %1 sekund po napisaniu.",
"still-uploading": "Poczekaj na pełne załadowanie",
"content-too-short": "Proszę wpisać dłuższy post. Posty powinny zawierać co najmniej %1 znaków.",
"content-too-long": "Proszę wpisać krótszy post. Posty nie mogą zawierać więcej niż %1 znaków.",
@@ -43,8 +43,8 @@
"title-too-long": "Wpisz krótszy tytuł, nie może być dłuższy niż %1 znaków.",
"too-many-posts": "Możesz wysyłać posty co %1 sekund - proszę poczekać",
"too-many-posts-newbie": "Jako nowy użytkownik, możesz wysyłać posty co %1 sekund, do chwili aż zbierzesz %2 reputacji - proszę poczekać przed ponownym wysłaniem posta",
- "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters",
- "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters",
+ "tag-too-short": "Proszę podać dłuższy tag. Tagi powinny zawierać co najmniej %1 znaków.",
+ "tag-too-long": "Proszę podać krótszy tag. Tagi nie mogą być dłuższe niż %1 znaków.",
"file-too-big": "Maksymalny dozwolony rozmiar pliku to %1 kb - proszę wybrać mniejszy plik",
"cant-vote-self-post": "Nie możesz głosować na własny post",
"already-favourited": "Już polubiłeś ten post",
@@ -52,7 +52,7 @@
"cant-ban-other-admins": "Nie możesz zbanować innych adminów!",
"invalid-image-type": "Błędny typ pliku. Dozwolone typy to: %1",
"invalid-image-extension": "Błędne rozszerzenie pliku",
- "invalid-file-type": "Invalid file type. Allowed types are: %1",
+ "invalid-file-type": "Błędny typ pliku. Dozwolone typy to: %1",
"group-name-too-short": "Nazwa grupy za krótka",
"group-already-exists": "Grupa już istnieje",
"group-name-change-not-allowed": "Nie można zmieniać nazwy tej grupy.",
@@ -76,6 +76,6 @@
"reload-failed": "NodeBB napotkał problem w czasie ładowania \"%1\". Forum będzie nadal dostarczać zasoby dostępne w kliencie, jednak powinieneś cofnąć ostatnią akcję.",
"registration-error": "Błąd rejestracji",
"parse-error": "Coś poszło nie tak podczas parsingu odpowiedzi serwera",
- "wrong-login-type-email": "Please use your email to login",
- "wrong-login-type-username": "Please use your username to login"
+ "wrong-login-type-email": "Zaloguj się używając adresu email",
+ "wrong-login-type-username": "Zaloguj się używając nazwy użytkownika"
}
\ No newline at end of file
diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json
index 19f43e2d89..b9c32948b9 100644
--- a/public/language/pl/groups.json
+++ b/public/language/pl/groups.json
@@ -4,8 +4,8 @@
"owner": "Właściciel grupy",
"new_group": "Stwórz nową grupę",
"no_groups_found": "Brak grup do wyświetlenia",
- "pending.accept": "Accept",
- "pending.reject": "Reject",
+ "pending.accept": "Przyjmij",
+ "pending.reject": "Odrzuć",
"cover-instructions": "Przeciągnij i upuść zdjęcie, ustaw w odpowiedniej pozycji i kliknij Zapisz",
"cover-change": "Zmień",
"cover-save": "Zapisz",
@@ -15,20 +15,20 @@
"details.pending": "Członkowie oczekujący",
"details.has_no_posts": "Członkowie tej grupy nie napisali żadnych postów.",
"details.latest_posts": "Ostatnie posty",
- "details.private": "Private",
+ "details.private": "Prywatna",
"details.grant": "Nadaj/Cofnij prawa Właściciela",
"details.kick": "Wykop",
"details.owner_options": "Administracja grupy",
- "details.group_name": "Group Name",
- "details.description": "Description",
- "details.badge_preview": "Badge Preview",
- "details.change_icon": "Change Icon",
- "details.change_colour": "Change Colour",
- "details.badge_text": "Badge Text",
- "details.userTitleEnabled": "Show Badge",
- "details.private_help": "If enabled, joining of groups requires approval from a group owner",
- "details.hidden": "Hidden",
- "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
+ "details.group_name": "Nazwa grupy",
+ "details.description": "Opis",
+ "details.badge_preview": "Podgląd plakietki",
+ "details.change_icon": "Zmień ikonę",
+ "details.change_colour": "Zmień kolor",
+ "details.badge_text": "Treść plakietki",
+ "details.userTitleEnabled": "Pokaż plakietkę",
+ "details.private_help": "Jeśli aktywowane, przystępowanie do grup wymaga zatwierdzenia przez właściciela grupy",
+ "details.hidden": "Ukryty",
+ "details.hidden_help": "Jeśli aktywowane, ta grupa nie będzie widoczna w wykazie grup, a użytkownicy będą musieli być zapraszani manualnie.",
"event.updated": "Dane grupy zostały zaktualizowane",
"event.deleted": "Grupa \"%1\" została skasowana"
}
\ No newline at end of file
diff --git a/public/language/pl/login.json b/public/language/pl/login.json
index 4a95c6d26e..1133f6afba 100644
--- a/public/language/pl/login.json
+++ b/public/language/pl/login.json
@@ -1,7 +1,7 @@
{
- "username-email": "Username / Email",
- "username": "Username",
- "email": "Email",
+ "username-email": "Nazwa użytkownika lub adres e-mail",
+ "username": "Nazwa użytkownika",
+ "email": "Adres e-mail",
"remember_me": "Zapamiętaj mnie",
"forgot_password": "Zapomniałeś hasło?",
"alternative_logins": "Alternatywne logowanie",
diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json
index 5e84128ee9..2a24b7c122 100644
--- a/public/language/pl/notifications.json
+++ b/public/language/pl/notifications.json
@@ -2,7 +2,7 @@
"title": "Powiadomienia",
"no_notifs": "Nie masz nowych powiadomień",
"see_all": "Zobacz wszystkie powiadomienia",
- "mark_all_read": "Mark all notifications read",
+ "mark_all_read": "Oznacz wszystkie powiadomienia jako przeczytane",
"back_to_home": "Wróć do %1",
"outgoing_link": "Łącze wychodzące",
"outgoing_link_message": "Opuszczasz %1.",
diff --git a/public/language/pl/recent.json b/public/language/pl/recent.json
index d395ee5722..563533001f 100644
--- a/public/language/pl/recent.json
+++ b/public/language/pl/recent.json
@@ -6,7 +6,7 @@
"year": "Rok",
"alltime": "Od początku",
"no_recent_topics": "Brak ostatnich wątków.",
- "no_popular_topics": "There are no popular topics.",
+ "no_popular_topics": "Brak popularnych wątków.",
"there-is-a-new-topic": "Masz nowy wątek.",
"there-is-a-new-topic-and-a-new-post": "Masz nowy wątek i nowy post.",
"there-is-a-new-topic-and-new-posts": "Masz nowy wątek i %1 nowych postów.",
diff --git a/public/language/pl/search.json b/public/language/pl/search.json
index 7a055eb66c..52b4e5a137 100644
--- a/public/language/pl/search.json
+++ b/public/language/pl/search.json
@@ -32,9 +32,9 @@
"category": "Kategoria",
"descending": "W kolejności malejącej",
"ascending": "W kolejności rosnącej",
- "save-preferences": "Save preferences",
- "clear-preferences": "Clear preferences",
- "search-preferences-saved": "Search preferences saved",
- "search-preferences-cleared": "Search preferences cleared",
- "show-results-as": "Show results as"
+ "save-preferences": "Zapisz ustawienia",
+ "clear-preferences": "Wyczyść ustawienia",
+ "search-preferences-saved": "Ustawienia wyszukiwania zapisane",
+ "search-preferences-cleared": "Ustawienia wyszukiwania wyczyszczone",
+ "show-results-as": "Pokaż wyniki jako"
}
\ No newline at end of file
diff --git a/public/language/pl/tags.json b/public/language/pl/tags.json
index c4d9498474..3036b34e62 100644
--- a/public/language/pl/tags.json
+++ b/public/language/pl/tags.json
@@ -1,7 +1,7 @@
{
"no_tag_topics": "Nie ma tematów z tym tagiem",
"tags": "Tagi",
- "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+ "enter_tags_here": "Tutaj wpisz tagi. %1-%2 znaków. Naciśnij enter po każdym.",
"enter_tags_here_short": "Wpisz tagi...",
"no_tags": "Jeszcze nie ma tagów."
}
\ No newline at end of file
diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json
index e9941d4abf..f27171c5fa 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -12,7 +12,7 @@
"notify_me": "Powiadamiaj mnie o nowych odpowiedziach w tym wątku",
"quote": "Cytuj",
"reply": "Odpowiedz",
- "guest-login-reply": "Log in to reply",
+ "guest-login-reply": "Zaloguj się, aby odpowiedzieć.",
"edit": "Edytuj",
"delete": "Usuń",
"purge": "Wymaż",
diff --git a/public/language/ru/category.json b/public/language/ru/category.json
index 8a97af5a0d..4d70a82236 100644
--- a/public/language/ru/category.json
+++ b/public/language/ru/category.json
@@ -1,6 +1,6 @@
{
"new_topic_button": "Создать тему",
- "guest-login-post": "Log in to post",
+ "guest-login-post": "Войдите чтобы создавать сообщения",
"no_topics": "В этой категории еще нет тем. Почему бы вам не создать первую?",
"browsing": "просматривают",
"no_replies": "Нет ответов",
diff --git a/public/language/ru/error.json b/public/language/ru/error.json
index cb43902332..bca2535d19 100644
--- a/public/language/ru/error.json
+++ b/public/language/ru/error.json
@@ -19,8 +19,8 @@
"email-taken": "Email занят",
"email-not-confirmed": "Ваш email не подтвержден, нажмите для подтверждения.",
"email-not-confirmed-chat": "Вы не можете оставлять сообщения, пока Ваш email не подтверждён",
- "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
- "email-confirm-failed": "We could not confirm your email, please try again later.",
+ "no-email-to-confirm": "Этот форум требует подтверждения по E-mail. Нажмите здесь для ввода E-mail.",
+ "email-confirm-failed": "Мы не можем подтвердить Ваш E-mail, попробуйте позже.",
"username-too-short": "Слишком короткое имя пользователя",
"username-too-long": "Имя пользователя слишком длинное",
"user-banned": "Пользователь заблокирован",
@@ -35,7 +35,7 @@
"no-emailers-configured": "Не подключен ни один плагин для отправки почты, поэтому тестовый email не может быть отправлен",
"category-disabled": "Категория отключена",
"topic-locked": "Тема закрыта",
- "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting",
+ "post-edit-duration-expired": "Вы можете редактировать сообщение в течении %1 секунд(ы) после написания.",
"still-uploading": "Пожалуйста, подождите завершения загрузки.",
"content-too-short": "Пост должен содержать минимум %1 симв.",
"content-too-long": "Размер поста не должен превышать %1 символов. Пожалуйста, сделайте его короче.",
@@ -43,8 +43,8 @@
"title-too-long": "Заголовок не может быть длиннее %1 символов.",
"too-many-posts": "Вы можете делать пост один раз в %1 сек.",
"too-many-posts-newbie": "Вы новый пользователь, поэтому можете делать пост раз в %1 сек., пока не заработаете %2 п. репутации.",
- "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters",
- "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters",
+ "tag-too-short": "Введите более длинный тэг. Тэги должны содержать как минимум %1 символа(ов).",
+ "tag-too-long": "Введите тэг покороче. Тэги должны быть короче %1 символов.",
"file-too-big": "Максимальный разрешенный размер файла - %1 Кбайт. Пожалуйста, загрузите файл меньшего размера.",
"cant-vote-self-post": "Вы не можете проголосовать за Ваш пост",
"already-favourited": "Вы уже добавили этот пост в избранное",
@@ -52,7 +52,7 @@
"cant-ban-other-admins": "Вы не можете забанить других администраторов!",
"invalid-image-type": "Неверный формат изображения. Поддерживаемые форматы: %1",
"invalid-image-extension": "Недопустимое расширение файла",
- "invalid-file-type": "Invalid file type. Allowed types are: %1",
+ "invalid-file-type": "Неверный формат фаила. Поддерживаемые форматы : %1",
"group-name-too-short": "Название группы слишком короткое",
"group-already-exists": "Группа уже существует",
"group-name-change-not-allowed": "Изменение названия группы запрещено",
@@ -76,6 +76,6 @@
"reload-failed": "NodeBB обнаружил проблему при перезагрузке: \"%1\". NodeBB продолжит работать с существующими ресурсами клиента, но Вы должны отменить то, что сделали перед перезагрузкой.",
"registration-error": "Ошибка при регистрации",
"parse-error": "Похоже, что-то пошло не так в процессе обработки ответа сервера.",
- "wrong-login-type-email": "Please use your email to login",
- "wrong-login-type-username": "Please use your username to login"
+ "wrong-login-type-email": "Пожалуйста, используйте свой E-mail для входа.",
+ "wrong-login-type-username": "Пожалуйста, используйте своё имя пользователя для входа."
}
\ No newline at end of file
diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json
index c46e857368..8ef4e59089 100644
--- a/public/language/ru/groups.json
+++ b/public/language/ru/groups.json
@@ -4,8 +4,8 @@
"owner": "Администратор группы",
"new_group": "Создать группу",
"no_groups_found": "Нет групп для отображения",
- "pending.accept": "Accept",
- "pending.reject": "Reject",
+ "pending.accept": "Принять",
+ "pending.reject": "Отклонить",
"cover-instructions": "Перетяните сюда изображение, переместите на нужную позицию и нажмите Сохранить",
"cover-change": "Изменить",
"cover-save": "Сохранить",
@@ -15,20 +15,20 @@
"details.pending": "Заявки в группу",
"details.has_no_posts": "Пользователями этой группы не публиковали никаких записей",
"details.latest_posts": "Последние записи",
- "details.private": "Private",
+ "details.private": "Частный (ая)",
"details.grant": "Выдать/забрать администратора",
"details.kick": "Исключить",
"details.owner_options": "Настройки группы",
- "details.group_name": "Group Name",
- "details.description": "Description",
- "details.badge_preview": "Badge Preview",
- "details.change_icon": "Change Icon",
- "details.change_colour": "Change Colour",
- "details.badge_text": "Badge Text",
- "details.userTitleEnabled": "Show Badge",
- "details.private_help": "If enabled, joining of groups requires approval from a group owner",
- "details.hidden": "Hidden",
- "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
+ "details.group_name": "Имя группы",
+ "details.description": "Описание",
+ "details.badge_preview": "Предпросмотр Бейджа",
+ "details.change_icon": "Сменить иконку",
+ "details.change_colour": "Изменить цвет",
+ "details.badge_text": "Текст на Бейдже",
+ "details.userTitleEnabled": "Показать Бейдж",
+ "details.private_help": "Если включено, вступление в группы будет подтверждаться владельцем группы",
+ "details.hidden": "Скрыто",
+ "details.hidden_help": "Если включено, группа не будет показываться в списках, а пользователи должны приглашаться вручную",
"event.updated": "Настройки группы обновлены",
"event.deleted": "Группа \"%1\" удалена"
}
\ No newline at end of file
diff --git a/public/language/ru/login.json b/public/language/ru/login.json
index b371df159e..b0a5793412 100644
--- a/public/language/ru/login.json
+++ b/public/language/ru/login.json
@@ -1,6 +1,6 @@
{
- "username-email": "Username / Email",
- "username": "Username",
+ "username-email": "Имя пользователя / E-mail",
+ "username": "Имя пользователя",
"email": "Email",
"remember_me": "Запомнить меня",
"forgot_password": "Забыли пароль?",
diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json
index 0618e808db..c3d1fa2bfc 100644
--- a/public/language/ru/notifications.json
+++ b/public/language/ru/notifications.json
@@ -2,7 +2,7 @@
"title": "Уведомления",
"no_notifs": "Для Вас нет новых уведомлений",
"see_all": "Просмотреть все уведомления",
- "mark_all_read": "Mark all notifications read",
+ "mark_all_read": "Отметить все уведомления как прочитанные",
"back_to_home": "Назад к %1",
"outgoing_link": "Внешняя ссылка",
"outgoing_link_message": "Вы покидаете %1.",
diff --git a/public/language/ru/recent.json b/public/language/ru/recent.json
index 83c1e01b53..bddea6644e 100644
--- a/public/language/ru/recent.json
+++ b/public/language/ru/recent.json
@@ -6,7 +6,7 @@
"year": "Год",
"alltime": "За всё время",
"no_recent_topics": "Нет свежих тем.",
- "no_popular_topics": "There are no popular topics.",
+ "no_popular_topics": "Популярные темы отсутствуют.",
"there-is-a-new-topic": "Опубликована новая тема.",
"there-is-a-new-topic-and-a-new-post": "Опубликована новая тема и новое сообщение.",
"there-is-a-new-topic-and-new-posts": "Опубликована новая тема и %1 новых сообщений.",
diff --git a/public/language/ru/search.json b/public/language/ru/search.json
index a3929d303b..8fa2f31ebd 100644
--- a/public/language/ru/search.json
+++ b/public/language/ru/search.json
@@ -32,9 +32,9 @@
"category": "Категория",
"descending": "В порядке возрастания",
"ascending": "В порядке убывания",
- "save-preferences": "Save preferences",
- "clear-preferences": "Clear preferences",
- "search-preferences-saved": "Search preferences saved",
+ "save-preferences": "Сохранить настройки",
+ "clear-preferences": "Очистить настройки",
+ "search-preferences-saved": "Искать сохраненные настройки",
"search-preferences-cleared": "Search preferences cleared",
- "show-results-as": "Show results as"
+ "show-results-as": "Показать результаты как"
}
\ No newline at end of file
diff --git a/public/language/ru/tags.json b/public/language/ru/tags.json
index fa5fa0b9b2..8b78464be4 100644
--- a/public/language/ru/tags.json
+++ b/public/language/ru/tags.json
@@ -1,7 +1,7 @@
{
"no_tag_topics": "Нет топиков с таким тегом.",
"tags": "Теги",
- "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+ "enter_tags_here": "Укажите тэги здесь. %1-%2 символов(а). Нажимайте Enter после каждого тэга.",
"enter_tags_here_short": "Введите теги...",
"no_tags": "Здесь еще нет тегов."
}
\ No newline at end of file
diff --git a/public/language/tr/category.json b/public/language/tr/category.json
index 34ac645f32..518bd9dcb0 100644
--- a/public/language/tr/category.json
+++ b/public/language/tr/category.json
@@ -1,6 +1,6 @@
{
"new_topic_button": "Yeni Başlık",
- "guest-login-post": "Log in to post",
+ "guest-login-post": "Göndermek için giriş yapın",
"no_topics": " Bu kategoride hiç konu yok. Yeni bir konu açmak istemez misiniz?",
"browsing": "gözden geçiriliyor",
"no_replies": "Kimse yanıtlamadı",
diff --git a/public/language/tr/error.json b/public/language/tr/error.json
index 69cd323a2f..d54bbce50a 100644
--- a/public/language/tr/error.json
+++ b/public/language/tr/error.json
@@ -19,8 +19,8 @@
"email-taken": "E-posta Alınmış",
"email-not-confirmed": "E-postanız onaylanmamış, onaylamak için lütfen buraya tıklayın.",
"email-not-confirmed-chat": "Email adresiniz doğrulanmadan sohbet edemezsiniz.",
- "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
- "email-confirm-failed": "We could not confirm your email, please try again later.",
+ "no-email-to-confirm": "Bu forum e-posta doğrulaması gerektirir, lütfen buraya bir e-posta adresi girin",
+ "email-confirm-failed": "E-posta adresinizi doğrulayamıyoruz. Lütfen daha sonra tekrar deneyin.",
"username-too-short": "Kullanıcı ismi çok kısa",
"username-too-long": "Kullanıcı ismi çok uzun.",
"user-banned": "Kullanıcı Yasaklı",
@@ -43,8 +43,8 @@
"title-too-long": "Lütfen daha kısa bir başlık girin. Başlıklar %1 karakterden uzun olamaz.",
"too-many-posts": "Sadece %1 saniyede bir ileti gönderebilirsiniz.",
"too-many-posts-newbie": "Yeni bir kullanıcı olarak, %2 saygınlığınız olana kadar sadece %1 saniyede bir mesaj gönderebilirsiniz. Lütfen tekrar ileti göndermeden önce bekleyin.",
- "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters",
- "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters",
+ "tag-too-short": "Lütfen daha uzun bir etiket giriniz. Etiketler en az %1 karakter uzunluğunda olmalı",
+ "tag-too-long": "Lütfen daha kısa bir etiket girin. Etiketler %1 karakterden daha uzun olamaz",
"file-too-big": "İzin verilen en büyük dosya boyutu %1 kbs.",
"cant-vote-self-post": "Kendi iletinize oy veremezsiniz",
"already-favourited": "Bu iletiyi zaten favorilerinize eklediniz",
@@ -52,7 +52,7 @@
"cant-ban-other-admins": "Başka yöneticileri yasaklayamazsınız!",
"invalid-image-type": "Geçersiz resim uzantısı. Izin verilen uzantılar: %1",
"invalid-image-extension": "Geçersiz resim uzantısı",
- "invalid-file-type": "Invalid file type. Allowed types are: %1",
+ "invalid-file-type": "Geçersiz dosya türü. İzin verilenler şunlar : %1",
"group-name-too-short": "Grup ismi çok kısa",
"group-already-exists": "Grup zaten var",
"group-name-change-not-allowed": "Grup ismini değiştiremezsiniz",
@@ -76,6 +76,6 @@
"reload-failed": "NodeBB tekrar yüklenirken bir sorunla karşılaştı: “%1“. NodeBB varolan dosyaları servis etmeye devam edecek.",
"registration-error": "Kayıt Hatası",
"parse-error": "Sunucu yanıtı çözümlemesi sırasında bir şeyler ters gitti",
- "wrong-login-type-email": "Please use your email to login",
- "wrong-login-type-username": "Please use your username to login"
+ "wrong-login-type-email": "Lütfen giriş için e-posta adresinizi kullanın",
+ "wrong-login-type-username": "Lütfen giriş için kullanıcı adınızı kullanın"
}
\ No newline at end of file
diff --git a/public/language/tr/groups.json b/public/language/tr/groups.json
index 7191d93c86..536921e7e5 100644
--- a/public/language/tr/groups.json
+++ b/public/language/tr/groups.json
@@ -4,8 +4,8 @@
"owner": "Grup Kurucusu",
"new_group": "Yeni Grup Oluştur",
"no_groups_found": "Henüz hiç grup yok",
- "pending.accept": "Accept",
- "pending.reject": "Reject",
+ "pending.accept": "Onayla",
+ "pending.reject": "Reddet",
"cover-instructions": "Bir fotoğrafı Sürükleyin ve Bırakın, uygun yere sürükleyip Kaydet'e tıklayın.",
"cover-change": "Değiştir",
"cover-save": "Kaydet",
@@ -15,20 +15,20 @@
"details.pending": "Üyeler bekleniyor",
"details.has_no_posts": "Bu grubun üyeleri henüz bir ileti göndermedi.",
"details.latest_posts": "En son iletiler",
- "details.private": "Private",
+ "details.private": "Özel",
"details.grant": "Grant/Rescind Ownership",
- "details.kick": "Kick",
+ "details.kick": "Dışarı at",
"details.owner_options": "Grup Yöneticisi",
- "details.group_name": "Group Name",
- "details.description": "Description",
- "details.badge_preview": "Badge Preview",
- "details.change_icon": "Change Icon",
- "details.change_colour": "Change Colour",
- "details.badge_text": "Badge Text",
- "details.userTitleEnabled": "Show Badge",
- "details.private_help": "If enabled, joining of groups requires approval from a group owner",
- "details.hidden": "Hidden",
- "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
+ "details.group_name": "Grup ismi",
+ "details.description": "Tanımlama",
+ "details.badge_preview": "Rozet Önizlemesi",
+ "details.change_icon": "İkonu Değiştir",
+ "details.change_colour": "Rengi Değiştir",
+ "details.badge_text": "Rozet Yazısı",
+ "details.userTitleEnabled": "Rozeti Göster",
+ "details.private_help": "Gruba katılmak için eğer etkinse grup sahibini onayı gerekir, ",
+ "details.hidden": "Gizli",
+ "details.hidden_help": "Bu grup eğer etkinse grup listelerinde bulunmaz, ve kullanıcılar bizzat davet eder",
"event.updated": "Grup detayları güncellenmiştir",
"event.deleted": "\"%1\" grubu silinmiş"
}
\ No newline at end of file
diff --git a/public/language/tr/login.json b/public/language/tr/login.json
index e18bc769ca..bd13e81d46 100644
--- a/public/language/tr/login.json
+++ b/public/language/tr/login.json
@@ -1,7 +1,7 @@
{
- "username-email": "Username / Email",
- "username": "Username",
- "email": "Email",
+ "username-email": "Kullancı Adı / E posta adresi",
+ "username": "Kullanıcı Adı",
+ "email": "E posta Adresi",
"remember_me": "Beni Hatırla!",
"forgot_password": "Şifrenizi mi unuttunuz?",
"alternative_logins": "Alternatif Girişler",
diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json
index c87b3ec4ee..64ca790352 100644
--- a/public/language/tr/notifications.json
+++ b/public/language/tr/notifications.json
@@ -2,7 +2,7 @@
"title": "Bildirimler",
"no_notifs": "Yeni bildirimleriniz yok",
"see_all": "Bütün bildirimleri gör",
- "mark_all_read": "Mark all notifications read",
+ "mark_all_read": "Okunmuş bütün bildirimleri işaretle",
"back_to_home": "Geri dön %1",
"outgoing_link": "Harici Link",
"outgoing_link_message": "Bu forumdan ayrılıyorsunuz",
diff --git a/public/language/tr/recent.json b/public/language/tr/recent.json
index 817a69b2f8..f91231966c 100644
--- a/public/language/tr/recent.json
+++ b/public/language/tr/recent.json
@@ -6,7 +6,7 @@
"year": "Yıl",
"alltime": "Hepsi",
"no_recent_topics": "Güncel konular yok.",
- "no_popular_topics": "There are no popular topics.",
+ "no_popular_topics": "Popüler konu yok",
"there-is-a-new-topic": "Yeni bir konu mevcut.",
"there-is-a-new-topic-and-a-new-post": "Yeni bir konu ve yayın mevcut.",
"there-is-a-new-topic-and-new-posts": "Bir adet yeni konu ve %1 adet yeni yayın var.",
diff --git a/public/language/tr/search.json b/public/language/tr/search.json
index 1819a07de3..2ffbbfe36e 100644
--- a/public/language/tr/search.json
+++ b/public/language/tr/search.json
@@ -32,9 +32,9 @@
"category": "Kategori",
"descending": "Azalan düzene göre",
"ascending": "Artan düzene göre",
- "save-preferences": "Save preferences",
- "clear-preferences": "Clear preferences",
- "search-preferences-saved": "Search preferences saved",
- "search-preferences-cleared": "Search preferences cleared",
- "show-results-as": "Show results as"
+ "save-preferences": "Tercihleri Kaydet",
+ "clear-preferences": "Tercihleri Sil",
+ "search-preferences-saved": "Kaydedilmiş Arama tercihleri",
+ "search-preferences-cleared": "Silinmiş Arama Tercihleri",
+ "show-results-as": "Sonuçları göster : "
}
\ No newline at end of file
diff --git a/public/language/tr/tags.json b/public/language/tr/tags.json
index c0ffd63eb1..344a4bfff6 100644
--- a/public/language/tr/tags.json
+++ b/public/language/tr/tags.json
@@ -1,7 +1,7 @@
{
"no_tag_topics": "Bu etiketli başlık yok.",
"tags": "Etiketler",
- "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+ "enter_tags_here": "Etiketleri buraya girin. %1-%2 karakter. Her etiketten sonra enter tuşuna basın.",
"enter_tags_here_short": "Etiketleri gir...",
"no_tags": "Henüz etiket yok."
}
\ No newline at end of file
diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json
index fa76fb4ee6..ef6276ca31 100644
--- a/public/language/tr/topic.json
+++ b/public/language/tr/topic.json
@@ -12,7 +12,7 @@
"notify_me": "Bu konudaki cevaplardan haberdar ol",
"quote": "Alıntı",
"reply": "Cevap",
- "guest-login-reply": "Log in to reply",
+ "guest-login-reply": "Cevaplamak için giriş yapın",
"edit": "Düzenle",
"delete": "Sil",
"purge": "Temizle",
diff --git a/public/language/tr/users.json b/public/language/tr/users.json
index 9e38f04530..ed6fd922fe 100644
--- a/public/language/tr/users.json
+++ b/public/language/tr/users.json
@@ -5,7 +5,7 @@
"search": "Ara",
"enter_username": "Aramak için bir kullanıcı adı girin",
"load_more": "Daha Fazla Yükle",
- "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
+ "users-found-search-took": "%1 kullanıcı(lar) bulundu! Arama %2 saniye sürdü.",
"filter-by": "Şu şekilde filtrele",
"online-only": "Sadece çevrimiçi",
"picture-only": "Sadece resim"
diff --git a/public/language/vi/category.json b/public/language/vi/category.json
index e536a54efb..be80ee1583 100644
--- a/public/language/vi/category.json
+++ b/public/language/vi/category.json
@@ -1,6 +1,6 @@
{
"new_topic_button": "Chủ đề mới",
- "guest-login-post": "Log in to post",
+ "guest-login-post": "Đăng nhập để viết bài",
"no_topics": "Không có bài viết trong danh mục này. Hãy đăng một bài viết mới.",
"browsing": "đang xem",
"no_replies": "Chưa có bình luận nào",
diff --git a/public/language/vi/email.json b/public/language/vi/email.json
index d0d376eb34..c7f5fd5b54 100644
--- a/public/language/vi/email.json
+++ b/public/language/vi/email.json
@@ -9,9 +9,9 @@
"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 bạn không gởi yêu cầu, hãy bỏ qua email này.",
"reset.text2": "Để đặt lại mật khẩu, hãy click vào liên kết sau:",
"reset.cta": "Click vào đây để khởi tạo lại mật khẩu",
- "reset.notify.subject": "Password successfully changed",
- "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
- "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
+ "reset.notify.subject": "Thay đổi mật khẩu thành công",
+ "reset.notify.text1": "Chúng tôi thông báo với bạn trên %1, mật khẩu của bạn đã thay đổi thành công",
+ "reset.notify.text2": "Nếu bạn không cho phép điều này, vui lòng thông báo cho quản trị viên ngay lập tức",
"digest.notifications": "Bạn có thông báo chưa đọc từ %1",
"digest.latest_topics": "Chủ đề mới nhất từ %1",
"digest.cta": "Click vào đây để truy cập %1",
@@ -20,8 +20,8 @@
"notif.chat.subject": "Bạn có tin nhắn mới từ %1",
"notif.chat.cta": "Nhấn vào đây để tiếp tục cuộc hội thoại",
"notif.chat.unsub.info": "Thông báo tin nhắn này được gửi tới dựa theo cài đặt theo dõi của bạn.",
- "notif.post.cta": "Click here to read the full topic",
- "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+ "notif.post.cta": "Nhấn vào đây để đọc toàn bộ chủ đề",
+ "notif.post.unsub.info": "Thông báo bài viết này được gửi cho bạn dựa tên thiết lập nhận thông báo của bạn",
"test.text1": "Đây là email kiểm tra xem chức năng gửi mail trên hệ thống NodeBB của bạn có hoạt động tốt hay không.",
"unsub.cta": "Nhấn vào đây để thay đổi cài đặt.",
"closing": "Xin cảm ơn!"
diff --git a/public/language/vi/error.json b/public/language/vi/error.json
index 65ddf93ba0..56d5a49788 100644
--- a/public/language/vi/error.json
+++ b/public/language/vi/error.json
@@ -18,7 +18,7 @@
"username-taken": "Tên đăng nhập đã tồn tại",
"email-taken": "Email đã được đăng kí",
"email-not-confirmed": "Email của bạn chưa được xác nhận, xin hãy nhấn vào đây để xác nhận địa chỉ này là của bạn",
- "email-not-confirmed-chat": "You are unable to chat until your email is confirmed",
+ "email-not-confirmed-chat": "Bạn không thể trò chuyện cho đến khi thư điện tử của bạn được xác nhận",
"no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
"email-confirm-failed": "We could not confirm your email, please try again later.",
"username-too-short": "Tên đăng nhập quá ngắn",
diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json
index d204c2fd0b..d218247ba7 100644
--- a/public/language/vi/notifications.json
+++ b/public/language/vi/notifications.json
@@ -2,7 +2,7 @@
"title": "Thông báo",
"no_notifs": "Bạn không có thông báo nào mới",
"see_all": "Xem tất cả thông báo",
- "mark_all_read": "Mark all notifications read",
+ "mark_all_read": "Đánh dấu đã xem tất cả thông báo",
"back_to_home": "Quay lại %1",
"outgoing_link": "Liên kết ngoài",
"outgoing_link_message": "Bạn đang rời khỏi %1.",
diff --git a/public/language/zh_CN/category.json b/public/language/zh_CN/category.json
index 21ea5d5acf..1d5d4fb2a5 100644
--- a/public/language/zh_CN/category.json
+++ b/public/language/zh_CN/category.json
@@ -1,6 +1,6 @@
{
"new_topic_button": "新主题",
- "guest-login-post": "Log in to post",
+ "guest-login-post": "登陆后发表",
"no_topics": "此版块还没有任何内容。 赶紧来发帖吧！",
"browsing": "正在浏览",
"no_replies": "尚无回复",
diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json
index 69ea834c58..b156a96793 100644
--- a/public/language/zh_CN/error.json
+++ b/public/language/zh_CN/error.json
@@ -19,8 +19,8 @@
"email-taken": "电子邮箱已被占用",
"email-not-confirmed": "您的电子邮箱尚未确认，请点击这里确认您的电子邮箱。",
"email-not-confirmed-chat": "在确认您的邮箱之前，您不能使用聊天功能",
- "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
- "email-confirm-failed": "We could not confirm your email, please try again later.",
+ "no-email-to-confirm": "本论坛需要电子邮箱确认，请点击这里输入一个电子邮箱地址",
+ "email-confirm-failed": "我们无法确认您的电子邮箱，请重试",
"username-too-short": "用户名太短",
"username-too-long": "用户名太长",
"user-banned": "用户已禁止",
@@ -35,7 +35,7 @@
"no-emailers-configured": "未加载任何电子邮箱插件，无法发送测试邮件",
"category-disabled": "版块已禁用",
"topic-locked": "主题已锁定",
- "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting",
+ "post-edit-duration-expired": "您只能在发表后 %1 秒内修改内容",
"still-uploading": "请等待上传完成",
"content-too-short": "请再输入一些内容，帖子至少要有 %1 个字符。",
"content-too-long": "请输入更短的发帖。发帖字数不能超过 %1 个字符。",
@@ -43,8 +43,8 @@
"title-too-long": "请输入更短的标题。不超过 %1 字。",
"too-many-posts": "发帖间隔至少要 %1 秒 - 请稍候再发帖",
"too-many-posts-newbie": "作为新用户，您必须每隔 %1 秒才能发帖一次，直到您有 %2 点威望为止 —— 请稍候再发帖",
- "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters",
- "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters",
+ "tag-too-short": "标签长度过短，标签长度至少为 %1 个字符",
+ "tag-too-long": "标签长度过长，标签长度至多为 %1 个字符",
"file-too-big": "文件不能超过 %1k 字节 - 请上传更小的文件",
"cant-vote-self-post": "您不能给自己的帖子投票。",
"already-favourited": "您已收藏该帖",
@@ -52,7 +52,7 @@
"cant-ban-other-admins": "您不能禁止其他管理员！",
"invalid-image-type": "无效的图像类型。允许的类型有：%1",
"invalid-image-extension": "无效的图像扩展",
- "invalid-file-type": "Invalid file type. Allowed types are: %1",
+ "invalid-file-type": "无效文件格式，允许的格式有：%1",
"group-name-too-short": "用户组名称太短",
"group-already-exists": "用户组已存在",
"group-name-change-not-allowed": "不允许更改用户组名称",
@@ -76,6 +76,6 @@
"reload-failed": "NodeBB 重新加载时遇到问题: \"%1\"。NodeBB 会继续给已存在的客户端组件服务，虽然您应该撤销在重新加载前执行的操作。",
"registration-error": "注册错误",
"parse-error": "解析服务器响应时出错",
- "wrong-login-type-email": "Please use your email to login",
- "wrong-login-type-username": "Please use your username to login"
+ "wrong-login-type-email": "请输入您的电子邮箱地址登录",
+ "wrong-login-type-username": "请输入您的用户名登录"
}
\ No newline at end of file
diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js
index 220c4e1980..e2484b1f07 100644
--- a/public/src/admin/extend/plugins.js
+++ b/public/src/admin/extend/plugins.js
@@ -144,7 +144,7 @@ define('admin/extend/plugins', function() {
socket.emit('admin.plugins.upgrade', {
id: pluginID,
version: version
- }, function(err) {
+ }, function(err, isActive) {
if (err) {
return app.alertError(err.message);
}
@@ -152,6 +152,18 @@ define('admin/extend/plugins', function() {
parent.find('.fa-exclamation-triangle').remove();
parent.find('.currentVersion').text(version);
btn.remove();
+ if (isActive) {
+ app.alert({
+ alert_id: 'plugin_upgraded',
+ title: 'Plugin Upgraded',
+ message: 'Please reload your NodeBB to fully upgrade this plugin',
+ type: 'warning',
+ timeout: 5000,
+ clickfn: function() {
+ socket.emit('admin.reload');
+ }
+ });
+ }
});
}
diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js
index 239d5bd809..b57453ffab 100644
--- a/public/src/admin/extend/widgets.js
+++ b/public/src/admin/extend/widgets.js
@@ -3,7 +3,7 @@
define('admin/extend/widgets', function() {
var Widgets = {};
-
+
Widgets.init = function() {
$('#widgets .nav-pills a').on('click', function(ev) {
var $this = $(this);
diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js
index 95f41b3510..9bd684ec80 100644
--- a/public/src/admin/general/navigation.js
+++ b/public/src/admin/general/navigation.js
@@ -18,7 +18,7 @@ define('admin/general/navigation', function() {
stop: drop
});
});
-
+
$('#enabled')
.on('click', '.delete', remove)
.on('click', '.toggle', toggle)
@@ -75,6 +75,7 @@ define('admin/general/navigation', function() {
function remove() {
$(this).parents('li').remove();
+ return false;
}
function toggle() {
diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js
index 63105b73f1..52d13874ab 100644
--- a/public/src/admin/manage/categories.js
+++ b/public/src/admin/manage/categories.js
@@ -75,8 +75,6 @@ define('admin/manage/categories', [
name: $('#inputName').val(),
description: $('#inputDescription').val(),
icon: $('#new-category-modal i').attr('value'),
- bgColor: '#0059b2',
- color: '#fff',
order: $('.admin-categories #entry-container').children().length + 1
};
@@ -207,7 +205,7 @@ define('admin/manage/categories', [
case 'name':
data[name] = $(this).val() + ' (copy)';
break;
- default:
+ default:
data[name] = $(this).val();
}
});
@@ -226,7 +224,7 @@ define('admin/manage/categories', [
var inputEl = $(this),
cid = inputEl.parents('li[data-cid]').attr('data-cid');
- uploader.open(RELATIVE_PATH + '/admin/category/uploadpicture', { cid: cid }, 0, function(imageUrlOnServer) {
+ uploader.open(RELATIVE_PATH + '/api/admin/category/uploadpicture', { cid: cid }, 0, function(imageUrlOnServer) {
inputEl.val(imageUrlOnServer);
var previewBox = inputEl.parents('li[data-cid]').find('.preview-box');
previewBox.css('background', 'url(' + imageUrlOnServer + '?' + new Date().getTime() + ')')
diff --git a/public/src/admin/modules/search.js b/public/src/admin/modules/search.js
index dec438165d..781f4ade9e 100644
--- a/public/src/admin/modules/search.js
+++ b/public/src/admin/modules/search.js
@@ -103,11 +103,17 @@ define(function() {
if (menuItems.html() !== '') {
menuItems.append('');
+ } else {
+ menuItems.append('