Merge pull request #591 from bhikkhu-kosalla-china/master

气泡升级

app/dict/dict_lookup.php

@@ -482,13 +482,13 @@ function lookup_user($word){
 				# code...
 				$strMean .=$mean . "; ";
 			}
-			$output .= "<div class='mean'><b>语法</b>:{$strCase}</div>";
+			$output .= "<div class='mean'><b>{$_local->gui->gramma}</b>:{$strCase}</div>";
 			if($key!=="_null_"){
-				$output .= "<div class='mean'><b>原型</b>:<a href='index.php?key={$key}'>{$key}</a></div>";				
+				$output .= "<div class='mean'><b>{$_local->gui->parent}</b>:<a href='index.php?key={$key}'>{$key}</a></div>";				
 			}
 
-			$output .= "<div class='mean'><b>意思</b>:{$strMean}</div>";
-			$output .= "<div class='mean'><b>组成</b>:{$strPart}</div>";
+			$output .= "<div class='mean'><b>{$_local->gui->g_mean}</b>:{$strMean}</div>";
+			$output .= "<div class='mean'><b>{$_local->gui->factor}</b>:{$strPart}</div>";
 		}
 		$output .= "<div><span>{$_local->gui->contributor}：</span>";
 		$userinfo = new UserInfo();

app/dict/grm_abbr.php

