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

Side by Side Diff: chrome/app/chromium_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: Address dfalcantara@ comment 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
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 distribution specific. 2 <!-- This file contains definitions of strings that are distribution specific.
3 These strings will not be translated and only english versions will 3 These strings will not be translated and only english versions will
4 be available for now. --> 4 be available for now. -->
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/chromium_strings.h" type="rc_header"> 9 <output filename="grit/chromium_strings.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after
1329 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 hromium cannot verify these certificates. 1329 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 hromium cannot verify these certificates.
1330 </message> 1330 </message>
1331 1331
1332 <!-- Offline interstitial --> 1332 <!-- Offline interstitial -->
1333 <if expr="not is_android and not is_ios"> 1333 <if expr="not is_android and not is_ios">
1334 <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."> 1334 <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.">
1335 Chromium can’t display the webpage because your computer isn’t connected to the Internet. 1335 Chromium can’t display the webpage because your computer isn’t connected to the Internet.
1336 </message> 1336 </message>
1337 </if> 1337 </if>
1338 1338
1339 <!-- Runtime permission infobar strings -->
1340 <if expr="is_android">
1341 <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.">
1342 Chromium needs camera access to share it with this site.
1343 </message>
1344 <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.">
1345 Chromium needs microphone access to share it with this site.
1346 </message>
1347 <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.">
1348 Chromium needs location access to share it with this site.
1349 </message>
1350 <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.">
1351 Chromium needs permissions access to share them with this site.
1352 </message>
1353 </if>
1354
1339 <!-- OOBE --> 1355 <!-- OOBE -->
1340 <if expr="chromeos"> 1356 <if expr="chromeos">
1341 <message name="IDS_INSTALLING_UPDATE" desc="Label shown on the updates i nstallation screen during OOBE"> 1357 <message name="IDS_INSTALLING_UPDATE" desc="Label shown on the updates i nstallation screen during OOBE">
1342 Please wait while Chromium installs the latest system updates. 1358 Please wait while Chromium installs the latest system updates.
1343 </message> 1359 </message>
1344 <message name="IDS_CHECKING_FOR_UPDATE_MSG" desc="Chrome OS OOBE: messag e shown during checking for update stage."> 1360 <message name="IDS_CHECKING_FOR_UPDATE_MSG" desc="Chrome OS OOBE: messag e shown during checking for update stage.">
1345 Chromium updates automatically so you always have the freshest version . 1361 Chromium updates automatically so you always have the freshest version .
1346 </message> 1362 </message>
1347 <message name="IDS_UPDATE_MSG" desc="Chrome OS OOBE: message shown durin g update stage."> 1363 <message name="IDS_UPDATE_MSG" desc="Chrome OS OOBE: message shown durin g update stage.">
1348 Chromium updates automatically so you always have the freshest version . When this download completes, Chromium will restart and you'll be on your way. 1364 Chromium updates automatically so you always have the freshest version . When this download completes, Chromium will restart and you'll be on your way.
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 </message> 1408 </message>
1393 <message name="IDS_WIN_PROMPT_TO_CLOSE_APPS_FOR_DESKTOP" 1409 <message name="IDS_WIN_PROMPT_TO_CLOSE_APPS_FOR_DESKTOP"
1394 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."> 1410 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.">
1395 Relaunching in Desktop mode will close and relaunch your Chromium apps . 1411 Relaunching in Desktop mode will close and relaunch your Chromium apps .
1396 </message> 1412 </message>
1397 </if> 1413 </if>
1398 1414
1399 </messages> 1415 </messages>
1400 </release> 1416 </release>
1401 </grit> 1417 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698