Add separate string for version mismatch in Chromoting.

Alphabetize strings in messages.json.

BUG=95615
TEST=none

Review URL: http://codereview.chromium.org/8329002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105957 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 28 insertions, 23 deletions

diff --git a/remoting/webapp/me2mom/_locales/en/messages.json b/remoting/webapp/me2mom/_locales/en/messages.json
index 4b5dd34..a23f23c 100644
--- a/remoting/webapp/me2mom/_locales/en/messages.json
+++ b/remoting/webapp/me2mom/_locales/en/messages.json
@@ -71,6 +71,18 @@
     "message": "Disconnect",
     "description": "Label for the host-side disconnect button, without keyboard shortcuts. Only used in case we aren't able to enable hot-key support. Clicking this button disconnects the remote user."
   },
+  "ERROR_AUTHENTICATION_FAILED": {
+    "message": "Authentication failed. Please sign out of Chromoting and try again.",
+    "description": "Error displayed if authentication fails. This can be caused by stale credentials, in which logging out of the web-app and retrying can fix the problem."
+  },
+  "ERROR_BAD_PLUGIN_VERSION": {
+    "message": "Some components required for Chromoting are missing. Please make sure you have installed the latest version and try again.",
+    "description": "Error displayed if the host or client plugin are missing or if they could not be loaded."
+  },
+  "ERROR_GENERIC": {
+    "message": "An unknown error occurred. Please sign out of Chromoting and try again.",
+    "description": "Generic error message, displayed if something went wrong, but we aren't able to determine what, or the cause is too technical to be of use to a typical user."
+  },
   "ERROR_HOST_IS_OFFLINE": {
     "message": "The remote computer is not responding to connection requests. Please verify that it is online and try again.",
     "description": "Error that is shown on the client side when we don't get a response from the host."
@@ -79,26 +91,18 @@
     "message": "An incompatible version of Chromoting was detected. Please make sure that you have the latest version of Chromium and Chromoting on both computers and try again.",
     "description": "Error that is shown on the client side when incompatible Chromoting versions are installed on host and client."
   },
-  "ERROR_GENERIC": {
-    "message": "An unknown error occurred. Please sign out of Chromoting and try again.",
-    "description": "Generic error message, displayed if something went wrong, but we aren't able to determine what, or the cause is too technical to be of use to a typical user."
-  },
   "ERROR_INVALID_ACCESS_CODE": {
     "message": "The access code is invalid. Please try again.",
     "description": "Error displayed if an invalid access code is entered."
   },
   "ERROR_MISSING_PLUGIN": {
-    "message": "Some components required for Chromoting are missing or out-of-date. Please make sure you're running the latest version of Chromium and try again.",
-    "description": "Error displayed if the client plugin fails to load. The most common reason for this is that the web-app is being used in a version of Chromium that doesn't support it."
+    "message": "Some components required for Chromoting are missing. Please make sure you're running the latest version of Chromium and try again.",
+    "description": "Error displayed if the client plugin fails to load."
   },
   "ERROR_NO_RESPONSE": {
     "message": "The server failed to respond to the network request.",
     "description": "Error displayed by the client if the server does not respond to a network request."
   },
-  "ERROR_AUTHENTICATION_FAILED": {
-    "message": "Authentication failed. Please sign out of Chromoting and try again.",
-    "description": "Error displayed if authentication fails. This can be caused by stale credentials, in which logging out of the web-app and retrying can fix the problem."
-  },
   "ERROR_UNABLE_TO_GET_TOKEN": {
     "message": "There was a problem accessing the server. Please try again.",
     "description": "Error message displayed if an access token could not be generated."
@@ -143,10 +147,6 @@
     "message": "Connected:",
     "description": "String displayed in front of the host when a connection is active informing the client user who they are connected to."
   },
-  "SIGN_OUT_BUTTON": {
-    "message": "Sign out",
-    "description": "Sign out button, visible if the user has authenticated. Clicking this clears authentication credentials and returns the web-app to the initial 'unauthenticated' state."
-  },
   "MESSAGE_GENERATING": {
     "message": "Generating access code\u2026",
     "description": "Text shown while generating an access code."
@@ -189,6 +189,10 @@
     "message": "Chromoting",
     "description": "The product name. Displayed in various Chromium pages, including the New Tab page, and displayed prominently on the app's main page."
   },
+  "SIGN_OUT_BUTTON": {
+    "message": "Sign out",
+    "description": "Sign out button, visible if the user has authenticated. Clicking this clears authentication credentials and returns the web-app to the initial 'unauthenticated' state."
+  },
   "STOP_SHARING_BUTTON": {
     "message": "Stop Sharing",
     "description": "Label for the 'stop sharing' button on the host-side. Clicking this button disconnects the client."
diff --git a/remoting/webapp/me2mom/client_session.js b/remoting/webapp/me2mom/client_session.js
index 505e41f..f652d99 100644
--- a/remoting/webapp/me2mom/client_session.js
+++ b/remoting/webapp/me2mom/client_session.js
@@ -88,24 +88,24 @@ remoting.ClientSession.prototype.error =
 remoting.ClientSession.prototype.API_VERSION_ = 2;
 
 /**
- * Server used to bridge into the Jabber network for establishing Jingle
- * connections.
+ * The oldest API version that we support.
+ * This will differ from the |API_VERSION_| if we maintain backward
+ * compatibility with older API versions.
  *
  * @const
  * @private
  */
-remoting.ClientSession.prototype.HTTP_XMPP_PROXY_ =
-    'https://chromoting-httpxmpp-oauth2-dev.corp.google.com';
+remoting.ClientSession.prototype.API_MIN_VERSION_ = 1;
 
 /**
- * The oldest API version that we support.
- * This will differ from the |API_VERSION_| if we maintain backward
- * compatibility with older API versions.
+ * Server used to bridge into the Jabber network for establishing Jingle
+ * connections.
  *
  * @const
  * @private
  */
-remoting.ClientSession.prototype.API_MIN_VERSION_ = 1;
+remoting.ClientSession.prototype.HTTP_XMPP_PROXY_ =
+    'https://chromoting-httpxmpp-oauth2-dev.corp.google.com';
 
 /**
  * The id of the client plugin
diff --git a/remoting/webapp/me2mom/remoting.js b/remoting/webapp/me2mom/remoting.js
index e7c5496..9b7a0a0 100644
--- a/remoting/webapp/me2mom/remoting.js
+++ b/remoting/webapp/me2mom/remoting.js
@@ -47,6 +47,7 @@ remoting.ClientError = {
   OAUTH_FETCH_FAILED: /*i18n-content*/'ERROR_AUTHENTICATION_FAILED',
   HOST_IS_OFFLINE: /*i18n-content*/'ERROR_HOST_IS_OFFLINE',
   INCOMPATIBLE_PROTOCOL: /*i18n-content*/'ERROR_INCOMPATIBLE_PROTOCOL',
+  BAD_PLUGIN_VERSION: /*i18n-content*/'ERROR_BAD_PLUGIN_VERSION',
   OTHER_ERROR: /*i18n-content*/'ERROR_GENERIC'
 };
 
@@ -493,7 +494,7 @@ function onClientStateChange_(oldState) {
   if (state == remoting.ClientSession.State.CREATED) {
     remoting.debug.log('Created plugin');
   } else if (state == remoting.ClientSession.State.BAD_PLUGIN_VERSION) {
-    showConnectError_(remoting.ClientError.MISSING_PLUGIN);
+    showConnectError_(remoting.ClientError.BAD_PLUGIN_VERSION);
   } else if (state == remoting.ClientSession.State.CONNECTING) {
     remoting.debug.log('Connecting as ' + remoting.username);
   } else if (state == remoting.ClientSession.State.INITIALIZING) {