1
0
forked from GitHub/gf-core

merge armor_N/armory_N with armour_N/armoury_N

This commit is contained in:
krasimir
2016-05-20 21:16:22 +00:00
parent ef99a3cd12
commit 1f76dd0d3b
17 changed files with 10 additions and 32 deletions

View File

@@ -892,7 +892,7 @@ lin armament_N = mkN "武装" | mkN "軍備" ;
lin armchair_N = mkN "アームチェア" | mkN "肘掛け椅子" ;
lin armed_A = variants {} ; --
lin armistice_N = mkN "停戦" | mkN "休戦" ;
lin armor_N = mkN "鎧" | mkN "装甲" ;
lin armour_N = mkN "鎧" | mkN "装甲" ;
lin armored_A = mkA "装甲の" ;
lin armpit_N = mkN "脇の下" | mkN "腋下" | mkN "腋窩" ;
lin armrest_N = mkN "肘掛け" ;