Merge pull request #5372 from Wouter92/master

couzteau · couzteau · commit 5b550eec1069 · 2013-11-08T16:15:15.000-08:00
Dutch Translation
diff --git a/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn b/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
@@ -1 +1 @@
-Subproject commit 456f099cbe48e420af7db10e85a19b4a760198d3
+Subproject commit c152be4a2e8383a21c573ba0b2495afc9ae84643
diff --git a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern
@@ -1 +1 @@
-Subproject commit 91a696a04b8de5c04b7c9f288ab940bbda124d66
+Subproject commit 21c9f963b94f6ad077f95d182e9b4568c0d3874d
diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js
@@ -456,6 +456,7 @@ define({
     "LOCALE_IT"                                 : "Italienisch",
     "LOCALE_JA"                                 : "Japanisch",
     "LOCALE_NB"                                 : "Norwegisch",
+    "LOCALE_NL"                                 : "Niederländisch",
     "LOCALE_PL"                                 : "Polnisch",
     "LOCALE_PT_BR"                              : "Portugiesisch, Brasilien",
     "LOCALE_PT_PT"                              : "Portugiesisch",
diff --git a/src/nls/nl/strings.js b/src/nls/nl/strings.js
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
@@ -455,13 +455,14 @@ define({
     "LOCALE_IT"                                 : "Italian",
     "LOCALE_JA"                                 : "Japanese",
     "LOCALE_NB"                                 : "Norwegian",
+    "LOCALE_NL"                                 : "Dutch",
     "LOCALE_FA_IR"                              : "Persian-Farsi",
     "LOCALE_PL"                                 : "Polish",
     "LOCALE_PT_BR"                              : "Portuguese, Brazil",
     "LOCALE_PT_PT"                              : "Portuguese",
     "LOCALE_RU"                                 : "Russian",
     "LOCALE_SK"                                 : "Slovak",
-	"LOCALE_SR"                                 : "Serbian",
+    "LOCALE_SR"                                 : "Serbian",
     "LOCALE_SV"                                 : "Swedish",
     "LOCALE_TR"                                 : "Turkish",
     "LOCALE_ZH_CN"                              : "Chinese, simplified",
diff --git a/src/nls/strings.js b/src/nls/strings.js
@@ -47,6 +47,7 @@ define(function (require, exports, module) {
         "it": true,
         "ja": true,
         "nb": true,
+        "nl": true,
         "pl": true,
         "pt-br": true,
         "pt-pt": true,
diff --git a/src/thirdparty/CodeMirror2 b/src/thirdparty/CodeMirror2
@@ -1 +1 @@
-Subproject commit 01e9fbb6496cda9e3e8fb3b29b4830770cebe642
+Subproject commit bc07cbddee496ebcb81c9a4d6466b112d2b14377
diff --git a/src/thirdparty/smart-auto-complete b/src/thirdparty/smart-auto-complete
@@ -0,0 +1 @@
+Subproject commit d5135c04bd34a6a04d3fd3fdb4238293c067e58c

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit d5135c04bd34a6a04d3fd3fdb4238293c067e58c`