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

public/language/nl/global.json

@@ -10,16 +10,16 @@
     "500.message": "Oeps! Het lijkt erop dat iets is fout gegaan!",
     "register": "Registeren",
     "login": "Inloggen",
-    "please_log_in": "Please Log In",
+    "please_log_in": "Log a.u.b. In",
-    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
+    "posting_restriction_info": "Reageren is momenteel beperkt tot geregistreerde leden, klik hier om in te loggen.",
-    "welcome_back": "Welcome Back ",
+    "welcome_back": "Welkom Terug!",
-    "you_have_successfully_logged_in": "You have successfully logged in",
+    "you_have_successfully_logged_in": "Je bent succesvol ingelogd",
     "logout": "Uitloggen",
     "logout.title": "Je bent nu uitgelogd.",
     "logout.message": "Je bent met succes uitgelogd van NodeBB",
     "save_changes": "Aanpassingen Opslaan",
     "close": "Sluiten",
-    "pagination": "Pagination",
+    "pagination": "Paginering",
     "header.admin": "Admin",
     "header.recent": "Recent",
     "header.unread": "Ongelezen",
@@ -49,7 +49,7 @@
     "posted": "geplaatst",
     "in": "in",
     "recentposts": "Recente Berichten",
-    "recentips": "Recently Logged In IPs",
+    "recentips": "Recente Ingelogde IPs",
     "online": "Online",
     "away": "Afwezig",
     "dnd": "Niet Storen",

public/language/nl/notifications.json

@@ -1,6 +1,6 @@
 {
     "title": "Notificaties",
-    "no_notifs": "You have no new notifications",
+    "no_notifs": "Je hebt geen nieuwe notificaties",
     "see_all": "Bekijk alle Notificaties",
     "back_to_home": "Terug naar NodeBB",
     "outgoing_link": "Uitgaande Link",

public/language/nl/pages.json

@@ -1,14 +1,14 @@
 {
     "home": "Home",
     "unread": "Ongelezen Onderwerpen",
-    "popular": "Popular Topics",
+    "popular": "Populaire Onderwerpen",
     "recent": "Recente Onderwerpen",
     "users": "Geregistreerde Gebruikers",
     "notifications": "Notificaties",
     "user.edit": "\"%1\" aanpassen",
     "user.following": "Mensen %1 Volgt",
     "user.followers": "Mensen die %1 Volgen",
-    "user.posts": "Posts made by %1",
+    "user.posts": "Berichten geplaatst door %1",
     "user.favourites": "%1's Favoriete Berichten",
     "user.settings": "Gebruikersinstellingen"
 }

public/language/nl/topic.json

@@ -11,7 +11,7 @@
     "reply": "Reageren",
     "edit": "Aanpassen",
     "delete": "Verwijderen",
-    "restore": "Restore",
+    "restore": "Herstellen",
     "move": "Verplaatsen",
     "fork": "Fork",
     "banned": "verbannen",
@@ -19,17 +19,17 @@
     "share": "Delen",
     "tools": "Gereedschap",
     "flag": "Markeren",
-    "bookmark_instructions": "Click here to return to your last position or close to discard.",
+    "bookmark_instructions": "Klik hier om terug te gaan naar je laatste positie of sluiten om te annuleren.",
     "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.title": "Volg Onderwerp",
-    "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
+    "following_topic.message": "Je zult nu notificaties ontvangen wanneer iemand reageert op dit onderwerp.",
-    "not_following_topic.title": "Not Following Topic",
+    "not_following_topic.title": "Volgt Onderwerp Niet",
-    "not_following_topic.message": "You will no longer receive notifications from this topic.",
+    "not_following_topic.message": "Je zult niet langer notificaties ontvangen van dit onderwerp.",
-    "login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
+    "login_to_subscribe": "Log a.u.b. in om op dit onderwerp te abonneren.",
-    "markAsUnreadForAll.success": "Topic marked as unread for all.",
+    "markAsUnreadForAll.success": "Onderwerp gemarkeerd als gelezen voor iedereen.",
-    "watch": "Watch",
+    "watch": "Volgen",
-    "share_this_post": "Share this Post",
+    "share_this_post": "Deel dit Bericht",
     "thread_tools.title": "Thread Gereedschap",
     "thread_tools.markAsUnreadForAll": "Ongelezen Markeren",
     "thread_tools.pin": "Onderwerp Vastmaken",
@@ -71,12 +71,12 @@
     "composer.submit": "Opslaan",
     "composer.replying_to": "Reageren op",
     "composer.new_topic": "Nieuw Onderwerp",
-    "composer.uploading": "uploading...",
+    "composer.uploading": "uploaden...",
-    "composer.thumb_url_label": "Paste a topic thumbnail URL",
+    "composer.thumb_url_label": "Plak een onderwerp thumbnail URL",
-    "composer.thumb_title": "Add a thumbnail to this topic",
+    "composer.thumb_title": "Voeg een thumbnail toe aan dit onderwerp",
     "composer.thumb_url_placeholder": "http://example.com/thumb.png",
-    "composer.thumb_file_label": "Or upload a file",
+    "composer.thumb_file_label": "Of upload een bestand",
-    "composer.thumb_remove": "Clear fields",
+    "composer.thumb_remove": "Velden leegmaken",
-    "composer.drag_and_drop_images": "Drag and Drop Images Here",
+    "composer.drag_and_drop_images": "Sleep en Zet Afbeeldingen Hier",
-    "composer.upload_instructions": "Upload images by dragging & dropping them."
+    "composer.upload_instructions": "Upload afbeeldingen door ze te slepen."
 }

