CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-20 23:44:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change link text: "Or download your changes"

Browse Source
This commit is contained in:
Bryan Housel
2015-03-05 19:47:48 -05:00
parent a7e67ccfd9
commit d4643b1b89
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/core.yaml
+1 -1
View File
@@ -326,7 +326,7 @@ en:
keep_remote: Use theirs
restore: Restore
delete: Leave Deleted
download_changes: Download your changes.
download_changes: Or download your changes.
done: "All conflicts resolved!"
help: |
Another user changed some of the same map features you changed.
dist/locales/en.json
Vendored
+1 -1
View File
@@ -400,7 +400,7 @@
"keep_remote": "Use theirs",
"restore": "Restore",
"delete": "Leave Deleted",
"download_changes": "Download your changes.",
"download_changes": "Or download your changes.",
"done": "All conflicts resolved!",
"help": "Another user changed some of the same map features you changed.\nClick on each item below for more details about the conflict, and choose whether to keep\nyour changes or the other user's changes.\n"
}