Chromium Code Reviews| Index: chrome/app/generated_resources.grd |
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
| index 959a0a3011849f383fe639a78ce45ee2b040ac6f..c6c3d628463a979b5deed0782471ec9423001a36 100644 |
| --- a/chrome/app/generated_resources.grd |
| +++ b/chrome/app/generated_resources.grd |
| @@ -5880,6 +5880,9 @@ Keep your key file in a safe place. You will need it to create new versions of y |
| <message name="IDS_POLICY_VALIDATION_OK" desc="Message indicating successful policy validation."> |
| Validation successful |
| </message> |
| + <message name="IDS_POLICY_VALIDATION_BAD_INITIAL_SIGNATURE" desc="Message indicating a bad signature on policy validation using the initial key."> |
|
Alexei Svitkine (slow)
2013/02/25 21:13:29
I don't think you meant to have all these changes
MAD
2013/02/25 21:41:01
Arg... I thought I resolved these... Some git mist
|
| + Bad intial signature |
| + </message> |
| <message name="IDS_POLICY_VALIDATION_BAD_SIGNATURE" desc="Message indicating a bad signature on policy validation."> |
| Bad signature |
| </message> |
| @@ -5892,6 +5895,9 @@ Keep your key file in a safe place. You will need it to create new versions of y |
| <message name="IDS_POLICY_VALIDATION_WRONG_POLICY_TYPE" desc="Message indicating the policy did not have the expected type."> |
| Wrong policy type |
| </message> |
| + <message name="IDS_POLICY_VALIDATION_WRONG_SETTINGS_ENTITY_ID" desc="Message indicating the policy did not have the expected entity identifier."> |
| + Wrong entity identifier |
| + </message> |
| <message name="IDS_POLICY_VALIDATION_BAD_TIMESTAMP" desc="Message indicating the policy timestamp is bad."> |
| Bad policy timestamp |
| </message> |
| @@ -6527,12 +6533,18 @@ Keep your key file in a safe place. You will need it to create new versions of y |
| <message name="IDS_FLAGS_ENABLE_NEW_AUTOFILL_UI_NAME" desc="Title for the flag to enable the new Autofill UI"> |
| Enable new Autofill UI |
| </message> |
| - <message name="IDS_FLAGS_ENABLE_NEW_AUTOFILL_UI_DESCRIPTION" desc="Description for the flag to enable the new Autofill UI"> |
| - Enable the browser process-based implementation of the Autofill UI, as opposed to the renderer process-based one. |
| + <message name="IDS_FLAGS_DISABLE_NATIVE_AUTOFILL_UI_NAME" desc="Title for the flag to disable the native Autofill UI"> |
| + Disable native Autofill UI |
| + </message> |
| + <message name="IDS_FLAGS_DISABLE_NATIVE_AUTOFILL_UI_DESCRIPTION" desc="Description for the flag to enable the new Autofill UI"> |
| + Disable the native implementation of the Autofill popup UI, which is implemented in the browser process rather than in the renderer process. |
| </message> |
| <message name="IDS_FLAGS_ENABLE_INTERACTIVE_AUTOCOMPLETE_NAME" desc="Name of the flag that enables an interactive autocomplete UI."> |
| Enable interactive autocomplete |
| </message> |
| + <message name="IDS_FLAGS_ENABLE_NEW_AUTOFILL_UI_DESCRIPTION" desc="Description for the flag to enable the new Autofill UI"> |
| + Enable the browser process-based implementation of the Autofill UI, as opposed to the renderer process-based one. |
| + </message> |
| <message name="IDS_FLAGS_ENABLE_INTERACTIVE_AUTOCOMPLETE_DESCRIPTION" desc="Description of the flag to enable an interactive autocomplete UI."> |
| Enable an interactive autocomplete UI that can be invoked by calling HTMLFormElement#requestAutocomplete. |
| </message> |
| @@ -7168,6 +7180,12 @@ Keep your key file in a safe place. You will need it to create new versions of y |
| <!-- TODO Add description of enable SPDY proxy auth flag. --> |
| </message> |
| </if> |
| + <message name="IDS_FLAGS_IMPL_SIDE_PAINTING_NAME" desc="Name of about:flags option for impl-side painting."> |
| + Impl-side painting |
| + </message> |
| + <message name="IDS_FLAGS_IMPL_SIDE_PAINTING_DESCRIPTION" desc="Description of about:flags option for impl-side painting."> |
| + If enabled, painting is done on a separate thread instead of the main thread. |
| + </message> |
| <!-- Crashes --> |
| <message name="IDS_CRASHES_TITLE" desc="Title for the chrome://crashes page."> |
| @@ -8253,16 +8271,16 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 |
| <message name="IDS_OPTIONS_MANAGED_USERS_SECTION_TITLE" desc="Title for the Managed User section"> |
| Managed User |
| </message> |
| - <message name="IDS_MANAGED_USER_SETTINGS_TITLE" desc="Title for the Managed User Settings dialog"> |
| + <message name="IDS_MANAGED_USER_SETTINGS_TITLE" desc="Title for the Managed User Settings dialog."> |
| Managed User Settings |
| </message> |
| - <message name="IDS_INSTALLED_CONTENT_PACKS_LABEL" desc="Label for installed whitelists on the Managed User Settings dialog"> |
| + <message name="IDS_INSTALLED_CONTENT_PACKS_LABEL" desc="Label for installed whitelists on the Managed User Settings dialog."> |
| Installed and enabled content packs: |
| </message> |
| <message name="IDS_GET_CONTENT_PACKS_BUTTON" desc="The text for the button that opens the webstore, Content pack section."> |
| Get Content Packs |
| </message> |
| - <message name="IDS_CONTENT_PACK_SETTINGS_LABEL" desc="Label that explains the three options associated with installed whitelists on the Managed User Settings dialog"> |
| + <message name="IDS_CONTENT_PACK_SETTINGS_LABEL" desc="Label that explains the three options associated with installed whitelists on the Managed User Settings dialog."> |
| When a managed user tries to access a site that is not in any content pack: |
| </message> |
| <message name="IDS_OUTSIDE_CONTENT_PACKS_ALLOW_RADIO" desc="A radio button in the Managed User Settings dialog for allowing a managed user to view sites that do not belong to the installed whitelists."> |
| @@ -8277,7 +8295,7 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 |
| <message name="IDS_ADVANCED_MANAGED_USER_LABEL" desc="A label in the Managed User Settings dialog for other managed user settings."> |
| Advanced settings |
| </message> |
| - <message name="IDS_SAFE_SEARCH_ENABLED" desc="A checkbox in the Managed User Settings dialog for enabling SafeSearch"> |
| + <message name="IDS_SAFE_SEARCH_ENABLED" desc="A checkbox in the Managed User Settings dialog for enabling SafeSearch."> |
| Enable Google's SafeSearch |
| </message> |
| <message name="IDS_SIGNIN_SYNC_DISABLED" desc="A checkbox in the Managed User Settings dialog for disabling sign in or sync."> |
| @@ -9266,6 +9284,9 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 |
| <message name="IDS_BOOKMARK_EDITOR_CONFIRM_DELETE" desc="The message shown in the dialog asking the user to confirm deleting a folder."> |
| This folder contains <ph name="COUNT">$1<ex>5</ex></ph> bookmarks. Are you sure you want to delete it? |
| </message> |
| + <message name="IDS_BOOKMARK_BAR_APPS_SHORTCUT_NAME" desc="Name shown in the bookmark bar for the apps page shortcut"> |
| + Apps |
| + </message> |
| <if expr="not pp_ifdef('use_titlecase')"> |
| <message name="IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME" desc="Name shown in the tree for the mobile bookmarks folder"> |
| Mobile bookmarks |
| @@ -9273,6 +9294,9 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 |
| <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="Name shown in the tree for the other bookmarks folder"> |
| Other bookmarks |
| </message> |
| + <message name="IDS_BOOKMARK_BAR_SHOW_APPS_SHORTCUT" desc="In Title Case: Name shown in the context menu to hide/show the apps shortcut in the bookmakr bar"> |
|
Alexei Svitkine (slow)
2013/02/25 21:13:29
This one isn't In Title Case.
MAD
2013/02/25 21:41:01
D'Ho!ne. :-)
|
| + Show apps shortcut |
| + </message> |
| </if> |
| <if expr="pp_ifdef('use_titlecase')"> |
| <message name="IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the mobile bookmarks folder"> |
| @@ -9281,6 +9305,9 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 |
| <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the other bookmarks folder"> |
| Other Bookmarks |
| </message> |
| + <message name="IDS_BOOKMARK_BAR_SHOW_APPS_SHORTCUT" desc="In Title Case: Name shown in the context menu to hide/show the apps shortcut in the bookmakr bar"> |
| + Show Apps Shortcut |
| + </message> |
| </if> |
| <if expr="not pp_ifdef('android') and not pp_ifdef('ios') and pp_ifdef('use_titlecase')"> |
| <message name="IDS_BOOKMARK_BAR_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the bookmarks bar folder"> |
| @@ -10638,7 +10665,7 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr |
| Reopen the pages that were open last |
| </message> |
| <message name="IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION" desc="The label of the 'Continue where I left off' startup option radio button"> |
| - Continue where I left off. |
| + Continue where I left off |
| </message> |
| <message name="IDS_OPTIONS_STARTUP_SHOW_PAGES" desc="The label of the 'Show these pages:' startup option radio button"> |
| Open a specific page or set of pages. |
| @@ -13648,7 +13675,7 @@ Some features may be unavailable. Please check that the profile exists and you |
| There is not enough space. |
| </message> |
| - <message name="IDS_FILE_BROWSER_SEARCH_NO_MATCHING_FILES" desc="In the File Manager, the message informing the user that the search did not match any files or directories."> |
| + <message name="IDS_FILE_BROWSER_SEARCH_NO_MATCHING_FILES_HTML" desc="In the File Manager, the message informing the user that the search did not match any files or directories."> |
| No items match <b>"<ph name="SEARCH_STRING">$1<ex>abc</ex></ph>"</b> |
| </message> |
| <message name="IDS_FILE_BROWSER_SEARCH_EXPAND" desc="In the File Manager, the text on the link to expand search when no matching files were found."> |