From de2e716d447c8fdd876c9bde1777150728ab2bbc Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 7 Dec 2015 23:42:56 -0800 Subject: [PATCH] Reword "merge lines" to "merge features" (closes #2861) --- data/core.yaml | 10 +++++----- dist/locales/en.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 9b3f2584b..62e15d93d 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -107,14 +107,14 @@ en: connected_to_hidden: This can't be disconnected because it is connected to a hidden feature. merge: title: Merge - description: Merge these lines. + description: Merge these features. key: C - annotation: "Merged {n} lines." + annotation: "Merged {n} features." not_eligible: These features can't be merged. - not_adjacent: These lines can't be merged because they aren't connected. - restriction: These lines can't be merged because at least one is a member of a "{relation}" relation. + not_adjacent: These features can't be merged because they 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 lines can't be merged because some of their tags have conflicting values. + conflicting_tags: These features can't be merged because some of their tags have conflicting values. move: title: Move description: Move this to a different location. diff --git a/dist/locales/en.json b/dist/locales/en.json index 64f683167..3825e3996 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -137,14 +137,14 @@ }, "merge": { "title": "Merge", - "description": "Merge these lines.", + "description": "Merge these features.", "key": "C", - "annotation": "Merged {n} lines.", + "annotation": "Merged {n} features.", "not_eligible": "These features can't be merged.", - "not_adjacent": "These lines can't be merged because they aren't connected.", - "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation.", + "not_adjacent": "These features can't be merged because they 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 lines can't be merged because some of their tags have conflicting values." + "conflicting_tags": "These features can't be merged because some of their tags have conflicting values." }, "move": { "title": "Move",