Merge branch 'master' of https://github.com/designcreateplay/NodeBB

package.json

@@ -40,7 +40,7 @@
     "socket.io-wildcard": "~0.1.1",
     "bcryptjs": "~0.7.10",
     "nodebb-plugin-mentions": "~0.4",
-    "nodebb-plugin-markdown": "~0.3",
+    "nodebb-plugin-markdown": "~0.4",
     "nodebb-widget-essentials": "~0.0",
     "nodebb-theme-vanilla": "~0.0.14",
     "nodebb-theme-cerulean": "~0.0.13",

public/language/ar/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "موضوع جديد",
     "no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لماذا لا تحاول نشر واحد؟<br />",
-    "sidebar.recent_replies": "الردود مؤخرا",
-    "sidebar.active_participants": "المشاركون النشطة",
-    "sidebar.moderators": "المشرفين",
     "posts": "مشاركات",
     "views": "مشاهدات",
     "posted": "نشر",

public/language/ar/global.json

@@ -10,6 +10,8 @@
     "500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!",
     "register": "تسجيل",
     "login": "دخول",
+    "please_log_in": "Please Log In",
+    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
     "welcome_back": "Welcome Back ",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "logout": "تسجيل الخروج",
@@ -47,6 +49,7 @@
     "posted": "posted",
     "in": "in",
     "recentposts": "Recent Posts",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Away",
     "dnd": "Do not Disturb",

public/language/ar/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings"
 }

public/language/ar/topic.json

@@ -11,6 +11,7 @@
     "reply": "رد",
     "edit": "صحح",
     "delete": "حذف",
+    "restore": "Restore",
     "move": "انقل",
     "fork": "فرع",
     "banned": "محظور",
@@ -18,8 +19,15 @@
     "share": "شارك",
     "tools": "أدوات",
     "flag": "Flag",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Flag this post for moderation",
     "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "following_topic.title": "Following Topic",
+    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
+    "not_following_topic.title": "Not Following Topic",
+    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Watch",
     "share_this_post": "Share this Post",
     "thread_tools.title": "أدوات الموضوع",
@@ -58,8 +66,17 @@
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.write": "Write",
     "composer.preview": "Preview",
+    "composer.help": "Help",
     "composer.discard": "Discard",
     "composer.submit": "Submit",
     "composer.replying_to": "Replying to",
-    "composer.new_topic": "New Topic"
+    "composer.new_topic": "New Topic",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
+    "composer.drag_and_drop_images": "Drag and Drop Images Here",
+    "composer.upload_instructions": "Upload images by dragging & dropping them."
 }

public/language/cs/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Nové téma",
     "no_topics": "<strong>V této kategorii zatím nejsou žádné příspěvky.</strong><br />Můžeš být první!",
-    "sidebar.recent_replies": "Poslední příspěvky",
-    "sidebar.active_participants": "Aktivní účastníci",
-    "sidebar.moderators": "Moderátoři",
     "posts": "příspěvky",
     "views": "zobrazení",
     "posted": "odesláno",

public/language/cs/global.json

@@ -10,6 +10,8 @@
     "500.message": "Jejda, vypadá to, že se něco pokazilo.",
     "register": "Registrovat",
     "login": "Přihlásit se",
+    "please_log_in": "Please Log In",
+    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
     "welcome_back": "Welcome Back ",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "logout": "Odhlásit se",
@@ -47,6 +49,7 @@
     "posted": "odesláno",
     "in": "v",
     "recentposts": "Nedávné příspěvky",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Pryč",
     "dnd": "Nerušit",

public/language/cs/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings"
 }

public/language/cs/topic.json

@@ -11,6 +11,7 @@
     "reply": "Odpovědět",
     "edit": "Upravit",
     "delete": "Smazat",
+    "restore": "Restore",
     "move": "Přesunout",
     "fork": "Rozdělit",
     "banned": "banned",
@@ -18,8 +19,15 @@
     "share": "Sdílet",
     "tools": "Nástroje",
     "flag": "Flag",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Flag this post for moderation",
     "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "following_topic.title": "Following Topic",
+    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
+    "not_following_topic.title": "Not Following Topic",
+    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Watch",
     "share_this_post": "Share this Post",
     "thread_tools.title": "Nástroje",
@@ -58,8 +66,17 @@
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.write": "Write",
     "composer.preview": "Preview",
+    "composer.help": "Help",
     "composer.discard": "Discard",
     "composer.submit": "Submit",
     "composer.replying_to": "Replying to",
-    "composer.new_topic": "New Topic"
+    "composer.new_topic": "New Topic",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
+    "composer.drag_and_drop_images": "Drag and Drop Images Here",
+    "composer.upload_instructions": "Upload images by dragging & dropping them."
 }

public/language/de/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Neues Thema",
     "no_topics": "<strong>Es gibt noch keine Threads in dieser Kategorie.</strong><br />Warum beginnst du nicht den ersten?",
-    "sidebar.recent_replies": "Neuste Antworten",
-    "sidebar.active_participants": "Aktive Teilnehmer",
-    "sidebar.moderators": "Moderatoren",
     "posts": "Posts",
     "views": "Aufrufe",
     "posted": "Geposted",

public/language/de/global.json

@@ -10,6 +10,8 @@
     "500.message": "Ooops! Looks like something went wrong!",
     "register": "Registrierung",
     "login": "Login",
+    "please_log_in": "Bitte einloggen",
+    "posting_restriction_info": "Nur registrierte Mitglieder dürfen Beiträge verfassen. Hier klicken zum Einloggen.",
     "welcome_back": "Willkommen zurück",
     "you_have_successfully_logged_in": "Du hast dich erfolgreich eingeloggt",
     "logout": "Logout",
@@ -47,6 +49,7 @@
     "posted": "geposted",
     "in": "in",
     "recentposts": "Aktuelle Beiträge",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Abwesend",
     "dnd": "Nicht stören",

public/language/de/pages.json

@@ -1,13 +1,14 @@
 {
     "home": "Home",
     "unread": "Unread Topics",
-    "popular": "Popular Topics",
+    "popular": "Beliebte Themen",
     "recent": "Recent Topics",
     "users": "Registered Users",
     "notifications": "Notifications",
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings"
 }

public/language/de/topic.json

@@ -11,6 +11,7 @@
     "reply": "antworten",
     "edit": "bearbeiten",
     "delete": "löschen",
+    "restore": "Restore",
     "move": "Verschieben",
     "fork": "Aufspalten",
     "banned": "gesperrt",
@@ -18,8 +19,15 @@
     "share": "Teilen",
     "tools": "Tools",
     "flag": "Markieren",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Diesen Beitrag zur Moderation markieren",
     "deleted_message": "Dieser Thread wurde gelöscht. Nur Nutzer mit Thread-Management Rechten können ihn sehen.",
