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

语法气泡升级

app/dict/grm_abbr.php

@@ -53,6 +53,7 @@ define("GRM_ABBR",[
 	["dictid"=>6,"abbr"=>"【合】","replace"=>"incomp"],
 	["dictid"=>6,"abbr"=>"【无】","replace"=>"ind"],
 	["dictid"=>6,"abbr"=>"（梵","replace"=>"bsk"],
+	["dictid"=>6,"abbr"=>"cond.","replace"=>"cond"],
 	["dictid"=>6,"abbr"=>"pres.","replace"=>"pres"],
 	["dictid"=>6,"abbr"=>"fut.","replace"=>"fut"],
 	["dictid"=>1,"abbr"=>"BSk．","replace"=>"bsk"],	
@@ -131,6 +132,7 @@ define("GRM_ABBR",[
 	["dictid"=>6,"abbr"=>"imper.","replace"=>"imp"],
 	["dictid"=>6,"abbr"=>"denom.","replace"=>"denom"],
 	["dictid"=>6,"abbr"=>"prp.","replace"=>"prp"],
+	["dictid"=>6,"abbr"=>"imp.","replace"=>"imp"],
 	["dictid"=>6,"abbr"=>"ppr.","replace"=>"prp"],
 	["dictid"=>6,"abbr"=>"aor.","replace"=>"aor"],
 	["dictid"=>6,"abbr"=>"Ger.","replace"=>"ger"],
@@ -153,6 +155,7 @@ define("GRM_ABBR",[
 	["dictid"=>6,"abbr"=>"cf.","replace"=>"cf"],
 	["dictid"=>6,"abbr"=>"pl.","replace"=>"pl"],
 	["dictid"=>6,"abbr"=>"sg.","replace"=>"sg"],
+	["dictid"=>6,"abbr"=>"pr.","replace"=>"pr"],
 	["dictid"=>6,"abbr"=>"pp.","replace"=>"pp"],
 	["dictid"=>6,"abbr"=>"m.","replace"=>"m"],
 	["dictid"=>6,"abbr"=>"f.","replace"=>"f"],
@@ -224,6 +227,7 @@ define("GRM_ABBR",[
 	["dictid"=>32,"abbr"=>"voc.","replace"=>"voc"],
 	["dictid"=>32,"abbr"=>"abl.","replace"=>"abl"],
 	["dictid"=>32,"abbr"=>"instr.","replace"=>"inst"],
+	["dictid"=>32,"abbr"=>"pron.","replace"=>"pron"],
 	["dictid"=>32,"abbr"=>"inst.","replace"=>"inst"],
 	["dictid"=>32,"abbr"=>"dat.","replace"=>"dat"],
 	["dictid"=>32,"abbr"=>"gen.","replace"=>"gen"],

app/users_guide/zh-cn/grammar_pr.md

@@ -0,0 +1,2 @@
+# 现在式
+

app/users_guide/zh-cn/grammar_pron.md

@@ -0,0 +1 @@
+# 代词