GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-28 22:12:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge armor_N/armory_N with armour_N/armoury_N

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/translator/Dictionary.gf
View File

@@ -3368,10 +3368,8 @@ fun armless_A : A ; -- 00146786 having no arms; "the armless Venu
fun armlet_N : N ; -- 02739427 a band worn around the arm for decoration
fun armlike_A : A ; -- 00146430 resembling an arm
fun armoire_N : N ; -- 02739550 a large wardrobe or cabinet; originally used for storing weapons
fun armor_N : N ;
fun armored_A : A ;
fun armorial_A : A ; -- 03045059 of or relating to heraldry or heraldic arms; "armorial bearing"
fun armory_N : N ;
fun armour_N : N ;
fun armour_plate_N : N ; -- 02740764 specially hardened steel plate used to protect fortifications or vehicles from enemy fire
fun armoured_A : A ;