+    "following_topic.title": "Thema wird gefolgt",
+    "following_topic.message": "Du erhälst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",
+    "not_following_topic.title": "Thema nicht gefolgt",
+    "not_following_topic.message": "Du erhälst keine weiteren Benachrichtigungen zu diesem Thema.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Beobachten",
     "share_this_post": "Diesen Beitrag teilen",
     "thread_tools.title": "Thread Tools",
@@ -58,8 +66,17 @@
     "composer.title_placeholder": "Hier den Titel des Themas eingeben...",
     "composer.write": "Schreiben",
     "composer.preview": "Vorschau",
+    "composer.help": "Help",
     "composer.discard": "Verwerfen",
     "composer.submit": "Absenden",
     "composer.replying_to": "Als Antwort auf",
-    "composer.new_topic": "Neues Thema"
+    "composer.new_topic": "Neues Thema",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
+    "composer.drag_and_drop_images": "Bilder hier reinziehen",
+    "composer.upload_instructions": "Zum Hochladen Bilder hier reinziehen."
 }

public/language/en_GB/topic.json

@@ -81,6 +81,7 @@
 	"composer.title_placeholder": "Enter your topic title here...",
 	"composer.write": "Write",
 	"composer.preview": "Preview",
+	"composer.help": "Help",
 	"composer.discard": "Discard",
 	"composer.submit": "Submit",
 	"composer.replying_to": "Replying to",
@@ -93,6 +94,5 @@
 	"composer.thumb_file_label": "Or upload a file",
 	"composer.thumb_remove": "Clear fields",
 	"composer.drag_and_drop_images": "Drag and Drop Images Here",
-	"composer.content_is_parsed_with": "Content is parsed with",
 	"composer.upload_instructions": "Upload images by dragging & dropping them."
 }

public/language/es/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Nuevo Tema",
     "no_topics": "<strong>No hay temas en esta categoría.</strong><br />Por que no te animas y publicas uno?",
-    "sidebar.recent_replies": "Respuestas recientes",
-    "sidebar.active_participants": "Miembros más activos",
-    "sidebar.moderators": "Moderadores",
     "posts": "respuestas",
     "views": "visitas",
     "posted": "posted",

public/language/es/global.json

@@ -10,6 +10,8 @@
     "500.message": "Ooops! Algo salio mal!, No te alarmes. Nuestros simios hiperinteligentes lo solucionarán",
     "register": "Registrarse",
     "login": "Conectarse",
+    "please_log_in": "Por favor conectate.",
+    "posting_restriction_info": "Para publicar debes ser miembro, registrate o conectate.",
     "welcome_back": "Bienvenido de nuevo!",
     "you_have_successfully_logged_in": "Te has conectado!",
     "logout": "Salir",
@@ -47,6 +49,7 @@
     "posted": "publicado",
     "in": "en",
     "recentposts": "Publicaciones Recientes",
+    "recentips": "Recently Logged In IPs",
     "online": "Conectado",
     "away": "No disponible",
     "dnd": "No molestar",

public/language/es/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Editando \"%1\"",
     "user.following": "Gente que sigue %1 ",
     "user.followers": "Seguidores de %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "Publicaciones favoritas de %1 ",
     "user.settings": "Preferencias del Usuario"
 }

public/language/es/topic.json

@@ -11,6 +11,7 @@
     "reply": "Responder",
     "edit": "Editar",
     "delete": "Borrar",
+    "restore": "Restore",
     "move": "Mover",
     "fork": "Bifurcar",
     "banned": "baneado",
@@ -18,8 +19,15 @@
     "share": "Compartir",
     "tools": "Herramientas",
     "flag": "Reportar",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Reportar esta publicación a los moderadores",
     "deleted_message": "Este tema ha sido borrado. Solo los miembros con privilegios pueden verlo.",
+    "following_topic.title": "Siguendo tema",
+    "following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.",
+    "not_following_topic.title": "No sigues este tema",
+    "not_following_topic.message": "No recibiras notificaciones de este tema.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Seguir",
     "share_this_post": "Compartir este post",
     "thread_tools.title": "Herramientas del Tema",
@@ -58,8 +66,17 @@
     "composer.title_placeholder": "Ingresa el titulo de tu tema",
     "composer.write": "Escribe",
     "composer.preview": "Previsualización",
+    "composer.help": "Help",
     "composer.discard": "Descartar",
     "composer.submit": "Enviar",
     "composer.replying_to": "Respondiendo a",
-    "composer.new_topic": "Nuevo Tema"
+    "composer.new_topic": "Nuevo Tema",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
+    "composer.drag_and_drop_images": "Arrastra las imagenes aqui",
+    "composer.upload_instructions": "Carga tus imagenes con solo arrastrarlas aqui."
 }

public/language/fi/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Uusi aihe",
     "no_topics": "<strong>Tällä aihealueella ei ole yhtään aihetta.</strong><br />Miksi et aloittaisi uutta?",
-    "sidebar.recent_replies": "Viimeisimmät vastaukset",
-    "sidebar.active_participants": "Aktiiviset keskustelijat",
-    "sidebar.moderators": "Moderaattorit",
     "posts": "viestit",
     "views": "katsottu",
     "posted": "kirjoitettu",

public/language/fi/global.json

@@ -49,6 +49,7 @@
     "posted": "kirjoitettu",
     "in": "alueelle",
     "recentposts": "Viimeisimmät viestit",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Poissa",
     "dnd": "Älä häiritse",

public/language/fi/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Muokataan \"%1\"",
     "user.following": "Käyttäjät, joita %1 seuraa",
     "user.followers": "Käyttäjät, jotka seuraavat käyttäjää %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "Käyttäjän %1 suosikkiviestit",
     "user.settings": "Käyttäjän asetukset"
 }

public/language/fi/topic.json

@@ -11,6 +11,7 @@
     "reply": "Vastaa",
     "edit": "Muokkaa",
     "delete": "Poista",
+    "restore": "Restore",
     "move": "Siirrä",
     "fork": "Haaroita",
     "banned": "estetty",
@@ -18,13 +19,15 @@
     "share": "Jaa",
     "tools": "Työkalut",
     "flag": "Ilmianna",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Ilmianna tämä viesti moderaattoreille",
     "deleted_message": "Tämä viestiketju on poistettu. Vain käyttäjät, joilla on viestiketjujen hallintaoikeudet, voivat nähdä sen.",
     "following_topic.title": "Seurataan aihetta",
     "following_topic.message": "Saat nyt ilmoituksen, kun joku kirjoittaa tähän aiheeseen.",
     "not_following_topic.title": "Et seuraa aihetta",
     "not_following_topic.message": "Et saa enää ilmoituksia tästä aiheesta.",
-    "login_to_subscribe": "Ole hyvä ja rekisteröidy tai kirjaudu sisään tilataksesi tämän aiheen",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Tarkkaile",
     "share_this_post": "Jaa tämä viesti",
     "thread_tools.title": "Aiheen työkalut",
