CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-14 17:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reword "merge lines" to "merge features" (closes #2861)

Browse Source
This commit is contained in:
Bryan Housel
2015-12-07 23:42:56 -08:00
parent e06d0cbca6
commit de2e716d44
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/core.yaml
View File

@@ -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.

10
dist/locales/en.json vendored
View File

@@ -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",