diff --git a/docs/plugins/create.rst b/docs/plugins/create.rst index 7ecc627d0a..568c9ece8d 100644 --- a/docs/plugins/create.rst +++ b/docs/plugins/create.rst @@ -31,7 +31,9 @@ Each plugin package contains a configuration file called ``plugin.json``. Here i "description": "Your plugin's description", "url": "Absolute URL to your plugin or a Github repository", "library": "./my-plugin.js", - "staticDir": "/assets", + "staticDirs": { + "images": "public/images" + }, "less": [ "assets/style.less" ], @@ -45,7 +47,9 @@ The ``id`` property is a unique name that identifies the plugin. The ``library`` property is a relative path to the library in your package. It is automatically loaded by NodeBB (if the plugin is activated). -The ``staticDir`` property is a path (relative to your plugin's root) to a directory that NodeBB will expose to the public at the route ``/plugins/{YOUR-PLUGIN-ID}``. +The ``staticDirs`` property is an object hash that maps out paths (relative to your plugin's root) to a directory that NodeBB will expose to the public at the route ``/plugins/{YOUR-PLUGIN-ID}``. + +* e.g. The ``staticDirs`` hash in the sample configuration maps ``/path/to/your/plugin/public/images`` to ``/plugins/my-plugin/images`` The ``less`` property contains an array of paths (relative to your plugin's directory), that will be precompiled into the CSS served by NodeBB. diff --git a/docs/plugins/hooks.rst b/docs/plugins/hooks.rst index f560bf6e0a..eb64dd8bca 100644 --- a/docs/plugins/hooks.rst +++ b/docs/plugins/hooks.rst @@ -182,4 +182,12 @@ Executed whenever a post is created or edited, after it is saved into the databa ``action:user.set`` ^^^^^^^^^^^^^^^^^^^^^ -Useful for things like awarding badges or achievements after a user has reached some value (ex. 100 posts) \ No newline at end of file +Parameters: field (str), value, type ('set', 'increment', or 'decrement') +Useful for things like awarding badges or achievements after a user has reached some value (ex. 100 posts) + +``action:settings.set`` +^^^^^^^^^^^^^^^^^^^^^ +Parameters: hash (str), object (obj) +Useful if your plugins want to cache settings instead of pulling from DB everytime a method is called. Listen to this and refresh accordingly. + + diff --git a/public/language/ar/global.json b/public/language/ar/global.json index 53a06b1f5a..638f37e5f5 100644 --- a/public/language/ar/global.json +++ b/public/language/ar/global.json @@ -50,7 +50,7 @@ "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", + "posted_in_ago": "posted in %1 %2", "replied_ago": "replied %1", "user_posted_ago": "%1 posted %2", "guest_posted_ago": "Guest posted %1", diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index 727cee9f62..851e1e0f7e 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -7,6 +7,7 @@ "post_is_deleted": "This post is deleted!", "profile": "ملف", "posted_by": "Posted by %1", + "posted_by_guest": "Posted by Guest", "chat": "دردشة", "notify_me": "تنبه من ردود جديدة في هذا الموضوع", "quote": "اقتبس", diff --git a/public/language/cs/global.json b/public/language/cs/global.json index 7fa9cddb38..eb9a0f0a8c 100644 --- a/public/language/cs/global.json +++ b/public/language/cs/global.json @@ -50,7 +50,7 @@ "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", + "posted_in_ago": "posted in %1 %2", "replied_ago": "replied %1", "user_posted_ago": "%1 posted %2", "guest_posted_ago": "Guest posted %1", diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index 88d70bd7f3..4220fc9499 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -7,6 +7,7 @@ "post_is_deleted": "This post is deleted!", "profile": "Profil", "posted_by": "Posted by %1", + "posted_by_guest": "Posted by Guest", "chat": "Chat", "notify_me": "Sledovat toto téma", "quote": "Citovat", diff --git a/public/language/de/global.json b/public/language/de/global.json index af37df4287..b4a3c84b07 100644 --- a/public/language/de/global.json +++ b/public/language/de/global.json @@ -45,16 +45,16 @@ "views": "Aufrufe", "reputation": "Reputation", "read_more": "weiterlesen", - "posted_ago_by_guest": "Gespostet %1 von Gast", + "posted_ago_by_guest": "%1 verfasst von einem Gast", "posted_ago_by": "Geposted %1 von %2", - "posted_ago": "posted %1", - "posted_in_ago_by_guest": "posted in %1 %2 by Guest", - "posted_in_ago_by": "Geposted in %1 %2 von %3", - "posted_in_ago": "Geposted in %1", + "posted_ago": "schrieb %1", + "posted_in_ago_by_guest": "verfasst in %1 %2 von einem Gast", + "posted_in_ago_by": "Verfasst in %1 %2 von %3", + "posted_in_ago": "posted in %1 %2", "replied_ago": "antwortete %1", "user_posted_ago": "1% schrieb %2", - "guest_posted_ago": "Guest posted %1", - "last_edited_by_ago": "zuletzt editirt von %1 %2", + "guest_posted_ago": "Gast schrieb %1", + "last_edited_by_ago": "zuletzt editiert von %1 %2", "norecentposts": "Keine aktuellen Beiträge", "norecenttopics": "Keine aktuellen Themen", "recentposts": "Aktuelle Beiträge", diff --git a/public/language/de/topic.json b/public/language/de/topic.json index e31c136723..28dc42c156 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -4,9 +4,10 @@ "topic_id_placeholder": "Topic ID eingeben", "no_topics_found": "Keine passende Themen gefunden.", "no_posts_found": "Keine Beiträge gefunden!", - "post_is_deleted": "This post is deleted!", + "post_is_deleted": "Dieser Beitrag wurde gelöscht!", "profile": "Profil", - "posted_by": "Posted by %1", + "posted_by": "Geschrieben von %1", + "posted_by_guest": "Posted by Guest", "chat": "Chat", "notify_me": "Werde bei neues Antworten auf dieses Thema benachrichtigt.", "quote": "zitieren", @@ -40,7 +41,7 @@ "thread_tools.lock": "Thema schließen", "thread_tools.unlock": "Thema öffnen", "thread_tools.move": "Thema verschieben", - "thread_tools.move_all": "Move All", + "thread_tools.move_all": "Alle verschieben", "thread_tools.fork": "Thema aufspalten", "thread_tools.delete": "Thema löschen", "thread_tools.delete_confirm": "Sind Sie sicher, dass Sie dieses Thema löschen möchten?", @@ -87,7 +88,7 @@ "composer.thumb_remove": "Felder leeren", "composer.drag_and_drop_images": "Bilder hier reinziehen", "composer.upload_instructions": "Zum Hochladen Bilder hier reinziehen.", - "more_users_and_guests": "%1 more user(s) and %2 guest(s)", - "more_users": "%1 more user(s)", - "more_guests": "%1 more guest(s)" + "more_users_and_guests": "%1 weitere(r) Nutzer und %2 Gäste", + "more_users": "%1 weitere(r) Nutzer", + "more_guests": "%1 weitere Gäste" } \ No newline at end of file diff --git a/public/language/en@pirate/global.json b/public/language/en@pirate/global.json index 4688fcff8b..b6765d066e 100644 --- a/public/language/en@pirate/global.json +++ b/public/language/en@pirate/global.json @@ -50,7 +50,7 @@ "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", + "posted_in_ago": "posted in %1 %2", "replied_ago": "replied %1", "user_posted_ago": "%1 posted %2", "guest_posted_ago": "Guest posted %1", diff --git a/public/language/en@pirate/topic.json b/public/language/en@pirate/topic.json index 7339a2bb3b..e5c97c09f1 100644 --- a/public/language/en@pirate/topic.json +++ b/public/language/en@pirate/topic.json @@ -7,6 +7,7 @@ "post_is_deleted": "This post is deleted!", "profile": "Profile", "posted_by": "Posted by %1", + "posted_by_guest": "Posted by Guest", "chat": "Chat", "notify_me": "Be notified of new replies in this topic", "quote": "Quote", diff --git a/public/language/en_US/global.json b/public/language/en_US/global.json index cc0d7e11dd..9673ee4afb 100644 --- a/public/language/en_US/global.json +++ b/public/language/en_US/global.json @@ -50,7 +50,7 @@ "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", + "posted_in_ago": "posted in %1 %2", "replied_ago": "replied %1", "user_posted_ago": "%1 posted %2", "guest_posted_ago": "Guest posted %1", diff --git a/public/language/en_US/notifications.json b/public/language/en_US/notifications.json index facec04e90..ee16612305 100644 --- a/public/language/en_US/notifications.json +++ b/public/language/en_US/notifications.json @@ -12,7 +12,7 @@ "user_made_post": "%1 made a new post", "new_message_from": "New message from %1", "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 has favourited your post.", + "favourited_your_post": "%1 has favorited your post.", "user_flagged_post": "%1 flagged a post.", "user_posted_to": "%1 has posted a reply to: %2" } \ No newline at end of file diff --git a/public/language/en_US/topic.json b/public/language/en_US/topic.json index ec70f8b365..ad4747ae31 100644 --- a/public/language/en_US/topic.json +++ b/public/language/en_US/topic.json @@ -7,6 +7,7 @@ "post_is_deleted": "This post is deleted!", "profile": "Profile", "posted_by": "Posted by %1", + "posted_by_guest": "Posted by Guest", "chat": "Chat", "notify_me": "Be notified of new replies in this topic", "quote": "Quote", diff --git a/public/language/es/global.json b/public/language/es/global.json index f678180d6e..a70dfc51a0 100644 --- a/public/language/es/global.json +++ b/public/language/es/global.json @@ -50,7 +50,7 @@ "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", + "posted_in_ago": "posted in %1 %2", "replied_ago": "replied %1", "user_posted_ago": "%1 posted %2", "guest_posted_ago": "Guest posted %1", diff --git a/public/language/es/pages.json b/public/language/es/pages.json index a1e82b600c..8d3b12a377 100644 --- a/public/language/es/pages.json +++ b/public/language/es/pages.json @@ -9,7 +9,7 @@ "user.following": "Gente que sigue %1 ", "user.followers": "Seguidores de %1", "user.posts": "Posteos de %1", - "user.topics": "Topics created by %1", + "user.topics": "Temas creados por %1", "user.favourites": "Publicaciones favoritas de %1 ", "user.settings": "Preferencias del Usuario" } \ No newline at end of file diff --git a/public/language/es/reset_password.json b/public/language/es/reset_password.json index 7fdd6ab7bd..a9f2114972 100644 --- a/public/language/es/reset_password.json +++ b/public/language/es/reset_password.json @@ -3,12 +3,12 @@ "update_password": "Actualizar contraseña", "password_changed.title": "Contraseña editada", "password_changed.message": "
La contraseña fue modificada con éxito, por favor inicia sesión de nuevo.",
- "wrong_reset_code.title": "Código de reinicio Incorrecto",
+ "wrong_reset_code.title": "Código de reinicio incorrecto",
"wrong_reset_code.message": "El código de reinicio ingresado no es correcto. Por favor inténtalo de nuevo o pide un nuevo código.",
"new_password": "Nueva Contraseña",
"repeat_password": "Confirmar Contraseña",
"enter_email": "Por favor ingresa tu correo electrónico y te enviaremos un correo con indicaciones para inicializar tu cuenta.",
- "enter_email_address": "Enter Email Address",
+ "enter_email_address": "Introduce tu correo electrónico",
"password_reset_sent": "Reinicio de contraseña enviado",
"invalid_email": "Correo Electrónico no válido o inexistente!"
}
\ No newline at end of file
diff --git a/public/language/es/topic.json b/public/language/es/topic.json
index 0c6fc174d9..3c3f9f753e 100644
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Perfil",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Chat",
"notify_me": "Serás notificado cuando haya nuevas respuestas en este tema",
"quote": "Citar",
diff --git a/public/language/et/global.json b/public/language/et/global.json
index 333b6152a7..27f3cefd89 100644
--- a/public/language/et/global.json
+++ b/public/language/et/global.json
@@ -45,16 +45,16 @@
"views": "Vaatamised",
"reputation": "Reputatsioon",
"read_more": "loe veel",
- "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",
- "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",
+ "posted_ago_by_guest": "postitatud %1 tagasi külalise poolt",
+ "posted_ago_by": "postitatud %1 tagasi kasutaja %2 poolt",
+ "posted_ago": "postitatud %1 tagasi",
+ "posted_in_ago_by_guest": "postitatud kategooriasse %1 %2 tagasi külalise poolt",
+ "posted_in_ago_by": "postitatud kategooriasse %1 %2 aega tagasi kasutaja %3 poolt",
+ "posted_in_ago": "postitatud kategooriasse %1 %2 tagasi",
+ "replied_ago": "vastas %1 tagasi",
+ "user_posted_ago": "kasutaja %1 postitas %2 tagasi",
+ "guest_posted_ago": "Külaline postitas %1",
+ "last_edited_by_ago": "viimati muudetud kasutaja %1 poolt %2 tagasi",
"norecentposts": "Hiljutisi postitusi ei ole",
"norecenttopics": "Hiljutisi teemasid ei ole",
"recentposts": "Hiljutised postitused",
@@ -65,6 +65,6 @@
"offline": "Väljas",
"email": "Emaili aadress",
"language": "Keel",
- "guest": "Guest",
- "guests": "Guests"
+ "guest": "Külaline",
+ "guests": "Külalised"
}
\ No newline at end of file
diff --git a/public/language/et/topic.json b/public/language/et/topic.json
index dce9918788..05c614a960 100644
--- a/public/language/et/topic.json
+++ b/public/language/et/topic.json
@@ -4,9 +4,10 @@
"topic_id_placeholder": "Sisesta teema ID",
"no_topics_found": "Teemasid ei leitud!",
"no_posts_found": "Postitusi ei leitud!",
- "post_is_deleted": "This post is deleted!",
+ "post_is_deleted": "See postitus on kustutatud!",
"profile": "Profiil",
- "posted_by": "Posted by %1",
+ "posted_by": "Postitatud %1 poolt",
+ "posted_by_guest": "Posted by Guest",
"chat": "Vestlus",
"notify_me": "Saa teateid uutest postitustest selles teemas",
"quote": "Tsiteeri",
@@ -40,7 +41,7 @@
"thread_tools.lock": "Lukusta teema",
"thread_tools.unlock": "Eemalda märgistatud teema",
"thread_tools.move": "Liiguta teema",
- "thread_tools.move_all": "Move All",
+ "thread_tools.move_all": "Liiguta kõik",
"thread_tools.fork": "Fork Topic",
"thread_tools.delete": "Kustuta teema",
"thread_tools.delete_confirm": "Oled kindel, et soovid kustutada antud teema?",
@@ -87,7 +88,7 @@
"composer.thumb_remove": "Puhasta väljad",
"composer.drag_and_drop_images": "Lohista pildid siia",
"composer.upload_instructions": "Lae üles pilte lohistades need siia.",
- "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
- "more_users": "%1 more user(s)",
- "more_guests": "%1 more guest(s)"
+ "more_users_and_guests": "%1 kasutaja(t) ja %2 külalist",
+ "more_users": "veel %1 kasutaja(t)",
+ "more_guests": "veel %1 külalist"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json
index 27d4615244..8d75610b52 100644
--- a/public/language/fa_IR/error.json
+++ b/public/language/fa_IR/error.json
@@ -19,7 +19,7 @@
"no-post": "چنین دیدگاهی نداریم",
"no-group": "چنین گروهی نداریم",
"no-user": "چنین کاربری نداریم",
- "no-teaser": "Teaser doesn't exist",
+ "no-teaser": "چکیدهٔ دیدگاه نیست",
"no-privileges": "شما پروانههای کافی برای این کار را ندارید.",
"category-disabled": "دسته از کار افتاد.",
"topic-locked": "جستار بسته شده",
diff --git a/public/language/fa_IR/global.json b/public/language/fa_IR/global.json
index 5ecee56f31..75f5bc20fb 100644
--- a/public/language/fa_IR/global.json
+++ b/public/language/fa_IR/global.json
@@ -39,18 +39,18 @@
"alert.unfollow": "شما دیگر %1 را دنبال نمیکنید!",
"alert.follow": "اکنون %1 را دنبال میکنید.",
"online": "حاضر",
- "users": "Users",
- "topics": "Topics",
+ "users": "کاربران",
+ "topics": "جُستارها",
"posts": "دیدگاهها",
"views": "بازدیدها",
- "reputation": "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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
@@ -65,6 +65,6 @@
"offline": "غایب",
"email": "رایانامه",
"language": "زبان",
- "guest": "Guest",
- "guests": "Guests"
+ "guest": "مهمان",
+ "guests": "مهمانها"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/success.json b/public/language/fa_IR/success.json
index af124e91ac..bfebde56e2 100644
--- a/public/language/fa_IR/success.json
+++ b/public/language/fa_IR/success.json
@@ -1,5 +1,5 @@
{
- "success": "Success",
+ "success": "موفقیت",
"topic-post": "دیدگاه شما باموفقیت فرستاده شد.",
"authentication-successful": "اعتبارسنجی موفق",
"settings-saved": "تنظیمات اندوخته شد."
diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json
index d885628f10..4ffe102720 100644
--- a/public/language/fa_IR/topic.json
+++ b/public/language/fa_IR/topic.json
@@ -4,9 +4,10 @@
"topic_id_placeholder": "ID جستار را بنویسید",
"no_topics_found": "هیچ جستاری یافت نشد!",
"no_posts_found": "دیدگاهی یافت نشد!",
- "post_is_deleted": "This post is deleted!",
+ "post_is_deleted": "این دیدگاه پاک شده!",
"profile": "نمایه",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "گفتگو",
"notify_me": "از پاسخهای تازه در جستار آگاه شوید",
"quote": "نقل قول",
@@ -40,7 +41,7 @@
"thread_tools.lock": "قفل کردن جستار",
"thread_tools.unlock": "باز کردن جستار",
"thread_tools.move": "جابجا کردن جستار",
- "thread_tools.move_all": "Move All",
+ "thread_tools.move_all": "جابجایی همه",
"thread_tools.fork": "شاخه ساختن از جستار",
"thread_tools.delete": "پاک کردن جستار",
"thread_tools.delete_confirm": "آیا از پاک کردن این جستار اطمینان دارید؟",
diff --git a/public/language/fi/global.json b/public/language/fi/global.json
index 72ce704376..aa12108f0d 100644
--- a/public/language/fi/global.json
+++ b/public/language/fi/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json
index acba808b23..0848103601 100644
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Profiili",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Keskustele",
"notify_me": "Ilmoita, kun tähän keskusteluun tulee uusia viestejä",
"quote": "Lainaa",
diff --git a/public/language/fr/error.json b/public/language/fr/error.json
index d536c24a73..43ba8ec4f0 100644
--- a/public/language/fr/error.json
+++ b/public/language/fr/error.json
@@ -1,49 +1,49 @@
{
- "invalid-data": "Invalid Data",
- "not-logged-in": "You don't seem to be logged in.",
- "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",
- "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.",
- "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 alread 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",
- "signature-too-long": "Signature can't be longer than %1 characters!",
- "cant-chat-with-yourself": "You can't chat with yourself!"
+ "invalid-data": "Données Invalides",
+ "not-logged-in": "Vous ne semblez pas être connecté.",
+ "invalid-cid": "ID de Catégorie Invalide",
+ "invalid-tid": "ID de Sujet Invalide",
+ "invalid-pid": "ID de Message Invalide",
+ "invalid-uid": "ID Utilisateur Invalide",
+ "invalid-username": "Nom d'utilisateur Invalide",
+ "invalid-email": "Email Invalide",
+ "invalid-title": "Titre Invalide",
+ "invalid-user-data": "Données Utilisateur Invalides",
+ "invalid-password": "Mot de passe Invalide",
+ "invalid-pagination-value": "Valeur de pagination invalide",
+ "username-taken": "Nom d’utilisateur déjà utilisé",
+ "email-taken": "Email déjà utilisé",
+ "user-banned": "Utilisateur banni",
+ "no-category": "Cette catégorie n'existe pas",
+ "no-topic": "Ce sujet n'existe pas",
+ "no-post": "Ce message n'existe pas",
+ "no-group": "Ce groupe n'existe pas",
+ "no-user": "Cet utilisateur n'existe pas",
+ "no-teaser": "L’aperçu n'existe pas",
+ "no-privileges": "Vous n'avez pas les privilèges nécessaires pour effectuer cette action.",
+ "category-disabled": "Catégorie désactivée",
+ "topic-locked": "Sujet Verrouillé",
+ "still-uploading": "Veuillez patienter pendant le téléchargement.",
+ "content-too-short": "Veuillez entrer un message plus long. %1 caractères minimum.",
+ "title-too-short": "Veuillez entrer un titre plus long. %1 caractères minimum.",
+ "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.",
+ "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",
+ "already-unfavourited": "Vous avez déjà enlevé ce message des favoris",
+ "cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs!",
+ "invalid-image-type": "Type d’image invalide",
+ "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",
+ "post-already-deleted": "Message déjà supprimé",
+ "post-already-restored": "Message déjà restauré",
+ "topic-already-deleted": "Sujet déjà supprimé",
+ "topic-already-restored": "Sujet déjà restauré",
+ "topic-thumbnails-are-disabled": "Miniatures de sujet désactivés",
+ "invalid-file": "Fichier Invalide",
+ "uploads-are-disabled": "Téléchargements désactivés",
+ "signature-too-long": "La signature ne peut dépasser %1 caractères!",
+ "cant-chat-with-yourself": "Vous ne pouvez chatter avec vous même!"
}
\ No newline at end of file
diff --git a/public/language/fr/global.json b/public/language/fr/global.json
index 203b1bb218..945eaaa046 100644
--- a/public/language/fr/global.json
+++ b/public/language/fr/global.json
@@ -45,16 +45,16 @@
"views": "Vues",
"reputation": "Réputation",
"read_more": "En lire plus",
- "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",
- "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",
+ "posted_ago_by_guest": "posté %1 par un Invité",
+ "posted_ago_by": "posté %1 par %2",
+ "posted_ago": "posté %1",
+ "posted_in_ago_by_guest": "posté dans %1 %2 par un Invité",
+ "posted_in_ago_by": "posté dans %1 %2 par %3",
+ "posted_in_ago": "posté dans %1 %2",
+ "replied_ago": "répondu %1",
+ "user_posted_ago": "%1 a posté %2",
+ "guest_posted_ago": "Un Invité a posté %1",
+ "last_edited_by_ago": "dernière édition par %1 %2",
"norecentposts": "Aucun Message Récent",
"norecenttopics": "Aucun Sujet Récent",
"recentposts": "Messages Récents",
@@ -65,6 +65,6 @@
"offline": "Hors ligne",
"email": "Email",
"language": "Langue",
- "guest": "Guest",
- "guests": "Guests"
+ "guest": "Invité",
+ "guests": "Invités"
}
\ No newline at end of file
diff --git a/public/language/fr/pages.json b/public/language/fr/pages.json
index d562c39d0b..ea7cd36d88 100644
--- a/public/language/fr/pages.json
+++ b/public/language/fr/pages.json
@@ -9,7 +9,7 @@
"user.following": "Personnes que %1 suit",
"user.followers": "Personnes qui suivent %1",
"user.posts": "Message écrit par %1",
- "user.topics": "Topics created by %1",
+ "user.topics": "Sujets créés par %1",
"user.favourites": "Messages favoris de %1",
"user.settings": "Préférences Utilisateur"
}
\ No newline at end of file
diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json
index 4ae56fe557..235603073a 100644
--- a/public/language/fr/topic.json
+++ b/public/language/fr/topic.json
@@ -4,9 +4,10 @@
"topic_id_placeholder": "Entrer l'ID du Sujet",
"no_topics_found": "Aucun sujet trouvé !",
"no_posts_found": "Aucun message trouvé!",
- "post_is_deleted": "This post is deleted!",
+ "post_is_deleted": "Ce message a été supprimé!",
"profile": "Profil",
- "posted_by": "Posted by %1",
+ "posted_by": "Posté par %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Chat",
"notify_me": "Être notifié des réponses dans ce sujet",
"quote": "Citer",
@@ -40,7 +41,7 @@
"thread_tools.lock": "Verrouiller le sujet",
"thread_tools.unlock": "Déverouiller le sujet",
"thread_tools.move": "Déplacer le sujet",
- "thread_tools.move_all": "Move All",
+ "thread_tools.move_all": "Déplacer tout",
"thread_tools.fork": "Scinder le sujet",
"thread_tools.delete": "Supprimer le sujet",
"thread_tools.delete_confirm": "Êtes vous sûr de vouloir supprimer ce sujet?",
@@ -87,7 +88,7 @@
"composer.thumb_remove": "Effacer les champs",
"composer.drag_and_drop_images": "Glisser-déposer ici les images",
"composer.upload_instructions": "Uploader des images par glisser-déposer.",
- "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
- "more_users": "%1 more user(s)",
- "more_guests": "%1 more guest(s)"
+ "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)"
}
\ No newline at end of file
diff --git a/public/language/fr/user.json b/public/language/fr/user.json
index 43d09519e1..f2293424a5 100644
--- a/public/language/fr/user.json
+++ b/public/language/fr/user.json
@@ -49,7 +49,7 @@
"digest_daily": "Quotidien",
"digest_weekly": "Hebdomadaire",
"digest_monthly": "Mensuel",
- "has_no_follower": "Cet utilisateur n'a aucun suiveur :(",
+ "has_no_follower": "Cet utilisateur n'est suivi par personnne :(",
"follows_no_one": "Cet utilisateur ne suit personne :(",
"has_no_posts": "Ce membre n'a rien posté pour le moment",
"has_no_topics": "L'utilsateur n'a encore créé aucun sujet.",
diff --git a/public/language/he/global.json b/public/language/he/global.json
index 7c4b380f43..74eb496719 100644
--- a/public/language/he/global.json
+++ b/public/language/he/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/he/topic.json b/public/language/he/topic.json
index 25aef2661b..1ae1536b88 100644
--- a/public/language/he/topic.json
+++ b/public/language/he/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "פרופיל",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "צ'אט",
"notify_me": "קבל התראה כאשר יש תגובות חדשות בנושא זה",
"quote": "ציטוט",
diff --git a/public/language/hu/global.json b/public/language/hu/global.json
index bb7327bb84..dab6719892 100644
--- a/public/language/hu/global.json
+++ b/public/language/hu/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/hu/reset_password.json b/public/language/hu/reset_password.json
index 78f260cc8b..eb3df1f2ec 100644
--- a/public/language/hu/reset_password.json
+++ b/public/language/hu/reset_password.json
@@ -11,4 +11,4 @@
"enter_email_address": "Email cím megadása",
"password_reset_sent": "Jelszó-visszaállítás elküldve",
"invalid_email": "Helytelen E-mail cím / Nem létező E-mail cím!"
-}
+}
\ No newline at end of file
diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json
index 37e9575140..141fdf8898 100644
--- a/public/language/hu/topic.json
+++ b/public/language/hu/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Profil",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Chat",
"notify_me": "Értesítést kérek az új hozzászólásokról ebben a topikban",
"quote": "Idéz",
diff --git a/public/language/it/global.json b/public/language/it/global.json
index 4dcf3f3656..c408572d8f 100644
--- a/public/language/it/global.json
+++ b/public/language/it/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/it/topic.json b/public/language/it/topic.json
index 5cbafadae5..ecad017444 100644
--- a/public/language/it/topic.json
+++ b/public/language/it/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Profilo",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Chat",
"notify_me": "Ricevi notifiche di nuove risposte in questa discussione",
"quote": "Citazione",
diff --git a/public/language/ja/category.json b/public/language/ja/category.json
index 0a4892d07f..43bc8f22d5 100644
--- a/public/language/ja/category.json
+++ b/public/language/ja/category.json
@@ -4,4 +4,4 @@
"browsing": "閲覧中",
"no_replies": "返事はまだありません",
"share_this_category": "この板を共有"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/error.json b/public/language/ja/error.json
index facf88fcf5..a5a3c70da5 100644
--- a/public/language/ja/error.json
+++ b/public/language/ja/error.json
@@ -46,4 +46,4 @@
"uploads-are-disabled": "アップロードが無効された",
"signature-too-long": "署名は最大%1文字までです!",
"cant-chat-with-yourself": "自分にチャットすることはできません!"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/global.json b/public/language/ja/global.json
index 35269d5d82..1d2504bab7 100644
--- a/public/language/ja/global.json
+++ b/public/language/ja/global.json
@@ -50,7 +50,7 @@
"posted_ago": "%1に投稿された",
"posted_in_ago_by_guest": "%1に %2 ゲストが投稿",
"posted_in_ago_by": "%1 %2に %3 が投稿",
- "posted_in_ago": "%1 に投稿",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "%1 に返答",
"user_posted_ago": "%1 が%2に投稿",
"guest_posted_ago": "ゲストが%1に投稿",
@@ -67,4 +67,4 @@
"language": "言語",
"guest": "ゲスト",
"guests": "ゲスト"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/language.json b/public/language/ja/language.json
index 19a14e500a..ecd635ee30 100644
--- a/public/language/ja/language.json
+++ b/public/language/ja/language.json
@@ -2,4 +2,4 @@
"name": "日本語",
"code": "ja",
"dir": "ltr"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/login.json b/public/language/ja/login.json
index a16f10ddf2..4c1876670a 100644
--- a/public/language/ja/login.json
+++ b/public/language/ja/login.json
@@ -5,4 +5,4 @@
"alternative_logins": "ほかのログイン方法",
"failed_login_attempt": "ログインに失敗しました.ユーザー名やパスワードをご確認ください。",
"login_successful": "ログインしました!"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/modules.json b/public/language/ja/modules.json
index 7a01eeca56..507012d7a6 100644
--- a/public/language/ja/modules.json
+++ b/public/language/ja/modules.json
@@ -4,4 +4,4 @@
"chat.send": "送信",
"chat.no_active": "チャットはありません。",
"chat.user_typing": "%1 は入力中 ..."
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json
index de907f0fcc..8706177779 100644
--- a/public/language/ja/notifications.json
+++ b/public/language/ja/notifications.json
@@ -15,4 +15,4 @@
"favourited_your_post": "%1はあなたのポストをお気に入りにしました。",
"user_flagged_post": "%1 ポストを報告しました。",
"user_posted_to": "%1 は %2 への返事を作成しました。"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json
index 8387697fe1..e9494c8d3f 100644
--- a/public/language/ja/pages.json
+++ b/public/language/ja/pages.json
@@ -12,4 +12,4 @@
"user.topics": "%1が作成したスレッド",
"user.favourites": "%1のお気に入りポスト",
"user.settings": "ユーザー設定"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/recent.json b/public/language/ja/recent.json
index 88125f8432..e9595739f7 100644
--- a/public/language/ja/recent.json
+++ b/public/language/ja/recent.json
@@ -4,4 +4,4 @@
"week": "最近 1 週",
"month": "最近 1 ヶ月",
"no_recent_topics": "最近のスレッドはありません。"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/register.json b/public/language/ja/register.json
index b1ce4c0794..7617407aa2 100644
--- a/public/language/ja/register.json
+++ b/public/language/ja/register.json
@@ -15,4 +15,4 @@
"alternative_registration": "ほかの登録方法",
"terms_of_use": "利用規約",
"agree_to_terms_of_use": "利用規約に同意する"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/reset_password.json b/public/language/ja/reset_password.json
index 4c2d9e6858..c732e9e159 100644
--- a/public/language/ja/reset_password.json
+++ b/public/language/ja/reset_password.json
@@ -11,4 +11,4 @@
"enter_email_address": "メールアドレスを入力してください",
"password_reset_sent": "パスワードリセットのメールを送信しました",
"invalid_email": "このメールアドレスは存在しません"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/success.json b/public/language/ja/success.json
index b8ea2c4056..cad5ecb03f 100644
--- a/public/language/ja/success.json
+++ b/public/language/ja/success.json
@@ -3,4 +3,4 @@
"topic-post": "成功に投稿しました。",
"authentication-successful": "認証が成功しました",
"settings-saved": "設定を保存しました。"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json
index d446179ca8..13fdba2593 100644
--- a/public/language/ja/topic.json
+++ b/public/language/ja/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "このポストが削除されます!",
"profile": "プロフィール",
"posted_by": "%1 のポスト",
+ "posted_by_guest": "Posted by Guest",
"chat": "チャット",
"notify_me": "このスレッドに新しいポストが投稿された際に通知する",
"quote": "引用",
@@ -90,4 +91,4 @@
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/unread.json b/public/language/ja/unread.json
index a6027a54b3..8b67da2a31 100644
--- a/public/language/ja/unread.json
+++ b/public/language/ja/unread.json
@@ -6,4 +6,4 @@
"selected": "選択済み",
"all": "すべて",
"topics_marked_as_read.success": "すべてのスレッドを既読にしました。"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/user.json b/public/language/ja/user.json
index 25ce70a83e..68b6d79bc6 100644
--- a/public/language/ja/user.json
+++ b/public/language/ja/user.json
@@ -59,4 +59,4 @@
"topics_per_page": "ページ毎のスレッド数",
"posts_per_page": "ページ毎のポスト数",
"notification_sounds": "通知が来たとき音を流す"
-}
+}
\ No newline at end of file
diff --git a/public/language/ja/users.json b/public/language/ja/users.json
index fa9b441a9a..654a14494f 100644
--- a/public/language/ja/users.json
+++ b/public/language/ja/users.json
@@ -5,4 +5,4 @@
"search": "検索",
"enter_username": "検索するユーザー名を入力してください",
"load_more": "もっと表示"
-}
+}
\ No newline at end of file
diff --git a/public/language/lt/error.json b/public/language/lt/error.json
index d536c24a73..840ef5b7c4 100644
--- a/public/language/lt/error.json
+++ b/public/language/lt/error.json
@@ -1,49 +1,49 @@
{
- "invalid-data": "Invalid Data",
- "not-logged-in": "You don't seem to be logged in.",
- "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",
- "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.",
- "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 alread 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",
- "signature-too-long": "Signature can't be longer than %1 characters!",
- "cant-chat-with-yourself": "You can't chat with yourself!"
+ "invalid-data": "Klaidingi duomenys",
+ "not-logged-in": "Atrodo, kad jūs neesate prisijungęs.",
+ "invalid-cid": "Klaidingas kategorijos ID",
+ "invalid-tid": "Klaidingas temos ID",
+ "invalid-pid": "Klaidingas pranešimo ID",
+ "invalid-uid": "Klaidingas vartotojo ID",
+ "invalid-username": "Klaidingas vartotojo vardas",
+ "invalid-email": "Klaidingas el. pašto adresas",
+ "invalid-title": "Klaidingas pavadinimas",
+ "invalid-user-data": "Klaidingi vartotojo duomenys",
+ "invalid-password": "Klaidingas slaptažodis",
+ "invalid-pagination-value": "Klaidinga puslapiavimo reikšmė",
+ "username-taken": "Vartotojo vardas jau užimtas",
+ "email-taken": "El. pašto adresas jau užimtas",
+ "user-banned": "Vartotojas užblokuotas",
+ "no-category": "Kategorija neegzistuoja",
+ "no-topic": "Tema neegzistuoja",
+ "no-post": "Pranešimas neegzistuoja",
+ "no-group": "Grupė neegzistuoja",
+ "no-user": "Vartotojas neegzistuoja",
+ "no-teaser": "Trumpas skelbimas neegzistuoja!",
+ "no-privileges": "Jūs neturite teisės atlikti šį veiksmą.",
+ "category-disabled": "Kategorija išjungta",
+ "topic-locked": "Tema užrakinta",
+ "still-uploading": "Prašome palaukti kol bus baigti visi kėlimai į serverį",
+ "content-too-short": "Jūsų pranešimas turėtų būti ilgesnis, mažiausiai %1 simbolių.",
+ "title-too-short": "Pavadinimas turėtų būtų ilgesnis, mažiausiai %1 simbolių.",
+ "title-too-long": "Pavadinimas turėtų būti trumpesnis. Maksimalus leistinas ilgis- %1 simbolių.",
+ "too-many-posts": "Rašyti pranešimus galite kas %1 sekundžių.",
+ "file-too-big": "Maksimalus leistinas failo dydis %1 kb",
+ "cant-vote-self-post": "Jūs negalite balsuoti už savo pranešimą",
+ "already-favourited": "Jūs jau esate pamėgę šį pranešimą",
+ "already-unfavourited": "Jūs jau esate pašalinę šį pranešimą iš mėgiamų sąrašo",
+ "cant-ban-other-admins": "Jūs negalite užblokuoti kitų administratorių!",
+ "invalid-image-type": "Klaidingas paveikslėlio tipas",
+ "group-name-too-short": "Grupės pavadinimas per trumpas",
+ "group-already-exists": "Tokia grupė jau egzistuoja",
+ "group-name-change-not-allowed": "Grupės pavadinimas keitimas neleidžiamas",
+ "post-already-deleted": "Pranešimas jau yra anksčiau ištrintas",
+ "post-already-restored": "Pranešimas jau anksčiau atkurtas",
+ "topic-already-deleted": "Tema jau anksčiau buvo ištrinta",
+ "topic-already-restored": "Tema jau anksčiau buvo atkurta",
+ "topic-thumbnails-are-disabled": "Temos paveikslėliai neleidžiami.",
+ "invalid-file": "Klaidingas failas",
+ "uploads-are-disabled": "Įkėlimai neleidžiami",
+ "signature-too-long": "Parašas negali būti ilgesnis negu %1 simboliai!",
+ "cant-chat-with-yourself": "Jūs negalite susirašinėti su savimi!"
}
\ No newline at end of file
diff --git a/public/language/lt/global.json b/public/language/lt/global.json
index 64f8df18ef..54f12be8f1 100644
--- a/public/language/lt/global.json
+++ b/public/language/lt/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json
index bc3806cfa9..26efd59b6c 100644
--- a/public/language/lt/topic.json
+++ b/public/language/lt/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Profilis",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Susirašinėti",
"notify_me": "Gauti pranešimus apie naujus atsakymus šioje temoje",
"quote": "Cituoti",
diff --git a/public/language/ms/global.json b/public/language/ms/global.json
index 769244044f..c2b5744009 100644
--- a/public/language/ms/global.json
+++ b/public/language/ms/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json
index 1c8680a8e3..cb1eaf42e9 100644
--- a/public/language/ms/topic.json
+++ b/public/language/ms/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Profil",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Sembang",
"notify_me": "Kekal dimaklumkan berkenaan respon dalam topik ini",
"quote": "Petikan",
diff --git a/public/language/nb/global.json b/public/language/nb/global.json
index 174caf3f87..c4f58883e2 100644
--- a/public/language/nb/global.json
+++ b/public/language/nb/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json
index fca974aa4f..5ecd38e2fc 100644
--- a/public/language/nb/topic.json
+++ b/public/language/nb/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Profil",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Chat",
"notify_me": "Bli varslet om nye svar i dette emnet",
"quote": "Siter",
diff --git a/public/language/nl/global.json b/public/language/nl/global.json
index 322239efe4..f5800b1abe 100644
--- a/public/language/nl/global.json
+++ b/public/language/nl/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json
index fcd6b36e70..ff6a0d125d 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Profiel",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Chat",
"notify_me": "Krijg notificaties van nieuwe reacties op dit onderwerp",
"quote": "Citeren",
diff --git a/public/language/pl/global.json b/public/language/pl/global.json
index 7f00359608..f44cf2e0e0 100644
--- a/public/language/pl/global.json
+++ b/public/language/pl/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
@@ -63,8 +63,8 @@
"dnd": "Nie przeszkadzać",
"invisible": "Niewidoczny",
"offline": "Niedostępny",
- "email": "Email",
- "language": "Language",
+ "email": "Adres e-mail",
+ "language": "Język",
"guest": "Guest",
"guests": "Guests"
}
\ No newline at end of file
diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json
index 3f86ea8757..5b586de5ec 100644
--- a/public/language/pl/modules.json
+++ b/public/language/pl/modules.json
@@ -3,5 +3,5 @@
"chat.placeholder": "napisz wiadomość tutaj i naciśnij enter",
"chat.send": "Wyślij",
"chat.no_active": "Nie prowadzisz obecnie żadnych rozmów.",
- "chat.user_typing": "%1 is typing ..."
+ "chat.user_typing": "%1 pisze..."
}
\ No newline at end of file
diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json
index aacda0e7f4..8ff62f566d 100644
--- a/public/language/pl/notifications.json
+++ b/public/language/pl/notifications.json
@@ -7,12 +7,12 @@
"outgoing_link_message": "Opuszczasz",
"continue_to": "Kontynuuj do",
"return_to": "Wróć do",
- "new_notification": "New Notification",
- "you_have_unread_notifications": "You have unread notifications.",
- "user_made_post": "%1 made a new post",
- "new_message_from": "New message from %1",
+ "new_notification": "Nowe powiadomienie",
+ "you_have_unread_notifications": "Masz nieprzeczytane powiadomienia.",
+ "user_made_post": "%1 napisał nowy post",
+ "new_message_from": "Nowa wiadomość od %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_posted_to": "%1 dodał odpowiedź do %2"
}
\ No newline at end of file
diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json
index c18c45e0c5..155c4619a1 100644
--- a/public/language/pl/pages.json
+++ b/public/language/pl/pages.json
@@ -9,7 +9,7 @@
"user.following": "Obserwowani przez %1",
"user.followers": "Obserwujący %1",
"user.posts": "Posty napisane przez %1",
- "user.topics": "Topics created by %1",
+ "user.topics": "Wątki stworzone przez %1",
"user.favourites": "Ulubione posty %1",
"user.settings": "Ustawienia użytkownika"
}
\ No newline at end of file
diff --git a/public/language/pl/reset_password.json b/public/language/pl/reset_password.json
index a7a71f04fd..fa0affeab6 100644
--- a/public/language/pl/reset_password.json
+++ b/public/language/pl/reset_password.json
@@ -8,7 +8,7 @@
"new_password": "Nowe hasło",
"repeat_password": "Powtórz hasło",
"enter_email": "Podaj swój adres e-mail i wyślemy ci wiadomość z instrukcjami jak zresetować hasło.",
- "enter_email_address": "Enter Email Address",
+ "enter_email_address": "Wpisz swój adres e-mail",
"password_reset_sent": "Instrukcje zostały wysłane",
"invalid_email": "Niepoprawny adres e-mail."
}
\ No newline at end of file
diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json
index 4250eaf41f..18c68678cd 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -6,7 +6,8 @@
"no_posts_found": "Nie znaleziono żadnych postów.",
"post_is_deleted": "This post is deleted!",
"profile": "Profil",
- "posted_by": "Posted by %1",
+ "posted_by": "Napisane przez %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Czat",
"notify_me": "Powiadamiaj mnie o nowych odpowiedziach w tym wątku",
"quote": "Cytuj",
@@ -77,7 +78,7 @@
"composer.help": "Pomoc",
"composer.discard": "Odrzuć",
"composer.submit": "Wyślij",
- "composer.replying_to": "Replying to %1",
+ "composer.replying_to": "Odpowiadanie na %1",
"composer.new_topic": "Nowy wątek",
"composer.uploading": "wysyłanie...",
"composer.thumb_url_label": "Wklej adres miniaturki wątku",
diff --git a/public/language/pl/user.json b/public/language/pl/user.json
index f28930d4cc..c0f56a6199 100644
--- a/public/language/pl/user.json
+++ b/public/language/pl/user.json
@@ -21,7 +21,7 @@
"chat": "Rozmawiaj",
"follow": "Śledź",
"unfollow": "Przestań śledzić",
- "profile_update_success": "Profile has been updated successfully!",
+ "profile_update_success": "Profil został zaktualizowany pomyślnie!",
"change_picture": "Zmień zdjęcie",
"edit": "Edytuj",
"uploaded_picture": "Przesłane zdjęcie",
@@ -32,7 +32,7 @@
"change_password_error_wrong_current": "Twoje aktualne hasło nie jest poprawne!",
"change_password_error_length": "Hasło jest za krótkie!",
"change_password_error_match": "Hasła muszą pasować!",
- "change_password_error_privileges": "You do not have the rights to change this password.",
+ "change_password_error_privileges": "Nie masz uprawnień do zmiany tego hasła.",
"change_password_success": "Twoje hasło jest zaktualizowane!",
"confirm_password": "Potwierdź hasło",
"password": "Hasło",
@@ -45,10 +45,10 @@
"show_email": "Wyświetlaj mój adres e-mail",
"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_off": "Wyłączone",
+ "digest_daily": "Codziennie",
+ "digest_weekly": "Co tydzień",
+ "digest_monthly": "Co miesiąc",
"has_no_follower": "Ten użytkownik nie ma jeszcze żadnych obserwujących",
"follows_no_one": "Użytkownik jeszcze nikogo nie obsweruje.",
"has_no_posts": "Użytkownik nie napisał jeszcze żadnych postów.",
diff --git a/public/language/pt_BR/global.json b/public/language/pt_BR/global.json
index 5503fb7125..bab2e65d8c 100644
--- a/public/language/pt_BR/global.json
+++ b/public/language/pt_BR/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json
index 36f737db2a..daf029be0b 100644
--- a/public/language/pt_BR/topic.json
+++ b/public/language/pt_BR/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Perfil",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Bate Papo",
"notify_me": "Ser notificado a cada nova resposta",
"quote": "Citar",
diff --git a/public/language/ru/global.json b/public/language/ru/global.json
index e5fa7d5d88..ba38a0cf7e 100644
--- a/public/language/ru/global.json
+++ b/public/language/ru/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json
index 40b9b7cd67..fd97b8372e 100644
--- a/public/language/ru/topic.json
+++ b/public/language/ru/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Профиль",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Чат",
"notify_me": "Сообщать мне об ответах в этой теме",
"quote": "Цитировать",
diff --git a/public/language/sc/global.json b/public/language/sc/global.json
index b9be532788..30c5548c40 100644
--- a/public/language/sc/global.json
+++ b/public/language/sc/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json
index a70cb7db8e..d164ab8480 100644
--- a/public/language/sc/topic.json
+++ b/public/language/sc/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Perfilu",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Tzarra",
"notify_me": "Imbia·mi notìficas pro is rispostas noas a custa arresonada",
"quote": "Mèntova",
diff --git a/public/language/sk/global.json b/public/language/sk/global.json
index df50a41ae5..f0c7f6af18 100644
--- a/public/language/sk/global.json
+++ b/public/language/sk/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/sk/reset_password.json b/public/language/sk/reset_password.json
index b4123f8818..bceaea8148 100644
--- a/public/language/sk/reset_password.json
+++ b/public/language/sk/reset_password.json
@@ -8,7 +8,7 @@
"new_password": "Nové heslo",
"repeat_password": "Potvrdenie hesla",
"enter_email": "Zadajte svoju emailovú adresu a my Vám pošleme informácie, ako môžete obnoviť svoje heslo.",
- "enter_email_address": "Enter Email Address",
+ "enter_email_address": "Zadajte e-mail",
"password_reset_sent": "Obnova hesla odoslaná",
"invalid_email": "Zlý email / Email neexistuje!"
}
\ No newline at end of file
diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json
index 04f2f94db1..f2d55ce1c2 100644
--- a/public/language/sk/topic.json
+++ b/public/language/sk/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Profil",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Chat",
"notify_me": "Sledovať túto tému",
"quote": "Citovať",
diff --git a/public/language/sv/global.json b/public/language/sv/global.json
index 097b9c31f5..441a1aabad 100644
--- a/public/language/sv/global.json
+++ b/public/language/sv/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json
index eae47cbf5b..66ca248587 100644
--- a/public/language/sv/topic.json
+++ b/public/language/sv/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "Profil",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Chatt",
"notify_me": "Få notiser om nya svar i detta ämne",
"quote": "Citera",
diff --git a/public/language/th/global.json b/public/language/th/global.json
index f6cab50f35..ea02312ad6 100644
--- a/public/language/th/global.json
+++ b/public/language/th/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/th/language.json b/public/language/th/language.json
index 60f5f2303c..c04cfd15be 100644
--- a/public/language/th/language.json
+++ b/public/language/th/language.json
@@ -1,5 +1,5 @@
{
"name": "ภาษาอังกฤษ (สหราชอาณาจักร / แคนาดา)",
- "code": "th",
+ "code": "en_GB",
"dir": "ltr"
}
\ No newline at end of file
diff --git a/public/language/th/topic.json b/public/language/th/topic.json
index 5650cc6681..187b74b496 100644
--- a/public/language/th/topic.json
+++ b/public/language/th/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "รายละเอียด",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "แชท",
"notify_me": "แจ้งเตือนเมื่อการตอบใหม่ในกระทู้นี้",
"quote": "คำอ้างอิง",
diff --git a/public/language/tr/global.json b/public/language/tr/global.json
index 9f5484160f..1dd370bfe8 100644
--- a/public/language/tr/global.json
+++ b/public/language/tr/global.json
@@ -45,16 +45,16 @@
"views": "Görüntülemeler",
"reputation": "Saygınlık",
"read_more": "daha fazla oku",
- "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",
- "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",
+ "posted_ago_by_guest": "Ziyaretçi tarafından %1 yayımlandı",
+ "posted_ago_by": "%2 tarafından %1 yayımlandı",
+ "posted_ago": "%1 yayımlandı",
+ "posted_in_ago_by_guest": "%1 içinde Ziyaretçi tarafından %2 yayımlandı",
+ "posted_in_ago_by": "%1 içinde %3 tarafından %2 yayımlandı",
+ "posted_in_ago": "%1 içinde %2 yayımlandı",
+ "replied_ago": "%1 yanıtlandı",
+ "user_posted_ago": "%1 %2 yayımladı",
+ "guest_posted_ago": "Ziyaretçi %1 yayımladı",
+ "last_edited_by_ago": "en son %1 tarafından %2 düzenlendi",
"norecentposts": "Güncel İletiler Yok",
"norecenttopics": "Güncel Başlıklar Yok",
"recentposts": "Güncel İletiler",
@@ -65,6 +65,6 @@
"offline": "Çevrimdışı",
"email": "E-posta",
"language": "Dil",
- "guest": "Guest",
- "guests": "Guests"
+ "guest": "Ziyaretçi",
+ "guests": "Ziyaretçiler"
}
\ No newline at end of file
diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json
index 47398c3dee..7a0758a998 100644
--- a/public/language/tr/topic.json
+++ b/public/language/tr/topic.json
@@ -4,9 +4,10 @@
"topic_id_placeholder": "Başlık ID gir",
"no_topics_found": "Hiç konu bulunamadı!",
"no_posts_found": "Hiç bir ileti bulunamadı!",
- "post_is_deleted": "This post is deleted!",
+ "post_is_deleted": "Bu ileti silinmiş!",
"profile": "Profil",
- "posted_by": "Posted by %1",
+ "posted_by": "%1 tarafından gönderildi",
+ "posted_by_guest": "Posted by Guest",
"chat": "Sohbet",
"notify_me": "Bu konudaki cevaplardan haberdar ol",
"quote": "Alıntı",
@@ -40,7 +41,7 @@
"thread_tools.lock": "Başlığı Kitle",
"thread_tools.unlock": "Başlığı Aç",
"thread_tools.move": "Başlığı Taşı",
- "thread_tools.move_all": "Move All",
+ "thread_tools.move_all": "Hepsini Taşı",
"thread_tools.fork": "Başlığı Ayır",
"thread_tools.delete": "Başlığı Sil",
"thread_tools.delete_confirm": "Bu başlığı gerçekten silmek istiyor musun?",
@@ -87,7 +88,7 @@
"composer.thumb_remove": "Alanları temizle",
"composer.drag_and_drop_images": "Resimleri buraya taşıyıp bırakabilirsiniz",
"composer.upload_instructions": "Resimleri taşıyıp bırakarak yükleyebilirsiniz.",
- "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
- "more_users": "%1 more user(s)",
- "more_guests": "%1 more guest(s)"
+ "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"
}
\ No newline at end of file
diff --git a/public/language/vi/global.json b/public/language/vi/global.json
index 433101d4cd..92ccbe6b3d 100644
--- a/public/language/vi/global.json
+++ b/public/language/vi/global.json
@@ -50,7 +50,7 @@
"posted_ago": "Đã viết %1",
"posted_in_ago_by_guest": "Đã viết trong %1 %2 bởi Khách",
"posted_in_ago_by": "Đã viết trong %1 %2 bởi %3",
- "posted_in_ago": "Đã viết trong %1",
+ "posted_in_ago": "được đăng trong %1 %2",
"replied_ago": "Đã trả lời %1",
"user_posted_ago": "%1 đã viết %2",
"guest_posted_ago": "Khách đã viết %1",
diff --git a/public/language/vi/language.json b/public/language/vi/language.json
index f0787f748a..798d02e33b 100644
--- a/public/language/vi/language.json
+++ b/public/language/vi/language.json
@@ -1,5 +1,5 @@
{
- "name": "Tiếng Việt",
- "code": "vi",
+ "name": "Tiếng Anh (Vương Quốc Anh/Canada)",
+ "code": "en_GB",
"dir": "ltr"
}
\ No newline at end of file
diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json
index 3cae01a414..1847f66d39 100644
--- a/public/language/vi/topic.json
+++ b/public/language/vi/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "Bài gửi này đã bị xóa!",
"profile": "Hồ sơ",
"posted_by": "Được viết bởi %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "Chat",
"notify_me": "Được thông báo khi có trả lời mới trong chủ đề này",
"quote": "Trích dẫn",
diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json
index d536c24a73..dddbcdfc88 100644
--- a/public/language/zh_CN/error.json
+++ b/public/language/zh_CN/error.json
@@ -1,14 +1,14 @@
{
- "invalid-data": "Invalid Data",
- "not-logged-in": "You don't seem to be logged in.",
- "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-data": "无效数据",
+ "not-logged-in": "你看起来还没有登陆",
+ "invalid-cid": "无效的板块ID",
+ "invalid-tid": "无效的话题ID",
+ "invalid-pid": "无效的帖子ID",
+ "invalid-uid": "无效的用户ID",
+ "invalid-username": "无效用户名",
+ "invalid-email": "无效电邮",
+ "invalid-title": "无效标题",
+ "invalid-user-data": "无效用户数据",
"invalid-password": "Invalid Password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
diff --git a/public/language/zh_CN/global.json b/public/language/zh_CN/global.json
index 866f659c48..d0012c0233 100644
--- a/public/language/zh_CN/global.json
+++ b/public/language/zh_CN/global.json
@@ -50,7 +50,7 @@
"posted_ago": "发布于 %1",
"posted_in_ago_by_guest": "游客发布于 %1 %2",
"posted_in_ago_by": "%3 在 %1 发布于 %2",
- "posted_in_ago": "发布在 %1",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "%1 回复",
"user_posted_ago": "%1 于 %2 发布",
"guest_posted_ago": "游客发布于 %1",
diff --git a/public/language/zh_CN/reset_password.json b/public/language/zh_CN/reset_password.json
index ffd0ff528d..2c593f4900 100644
--- a/public/language/zh_CN/reset_password.json
+++ b/public/language/zh_CN/reset_password.json
@@ -8,7 +8,7 @@
"new_password": "新的密码",
"repeat_password": "确认密码",
"enter_email": "请输入您的Email地址,我们会发送邮件告诉您如何重置密码。",
- "enter_email_address": "Enter Email Address",
+ "enter_email_address": "输入邮箱地址",
"password_reset_sent": "密码重置邮件已发送。",
"invalid_email": "非法的邮箱地址/邮箱不存在!"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json
index b710e82ff4..d678314f6f 100644
--- a/public/language/zh_CN/topic.json
+++ b/public/language/zh_CN/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "This post is deleted!",
"profile": "资料",
"posted_by": "Posted by %1",
+ "posted_by_guest": "Posted by Guest",
"chat": "聊天",
"notify_me": "该主题有新回复时通知我",
"quote": "引用",
diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json
index d71a32feff..383952d163 100644
--- a/public/language/zh_CN/user.json
+++ b/public/language/zh_CN/user.json
@@ -43,8 +43,8 @@
"max": "最大.",
"settings": "设置",
"show_email": "显示我的邮箱",
- "digest_label": "Subscribe to Digest",
- "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
+ "digest_label": "订阅摘要",
+ "digest_description": "按照计划订阅邮件提醒( 新通知和话题 )",
"digest_off": "关闭",
"digest_daily": "今天",
"digest_weekly": "本周",
diff --git a/public/language/zh_TW/global.json b/public/language/zh_TW/global.json
index 69262ee6ad..3222f72a1e 100644
--- a/public/language/zh_TW/global.json
+++ b/public/language/zh_TW/global.json
@@ -50,7 +50,7 @@
"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",
+ "posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json
index e4e90365fb..f403487fc0 100644
--- a/public/language/zh_TW/topic.json
+++ b/public/language/zh_TW/topic.json
@@ -7,6 +7,7 @@
"post_is_deleted": "帖子已被刪除!",
"profile": "資料",
"posted_by": "由 %1 發布",
+ "posted_by_guest": "Posted by Guest",
"chat": "聊天",
"notify_me": "該主題有新回覆時通知我",
"quote": "引用",
diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index c3fb2cb6b4..59807fa7a0 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -83,13 +83,13 @@ var ajaxify = ajaxify || {};
app.processPage();
- ajaxify.widgets.render(tpl_url, url, function(err) {
- $('#content, #footer').stop(true, true).removeClass('ajaxifying');
- ajaxify.initialLoad = false;
+ ajaxify.widgets.render(tpl_url, url);
- app.refreshTitle(url);
- $(window).trigger('action:ajaxify.end', {url: url});
- });
+ $('#content, #footer').stop(true, true).removeClass('ajaxifying');
+ ajaxify.initialLoad = false;
+
+ app.refreshTitle(url);
+ $(window).trigger('action:ajaxify.end', {url: url});
}, url);
return true;
diff --git a/public/src/app.js b/public/src/app.js
index 79dce1df9a..6f768c2596 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -117,7 +117,7 @@ var socket,
});
socket.on('reconnecting', function (data, attempt) {
- if(attempt === config.maxReconnectionAttempts) {
+ if(attempt === parseInt(config.maxReconnectionAttempts, 10)) {
socket.socket.reconnectionAttempts = 0;
socket.socket.reconnectionDelay = config.reconnectionDelay;
return;
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index bae43ba3c1..d6fd2a697c 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -255,6 +255,9 @@ define(['forum/pagination', 'forum/topic/threadTools', 'forum/topic/postTools',
} else if(!user.length && data.online) {
user = createUserIcon(data.uid, data.picture, data.userslug, data.username);
activeEl.append(user);
+ activeEl.find('a[data-uid] img').tooltip({
+ placement: 'top'
+ });
}
}
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index e7a9ea371a..21588fbe4b 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -88,10 +88,12 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
socket.on('event:chats.userStartTyping', function(withUid) {
var modal = module.getModal(withUid);
var chatContent = modal.find('#chat-content');
- modal.find('.user-typing')
- .removeClass('hide')
- .appendTo(chatContent);
- scrollToBottom(chatContent);
+ var atBottom = chatContent[0].scrollHeight - chatContent.scrollTop() === chatContent.innerHeight();
+
+ modal.find('.user-typing').removeClass('hide').appendTo(chatContent);
+ if (atBottom) {
+ scrollToBottom(chatContent);
+ }
});
socket.on('event:chats.userStopTyping', function(withUid) {
@@ -164,6 +166,20 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
handle: '.modal-header'
});
+ chatModal.find('.modal-content').resizable({
+ minHeight: 250,
+ minWidth: 400
+ });
+
+ chatModal.find('.modal-content').on('resize', function(event, ui) {
+ var totalHeight = chatModal.find('.modal-content').outerHeight() - chatModal.find('.modal-header').outerHeight();
+ var padding = parseInt(chatModal.find('.modal-body').css('padding-top'), 10) + parseInt(chatModal.find('.modal-body').css('padding-bottom'), 10);
+ var contentMargin = parseInt(chatModal.find('#chat-content').css('margin-top'), 10) + parseInt(chatModal.find('#chat-content').css('margin-bottom'), 10);
+ var inputGroupHeight = chatModal.find('.input-group').outerHeight();
+
+ chatModal.find('#chat-content').css('height', totalHeight - padding - contentMargin - inputGroupHeight);
+ });
+
chatModal.find('#chat-with-name').html(username);
chatModal.find('#chat-close-btn').on('click', function() {
@@ -181,7 +197,7 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
});
translator.translate('[[modules:chat.user_typing, ' + username + ']]', function(translated) {
- chatModal.find('.user-typing').text(translated);
+ chatModal.find('.user-typing .text').text(translated);
});
@@ -286,7 +302,7 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
var time = ' ';
- if (data.fromuid !== chatContent.children().last().attr('data-uid')) {
+ if (data.fromuid !== chatContent.children('.chat-message').last().attr('data-uid')) {
var userPicture = $('');
var userName = $(' '+ data.fromUser.username + '');
userName.toggleClass('chat-user-you', isYou);
diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js
index 272060d537..177a685137 100644
--- a/public/src/modules/settings.js
+++ b/public/src/modules/settings.js
@@ -1,68 +1,592 @@
-"use strict";
-/* global define, socket, app */
+define(function () {
-/*
- settings.js 2.0, because version 1:
- - saved everything in "config" hash
- - was hand-rolled (mm, salmon hand roll)
- - Relied on app.config (!!)
- This module should:
- - Allow you to save to any specified hash
- - Rely on jQuery
- - Use sockets
- - Be more awesome
-*/
+ const DEFAULT_PLUGINS = [
+ 'settings/checkbox',
+ 'settings/textarea',
+ 'settings/select',
+ 'settings/array',
+ 'settings/key'
+ ];
-define(function() {
- var Settings = {};
+ var Settings,
+ onReady = [],
+ waitingJobs = 0,
+ helper;
- Settings.load = function(hash, formEl, callback) {
- socket.emit('admin.settings.get', {
- hash: hash
- }, function(err, values) {
- if (!err) {
- $(formEl).deserialize(values);
- if (typeof callback === 'function') {
- callback();
+ /*
+ * Attributes of HTML-tags that get used by default plugins:
+ * + data-key: the key to save/load the value within configuration-object
+ * + data-type: highest priority type-definition to determine what kind of element it is or which plugin to hook
+ * + type: normal priority type-definition
+ * + data-empty: if 'false' or '0' then values that are assumed as empty turn into null. data-empty of arrays affect
+ * their child-elements
+ * + data-trim: if not 'false' or '0' then values will get trimmed as defined by the elements type
+ * + data-split: if set and the element doesn't belong to any plugin, it's value will get split and joined by its
+ * value into the input-field
+ * array-elements:
+ * + data-split: separator (HTML allowed) between the elements, defaults to ', '
+ * + data-new: value to insert into new created elements
+ * + data-attributes: an object to set the attributes of the child HTML-elements. tagName as special key will set
+ * the tag-name of the child HTML-elements
+ * key-fields:
+ * + data-trim: if 'false' or '0' then the value will get saved as string else as object providing following
+ * properties: ctrl, alt, shift, meta, code, char
+ * + data-split: separator between different modifiers and the key-code of the value that gets saved
+ * (only takes effect if trimming)
+ * + data-short: if not 'false' or '0' then modifier-keys get saved as first uppercase character
+ * (only takes effect if trimming)
+ * select:
+ * + data-options: an array of {"text":"Displayed Text","value":"some_value"}-like objects
+ *
+ * The name of the HTML-tag is lowest priority type-definition
+ *
+ * Examples-HTML:
+ No!
+
+ Yes!
+
+ An array of checkboxes that are selected by default:
+
| "+this._get(e,"weekHeader")+" | ":"",b=0;7>b;b++)T=(b+h)%7,N+="=5?" class='ui-datepicker-week-end'":"")+">"+""+p[T]+" | ";for(I+=N+"
|---|---|
| "+this._get(e,"calculateWeek")(F)+" | ":"",b=0;7>b;b++)j=f?f.apply(e.input?e.input[0]:null,[F]):[!0,""],K=F.getMonth()!==Z,R=K&&!v||!j[0]||$&&$>F||X&&F>X,O+=""+(K&&!_?" ":R?""+F.getDate()+"":""+F.getDate()+"")+" | ",F.setDate(F.getDate()+1),F=this._daylightSavingAdjust(F);I+=O+"
| "+this._get(e,"weekHeader")+" | ":"",b=0;7>b;b++)T=(b+h)%7,N+="=5?" class='ui-datepicker-week-end'":"")+">"+""+p[T]+" | ";for(I+=N+"
|---|---|
| "+this._get(e,"calculateWeek")(F)+" | ":"",b=0;7>b;b++)j=f?f.apply(e.input?e.input[0]:null,[F]):[!0,""],K=F.getMonth()!==Z,R=K&&!v||!j[0]||$&&$>F||X&&F>X,O+=""+(K&&!_?" ":R?""+F.getDate()+"":""+F.getDate()+"")+" | ",F.setDate(F.getDate()+1),F=this._daylightSavingAdjust(F);I+=O+"