@@ -63,11 +66,17 @@
     "composer.title_placeholder": "Syötä aiheesi otsikko tähän...",
     "composer.write": "Kirjoita",
     "composer.preview": "Esikatsele",
+    "composer.help": "Help",
     "composer.discard": "Hylkää",
     "composer.submit": "Lähetä",
     "composer.replying_to": "Vastataan aiheeseen",
     "composer.new_topic": "Uusi aihe",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
     "composer.drag_and_drop_images": "Vedä ja pudota kuvat tähän",
-    "composer.content_is_parsed_with": "Sisältö jäsennetään muodossa",
     "composer.upload_instructions": "Lataa kuvia vetämällä & pudottamalla ne."
 }

public/language/fr/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Nouveau Sujet",
     "no_topics": "<strong>Il n'y a aucun topic dans cette catégorie.</strong><br />Pourquoi ne pas en créer un?",
-    "sidebar.recent_replies": "Réponses Récentes",
-    "sidebar.active_participants": "Participants Actifs",
-    "sidebar.moderators": "Modérateurs",
     "posts": "messages",
     "views": "vues",
     "posted": "posté",

public/language/fr/global.json

@@ -10,6 +10,8 @@
     "500.message": "Oops! Il semblerait que quelque chose se soit mal passé!",
     "register": "S'inscrire",
     "login": "Connecter",
+    "please_log_in": "Connectez vous",
+    "posting_restriction_info": "L'écriture de message est réservée aux membres enregistrés, cliquer ici pour se connecter",
     "welcome_back": "Bon retour parmis nous",
     "you_have_successfully_logged_in": "Vous vous êtes connecté avec succès.",
     "logout": "Déconnection",
@@ -47,6 +49,7 @@
     "posted": "posté",
     "in": "dans",
     "recentposts": "Messages Récents",
+    "recentips": "Recently Logged In IPs",
     "online": "En ligne",
     "away": "Absent",
     "dnd": "Occupé",

public/language/fr/pages.json

@@ -1,13 +1,14 @@
 {
     "home": "Accueil",
     "unread": "Sujets non lus",
-    "popular": "Popular Topics",
+    "popular": "Sujets Populaires",
     "recent": "Sujets Récents",
     "users": "Utilisateurs enregistrés",
     "notifications": "Notifications",
     "user.edit": "Edite \"%1\"",
     "user.following": "Personnes que %1 suit",
     "user.followers": "Personnes qui suivent  %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "Messages favoris de %1",
     "user.settings": "Préférences Utilisateur"
 }

public/language/fr/topic.json

@@ -11,6 +11,7 @@
     "reply": "Répondre",
     "edit": "Editer",
     "delete": "Supprimer",
+    "restore": "Restore",
     "move": "Déplacer",
     "fork": "Scinder",
     "banned": "bannis",
@@ -18,8 +19,15 @@
     "share": "Partager",
     "tools": "Outils",
     "flag": "Signaler",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Signaler ce post pour modération",
     "deleted_message": "Ce sujet a été supprimé. Seuls les utilsateurs avec les droits d'administration peuvent le voir.",
+    "following_topic.title": "Sujet suivi",
+    "following_topic.message": "Vous recevrez désormais des notifications lorsque quelqu'un postera dans ce sujet.",
+    "not_following_topic.title": "Sujet non suivi",
+    "not_following_topic.message": "Vous ne recevrez plus de notifications pour ce sujet.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Suivre",
     "share_this_post": "Partager ce message",
     "thread_tools.title": "Outils du Fil",
@@ -58,8 +66,17 @@
     "composer.title_placeholder": "Entrer le titre du sujet ici...",
     "composer.write": "Ecriture",
     "composer.preview": "Aperçu",
+    "composer.help": "Help",
     "composer.discard": "Abandon",
     "composer.submit": "Envoi",
     "composer.replying_to": "Répondre à",
-    "composer.new_topic": "Nouveau Sujet"
+    "composer.new_topic": "Nouveau Sujet",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
+    "composer.drag_and_drop_images": "Glisser-déposer ici les images",
+    "composer.upload_instructions": "Uploader des images par glisser-déposer."
 }

public/language/he/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "נושא חדש",
     "no_topics": "<strong>קטגוריה זו ריקה מנושאים.</strong><br />למה שלא תנסה להוסיף נושא חדש?",
-    "sidebar.recent_replies": "תגובות אחרונות",
-    "sidebar.active_participants": "משתתפים פעילים",
-    "sidebar.moderators": "מנהלי הפורום",
     "posts": "פוסטים",
     "views": "צפיות",
     "posted": "פורסם",

public/language/he/global.json

@@ -10,6 +10,8 @@
     "500.message": "אופס! נראה שמשהו השתבש!",
     "register": "הרשמה",
     "login": "התחברות",
+    "please_log_in": "Please Log In",
+    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
     "welcome_back": "ברוכים השבים",
     "you_have_successfully_logged_in": "התחברת בהצלחה",
     "logout": "יציאה",
@@ -47,6 +49,7 @@
     "posted": "פורסם",
     "in": "ב",
     "recentposts": "פוסטים אחרונים",
+    "recentips": "Recently Logged In IPs",
     "online": "מחובר",
     "away": "לא נמצא",
     "dnd": "לא להפריע",

public/language/he/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "עורך את %1",
     "user.following": "אנשים ש%1 עוקב אחריהם",
     "user.followers": "אנשים שעוקבים אחרי %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "הפוסטים המועדפים על %1",
     "user.settings": "הגדרות משתמש"
 }

public/language/he/topic.json

@@ -11,6 +11,7 @@
     "reply": "תגובה",
     "edit": "עריכה",
     "delete": "מחק",
+    "restore": "Restore",
     "move": "הזז",
     "fork": "פורק",
     "banned": "מורחק",
@@ -18,8 +19,15 @@
     "share": "Share",
     "tools": "כלים",
     "flag": "דווח",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "דווח על פוסט זה למנהל",
     "deleted_message": "הנושא הזה נמחק. רק מנהלים מורשים לראות אותו",
+    "following_topic.title": "Following Topic",
+    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
+    "not_following_topic.title": "Not Following Topic",
+    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "עקוב",
     "share_this_post": "שתף פוסט זה",
     "thread_tools.title": "כלים",
@@ -58,8 +66,17 @@
     "composer.title_placeholder": "הכנס את כותרת הנושא כאן...",
     "composer.write": "כתוב",
     "composer.preview": "תצוגה מקדימה",
+    "composer.help": "Help",
     "composer.discard": "מחק",
     "composer.submit": "שלח",
     "composer.replying_to": "תגובה",
-    "composer.new_topic": "נושא חדש"
+    "composer.new_topic": "נושא חדש",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
+    "composer.drag_and_drop_images": "Drag and Drop Images Here",
+    "composer.upload_instructions": "Upload images by dragging & dropping them."
 }

public/language/hu/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Új Topik",
     "no_topics": "<strong>Még nincs nyitva egy téma sem ebben a kategóriában.</strong>Miért nem hozol létre egyet?",
