diff options
author | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-11 18:13:16 +0000 |
---|---|---|
committer | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-11 18:13:16 +0000 |
commit | a867a7ed5b258420d4eafd416e4d295a87af0de0 (patch) | |
tree | 6ab82f1067732a871732087988ddcadfe9cff0f2 /remoting | |
parent | eff1339531f28037e2da1b1325c65de1db724203 (diff) | |
download | chromium_src-a867a7ed5b258420d4eafd416e4d295a87af0de0.zip chromium_src-a867a7ed5b258420d4eafd416e4d295a87af0de0.tar.gz chromium_src-a867a7ed5b258420d4eafd416e4d295a87af0de0.tar.bz2 |
Use separate strings for host- and client-side disconnect buttons.
BUG=99236
TEST=Manual
Review URL: http://codereview.chromium.org/8228012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r-- | remoting/host/plugin/host_script_object.cc | 2 | ||||
-rw-r--r-- | remoting/webapp/me2mom/_locales/en/messages.json | 20 | ||||
-rw-r--r-- | remoting/webapp/me2mom/choice.html | 2 |
3 files changed, 14 insertions, 10 deletions
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc index 6f900af..9dc8534 100644 --- a/remoting/host/plugin/host_script_object.cc +++ b/remoting/host/plugin/host_script_object.cc @@ -752,7 +752,7 @@ void HostNPScriptObject::LocalizeStrings(NPObject* localize_func) { remoting::UiStrings::RTL : remoting::UiStrings::LTR; LocalizeString(localize_func, /*i18n-content*/"PRODUCT_NAME", &ui_strings.product_name); - LocalizeString(localize_func, /*i18n-content*/"DISCONNECT_BUTTON", + LocalizeString(localize_func, /*i18n-content*/"DISCONNECT_OTHER_BUTTON", &ui_strings.disconnect_button_text); LocalizeString(localize_func, #if defined(OS_WIN) diff --git a/remoting/webapp/me2mom/_locales/en/messages.json b/remoting/webapp/me2mom/_locales/en/messages.json index 5fe05ce..a2ee0b7 100644 --- a/remoting/webapp/me2mom/_locales/en/messages.json +++ b/remoting/webapp/me2mom/_locales/en/messages.json @@ -45,21 +45,25 @@ "message": "With Chromoting you can easily and securely let another Chromium user see and control your computer.", "description": "Description for the host app. This is shown to the host above the 'Share This Computer' button user before the client connects." }, - "DISCONNECT_BUTTON": { - "message": "Disconnect", - "description": "Label for the disconnect button, without keyboard shortcuts. Only used in case we aren't able to enable hot-key support." - }, "DISCONNECT_BUTTON_PLUS_SHORTCUT_LINUX": { "message": "Disconnect (Ctrl+Alt+Esc)", - "description": "Label for the disconnect button including the Linux keyboard shortcut." + "description": "Label for the disconnect button including the Linux keyboard shortcut. Clicking this button disconnects the remote user." }, "DISCONNECT_BUTTON_PLUS_SHORTCUT_MAC_OS_X": { - "message": "Disconnect (\u2325\u2303\u238b)", - "description": "Label for the disconnect button including the Mac OS X keyboard shortcut." + "message": "Disconnect (Opt+Ctrl+Esc)", + "description": "Label for the disconnect button including the Mac OS X keyboard shortcut. Clicking this button disconnects the remote user." }, "DISCONNECT_BUTTON_PLUS_SHORTCUT_WINDOWS": { "message": "Disconnect (Ctrl+Alt+Esc)", - "description": "Label for the disconnect button including the Windows keyboard shortcut." + "description": "Label for the disconnect button including the Windows keyboard shortcut. Clicking this button disconnects the remote user." + }, + "DISCONNECT_MYSELF_BUTTON": { + "message": "Disconnect", + "description": "Label for the client-side disconnect button. Clicking this button disconnects oneself from the host." + }, + "DISCONNECT_OTHER_BUTTON": { + "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_HOST_IS_OFFLINE": { "message": "The remote computer is not responding to connection requests. Please verify that it is online and try again.", diff --git a/remoting/webapp/me2mom/choice.html b/remoting/webapp/me2mom/choice.html index e5917d6..781a644 100644 --- a/remoting/webapp/me2mom/choice.html +++ b/remoting/webapp/me2mom/choice.html @@ -66,7 +66,7 @@ found in the LICENSE file. <span id="session-status-message" i18n-content="LABEL_CONNECTED"></span> <strong id="connected-to"></strong> <button type="button" onclick="remoting.disconnect();" - i18n-content="DISCONNECT_BUTTON"></button> + i18n-content="DISCONNECT_MYSELF_BUTTON"></button> <span class="end-align"> <button id="toggle-scaling" onClick="remoting.toggleScaleToFit(this);"> |