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

@@ -3385,15 +3385,13 @@ lin armless_A = mkA "armless" ;
lin armlet_N = mkN "armlet" "armlets";
lin armlike_A = mkA "armlike" ;
lin armoire_N = mkN "armoire" "armoires";
lin armor_N = mkN "armor" ;
lin armored_A = mkA "armored" ;
lin armorial_A = compoundA (mkA "armorial");
lin armory_N = mkN "armory" ;
lin armour_N = mkN "armour" ;
lin armour_plate_N = variants {mkN "armour-plate" "armour-plates"; mkN "armour plate" "armour plates"};
lin armoured_A = compoundA (mkA "armoured");
lin armourer_N = variants {mkN "armourer" "armourers"; mkN "armorer"} ;
lin armoury_N = mkN "armoury" "armouries";
lin armoury_N = variants {mkN "armoury" "armouries"; mkN "armory"} ;
lin armpit_N = mkN "armpit" "armpits";
lin armrest_N = mkN "armrest" ;
lin arms_race_N = variants {mkN "arms-race"; mkN "arms race"};