public/language/nl/user.json

@@ -20,19 +20,19 @@
     "gravatar": "Gravatar",
     "birthday": "Verjaardag",
     "chat": "Chat",
-    "follow": "Follow",
+    "follow": "Volgen",
-    "unfollow": "Unfollow",
+    "unfollow": "Ontvolgen",
     "change_picture": "Afbeelding Aanpassen",
     "edit": "Aanpassen",
     "uploaded_picture": "Afbeelding Uploaden",
     "upload_new_picture": "Nieuwe Afbeelding Uploaden",
-    "current_password": "Current Password",
+    "current_password": "Huidige Wachtwoord",
     "change_password": "Wachtwoord Aanpassen",
     "confirm_password": "Bevestig Wachtwoord",
     "password": "Wachtwoord",
     "upload_picture": "Afbeelding Uploaden",
     "upload_a_picture": "Upload een afbeelding",
-    "image_spec": "You may only upload PNG, JPG, or GIF files",
+    "image_spec": "Je mag alleen PNG, JPG, of GIF bestanden uploaden.",
     "max": "max.",
     "settings": "Instellingen",
     "show_email": "Laat Mijn Email Zien",
@@ -41,7 +41,7 @@
     "has_no_posts": "Deze gebruiker heeft nog geen berichten geplaatst",
     "email_hidden": "Email Verborgen",
     "hidden": "verborgen",
-    "paginate_description": "Paginate topics and posts instead of using infinite scroll.",
+    "paginate_description": "Blader door onderwerpen en berichten in plaats van oneindig scrollen.",
-    "topics_per_page": "Topics per Page",
+    "topics_per_page": "Onderwerpen per Pagina",
-    "posts_per_page": "Posts per Page"
+    "posts_per_page": "Berichten per Pagina"
 }

src/plugins.js

@@ -175,7 +175,7 @@ var fs = require('fs'),
 									(function(staticDir) {
 										fs.exists(staticDir, function(exists) {
 											if (exists) {
-												Plugins.staticDirs[path.join(pluginData.id, mappedPath)] = staticDir;
+												Plugins.staticDirs[pluginData.id + '/' + mappedPath] = staticDir;
 											} else {
 												winston.warn('[plugins/' + pluginData.id + '] Mapped path \'' + mappedPath + ' => ' + staticDir + '\' not found.');
 											}