Merge branch 'dev'

i18next · Mar 27, 2015 · ca8356e · ca8356e
2 parents 94f55f3 + 6853b24
commit ca8356e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/assets/i18n/de/locale.json b/assets/i18n/de/locale.json
@@ -2,4 +2,4 @@
     "language": {
         "en-US": "English"
     }
-}
+}
diff --git a/assets/i18n/de/translation.json b/assets/i18n/de/translation.json
@@ -9,4 +9,4 @@
     "dac6b24f78471a132bc9a7ec7774530351b54fb0": "Basic Example",
     "e37ace809ee73b5cce56ec27cca9b0f012635454": "YouTube has more than __count__ billion users.",
     "loading": "Wird geladen..."
-}
+}
diff --git a/assets/i18n/en/locale.json b/assets/i18n/en/locale.json
@@ -2,4 +2,4 @@
     "language": {
         "en-US": "English"
     }
-}
+}
diff --git a/assets/i18n/en/translation.json b/assets/i18n/en/translation.json
@@ -9,4 +9,4 @@
     "dac6b24f78471a132bc9a7ec7774530351b54fb0": "Basic Example",
     "e37ace809ee73b5cce56ec27cca9b0f012635454": "YouTube has more than __count__ billion users.",
     "loading": "Loading..."
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "i18next-scanner",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "i18next-scanner is a transfrom stream that can scan your code, extract translation keys/values, and merge them into i18n resource files.",
   "homepage": "https://github.com/cheton/i18next-scanner",
   "author": "Cheton Wu <cheton@gmail.com>",
@@ -22,8 +22,7 @@
     }
   ],
   "engines": {
-    "node": "0.10.x",
-    "npm": "1.1.x"
+    "node": "0.10.x"
   },
   "keywords": [
     "i18n",
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ @@
         "language": {
             "en-US": "English"
         }
-    }
+    }