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

fill remoteGraph with loadMultiple, finally do proper undeletion

Browse Source
This commit is contained in:
Bryan Housel
2015-03-03 23:43:37 -05:00
parent 56449bc589
commit c503b9f96c
5 changed files with 88 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/core.yaml
+1 -1
View File
@@ -334,7 +334,7 @@ en:
your changes or the other user's changes.
merge_remote_changes:
conflict:
deleted: 'This object has been deleted.'
deleted: 'This object has been deleted by {user}.'
location: 'This object was moved by both you and {user}.'
nodelist: 'Nodes were changed by both you and {user}.'
memberlist: 'Relation members were changed by both you and {user}.'