Merge branch 'master' of https://github.com/visuddhinanda/mint

app/public/lang/zh-cn.json

@@ -611,7 +611,7 @@
 		"cooperate_group": "协作组",
 		"personal": "个人",
 		"empty_null_mark": "这里很安静",
-		"lesson_intro": "看看世界个地的巴利专家都是如何解析圣典的",
+		"lesson_intro": "看看世界各地的巴利专家都是如何解析圣典的",
 		"teaching_course": "主讲的课程",
 		"watching_course": "关注的课程",
 		"": ""

app/public/lang/zh-tw.json

@@ -610,7 +610,7 @@
 		"cooperate_group": "協作組",
 		"personal": "個人",
 		"empty_null_mark": "這裡很安靜",
-		"lesson_intro": "看看世界個地的巴利專家都是如何解析聖典的",
+		"lesson_intro": "看看世界各地的巴利專家都是如何解析聖典的",
 		"teaching_course": "主講的課程",
 		"watching_course": "關注的課程",
 		"": ""

app/studio/js/relation.js

@@ -122,7 +122,7 @@ function rela_render_context(wordid,index,strRela,grammar){
 	output += "<div class=\"case_dropdown rela_menu\" style='display: inline-block'>";
 	output += "<p class=\"case_dropbtn\">";
 	if(strRela==""){
-		output += "<span class='relation_blank'>Relation</span>";
+		output += "<span class='relation_blank'>"+gLocal.gui.relation+"</span>";
 	}
 	else{
 		output += "<span class='relation_text'>"+strRela+"</span>";

app/studio/js/render.js

@@ -1705,7 +1705,7 @@ function render_tran_sent_block(book, para, begin, end, channal = 0, readonly =
 		output += "<span>";
 
 		if (thischannal) {
-			output += thischannal.name + "-" + thischannal.lang + "@";
+			output += thischannal.name + "-<b>" + thischannal.lang + "</b>@";
 			if (thischannal.username == getCookie("username")) {
 				output += gLocal.gui.your;
 			} else {

documents/users_guide/en/markdown_guide.md

@@ -9,7 +9,7 @@
 |`*italic*`|*italic*|
 |`***bold Italic***`|***bold Italic***|
 |`~~strikethrough~~`|~~strikethrough~~|
-|`[link to wikipali](www.wikipali.org)`|[link to wikipali](www.wikipali.org)|
+|`[link to wikipali](www.wikipali.org "commentary
note")`|[link to wikipali](www.wikipali.org "commentary
note")|
 ---
 ## paragraph style
 

documents/users_guide/zh-cn/markdown_guide.md

@@ -8,7 +8,7 @@
 |`*斜体*`|*斜体*|
 |`***粗斜体***`|***粗斜体***|
 |`~~校对删除~~`|~~校对删除~~|
-|`[链接标题](www.wikipali.org)`|[链接标题](www.wikipali.org)|
+|`[链接标题](www.wikipali.org "注
释")`|[链接标题](www.wikipali.org "注
释")|
 
 ## 段落样式
 

documents/users_guide/zh-tw/markdown_guide.md

@@ -7,7 +7,7 @@
 |`*斜體*`|*斜體*|
 |`***粗斜體***`|***粗斜體***|
 |`~~校對刪除~~`|~~校對刪除~~|
-|`[連結標題](www.wikipali.org)`|[連結標題](www.wikipali.org)|
+|`[連結標題](www.wikipali.org "註
釋")`|[連結標題](www.wikipali.org "註
釋")|
 |\`内容`||
 
 ## 段落樣式