-    "sidebar.recent_replies": "Friss Válaszok",
-    "sidebar.active_participants": "Aktív Résztvevők",
-    "sidebar.moderators": "Moderátorok",
     "posts": "hozzászólások",
     "views": "megtekintések",
     "posted": "hozzászólt",

public/language/hu/global.json

@@ -10,6 +10,8 @@
     "500.message": "Hoppá! Úgy tűnik valami hiba történt!",
     "register": "Regisztrálás",
     "login": "Belépés",
+    "please_log_in": "Please Log In",
+    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
     "welcome_back": "Welcome Back ",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "logout": "Kijelentkezés",
@@ -47,6 +49,7 @@
     "posted": "hozzászólt",
     "in": "itt:",
     "recentposts": "Friss hozzászólások",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Távol van",
     "dnd": "Elfoglalt",

public/language/hu/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Szerkesztés \"%1\"",
     "user.following": "Tagok akiket %1 követ",
     "user.followers": "Tagok akik követik %1 -t",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1 Kedvenc Hozzászólásai",
     "user.settings": "Felhasználói Beállítások"
 }

public/language/hu/topic.json

@@ -11,6 +11,7 @@
     "reply": "Válasz",
     "edit": "Szerkeszt",
     "delete": "Töröl",
+    "restore": "Restore",
     "move": "Áthelyez",
     "fork": "Szétszedés",
     "banned": "tiltva",
@@ -18,13 +19,15 @@
     "share": "Megosztás",
     "tools": "Eszközök",
     "flag": "Jelentés",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "A hozzászólás jelentése a moderátoroknál",
     "deleted_message": "Ez a topik törölve lett. Kizárólag azok a felhasználók láthatják, akiknek joga van hozzá.",
     "following_topic.title": "Following Topic",
     "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
     "not_following_topic.title": "Not Following Topic",
     "not_following_topic.message": "You will no longer receive notifications from this topic.",
-    "login_to_subscribe": "Please register or log in in order to subscribe to this topic",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Watch",
     "share_this_post": "Share this Post",
     "thread_tools.title": "Téma Eszközök",
@@ -63,11 +66,17 @@
     "composer.title_placeholder": "Írd be a témanevet...",
     "composer.write": "Ír",
     "composer.preview": "Előnézet",
+    "composer.help": "Help",
     "composer.discard": "Elvet",
     "composer.submit": "Küldés",
     "composer.replying_to": "Válasz erre:",
     "composer.new_topic": "Új Topik",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
     "composer.drag_and_drop_images": "Drag and Drop Images Here",
-    "composer.content_is_parsed_with": "Content is parsed with",
     "composer.upload_instructions": "Upload images by dragging & dropping them."
 }

public/language/it/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Nuovo Argomento",
     "no_topics": "<strong>Non ci sono discussioni in questa categoria.</strong><br />Perché non ne inizi una?",
-    "sidebar.recent_replies": "Risposte Recenti",
-    "sidebar.active_participants": "Partecipanti Attivi",
-    "sidebar.moderators": "Moderatori",
     "posts": "post",
     "views": "visualizzazioni",
     "posted": "postato",

public/language/it/global.json

@@ -49,6 +49,7 @@
     "posted": "postato",
     "in": "in",
     "recentposts": "Post Recenti",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Non disponibile",
     "dnd": "Non disturbare",

public/language/it/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Modificando \"%1\"",
     "user.following": "%1 Persone seguono",
     "user.followers": "Persone che seguono %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "Post Favoriti di %1",
     "user.settings": "Impostazioni Utente"
 }

public/language/it/topic.json

@@ -11,6 +11,7 @@
     "reply": "Rispondi",
     "edit": "Modifica",
     "delete": "Cancella",
+    "restore": "Restore",
     "move": "Muovi",
     "fork": "Dividi",
     "banned": "bannato",
@@ -18,14 +19,16 @@
     "share": "Condividi",
     "tools": "Strumenti",
     "flag": "Segnala",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Segnala questo post per la moderazione",
     "deleted_message": "Questo argomento è stato cancellato. Solo gli utenti che possono gestire gli argomenti riescono a vederlo.",
-    "following_topic.title": "Argomento seguente",
+    "following_topic.title": "Stai seguendo questa Discussione",
     "following_topic.message": "Da ora riceverai notifiche quando qualcuno posterà in questa discussione.",
-    "not_following_topic.title": "Non stai seguendo questo argomento",
+    "not_following_topic.title": "Non stai seguendo questa Discussione",
     "not_following_topic.message": "Non riceverai più notifiche da questa discussione.",
-    "login_to_subscribe": "Per favore registrati o accedi per sottoscrivere questo argomento",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
-    "watch": "Guarda",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
+    "watch": "Osserva",
     "share_this_post": "Condividi questo Post",
     "thread_tools.title": "Strumenti per il Thread",
     "thread_tools.markAsUnreadForAll": "Segna come non letto",
@@ -63,11 +66,17 @@
     "composer.title_placeholder": "Inserisci qui il titolo della discussione...",
     "composer.write": "Scrivi",
     "composer.preview": "Anteprima",
-    "composer.discard": "Scarta",
+    "composer.help": "Help",
+    "composer.discard": "Annulla",
     "composer.submit": "Invia",
     "composer.replying_to": "Rispondendo a",
     "composer.new_topic": "Nuovo Argomento",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
     "composer.drag_and_drop_images": "Trascina e rilascia le immagini qui",
-    "composer.content_is_parsed_with": "Il contenuto è analizzato con",
     "composer.upload_instructions": "Carica immagini trascinandole e rilasciandole."
 }

public/language/nb/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Nytt emne",
     "no_topics": "<strong>Det er ingen emner i denne kategorien</strong><br />Hvorfor ikke lage ett?",
-    "sidebar.recent_replies": "Seneste svar",
-    "sidebar.active_participants": "Aktive deltakere",
-    "sidebar.moderators": "Moderatorer",
     "posts": "inlegg",
     "views": "visninger",
     "posted": "skapte",

public/language/nb/global.json

@@ -10,6 +10,8 @@
     "500.message": "Oops! Ser ut som noe gikk galt!",
     "register": "Registrer",
     "login": "Logg inn",
+    "please_log_in": "Vennligst logg inn",
+    "posting_restriction_info": "Posting er foreløpig begrenset til registrerte medlemmer, klikk her for å logge inn.",
     "welcome_back": "Velkommen tilbake",
     "you_have_successfully_logged_in": "Du har blitt logget inn",
     "logout": "Logg ut",
@@ -47,6 +49,7 @@
     "posted": "skapt",
     "in": "i",
     "recentposts": "Seneste innlegg",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Borte",
     "dnd": "Ikke forsturr",

public/language/nb/pages.json

