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

Side by Side Diff: chrome/app/google_chrome_strings.grd

Issue 1240923002: Add an infobar to resolve android runtime permission mismatches. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 5 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/chrome_jni_registrar.cc » ('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 <!-- This file contains definitions of strings that are specific to 2 <!-- This file contains definitions of strings that are specific to
3 Google Chrome. These strings will be translated for each locale that Google 3 Google Chrome. These strings will be translated for each locale that Google
4 Chrome supports. --> 4 Chrome supports. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="grit/google_chrome_strings.h" type="rc_header"> 9 <output filename="grit/google_chrome_strings.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after
1252 To establish a secure connection, your clock needs to be set correctly. This is because the certificates that websites use to identify themselves are on ly valid for specific periods of time. Since your device's clock is incorrect, C hrome cannot verify these certificates. 1252 To establish a secure connection, your clock needs to be set correctly. This is because the certificates that websites use to identify themselves are on ly valid for specific periods of time. Since your device's clock is incorrect, C hrome cannot verify these certificates.
1253 </message> 1253 </message>
1254 1254
1255 <!-- Offline interstitial --> 1255 <!-- Offline interstitial -->
1256 <if expr="not is_android and not is_ios"> 1256 <if expr="not is_android and not is_ios">
1257 <message name="IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED" desc="Summa ry of the error page when the network connection failed. May be followed by plat form dependent instructions."> 1257 <message name="IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED" desc="Summa ry of the error page when the network connection failed. May be followed by plat form dependent instructions.">
1258 Google Chrome can’t display the webpage because your computer isn’t co nnected to the Internet. 1258 Google Chrome can’t display the webpage because your computer isn’t co nnected to the Internet.
1259 </message> 1259 </message>
1260 </if> 1260 </if>
1261 1261
1262 <!-- Runtime permission infobar strings -->
1263 <if expr="is_android">
1264 <message name="IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT" desc="Text sh own in an infobar when a website has requested access to the camera capabilities , but Chrome is missing the Android camera permission.">
1265 Chrome needs camera access to share it with this site.
1266 </message>
1267 <message name="IDS_INFOBAR_MISSING_MICROPHONE_PERMISSION_TEXT" desc="Tex t shown in an infobar when a website has requested access to the microphone capa bilities, but Chrome is missing the Android microphone permission.">
1268 Chrome needs microphone access to share it with this site.
1269 </message>
1270 <message name="IDS_INFOBAR_MISSING_LOCATION_PERMISSION_TEXT" desc="Text shown in an infobar when a website has requested access to the location capabili ties, but Chrome is missing the Android location permission.">
1271 Chrome needs location access to share it with this site.
1272 </message>
1273 <message name="IDS_INFOBAR_MISSING_MULTIPLE_PERMISSIONS_TEXT" desc="Text shown in an infobar when a website has requested access to the multiple restric ted capabilities (e.g. location, camera, microphone), but Chrome is missing the corresponding Android permissions.">
1274 Chrome needs permissions access to share them with this site.
1275 </message>
1276 </if>
1277
1262 <!-- OOBE --> 1278 <!-- OOBE -->
1263 <if expr="chromeos"> 1279 <if expr="chromeos">
1264 <message name="IDS_INSTALLING_UPDATE" desc="Label shown on the updates i nstallation screen during OOBE"> 1280 <message name="IDS_INSTALLING_UPDATE" desc="Label shown on the updates i nstallation screen during OOBE">
1265 Please wait while Chrome installs the latest system updates. 1281 Please wait while Chrome installs the latest system updates.
1266 </message> 1282 </message>
1267 <message name="IDS_CHECKING_FOR_UPDATE_MSG" desc="Chrome OS OOBE: messag e shown during checking for update stage."> 1283 <message name="IDS_CHECKING_FOR_UPDATE_MSG" desc="Chrome OS OOBE: messag e shown during checking for update stage.">
1268 Chrome updates automatically so you always have the freshest version. 1284 Chrome updates automatically so you always have the freshest version.
1269 </message> 1285 </message>
1270 <message name="IDS_UPDATE_MSG" desc="Chrome OS OOBE: message shown durin g update stage."> 1286 <message name="IDS_UPDATE_MSG" desc="Chrome OS OOBE: message shown durin g update stage.">
1271 Chrome updates automatically so you always have the freshest version. When this download completes, Chrome will restart and you'll be on your way. 1287 Chrome updates automatically so you always have the freshest version. When this download completes, Chrome will restart and you'll be on your way.
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
1315 </message> 1331 </message>
1316 <message name="IDS_WIN_PROMPT_TO_CLOSE_APPS_FOR_DESKTOP" 1332 <message name="IDS_WIN_PROMPT_TO_CLOSE_APPS_FOR_DESKTOP"
1317 desc="Modal message box prompt shown to the user after requesti ng to relaunch in Desktop mode while packaged apps are running, which will requi re all packaged apps to be closed and then restarted. Dialog is shown with choic es: OK, Cancel."> 1333 desc="Modal message box prompt shown to the user after requesti ng to relaunch in Desktop mode while packaged apps are running, which will requi re all packaged apps to be closed and then restarted. Dialog is shown with choic es: OK, Cancel.">
1318 Relaunching in Desktop mode will close and relaunch your Chrome apps. 1334 Relaunching in Desktop mode will close and relaunch your Chrome apps.
1319 </message> 1335 </message>
1320 </if> 1336 </if>
1321 1337
1322 </messages> 1338 </messages>
1323 </release> 1339 </release>
1324 </grit> 1340 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/chrome_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698