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

Side by Side Diff: chrome/app/settings_strings.grdp

Issue 2973243002: Adding pref to store the user-selected proximity threshold. (Closed)
Patch Set: Fixing browser tests Created 3 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 <!-- Settings-specific strings (included from generated_resources.grd). --> 2 <!-- Settings-specific strings (included from generated_resources.grd). -->
3 <grit-part> 3 <grit-part>
4 <!-- Main Page --> 4 <!-- Main Page -->
5 <if expr="chromeos"> 5 <if expr="chromeos">
6 <message name="IDS_SETTINGS_SECONDARY_USER_BANNER" desc="Banner displayed in settings page when the user is secondary in a multi-profile session."> 6 <message name="IDS_SETTINGS_SECONDARY_USER_BANNER" desc="Banner displayed in settings page when the user is secondary in a multi-profile session.">
7 Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com< /ex></ph> are being shared with you. These settings only affect your account whe n using multiple sign-in. 7 Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com< /ex></ph> are being shared with you. These settings only affect your account whe n using multiple sign-in.
8 </message> 8 </message>
9 </if> 9 </if>
10 10
(...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 </message> 1099 </message>
1100 <message name="IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_ERROR_TITLE" desc="The titl e text on the Easy unlock turn off dialog when Easy unlock could not be turned o ff because there is a server error."> 1100 <message name="IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_ERROR_TITLE" desc="The titl e text on the Easy unlock turn off dialog when Easy unlock could not be turned o ff because there is a server error.">
1101 Smart Lock is unavailable 1101 Smart Lock is unavailable
1102 </message> 1102 </message>
1103 <message name="IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_ERROR_MESSAGE" desc="The te xt on the Easy unlock turn off dialog when Easy unlock could not be turned off b ecause there is a server error."> 1103 <message name="IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_ERROR_MESSAGE" desc="The te xt on the Easy unlock turn off dialog when Easy unlock could not be turned off b ecause there is a server error.">
1104 Smart Lock is currently unavailable. Please try again later. 1104 Smart Lock is currently unavailable. Please try again later.
1105 </message> 1105 </message>
1106 <message name="IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_RETRY" desc="The label text of the retry button on the Easy unlock turn off dialog when Easy unlock could n ot be turned off because there is a server error."> 1106 <message name="IDS_SETTINGS_EASY_UNLOCK_TURN_OFF_RETRY" desc="The label text of the retry button on the Easy unlock turn off dialog when Easy unlock could n ot be turned off because there is a server error.">
1107 Retry 1107 Retry
1108 </message> 1108 </message>
1109 <message name="IDS_SETTINGS_EASY_UNLOCK_PROXIMITY_THRESHOLD_LABEL" desc="The text on the Easy unlock settings page indicating how close the phone should be for unlock to work.">
1110 Only unlock this Chromebook when your phone is
1111 </message>
1112 <message name="IDS_SETTINGS_EASY_UNLOCK_PROXIMITY_THRESHOLD_VERY_CLOSE" desc ="The text on the Easy unlock settings page indicating the phone should be very close for the unlock to work.">
1113 very close
battre 2017/07/12 07:18:47 Drive by: I think that these values are pretty mea
sacomoto 2017/07/12 15:52:52 This is intentionally vague. Unfortunately, the ma
1114 </message>
1115 <message name="IDS_SETTINGS_EASY_UNLOCK_PROXIMITY_THRESHOLD_CLOSE" desc="The text on the Easy unlock settings page indicating the phone should be close for the unlock to work.">
1116 close
1117 </message>
1118 <message name="IDS_SETTINGS_EASY_UNLOCK_PROXIMITY_THRESHOLD_FAR" desc="The t ext on the Easy unlock settings page indicating the phone can be far for the unl ock to work.">
1119 far
1120 </message>
1121 <message name="IDS_SETTINGS_EASY_UNLOCK_PROXIMITY_THRESHOLD_VERY_FAR" desc=" The text on the Easy unlock settings page indicating the phone can be very far f or the unlock to work.">
1122 very far
1123 </message>
1109 1124
1110 <!-- Strings specific to the Settings Internet Page --> 1125 <!-- Strings specific to the Settings Internet Page -->
1111 <message name="IDS_SETTINGS_INTERNET" desc="Name of the settings page which displays internet preferences."> 1126 <message name="IDS_SETTINGS_INTERNET" desc="Name of the settings page which displays internet preferences.">
1112 Network 1127 Network
1113 </message> 1128 </message>
1114 <message name="IDS_SETTINGS_INTERNET_CONFIG" desc="Name of the settings page for configuring a network."> 1129 <message name="IDS_SETTINGS_INTERNET_CONFIG" desc="Name of the settings page for configuring a network.">
1115 Configure network 1130 Configure network
1116 </message> 1131 </message>
1117 <message name="IDS_SETTINGS_INTERNET_DETAIL" desc="Name of the settings page which displays network details."> 1132 <message name="IDS_SETTINGS_INTERNET_DETAIL" desc="Name of the settings page which displays network details.">
1118 Network Details 1133 Network Details
(...skipping 2074 matching lines...) Expand 10 before | Expand all | Expand 10 after
3193 System 3208 System
3194 </message> 3209 </message>
3195 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available."> 3210 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available.">
3196 Use hardware acceleration when available 3211 Use hardware acceleration when available
3197 </message> 3212 </message>
3198 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings."> 3213 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings.">
3199 Open proxy settings 3214 Open proxy settings
3200 </message> 3215 </message>
3201 </if> 3216 </if>
3202 </grit-part> 3217 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/settings_private/prefs_util.cc » ('j') | components/proximity_auth/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698