Merge branch 'laravel' of https://github.com/bhikkhu-kosalla-china/mint into staging

public/app/channal/channal.js

@@ -2,10 +2,10 @@ var _my_channal = null;
 var gChannelId;
 var get_channel_list_callback = null;
 var enumChannelType = [
-    {id:'translation',title:'translation',icon:''},    
-    {id:'original',title:'original',icon:''},
-    {id:'nissaya',title:'nissaya',icon:''},
-    {id:'commentary',title:'commentary',icon:''},
+    {id:'translation',title:gLocal.gui.translation,icon:''},    
+    {id:'original',title:gLocal.gui.master_copy,icon:''},
+    {id:'nissaya',title:gLocal.gui.nissaya,icon:''},
+    {id:'commentary',title:gLocal.gui.commentary,icon:''},
 ]
 channal_list();
 var share_win;
@@ -53,7 +53,7 @@ function my_channal_list() {
 					html += '<div style="max-width:2em;flex:1;"><input type="checkbox" /></div>';
 					html += "<div style='flex:0.5;'>No.</div>";
 					html += "<div style='flex:2;'>" + gLocal.gui.title + "</div>";
-					html += "<div style='flex:1;'>" + gLocal.gui.type + "</a></div>";                    
+					html += "<div style='flex:1;'>" + gLocal.gui.channel_type + "</a></div>";                    
 					html += "<div style='flex:2;'>" + gLocal.gui.owner + "</div>";
 					html += "<div style='flex:1;'>" + gLocal.gui.privacy + "</div>";
 					html += "<div style='flex:1;'>" + gLocal.gui.permission + "</a></div>";

public/app/public/lang/default.json

@@ -656,6 +656,8 @@
 		"pass": "pass.",
 		"space": " ",
 		"channel_type": "channel type",
+		"master_copy": "pāli",
+		"nissaya": "nissaya",
 		"": ""
 	},
 	"grammastr": [

public/app/public/lang/en.json

@@ -655,6 +655,8 @@
 		"pass": "pass.",
 		"space": " ",
 		"channel_type": "channel type",
+		"master_copy": "pāli",
+		"nissaya": "nissaya",
 		"": ""
 	},
 	"grammastr": [

public/app/public/lang/my.json

@@ -636,6 +636,8 @@
 		"pass": "အောင်သည်။ ကျော်ဖျက်သည်။",
 		"space": " ",
 		"channel_type": "ချန်နယ်အမျိုးအစား",
+		"master_copy": "ပါလိ",
+		"nissaya": "နိဿယ",
 		
 		
 		

public/app/public/lang/si.json

@@ -660,6 +660,9 @@
 		"pass": "pass.",
 		"space": " ",
 		"channel_type": "channel type",
+		"master_copy": "පාලි",
+		"nissaya": "සන‍්න‍ය",
+
 		"": ""
 	},
 	"grammastr": [

public/app/public/lang/zh-cn.json

@@ -658,6 +658,8 @@
 		"pass": "被动",
 		"space": "",
 		"channel_type": "资源类型",
+		"master_copy": "巴利底本",
+		"nissaya": "依词释",
 		"": ""
 	},
 	"grammastr": [

public/app/public/lang/zh-tw.json

@@ -657,6 +657,8 @@
 		"pass": "被動",
 		"channel_type": "資源類型",
 		"space": "",
+		"master_copy": "巴利底本",
+		"nissaya": "依詞釋",
 		"": ""
 	},
 	"grammastr": [