Merge remote-tracking branch 'origin/master' into parser-data

2017-01-01 14:25:37 -05:00
parent 0b5cc96654 d61e90a33d
commit 101bbcc02d
4 changed files with 8894 additions and 8848 deletions
--- a/resources/dictionaries/cy/building_types.txt
+++ b/resources/dictionaries/cy/building_types.txt
@@ -1,2 +1,5 @@
 bythynnod
-tyddyn
+fferm
+fflat
+tŷ|ty
+tyddyn
--- a/resources/dictionaries/cy/directionals.txt
+++ b/resources/dictionaries/cy/directionals.txt
@@ -0,0 +1,4 @@
+gogledd|ogledd
+dwyrain|ddwyrain
+de|dde
+gorllewin|orllewin
--- a/resources/dictionaries/cy/place_names.txt
+++ b/resources/dictionaries/cy/place_names.txt
@@ -1,10 +1,22 @@
+banc
 castell
+capel
+coleg
 efail
 eglwys
 felin
+fferm
+fflat
+fflatiau
 ffynnon
+gwesty
+maes awyr
 pont|bont
-sarn
-stad
 rhodfa'r|rhodfar
-ysgol
+sarn
+sinema
+stad
+sŵ
+swyddfa
+treath
+ysgol
--- a/src/address_expansion_data.c
+++ b/src/address_expansion_data.c