Merge branch 'master' of https://github.com/VeriteCo/Timeline

codekit-config.json

@@ -1529,6 +1529,17 @@
       "outputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/Rancho-Gudea.css",
       "strictImports" : 0,
       "fileType" : 0
+    },
+    "\/source\/js\/locale\/ja.js" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 1,
+      "inputAbbreviatedPath" : "\/source\/js\/locale\/ja.js",
+      "outputStyle" : 1,
+      "syntaxCheckerStyle" : 0,
+      "outputAbbreviatedPath" : "\/locale\/ja.js",
+      "fileType" : 5
     }
   },
   "manualImportLinks" : [
@@ -1615,6 +1626,13 @@
       "linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
       "baseFileAbbreviatedPath" : "\/source\/js\/locale\/pt-br.js",
       "followForSyntaxChecking" : 1
+    },
+    {
+      "type" : 0,
+      "position" : 0,
+      "linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
+      "baseFileAbbreviatedPath" : "\/source\/js\/locale\/ja.js",
+      "followForSyntaxChecking" : 1
     }
   ],
   "projectSettings" : {

source/js/locale/zh-ch.js

@@ -22,10 +22,10 @@ if(typeof VMM != 'undefined') {
 			full_long_small_date: "HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'",
 		},
 		messages: {
-			loading_timeline: "Loading Timeline... ",
-			return_to_title: "Return to Title",
-			expand_timeline: "Expand Timeline",
-			contract_timeline: "Contract Timeline"
+			loading_timeline: "加载时间线... ",
+			return_to_title: "回到开头",
+			expand_timeline: "伸展时间",
+			contract_timeline: "缩短时间"
 		}
 	}
 }