@@ -20,6 +20,7 @@ define("GRM_ABBR",[
 	["dictid"=>35,"abbr"=>"（ti）","replace"=>"ti"],
 	["dictid"=>35,"abbr"=>"（kri）","replace"=>"verb"],
 	["dictid"=>35,"abbr"=>"（i）","replace"=>"f"],
+	["dictid"=>4,"abbr"=>"【字首】","replace"=>"pref"],
 	["dictid"=>4,"abbr"=>"【过】","replace"=>"aor"],
 	["dictid"=>4,"abbr"=>"【过分】","replace"=>"pp"],
 	["dictid"=>4,"abbr"=>"【现分】","replace"=>"prp"],
@@ -36,6 +37,7 @@ define("GRM_ABBR",[
 	["dictid"=>4,"abbr"=>"【合】","replace"=>"incomp"],
 	["dictid"=>4,"abbr"=>"【无】","replace"=>"ind"],
 	["dictid"=>4,"abbr"=>"（梵","replace"=>"bsk"],
+	["dictid"=>6,"abbr"=>"【字首】","replace"=>"pref"],
 	["dictid"=>6,"abbr"=>"【过】","replace"=>"aor"],
 	["dictid"=>6,"abbr"=>"【过分】","replace"=>"pp"],
 	["dictid"=>6,"abbr"=>"【现分】","replace"=>"prp"],
@@ -55,10 +57,15 @@ define("GRM_ABBR",[
 	["dictid"=>6,"abbr"=>"cond.","replace"=>"cond"],
 	["dictid"=>6,"abbr"=>"pres.","replace"=>"pres"],
 	["dictid"=>6,"abbr"=>"fut.","replace"=>"fut"],
+	["dictid"=>6,"abbr"=>"fut.","replace"=>"fut"],
+	["dictid"=>19,"abbr"=>"pron．","replace"=>"pron"],
+	["dictid"=>19,"abbr"=>"pref．","replace"=>"pref"],
 	["dictid"=>19,"abbr"=>"aor．","replace"=>"aor"],
 	["dictid"=>19,"abbr"=>"caus．","replace"=>"caus"],
 	["dictid"=>19,"abbr"=>"fut．","replace"=>"fut"],
 	["dictid"=>19,"abbr"=>"grd．","replace"=>"fpp"],	
+	["dictid"=>1,"abbr"=>"pron．","replace"=>"pron"],
+	["dictid"=>1,"abbr"=>"pref．","replace"=>"pref"],
 	["dictid"=>1,"abbr"=>"grd．","replace"=>"fpp"],	
 	["dictid"=>1,"abbr"=>"caus．","replace"=>"caus"],
 	["dictid"=>1,"abbr"=>"fut．","replace"=>"fut"],
@@ -90,6 +97,8 @@ define("GRM_ABBR",[
 	["dictid"=>1,"abbr"=>"f．","replace"=>"f"],
 	["dictid"=>1,"abbr"=>"n．","replace"=>"nt"],
 	["dictid"=>1,"abbr"=>"：a．","replace"=>"adj"],
+	["dictid"=>8,"abbr"=>"pron．","replace"=>"pron"],
+	["dictid"=>8,"abbr"=>"pref．","replace"=>"pref"],
 	["dictid"=>8,"abbr"=>"grd．","replace"=>"fpp"],	
 	["dictid"=>8,"abbr"=>"imper．","replace"=>"imp"],	
 	["dictid"=>8,"abbr"=>"caus．","replace"=>"caus"],
@@ -169,6 +178,7 @@ define("GRM_ABBR",[
 	["dictid"=>3,"abbr"=>"[a.]","replace"=>"adj"],
 	["dictid"=>6,"abbr"=>"imper.","replace"=>"imp"],
 	["dictid"=>6,"abbr"=>"denom.","replace"=>"denom"],
+	["dictid"=>6,"abbr"=>"pron.","replace"=>"pron"],
 	["dictid"=>6,"abbr"=>"prp.","replace"=>"prp"],
 	["dictid"=>6,"abbr"=>"imp.","replace"=>"imp"],
 	["dictid"=>6,"abbr"=>"ppr.","replace"=>"prp"],

app/studio/js/relation_list.json

@@ -38,7 +38,7 @@ var list_relation=[
     {
         "id": "ASV",
         "case": "",
-        "note": "施动者<主格> -> 动词<br>XX把...",
+        "note": "施动者<主格> -> 动词<br>XX把…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -65,7 +65,7 @@ var list_relation=[
     {
         "id": "AOV",
         "case": ".nom.",
-        "note": "受动者<主格> -> 动词<br>XX被...",
+        "note": "受动者<主格> -> 动词<br>XX被…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -92,7 +92,7 @@ var list_relation=[
     {
         "id": "DASO-P",
         "case": ".nom.",
-        "note": "<字面>主语 -> 系动词<br>XX是...",
+        "note": "<字面>主语 -> 系动词<br>XX是…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -119,7 +119,7 @@ var list_relation=[
     {
         "id": "DASO-S",
         "case": ".nom.",
-        "note": "<字面>表语 -> 系动词<br>...是XX",
+        "note": "<字面>表语 -> 系动词<br>…是XX",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -137,7 +137,7 @@ var list_relation=[
     {
         "id": "NIO",
         "case": ".nom.",
-        "note": "被描述 -> 定性<br>XX有...",
+        "note": "被描述 -> 定性<br>XX有…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -164,7 +164,7 @@ var list_relation=[
     {
         "id": "NID",
         "case": ".nom.",
-        "note": "待命名 -> 命名<br>XX叫做...",
+        "note": "待命名 -> 命名<br>XX叫做…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -191,7 +191,7 @@ var list_relation=[
     {
         "id": "DASD-P",
         "case": ".nom.",
-        "note": "<命名>主 -> 系<br>XX叫做...",
+        "note": "<命名>主 -> 系<br>XX叫做…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -218,7 +218,7 @@ var list_relation=[
     {
         "id": "DASD-S",
         "case": ".nom.",
-        "note": "<命名>表 -> 系<br>...叫做XX",
+        "note": "<命名>表 -> 系<br>…叫做XX",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -272,7 +272,7 @@ var list_relation=[
     {
         "id": "IOV",
         "case": ".acc.",
-        "note": "受动者<非主格> -> 动词<br>...把XX",
+        "note": "受动者<非主格> -> 动词<br>…把XX",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -434,7 +434,7 @@ var list_relation=[
     {
         "id": "SOE",
         "case": ".inst.",
-        "note": "伴随 -> 动词<带连词><br>跟XX一起",
+        "note": "<带连词>伴随关系<br>跟XX一起",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -461,7 +461,7 @@ var list_relation=[
     {
         "id": "SOI",
         "case": ".inst.",
-        "note": "伴随 -> 动词<无连词><br>与XX",
+        "note": "<无连词>伴随关系<br>与XX",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -515,7 +515,7 @@ var list_relation=[
     {
         "id": "CAU",
         "case": ".inst.",
-        "note": "因果<br>根据XX",
+        "note": "因 -> 果<br>根据XX",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -533,7 +533,7 @@ var list_relation=[
     {
         "id": "IOV",
         "case": ".inst.",
-        "note": "被使役宾语 -> 动词<br>令XX...",
+        "note": "被使役宾语 -> 动词<br>令XX…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -650,7 +650,7 @@ var list_relation=[
     {
         "id": "PUR",
         "case": ".dat.",
-        "note": "目的 -> 动词<br>为了...",
+        "note": "目的 -> 动词<br>为了…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -785,7 +785,7 @@ var list_relation=[
     {
         "id": "POS",
         "case": ".gen.",
-        "note": "从属<br>属于XX的",
+        "note": "所有 -> 被所有<br>属于XX的",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -839,7 +839,7 @@ var list_relation=[
     {
         "id": "ISV",
         "case": ".gen.",
-        "note": "施动者<非主格> -> 动词<br>XX的...<动作>",
+        "note": "施动者<非主格> -> 动词<br>XX的…<动作>",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -866,7 +866,7 @@ var list_relation=[
     {
         "id": "IOV",
         "case": ".gen.",
-        "note": "受动者<非主格> -> 动词<br>XX的被...",
+        "note": "受动者<非主格> -> 动词<br>XX的被…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -893,7 +893,7 @@ var list_relation=[
     {
         "id": "LOV",
         "case": ".loc.",
-        "note": "容纳 -> 被容纳<br>在...",
+        "note": "容器 -> 动词<br>在…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -920,7 +920,7 @@ var list_relation=[
     {
         "id": "MOT",
         "case": ".loc.",
-        "note": "动机",
+        "note": "表现 -> 有表现",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -1244,7 +1244,7 @@ var list_relation=[
     {
         "id": "DEF",
         "case": "",
-        "note": "特征限定<br>当...",
+        "note": "特征限定<br>当…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -1460,7 +1460,7 @@ var list_relation=[
     {
         "id": "LOV",
         "case": ".adv.",
-        "note": "容纳 -> 被容纳<br>在...",
+        "note": "容纳 -> 被容纳<br>在…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",

app/users_guide/zh-cn/grammar_fut.md

@@ -1,9 +1,17 @@
 # 将来时
 
-**动词**变位之一，表达将来发生的动作，用在表示**将来时**。
+**动词**变位之一，表示将要发生或将要做（的事情），动作。相当于英语的一般将来时。
 
 |语种|缩写|全称|
 |-|-|-|
 |巴利|——|Anāgata|
 |汉|**将**|将来式|
 |英|**fur.**|Future tense|
+
+## 常用语尾表
+
+|将来时|单数|复数|
+| -- | -- | -- |
+|第三人称|~(i)ssati<br>TA**将**~|~(i)ssanti<br>TA们**将**~|
+|第二人称|~(i)ssasi<br>你**将**~|~(i)ssatha<br>你们**将**~|
+|第一人称|~(i)ssāmi<br>我**将**~|~(i)ssāma<br>我们**将**~|

app/users_guide/zh-cn/grammar_opt.md

@@ -9,3 +9,4 @@
 |汉|潜|潜能式<br>愿望式<br>祈愿式|
 |英|Opt.|Optative Tense|
 
+

app/users_guide/zh-cn/grammar_pref.md

@@ -0,0 +1,7 @@
+# 前缀
+
+|语种|缩写|全称|
+|-|-|-|
+|巴利|——|upasagga|
+|汉|**前缀**|绝对体<br>连续<br>不变分词|
+|英|**pref.**|prefix|

app/users_guide/zh-cn/grammar_pres.md

@@ -9,3 +9,11 @@
 |汉|现|现在式|
 |英|pres.|present tense|
 
+## 常用语尾表
+
+|现在时|单数|复数|
+| -- | -- | -- |
+|第三人称|~ti<br>TA**正在**~|~nti<br>TA们**正在**~|
+|第二人称|~si<br>你**正在**~|~tha<br>你们**正在**~|
+|第一人称|~āmi<br>我**正在**~|~āma<br>我们**正在**~|
+