rework save UI

data/core.yaml

@@ -321,8 +321,8 @@ en:
     conflict:
       header: Resolve conflicting edits
       message: 'Conflicting edits were made to {name}'
-      keep_local: Keep my changes
-      keep_remote: Discard my changes
+      keep_local: Keep mine
+      keep_remote: Use theirs
       restore: Restore
       delete: Leave Deleted
       annotation:
@@ -331,8 +331,8 @@ en:
         keep_remote: 'Kept remote version of {id}.'
         restore: 'Restored local version of {id}.'
         delete: 'Deleted local version of {id}.'
-      try_again: Try to Save
       download_changes: Download your changes.
+      done: "All conflicts resolved!"
       help: |
         Another user changed some of the same map features you changed.
         Click on each item below for more details about the conflict, and choose whether to keep