@@ -1,13 +1,14 @@
 {
     "home": "Hjem",
     "unread": "Uleste emner",
-    "popular": "Popular Topics",
+    "popular": "Populære tråder",
     "recent": "Seneste emner",
     "users": "Registrerte brukere",
     "notifications": "Varsler",
     "user.edit": "Endrer \"%1\"",
     "user.following": "Personer %1 følger",
     "user.followers": "Personer som følger %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1 sine favoritt-innlegg",
     "user.settings": "Brukerinnstillinger"
 }

public/language/nb/topic.json

@@ -11,6 +11,7 @@
     "reply": "Svar",
     "edit": "Endre",
     "delete": "Slett",
+    "restore": "Restore",
     "move": "Flytt",
     "fork": "Del",
     "banned": "utestengt",
@@ -18,8 +19,15 @@
     "share": "Del",
     "tools": "Verktøy",
     "flag": "Rapporter",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Rapporter dette innlegget for granskning",
     "deleted_message": "Denne tråden har blitt slettet. Bare brukere med trådhåndterings-privilegier kan se den.",
+    "following_topic.title": "Følger tråd",
+    "following_topic.message": "Du vil nå motta varsler når noen skriver i denne tråden.",
+    "not_following_topic.title": "Følger ikke tråd",
+    "not_following_topic.message": "Du vil ikke lenger motta varsler fra denne tråden.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Overvåk",
     "share_this_post": "Del ditt innlegg",
     "thread_tools.title": "Trådverktøy",
@@ -58,8 +66,17 @@
     "composer.title_placeholder": "Skriv din tråd-tittel her",
     "composer.write": "Skriv",
     "composer.preview": "Forhåndsvis",
+    "composer.help": "Help",
     "composer.discard": "Forkast",
     "composer.submit": "Send",
     "composer.replying_to": "Svarer til",
-    "composer.new_topic": "Ny tråd"
+    "composer.new_topic": "Ny tråd",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
+    "composer.drag_and_drop_images": "Dra og slipp bilder her",
+    "composer.upload_instructions": "Last opp bilder ved å dra og slippe dem."
 }

public/language/nl/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Nieuw onderwerp",
     "no_topics": "<strong>Er zijn geen onderwerpen in deze categorie.</strong><br />Waarom maak je er niet een aan?",
-    "sidebar.recent_replies": "Recente Reacties",
-    "sidebar.active_participants": "Actieve Deelnemers",
-    "sidebar.moderators": "Moderators",
     "posts": "berichten",
     "views": "weergaven",
     "posted": "geplaatst",

public/language/nl/global.json

@@ -49,6 +49,7 @@
     "posted": "geplaatst",
     "in": "in",
     "recentposts": "Recente Berichten",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Afwezig",
     "dnd": "Niet Storen",

public/language/nl/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "\"%1\" aanpassen",
     "user.following": "Mensen %1 Volgt",
     "user.followers": "Mensen die %1 Volgen",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1's Favoriete Berichten",
     "user.settings": "Gebruikersinstellingen"
 }

public/language/nl/topic.json

@@ -11,6 +11,7 @@
     "reply": "Reageren",
     "edit": "Aanpassen",
     "delete": "Verwijderen",
+    "restore": "Restore",
     "move": "Verplaatsen",
     "fork": "Fork",
     "banned": "verbannen",
@@ -18,13 +19,15 @@
     "share": "Delen",
     "tools": "Gereedschap",
     "flag": "Markeren",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Dit bericht markeren voor moderatie",
     "deleted_message": "Dit onderwerp is verwijderd. Alleen gebruikers met onderwerp management privileges kunnen dit onderwerp zien.",
     "following_topic.title": "Following Topic",
     "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
     "not_following_topic.title": "Not Following Topic",
     "not_following_topic.message": "You will no longer receive notifications from this topic.",
-    "login_to_subscribe": "Please register or log in in order to subscribe to this topic",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Watch",
     "share_this_post": "Share this Post",
     "thread_tools.title": "Thread Gereedschap",
@@ -63,11 +66,17 @@
     "composer.title_placeholder": "Vul de titel voor het onderwerp hier in...",
     "composer.write": "Schrijven",
     "composer.preview": "Voorbeeld",
+    "composer.help": "Help",
     "composer.discard": "Annuleren",
     "composer.submit": "Opslaan",
     "composer.replying_to": "Reageren op",
     "composer.new_topic": "Nieuw Onderwerp",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
     "composer.drag_and_drop_images": "Drag and Drop Images Here",
-    "composer.content_is_parsed_with": "Content is parsed with",
     "composer.upload_instructions": "Upload images by dragging & dropping them."
 }

public/language/pl/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Nowy wątek",
     "no_topics": "<strong>W tej kategorii nie ma jeszcze żadnych wątków.</strong><br />Dlaczego ty nie utworzysz jakiegoś?",
-    "sidebar.recent_replies": "Ostatnie odpowiedzi",
-    "sidebar.active_participants": "Aktywni uczestnicy",
-    "sidebar.moderators": "Moderatorzy",
     "posts": "postów",
     "views": "wyświetleń",
     "posted": "napisano",

public/language/pl/global.json

@@ -49,6 +49,7 @@
     "posted": "napisano",
     "in": "w",
     "recentposts": "Ostatnie posty",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Z dala",
     "dnd": "Nie przeszkadzać",

public/language/pl/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Edytowanie \"%1\"",
     "user.following": "Obserwowani przez %1",
     "user.followers": "Obserwujący %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "Ulubione posty %1",
     "user.settings": "Ustawienia użytkownika"
 }

public/language/pl/topic.json

@@ -11,6 +11,7 @@
     "reply": "Odpowiedz",
     "edit": "Edytuj",
     "delete": "Usuń",
+    "restore": "Restore",
     "move": "Przenieś",
     "fork": "Skopiuj",
     "banned": "zbanowany",
@@ -18,13 +19,15 @@
     "share": "Udostępnij",
     "tools": "Narzędzia",
     "flag": "Zgłoś",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Zgłoś post do moderacji",
     "deleted_message": "Ten wątek został usunięty. Tylko użytkownicy z uprawnieniami do zarządzania wątkami mogą go widzieć.",
     "following_topic.title": "Obserwujesz wątek",
     "following_topic.message": "Będziesz otrzymywał powiadomienia, gdy ktoś odpowie w tym wątku.",
     "not_following_topic.title": "Nie obserwujesz wątku",
     "not_following_topic.message": "Nie będziesz otrzymywał więcej powiadomień z tego wątku.",
-    "login_to_subscribe": "Zaloguj się, aby subskrybować ten wątek.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Obserwuj",
     "share_this_post": "Udostępnij",
     "thread_tools.title": "Narzędzia wątków",
@@ -63,11 +66,17 @@
     "composer.title_placeholder": "Wpisz tytuł wątku tutaj",
     "composer.write": "Pisz",
     "composer.preview": "Podgląd",
+    "composer.help": "Help",
     "composer.discard": "Odrzuć",
     "composer.submit": "Wyślij",
     "composer.replying_to": "Odpowiadasz",
     "composer.new_topic": "Nowy wątek",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
     "composer.drag_and_drop_images": "Przeciągnij i upuść obrazek tutaj.",
