| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index 1d4bbf55f091502ca60b916e97cf4ec5e0e90ce5..8922cecb0fc93ddbf834bc58420b6ca4e375bd94 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -4600,6 +4600,12 @@ Even if you have downloaded files from this website before, the website might ha
|
| <message name="IDS_EXTENSION_PROMPT_WARNING_SETTINGS_PRIVATE" desc="Permission string for access to settings.">
|
| Read and change user and device settings
|
| </message>
|
| + <message name="IDS_EXTENSION_PROMPT_WARNING_SEARCH_ENGINES_PRIVATE" desc="Permission string for access to search engines.">
|
| + Read and change default and custom search engines
|
| + </message>
|
| + <message name="IDS_EXTENSION_PROMPT_WARNING_AUTOFILL_PRIVATE" desc="Permission string for access to autofill settings.">
|
| + Read and change autofill settings
|
| + </message>
|
|
|
| <!-- Extension/App error messages -->
|
| <message name="IDS_EXTENSION_CANT_GET_ABSOLUTE_PATH" desc="Warning displayed in pack dialog when the absolute path to the extension directory can not be found.">
|
| @@ -5870,6 +5876,18 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <message name="IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION" desc="Description of the flag to enable touch based text editing.">
|
| Touch editing can be initiated by tapping on a textfield or a selected text.
|
| </message>
|
| + <message name="IDS_FLAGS_TOUCH_SELECTION_STRATEGY_NAME" desc="Name of the flag that controls touch based text selection strategy.">
|
| + Touch text selection strategy
|
| + </message>
|
| + <message name="IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DESCRIPTION" desc="Description of the flag that controls touch based text selection strategy.">
|
| + Controls how text selection granularity changes when touch text selection handles are dragged. Non-default behavior is experimental.
|
| + </message>
|
| + <message name="IDS_TOUCH_SELECTION_STRATEGY_CHARACTER" desc="Description for the touch text selection strategy which always uses character granularity.">
|
| + Character
|
| + </message>
|
| + <message name="IDS_TOUCH_SELECTION_STRATEGY_DIRECTION" desc="Description for the touch text selection strategy which is based on the direction in which the handle is dragged.">
|
| + Direction
|
| + </message>
|
| <message name="IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_NAME" desc="Title for the flag to use the Online Wallet sandbox servers (instead of production).">
|
| Use Wallet sandbox servers
|
| </message>
|
| @@ -7383,12 +7401,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <message name="IDS_OMNIBOX_KEYWORD_TEXT" desc="Text shown in the search button at the front of the omnibox when the user has selected a keyword">
|
| Search <ph name="SITE_NAME">$1<ex>google.com</ex></ph>:
|
| </message>
|
| - <message name="IDS_OMNIBOX_EMPTY_HINT_WITH_DEFAULT_SEARCH_PROVIDER" desc="The text displayed in the omnibox when it is empty, which includes the name of the default search provider.">
|
| + <message name="IDS_SEARCH_BOX_EMPTY_HINT" desc="The text displayed in the fakebox when it is empty, which includes the name of the default search provider.">
|
| Search <ph name="ENGINE">$1<ex>Google</ex></ph> or type URL
|
| </message>
|
| - <message name="IDS_OMNIBOX_EMPTY_HINT_NO_DEFAULT_SEARCH_PROVIDER" desc="The text displayed in the omnibox when it is empty, if the default search provider cannot be determined.">
|
| - Type URL
|
| - </message>
|
| <if expr="is_ios">
|
| <message name="IDS_OMNIBOX_EMPTY_HINT" desc="The text displayed in the omnibox when it is empty.">
|
| Search or type URL
|
|
|