[boundaries] Adding prefix/suffix replacements for English and Spanish

resources/boundaries/names/languages/en.yaml

@@ -1,4 +1,5 @@
 # Prefixes which can be stripped to normalize a place name
+# Note these will be stripped off the front at random, not every time
 prefixes:
     - city of
     - township of
@@ -7,9 +8,18 @@ prefixes:
     - municipality of
     - borough of
     - london borough of
+    - royal borough of
     - shire of
+    - parish of
+    - free state of
+    - autonomous city of
+    - territorial waters of
+    - county of
+    - county
+    - district of
 
 # Suffixes which can be stripped to normalize a place name
 suffixes:
     - township
     - municipality
+    - city

resources/boundaries/names/languages/es.yaml

@@ -1,6 +1,8 @@
 prefixes:
     # Note: "ciudad de" should not be included as it's part of proper names
     - colonia
+    - municipio nuestra senora de
+    - ciudad de
 
 
 suffixes: