jenkins-bot has submitted this change and it was merged.
Change subject: Kill off two references to there being a Cancel button
......................................................................
Kill off two references to there being a Cancel button
Change-Id: I36f13b2fffcb442c0a4b27d64d388f24c3c3766e
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
2 files changed, 2 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index d3df702..24947c1 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -756,7 +756,6 @@
'visualeditor-savedialog-warning-dirty',
'visualeditor-saveerror',
'visualeditor-serializeerror',
- 'visualeditor-toolbar-cancel',
'visualeditor-toolbar-format-tooltip',
'visualeditor-toolbar-insert',
'visualeditor-toolbar-savedialog',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 4a1b917..071e287 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -25,7 +25,7 @@
"visualeditor-annotationbutton-linknode-tooltip": "Simple link",
"visualeditor-beta-appendix": "beta",
"visualeditor-beta-label": "beta",
- "visualeditor-beta-warning": "VisualEditor is in 'beta'. You may encounter
software issues, and you may not be able to edit parts of the page. To switch
back to source editing at any time without losing your changes, open the
dropdown next to \"{{int:visualeditor-toolbar-cancel}}\" and select
\"{{int:visualeditor-mweditmodesource-title}}\".",
+ "visualeditor-beta-warning": "VisualEditor is in 'beta'. You may encounter
software issues, and you may not be able to edit parts of the page. To switch
back to source editing at any time without losing your changes, open the
dropdown next to \"{{int:visualeditor-toolbar-savedialog}}\" and select
\"{{int:visualeditor-mweditmodesource-title}}\".",
"visualeditor-browserwarning": "You are using a browser which is not
officially supported by VisualEditor.",
"visualeditor-ca-createlocaldescriptionsource": "Add local description
source",
"visualeditor-ca-createsource": "Create source",
@@ -239,7 +239,6 @@
"visualeditor-serializeerror": "Error loading data from server: $1.",
"visualeditor-settings-tool": "Page settings",
"visualeditor-timeout":"It looks like this editor is currently
unavailable. Would you like to edit in source mode instead?",
- "visualeditor-toolbar-cancel": "Cancel",
"visualeditor-toolbar-cite-label": "Cite",
"visualeditor-toolbar-format-tooltip": "Format paragraph",
"visualeditor-toolbar-savedialog": "Save page",
@@ -249,7 +248,7 @@
"visualeditor-viewpage-savewarning-title": "Are you sure?",
"visualeditor-viewpage-savewarning-discard": "Discard edits",
"visualeditor-viewpage-savewarning-keep": "Continue editing",
- "visualeditor-wikitext-warning": "You are using VisualEditor -
[[{{MediaWiki:visualeditor-wikitext-warning-link}}|wikitext]] does not work
here. To switch to source editing at any time without losing your changes, open
the dropdown menu next to \"{{int:visualeditor-toolbar-cancel}}\" and select
\"{{int:visualeditor-mweditmodesource-title}}\".",
+ "visualeditor-wikitext-warning": "You are using VisualEditor -
[[{{MediaWiki:visualeditor-wikitext-warning-link}}|wikitext]] does not work
here. To switch to source editing at any time without losing your changes, open
the dropdown menu next to \"{{int:visualeditor-toolbar-savedialog}}\" and
select \"{{int:visualeditor-mweditmodesource-title}}\".",
"visualeditor-wikitext-warning-link": "Help:Wiki markup",
"visualeditor-wikitext-warning-title": "Wikitext markup detected"
}
--
To view, visit https://gerrit.wikimedia.org/r/151969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36f13b2fffcb442c0a4b27d64d388f24c3c3766e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
