CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-03 13:38:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3964 from slibby/master

Browse Source 
Updated Merge Messaging + CONTRIBUTING.md
This commit is contained in:
Bryan Housel
2017-04-16 12:59:38 -04:00
committed by GitHub
parent 3c5c0f9ec6 5e9de84035
commit 5c31213673
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/core.yaml
+1 -1
View File
@@ -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.