From e97b18a2ca3109226a9c6e46db3aa3121dd97e38 Mon Sep 17 00:00:00 2001
From: Zach Wise <zach@digitalartwork.net>
Date: Tue, 12 Feb 2013 13:49:37 -0600
Subject: [PATCH] renamed zh-ch to zh-cn closes #338

---
 codekit-config.json         | 22 +++++++++++-----------
 compiled/js/locale/zh-ch.js |  2 +-
 compiled/js/locale/zh-cn.js |  2 ++
 source/js/Core              |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 compiled/js/locale/zh-cn.js

diff --git a/codekit-config.json b/codekit-config.json
index 25c3fde..0753977 100644
--- a/codekit-config.json
+++ b/codekit-config.json
@@ -802,17 +802,6 @@
       "outputAbbreviatedPath" : "\/source\/js\/Core\/Core\/VMM.LoadLib-min.js",
       "fileType" : 64
     },
-    "\/source\/js\/Core\/Language\/locale\/zh-ch.js" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 1,
-      "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/zh-ch.js",
-      "outputStyle" : 1,
-      "syntaxCheckerStyle" : 0,
-      "outputAbbreviatedPath" : "\/compiled\/js\/locale\/zh-ch.js",
-      "fileType" : 64
-    },
     "\/source\/js\/Core\/Core\/VMM.Util.js" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 1,
@@ -2083,6 +2072,17 @@
       "initialSize" : 119914,
       "fileType" : 4096
     },
+    "\/source\/js\/Core\/Language\/locale\/zh-cn.js" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 1,
+      "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/zh-cn.js",
+      "outputStyle" : 1,
+      "syntaxCheckerStyle" : 0,
+      "outputAbbreviatedPath" : "\/compiled\/js\/locale\/zh-ch.js",
+      "fileType" : 64
+    },
     "\/dev_examples\/power-plants\/fisk_pauldailingmedill.jpg" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
diff --git a/compiled/js/locale/zh-ch.js b/compiled/js/locale/zh-ch.js
index 0368c4e..4114397 100644
--- a/compiled/js/locale/zh-ch.js
+++ b/compiled/js/locale/zh-ch.js
@@ -1,2 +1,2 @@
 /* LANGUAGE 
-================================================== */typeof VMM!="undefined"&&(VMM.Language={lang:"zh-ch",api:{wikipedia:"zh"},date:{month:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],month_abbr:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],day:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],day_abbr:["周日","周一","周二","周三","周四","周五","周六"]},dateformats:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"d mmm",full:"d mmmm yyyy",time_no_seconds_short:"HH:MM",time_no_seconds_small_date:"HH:MM'<br/><small>'d mmmm yyyy'</small>'",full_long:"dddd',' d mmm yyyy 'um' HH:MM",full_long_small_date:"HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'"},messages:{loading_timeline:"加载时间线... ",return_to_title:"回到开头",expand_timeline:"伸展时间",contract_timeline:"缩短时间",wikipedia:"From Wikipedia, the free encyclopedia",loading_content:"Loading Content",loading:"Loading"}});
\ No newline at end of file
+================================================== */typeof VMM!="undefined"&&(VMM.Language={lang:"zh-cn",api:{wikipedia:"zh"},date:{month:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],month_abbr:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],day:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],day_abbr:["周日","周一","周二","周三","周四","周五","周六"]},dateformats:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"d mmm",full:"d mmmm yyyy",time_no_seconds_short:"HH:MM",time_no_seconds_small_date:"HH:MM'<br/><small>'d mmmm yyyy'</small>'",full_long:"dddd',' d mmm yyyy 'um' HH:MM",full_long_small_date:"HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'"},messages:{loading_timeline:"加载时间线... ",return_to_title:"回到开头",expand_timeline:"伸展时间",contract_timeline:"缩短时间",wikipedia:"From Wikipedia, the free encyclopedia",loading_content:"Loading Content",loading:"Loading"}});
\ No newline at end of file
diff --git a/compiled/js/locale/zh-cn.js b/compiled/js/locale/zh-cn.js
new file mode 100644
index 0000000..4114397
--- /dev/null
+++ b/compiled/js/locale/zh-cn.js
@@ -0,0 +1,2 @@
+/* LANGUAGE 
+================================================== */typeof VMM!="undefined"&&(VMM.Language={lang:"zh-cn",api:{wikipedia:"zh"},date:{month:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],month_abbr:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],day:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],day_abbr:["周日","周一","周二","周三","周四","周五","周六"]},dateformats:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"d mmm",full:"d mmmm yyyy",time_no_seconds_short:"HH:MM",time_no_seconds_small_date:"HH:MM'<br/><small>'d mmmm yyyy'</small>'",full_long:"dddd',' d mmm yyyy 'um' HH:MM",full_long_small_date:"HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'"},messages:{loading_timeline:"加载时间线... ",return_to_title:"回到开头",expand_timeline:"伸展时间",contract_timeline:"缩短时间",wikipedia:"From Wikipedia, the free encyclopedia",loading_content:"Loading Content",loading:"Loading"}});
\ No newline at end of file
diff --git a/source/js/Core b/source/js/Core
index 7606209..869f190 160000
--- a/source/js/Core
+++ b/source/js/Core
@@ -1 +1 @@
-Subproject commit 76062094ecec6991281e37c53f432c615fc8b566
+Subproject commit 869f1904c806d28cb9c0b75880f0e1b4295fbe96