Updated Merge Messaging + CONTRIBUTING.md

CONTRIBUTING.md

@@ -90,7 +90,7 @@ These are separate translations for uniformity reasons and because some language
  may translate "type" differently in "type of aeroway" and "type of amenity", for
  example.
 
-## Adding New Strings for Translation
+## Adding New Strings for Translation or Updating Existing Strings
 
 iD translates strings with a `t` function - `t('foo.bar')` translate the key
 `foo.bar` into the current language. If you introduce new translatable strings
@@ -99,6 +99,10 @@ to iD, only display them in the interface through the `t()` function.
 Then, add the new string to `data/core.yaml`. The translation system, Transifex,
 will automatically detect the change.
 
+If you are updating an existing string, update it in `data/core/yaml` and run 
+`npm run build` to generate the `en.json` file automatically, then commit both 
+modified files.
+
 Use `npm run build` to build the translations with the local changes.
 
 `npm run translations` can be used to pull the latest translations from Transifex.

data/core.yaml

@@ -123,7 +123,7 @@ en:
       key: C
       annotation: "Merged {n} features."
       not_eligible: These features can't be merged.
-      not_adjacent: These features can't be merged because they aren't connected.
+      not_adjacent: These features can't be merged because their endpoints aren't connected.
       restriction: These features can't be merged because at least one is a member of a "{relation}" relation.
       incomplete_relation: These features can't be merged because at least one hasn't been fully downloaded.
       conflicting_tags: These features can't be merged because some of their tags have conflicting values.

dist/locales/en.json

@@ -159,7 +159,7 @@
                 "key": "C",
                 "annotation": "Merged {n} features.",
                 "not_eligible": "These features can't be merged.",
-                "not_adjacent": "These features can't be merged because they aren't connected.",
+                "not_adjacent": "These features can't be merged because their endpoints aren't connected.",
                 "restriction": "These features can't be merged because at least one is a member of a \"{relation}\" relation.",
                 "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded.",
                 "conflicting_tags": "These features can't be merged because some of their tags have conflicting values."
@@ -3857,14 +3857,14 @@
                     "name": "Piste/Ski Trail",
                     "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
                 },
-                "place/city": {
-                    "name": "City",
-                    "terms": ""
-                },
                 "place/farm": {
                     "name": "Farm",
                     "terms": ""
                 },
+                "place/city": {
+                    "name": "City",
+                    "terms": ""
+                },
                 "place/hamlet": {
                     "name": "Hamlet",
                     "terms": ""