-    "composer.content_is_parsed_with": "Tekst jest parsowany przy pomocy",
     "composer.upload_instructions": "Prześlij obrazki przeciągając i upuszczając je."
 }

public/language/pt_BR/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Novo Tópico",
     "no_topics": "<strong>Não tem nenhum tópico nesta categoria.</strong><br />Por que não tenta postar um?",
-    "sidebar.recent_replies": "Respostas Recentes",
-    "sidebar.active_participants": "Participantes Ativos",
-    "sidebar.moderators": "Moderadores",
     "posts": "posts",
     "views": "visualizações",
     "posted": "postado",

public/language/pt_BR/global.json

@@ -49,6 +49,7 @@
     "posted": "Postado",
     "in": "em",
     "recentposts": "Posts Recentes",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Ausente",
     "dnd": "Não Perturbe",

public/language/pt_BR/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Editando \"%1\"",
     "user.following": "Pessoas %1 Seguindo",
     "user.followers": "Pessoas que seguem %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1's Posts Favoritos",
     "user.settings": "Configurações de Usuário"
 }

public/language/pt_BR/topic.json

@@ -11,6 +11,7 @@
     "reply": "Responder",
     "edit": "Editar",
     "delete": "Deletar",
+    "restore": "Restore",
     "move": "Mover",
     "fork": "Fork",
     "banned": "Banido",
@@ -18,13 +19,15 @@
     "share": "Compartilhar",
     "tools": "Ferramentas",
     "flag": "Marcar",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Marcar este post para moderação",
     "deleted_message": "Esta Thread foi deletada. Somente usuários com privilégios administrativos podem ver.",
     "following_topic.title": "Seguir Tópico",
     "following_topic.message": "Você receberá notificações quando alguém responder este tópico.",
     "not_following_topic.title": "Não está seguindo Tópico",
     "not_following_topic.message": "Você não irá mais receber notificações deste tópico.",
-    "login_to_subscribe": "Por favor registre ou logue para poder assinar este tópico",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Acompanhar",
     "share_this_post": "Compartilhar este Post",
     "thread_tools.title": "Ferramentas da Thread",
@@ -63,11 +66,17 @@
     "composer.title_placeholder": "Digite seu tópico aqui...",
     "composer.write": "Escreva",
     "composer.preview": "Pré Visualização",
+    "composer.help": "Help",
     "composer.discard": "Descartar",
     "composer.submit": "Enviar",
     "composer.replying_to": "Respondendo para",
     "composer.new_topic": "Novo Tópico",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
     "composer.drag_and_drop_images": "Clique e arraste imagens aqui",
-    "composer.content_is_parsed_with": "Conteúdo está separado com",
     "composer.upload_instructions": "Mande suas imagens arrastando e soltando."
 }

public/language/ru/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Создать тему",
     "no_topics": "<strong>В этой категории еще нет тем.</strong><br />Почему бы вам не создать первую?",
-    "sidebar.recent_replies": "Последние сообщения",
-    "sidebar.active_participants": "Активные участники",
-    "sidebar.moderators": "Модераторы",
     "posts": "сообщений",
     "views": "просмотров",
     "posted": "написано",

public/language/ru/global.json

@@ -10,6 +10,8 @@
     "500.message": "Упс! Похоже, что-то пошло не так!",
     "register": "Зарегистрироваться",
     "login": "Войти",
+    "please_log_in": "Please Log In",
+    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
     "welcome_back": "Welcome Back ",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "logout": "Выйти",
@@ -47,6 +49,7 @@
     "posted": "создан",
     "in": "в",
     "recentposts": "Свежие записи",
+    "recentips": "Recently Logged In IPs",
     "online": "В сети",
     "away": "Отсутствует",
     "dnd": "Не беспокоить",

public/language/ru/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Редактирование \"%1\"",
     "user.following": "%1 читает",
     "user.followers": "Читают %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "Избранные сообщения %1",
     "user.settings": "Настройки"
 }

public/language/ru/topic.json

@@ -11,6 +11,7 @@
     "reply": "Ответить",
     "edit": "Редактировать",
     "delete": "Удалить",
+    "restore": "Restore",
     "move": "Перенести",
     "fork": "Ответвление",
     "banned": "заблокировано",
@@ -18,8 +19,15 @@
     "share": "Поделиться",
     "tools": "Опции",
     "flag": "Отметить",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Отметить сообщение для модерирования",
     "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "following_topic.title": "Following Topic",
+    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
+    "not_following_topic.title": "Not Following Topic",
+    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Watch",
     "share_this_post": "Share this Post",
     "thread_tools.title": "Опции Темы",
@@ -58,8 +66,17 @@
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.write": "Write",
     "composer.preview": "Preview",
+    "composer.help": "Help",
     "composer.discard": "Discard",
     "composer.submit": "Submit",
     "composer.replying_to": "Replying to",
-    "composer.new_topic": "New Topic"
+    "composer.new_topic": "New Topic",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
+    "composer.drag_and_drop_images": "Drag and Drop Images Here",
+    "composer.upload_instructions": "Upload images by dragging & dropping them."
 }

public/language/sk/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Nová téma",
     "no_topics": "<strong>V tejto kategórií zatiaľ nie sú žiadne príspevky.</strong><br />Môžeš byť prvý!",
-    "sidebar.recent_replies": "Posledné príspevky",
-    "sidebar.active_participants": "Aktívni účastníci",
-    "sidebar.moderators": "Moderátori",
     "posts": "príspevkov",
     "views": "zobrazení",
     "posted": "odoslané",

public/language/sk/global.json

@@ -49,6 +49,7 @@
     "posted": "príspevok",
     "in": "v",
     "recentposts": "Posledné príspevky",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Preč",
     "dnd": "Nevyrušovať",

public/language/sk/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings"
 }

public/language/sk/topic.json

@@ -11,6 +11,7 @@
     "reply": "Odpovedať",
     "edit": "Upraviť",
     "delete": "Zmazať",
+    "restore": "Restore",
     "move": "Presunúť",
     "fork": "Rozdeliť",
     "banned": "Zakázaný",
@@ -18,13 +19,15 @@
     "share": "Zdieľaj",
     "tools": "Nástroje",
     "flag": "Označiť",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Označiť príspevok pre moderáciu",
     "deleted_message": "Toto vlákno bolo vymazané. Iba užívatelia s privilégiami ho môžu vidieť.",
     "following_topic.title": "Sledovať Tému",
     "following_topic.message": "Budete teraz príjimať notifikácie, ked niekto prispeje do témy.",
     "not_following_topic.title": "Nesledujete Tému",
     "not_following_topic.message": "Nebudete už dostávať notifikácie z tejto Témy",
-    "login_to_subscribe": "Prosím Zaregistrujte sa alebo sa Prihláste, aby ste mohli odoberať túto Tému",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Sledovať",
     "share_this_post": "Zdielaj tento príspevok",
     "thread_tools.title": "Nástroje",
@@ -63,11 +66,17 @@
     "composer.title_placeholder": "Vlož nadpis témy sem...",
     "composer.write": "Píš",
     "composer.preview": "Náhľad",
+    "composer.help": "Help",
     "composer.discard": "Zahodiť",
     "composer.submit": "Poslať",
     "composer.replying_to": "Odpovedáš ",
     "composer.new_topic": "Nová téma",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
     "composer.drag_and_drop_images": "Pretiahni a Pusť Obrázky Sem",
-    "composer.content_is_parsed_with": "Obsah je vybraný s",
     "composer.upload_instructions": "Nahraj obrázky pretiahnutím a pustením ich."
 }

public/language/sv/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Nytt ämne",
     "no_topics": "<strong>Det finns inga ämnen i denna kategori.</strong><br />Varför inte skapa ett?",
-    "sidebar.recent_replies": "Senaste svaren",
-    "sidebar.active_participants": "Aktiva deltagare",
-    "sidebar.moderators": "Moderatorer",
     "posts": "inlägg",
     "views": "tittningar",
     "posted": "skapad",

public/language/sv/global.json

@@ -10,6 +10,8 @@
     "500.message": "Hoppsan! Verkar som att något gått snett!",
     "register": "Registrera",
     "login": "Logga in",
+    "please_log_in": "Please Log In",
+    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
     "welcome_back": "Welcome Back ",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "logout": "Logga ut",
@@ -47,6 +49,7 @@
     "posted": "svarade",
     "in": "i",
     "recentposts": "Senaste ämnena",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Borta",
     "dnd": "Stör ej",

public/language/sv/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Ändrar \"%1\"",
     "user.following": "Personer %1 Följer",
     "user.followers": "Personer som följer %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1's favorit-inlägg",
     "user.settings": "Avnändarinställningar"
 }

public/language/sv/topic.json

@@ -11,6 +11,7 @@
     "reply": "Svara",
     "edit": "Ändra",
     "delete": "Ta bort",
+    "restore": "Restore",
     "move": "Flytta",
     "fork": "Grena",
     "banned": "bannad",
@@ -18,8 +19,15 @@
     "share": "Dela",
     "tools": "Verktyg",
     "flag": "Rapportera",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Rapportera detta inlägg för granskning",
     "deleted_message": "Denna tråd har tagits bort. Endast användare med administrations-rättigheter kan se den.",
+    "following_topic.title": "Following Topic",
+    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
+    "not_following_topic.title": "Not Following Topic",
+    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Watch",
     "share_this_post": "Share this Post",
     "thread_tools.title": "Trådverktyg",
@@ -58,8 +66,17 @@
     "composer.title_placeholder": "Skriv in ämnets titel här...",
     "composer.write": "Skriv",
     "composer.preview": "Förhandsgranska",
+    "composer.help": "Help",
     "composer.discard": "Avbryt",
     "composer.submit": "Spara",
     "composer.replying_to": "Svarar till",
-    "composer.new_topic": "Nytt ämne"
+    "composer.new_topic": "Nytt ämne",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
+    "composer.drag_and_drop_images": "Drag and Drop Images Here",
+    "composer.upload_instructions": "Upload images by dragging & dropping them."
 }

public/language/tr/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "Yeni Başlık",
     "no_topics": "<strong> Bu kategoride hiç konu yok. </strong> <br /> Yeni bir konu açmak istemez misiniz?",
-    "sidebar.recent_replies": "Güncel Cevaplar",
-    "sidebar.active_participants": "Aktif Katılımcılar",
-    "sidebar.moderators": "Moderatörler",
     "posts": "ileti",
     "views": "görüntülemeler",
     "posted": "yayımlandı",

public/language/tr/global.json

@@ -10,6 +10,8 @@
     "500.message": "Ups! Bir şeyler ters gitti sanki!",
     "register": "Kayıt Ol",
     "login": "Giriş",
+    "please_log_in": "Please Log In",
+    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
     "welcome_back": "Welcome Back ",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "logout": "Çıkış",
@@ -47,6 +49,7 @@
     "posted": "gönderildi",
     "in": "içinde",
     "recentposts": "Güncel İletiler",
+    "recentips": "Recently Logged In IPs",
     "online": "Çevrimiçi",
     "away": "Dışarıda",
     "dnd": "Rahatsız Etmeyin",

public/language/tr/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "\"% 1\" düzenleniyor",
     "user.following": "İnsanlar %1 Takip Ediyor",
     "user.followers": "%1 takip edenler",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1'in Favori İletileri",
     "user.settings": "Kullanıcı Ayarları"
 }

public/language/tr/topic.json

@@ -11,6 +11,7 @@
     "reply": "Cevap",
     "edit": "Düzenle",
     "delete": "Sil",
+    "restore": "Restore",
     "move": "Taşı",
     "fork": "Fork",
     "banned": "yasaklı",
@@ -18,8 +19,15 @@
     "share": "Paylaş",
     "tools": "Araçlar",
     "flag": "Bayrak",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Bu iletiyi moderatöre haber et",
     "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "following_topic.title": "Following Topic",
+    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
+    "not_following_topic.title": "Not Following Topic",
+    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Watch",
     "share_this_post": "Share this Post",
     "thread_tools.title": "Seçenekler",
@@ -58,8 +66,17 @@
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.write": "Write",
     "composer.preview": "Preview",
+    "composer.help": "Help",
     "composer.discard": "Discard",
     "composer.submit": "Submit",
     "composer.replying_to": "Replying to",
-    "composer.new_topic": "New Topic"
+    "composer.new_topic": "New Topic",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
+    "composer.drag_and_drop_images": "Drag and Drop Images Here",
+    "composer.upload_instructions": "Upload images by dragging & dropping them."
 }

public/language/zh_CN/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "新主题",
     "no_topics": "<strong>这个版面还没有任何内容。</strong><br />赶紧来发帖吧！",
-    "sidebar.recent_replies": "最近回复",
-    "sidebar.active_participants": "活跃用户",
-    "sidebar.moderators": "版主",
     "posts": "帖子",
     "views": "浏览",
     "posted": "发布",

public/language/zh_CN/global.json

@@ -13,7 +13,7 @@
     "please_log_in": "请登录",
     "posting_restriction_info": "发表目前仅限于注册会员，点击这里登录。",
     "welcome_back": "欢迎回来",
-    "you_have_successfully_logged_in": "你已经退出登录",
+    "you_have_successfully_logged_in": "你已成功登录！",
     "logout": "退出",
     "logout.title": "你已经退出。",
     "logout.message": "你已经成功退出登录。",
@@ -49,6 +49,7 @@
     "posted": "发布",
     "in": "在",
     "recentposts": "最新发表",
+    "recentips": "Recently Logged In IPs",
     "online": " 在线",
     "away": "离开",
     "dnd": "不打扰",

