Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(612)

Side by Side Diff: remoting/resources/remoting_strings.grd

Issue 12905012: Webapp changes to support third party authentication (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase, update patch Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/remoting.gyp ('k') | remoting/webapp/appsv2.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <grit base_dir="." current_release="1" enc_check="möl" latest_public_release="0" source_lang_id="en"> 3 <grit base_dir="." current_release="1" enc_check="möl" latest_public_release="0" source_lang_id="en">
4 <outputs> 4 <outputs>
5 <output filename="remoting/base/string_resources.h" type="rc_header"> 5 <output filename="remoting/base/string_resources.h" type="rc_header">
6 <emit emit_type="prepend"/> 6 <emit emit_type="prepend"/>
7 </output> 7 </output>
8 <output filename="remoting/resources/en-US.pak" lang="en" type="data_package "/> 8 <output filename="remoting/resources/en-US.pak" lang="en" type="data_package "/>
9 <output filename="remoting/webapp/_locales/en/messages.json" lang="en" type= "chrome_messages_json"/> 9 <output filename="remoting/webapp/_locales/en/messages.json" lang="en" type= "chrome_messages_json"/>
10 <output filename="remoting/resources/ar.pak" lang="ar" type="data_package"/> 10 <output filename="remoting/resources/ar.pak" lang="ar" type="data_package"/>
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 </translations> 135 </translations>
136 <release allow_pseudo="false" seq="1"> 136 <release allow_pseudo="false" seq="1">
137 <messages fallback_to_english="true"> 137 <messages fallback_to_english="true">
138 <if expr="pp_ifdef('_google_chrome')"> 138 <if expr="pp_ifdef('_google_chrome')">
139 <message desc="Message shown when the Chrome Remote Desktop client tab i s closed while a connection is active." name="IDR_CLOSE_PROMPT"> 139 <message desc="Message shown when the Chrome Remote Desktop client tab i s closed while a connection is active." name="IDR_CLOSE_PROMPT">
140 Leaving this page will end your Chrome Remote Desktop session. 140 Leaving this page will end your Chrome Remote Desktop session.
141 </message> 141 </message>
142 <message desc="Text shown when the app first starts, or if the access to ken is invalidated, explaining the need to authorize the Chrome Remote Desktop a pp before use." name="IDR_DESCRIPTION_AUTHORIZE"> 142 <message desc="Text shown when the app first starts, or if the access to ken is invalidated, explaining the need to authorize the Chrome Remote Desktop a pp before use." name="IDR_DESCRIPTION_AUTHORIZE">
143 To use Chrome Remote Desktop you must grant extended access permission s to your computer. You only have to do this once. 143 To use Chrome Remote Desktop you must grant extended access permission s to your computer. You only have to do this once.
144 </message> 144 </message>
145 <message desc="Confirmation prompt shown when a user needs to authentica te against a third party, explaining the need to authorize the Chrome Remote Des ktop app to access the authentication URL." name="IDR_DESCRIPTION_THIRD_PARTY_AU TH">
146 The remote host requires you to authenticate to a third-party website. To continue, you must grant Chrome Remote Desktop additional permissions to acc ess this address:
147 </message>
145 <message desc="Description for the home screen. This is shown when the a pp starts up, above buttons to share or connect." name="IDR_DESCRIPTION_HOME"> 148 <message desc="Description for the home screen. This is shown when the a pp starts up, above buttons to share or connect." name="IDR_DESCRIPTION_HOME">
146 Chrome Remote Desktop allows you to securely share your computer over the Web. Both users must be running the Chrome Remote Desktop app, which can be found at <ph name="URL">$1<ex>&lt;a href=http://chrome.google.com/remotedesktop& gt;chrome.google.com/remotedesktop&lt;/a&gt;</ex></ph>. 149 Chrome Remote Desktop allows you to securely share your computer over the Web. Both users must be running the Chrome Remote Desktop app, which can be found at <ph name="URL">$1<ex>&lt;a href=http://chrome.google.com/remotedesktop& gt;chrome.google.com/remotedesktop&lt;/a&gt;</ex></ph>.
147 </message> 150 </message>
148 <message desc="Error displayed if authentication fails. This can be caus ed by stale credentials, in which logging out of the web-app and retrying can fi x the problem." name="IDR_ERROR_AUTHENTICATION_FAILED"> 151 <message desc="Error displayed if authentication fails. This can be caus ed by stale credentials, in which logging out of the web-app and retrying can fi x the problem." name="IDR_ERROR_AUTHENTICATION_FAILED">
149 Authentication failed. Please sign in to Chrome Remote Desktop again. 152 Authentication failed. Please sign in to Chrome Remote Desktop again.
150 </message> 153 </message>
151 <message desc="Error displayed if the host or client plugin are missing or if they could not be loaded." name="IDR_ERROR_BAD_PLUGIN_VERSION"> 154 <message desc="Error displayed if the host or client plugin are missing or if they could not be loaded." name="IDR_ERROR_BAD_PLUGIN_VERSION">
152 Some components required for Chrome Remote Desktop are missing. Please make sure you have installed the latest version and try again. 155 Some components required for Chrome Remote Desktop are missing. Please make sure you have installed the latest version and try again.
153 </message> 156 </message>
154 <message desc="Error that is shown on the client side when incompatible Chrome Remote Desktop versions are installed on host and client." name="IDR_ERRO R_INCOMPATIBLE_PROTOCOL"> 157 <message desc="Error that is shown on the client side when incompatible Chrome Remote Desktop versions are installed on host and client." name="IDR_ERRO R_INCOMPATIBLE_PROTOCOL">
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 </message> 201 </message>
199 </if> 202 </if>
200 203
201 <if expr="not pp_ifdef('_google_chrome')"> 204 <if expr="not pp_ifdef('_google_chrome')">
202 <message desc="Message shown when the Chromoting client tab is closed wh ile a connection is active." name="IDR_CLOSE_PROMPT"> 205 <message desc="Message shown when the Chromoting client tab is closed wh ile a connection is active." name="IDR_CLOSE_PROMPT">
203 Leaving this page will end your Chromoting session. 206 Leaving this page will end your Chromoting session.
204 </message> 207 </message>
205 <message desc="Text shown when the app first starts, or if the access to ken is invalidated, explaining the need to authorize the Chromoting app before u se." name="IDR_DESCRIPTION_AUTHORIZE"> 208 <message desc="Text shown when the app first starts, or if the access to ken is invalidated, explaining the need to authorize the Chromoting app before u se." name="IDR_DESCRIPTION_AUTHORIZE">
206 To use Chromoting you must grant extended access permissions to your c omputer. You only have to do this once. 209 To use Chromoting you must grant extended access permissions to your c omputer. You only have to do this once.
207 </message> 210 </message>
211 <message desc="Confirmation prompt shown when a user needs to authentica te against a third party, explaining the need to authorize the Chromoting app to access the authentication URL." name="IDR_DESCRIPTION_THIRD_PARTY_AUTH">
212 The remote host requires you to authenticate to a third-party website. To continue, you must grant Chromoting additional permissions to access this ad dress:
213 </message>
208 <message desc="Description for the home screen. This is shown when the a pp starts up, above buttons to share or connect." name="IDR_DESCRIPTION_HOME"> 214 <message desc="Description for the home screen. This is shown when the a pp starts up, above buttons to share or connect." name="IDR_DESCRIPTION_HOME">
209 Chromoting allows you to securely share your computer over the Web. Bo th users must be running the Chromoting app, which can be found at <ph name="URL ">$1<ex>&lt;a href=http://chrome.google.com/remotedesktop&gt;chrome.google.com/r emotedesktop&lt;/a&gt;</ex></ph>. 215 Chromoting allows you to securely share your computer over the Web. Bo th users must be running the Chromoting app, which can be found at <ph name="URL ">$1<ex>&lt;a href=http://chrome.google.com/remotedesktop&gt;chrome.google.com/r emotedesktop&lt;/a&gt;</ex></ph>.
210 </message> 216 </message>
211 <message desc="Error displayed if authentication fails. This can be caus ed by stale credentials, in which logging out of the web-app and retrying can fi x the problem." name="IDR_ERROR_AUTHENTICATION_FAILED"> 217 <message desc="Error displayed if authentication fails. This can be caus ed by stale credentials, in which logging out of the web-app and retrying can fi x the problem." name="IDR_ERROR_AUTHENTICATION_FAILED">
212 Authentication failed. Please sign in to Chromoting again. 218 Authentication failed. Please sign in to Chromoting again.
213 </message> 219 </message>
214 <message desc="Error displayed if the host or client plugin are missing or if they could not be loaded." name="IDR_ERROR_BAD_PLUGIN_VERSION"> 220 <message desc="Error displayed if the host or client plugin are missing or if they could not be loaded." name="IDR_ERROR_BAD_PLUGIN_VERSION">
215 Some components required for Chromoting are missing. Please make sure you have installed the latest version and try again. 221 Some components required for Chromoting are missing. Please make sure you have installed the latest version and try again.
216 </message> 222 </message>
217 <message desc="Error that is shown on the client side when incompatible Chromoting versions are installed on host and client." name="IDR_ERROR_INCOMPATI BLE_PROTOCOL"> 223 <message desc="Error that is shown on the client side when incompatible Chromoting versions are installed on host and client." name="IDR_ERROR_INCOMPATI BLE_PROTOCOL">
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 </message> 548 </message>
543 <message desc="Help link displayed when the user enables the host on this computer. Clicking this link opens a page that explains why this operation is sa fe. This string appears in a UI with limited horizontal space. Please try to kee p translations no more than about 30 characters." name="IDR_WHY_IS_THIS_SAFE"> 549 <message desc="Help link displayed when the user enables the host on this computer. Clicking this link opens a page that explains why this operation is sa fe. This string appears in a UI with limited horizontal space. Please try to kee p translations no more than about 30 characters." name="IDR_WHY_IS_THIS_SAFE">
544 Why is this safe? 550 Why is this safe?
545 </message> 551 </message>
546 <message desc="Survey link for users that want to take part." name="IDR_SI GN_ME_UP"> 552 <message desc="Survey link for users that want to take part." name="IDR_SI GN_ME_UP">
547 Take the survey 553 Take the survey
548 </message> 554 </message>
549 </messages> 555 </messages>
550 </release> 556 </release>
551 </grit> 557 </grit>
OLDNEW
« no previous file with comments | « remoting/remoting.gyp ('k') | remoting/webapp/appsv2.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698