From d4643b1b89f3ff5b66702b6e0dff5805c823d886 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 5 Mar 2015 19:47:48 -0500 Subject: [PATCH] Change link text: "Or download your changes" --- data/core.yaml | 2 +- dist/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index fbbd813e5..f18746606 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -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. diff --git a/dist/locales/en.json b/dist/locales/en.json index 4eab3d39c..f95a44b29 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -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" }