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

OsmChange -> osmChange

Browse Source
This commit is contained in:
Bryan Housel
2017-09-15 19:44:55 -04:00
parent 82494750ef
commit 359eab468c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/core.yaml
+2 -2
View File
@@ -260,7 +260,7 @@ en:
save: Upload
cancel: Cancel
changes: "{count} Changes"
download_changes: Download OsmChange file
download_changes: Download osmChange file
warnings: Warnings
modified: Modified
deleted: Deleted
@@ -464,7 +464,7 @@ en:
keep_remote: Use theirs
restore: Restore
delete: Leave Deleted
download_changes: Or download your changes.
download_changes: Or download osmChange file
done: "All conflicts resolved!"
help: |
Another user changed some of the same map features you changed.
dist/locales/en.json
Vendored
+2 -2
View File
@@ -334,7 +334,7 @@
"save": "Upload",
"cancel": "Cancel",
"changes": "{count} Changes",
"download_changes": "Download OsmChange file",
"download_changes": "Download osmChange file",
"warnings": "Warnings",
"modified": "Modified",
"deleted": "Deleted",
@@ -573,7 +573,7 @@
"keep_remote": "Use theirs",
"restore": "Restore",
"delete": "Leave Deleted",
"download_changes": "Or download your changes.",
"download_changes": "Or download osmChange file",
"done": "All conflicts resolved!",
"help": "Another user changed some of the same map features you changed.\nClick on each feature below for more details about the conflict, and choose whether to keep\nyour changes or the other user's changes.\n"
}