Merge pull request #1118 from matrix-org/luke/fix-email-cancel-button-text

Show a "Skip" button instead of "Cancel" in SetEmailDialog

src/components/views/dialogs/SetEmailDialog.js

@@ -154,7 +154,7 @@ export default React.createClass({
                     />
                     <input
                         type="submit"
-                        value={_t("Cancel")}
+                        value={_t("Skip")}
                         onClick={this.onCancelled}
                     />
                 </div>

src/i18n/strings/en_EN.json

@@ -912,6 +912,7 @@
   "Disable Peer-to-Peer for 1:1 calls": "Disable Peer-to-Peer for 1:1 calls",
   "Do you want to set an email address?": "Do you want to set an email address?",
   "This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
+  "Skip":"Skip",
   "Start verification": "Start verification",
   "Share without verifying": "Share without verifying",
   "Ignore request": "Ignore request",