public/language/zh_CN/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "编辑 \"%1\"",
     "user.following": "%1的人关注",
     "user.followers": "%1关注的人",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1 喜爱的帖子",
     "user.settings": "用户设置"
 }

public/language/zh_CN/topic.json

@@ -11,6 +11,7 @@
     "reply": "回复",
     "edit": "编辑",
     "delete": "删除",
+    "restore": "Restore",
     "move": "移动",
     "fork": "作为主题",
     "banned": "禁止",
@@ -18,13 +19,15 @@
     "share": "分享",
     "tools": "工具",
     "flag": "标志",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "标志受限的帖子",
     "deleted_message": "这个帖子已经删除，只有帖子的拥有者才有权限去查看。",
     "following_topic.title": "关注该主题",
     "following_topic.message": "当有回复提交的时候你将会收到通知。",
     "not_following_topic.title": "非关注主题",
     "not_following_topic.message": "你将不再接受来自该帖子的通知。",
-    "login_to_subscribe": "请注册或登录以订阅该主题",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "查看",
     "share_this_post": "分享帖子",
     "thread_tools.title": "管理工具",
@@ -63,11 +66,17 @@
     "composer.title_placeholder": "在这里输入你的主题标题...",
     "composer.write": "书写",
     "composer.preview": "预览",
+    "composer.help": "Help",
     "composer.discard": "丢弃",
     "composer.submit": "提交",
     "composer.replying_to": "回复",
     "composer.new_topic": "新主题",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
     "composer.drag_and_drop_images": "把图像拖到此处",
-    "composer.content_is_parsed_with": "内容已经被解析",
     "composer.upload_instructions": "拖拽图片以上传"
 }

public/language/zh_TW/category.json

@@ -1,9 +1,6 @@
 {
     "new_topic_button": "新主題",
     "no_topics": "<strong>這個版面還沒有任何內容。</strong><br />趕緊來發帖吧！",
-    "sidebar.recent_replies": "最近回復",
-    "sidebar.active_participants": "活躍用戶",
-    "sidebar.moderators": "版主",
     "posts": "帖子",
     "views": "瀏覽",
     "posted": "發布",

public/language/zh_TW/global.json

@@ -10,6 +10,8 @@
     "500.message": "不好！看來是哪裡出錯了！",
     "register": "注冊",
     "login": "登錄",
+    "please_log_in": "Please Log In",
+    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
     "welcome_back": "Welcome Back ",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "logout": "退出",
@@ -47,6 +49,7 @@
     "posted": "posted",
     "in": "in",
     "recentposts": "Recent Posts",
+    "recentips": "Recently Logged In IPs",
     "online": "Online",
     "away": "Away",
     "dnd": "Do not Disturb",

public/language/zh_TW/pages.json

@@ -8,6 +8,7 @@
     "user.edit": "Editing \"%1\"",
     "user.following": "People %1 Follows",
     "user.followers": "People who Follow %1",
+    "user.posts": "Posts made by %1",
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings"
 }

public/language/zh_TW/topic.json

@@ -11,6 +11,7 @@
     "reply": "回復",
     "edit": "編輯",
     "delete": "刪除",
+    "restore": "Restore",
     "move": "移動",
     "fork": "作為主題",
     "banned": "封禁",
@@ -18,8 +19,15 @@
     "share": "Share",
     "tools": "Tools",
     "flag": "Flag",
+    "bookmark_instructions": "Click here to return to your last position or close to discard.",
     "flag_title": "Flag this post for moderation",
     "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
+    "following_topic.title": "Following Topic",
+    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
+    "not_following_topic.title": "Not Following Topic",
+    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "markAsUnreadForAll.success": "Topic marked as unread for all.",
     "watch": "Watch",
     "share_this_post": "Share this Post",
     "thread_tools.title": "管理工具",
@@ -58,8 +66,17 @@
     "composer.title_placeholder": "Enter your topic title here...",
     "composer.write": "Write",
     "composer.preview": "Preview",
+    "composer.help": "Help",
     "composer.discard": "Discard",
     "composer.submit": "Submit",
     "composer.replying_to": "Replying to",
-    "composer.new_topic": "New Topic"
+    "composer.new_topic": "New Topic",
+    "composer.uploading": "uploading...",
+    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_url_placeholder": "http://example.com/thumb.png",
+    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_remove": "Clear fields",
+    "composer.drag_and_drop_images": "Drag and Drop Images Here",
+    "composer.upload_instructions": "Upload images by dragging & dropping them."
 }

public/src/modules/composer.js

@@ -678,6 +678,13 @@ define(['taskbar'], function(taskbar) {
 					}
 				});
 
+				socket.emit('modules.composer.renderHelp', function(err, html) {
+					if (html && html.length > 0) {
+						postContainer.find('.help').html(html);
+						postContainer.find('[data-pane=".tab-help"]').parent().removeClass('hidden');
+					}
+				});
+
 				$(window).trigger('action:composer.loaded', {
 					post_uuid: post_uuid
 				});

public/templates/composer.tpl

@@ -58,6 +58,7 @@
 		<ul class="nav nav-tabs">
 			<li class="active"><a data-pane=".tab-write" data-toggle="tab">[[topic:composer.write]]</a></li>
 			<li><a data-pane=".tab-preview" data-toggle="tab">[[topic:composer.preview]]</a></li>
+			<li class="hidden"><a data-pane=".tab-help" data-toggle="tab">[[topic:composer.help]]</a></li>
 			<li class="btn-group pull-right action-bar">
 				<button class="btn btn-default" data-action="discard" tabIndex="5"><i class="fa fa-times"></i> [[topic:composer.discard]]</button>
 				<button data-action="post" class="btn btn-default btn-primary" tabIndex="3"><i class="fa fa-check"></i> [[topic:composer.submit]]</button>
@@ -71,13 +72,15 @@
 			<div class="tab-pane tab-preview">
 				<div class="preview well"></div>
 			</div>
+			<div class="tab-pane tab-help">
+				<div class="help well"></div>
+			</div>
 		</div>
 
 		<div class="imagedrop"><div>[[topic:composer.drag_and_drop_images]]</div></div>
 
 		<div class="text-center instructions">
 			<span>
-				<small>[[topic:composer.content_is_parsed_with]] <a href="http://daringfireball.net/projects/markdown/syntax">Markdown</a>. </small>
 				<span class="upload-instructions hide"><small>[[topic:composer.upload_instructions]]</small></span>
 			</span>
 

src/socket.io/modules.js

@@ -68,7 +68,11 @@ SocketModules.composer.editCheck = function(socket, pid, callback) {
 
 SocketModules.composer.renderPreview = function(socket, content, callback) {
 	plugins.fireHook('filter:post.parse', content, callback);
-}
+};
+
+SocketModules.composer.renderHelp = function(socket, data, callback) {
+	plugins.fireHook('filter:composer.help', '', callback);
+};
 
 /* Chat */