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

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

Issue 2911303003: chromeos: Remove SystemTrayDelegate::GetIMEManagedMessage() (Closed)
Patch Set: rebase Created 3 years, 6 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 2
3 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 7784 matching lines...) Expand 10 before | Expand all | Expand 10 after
7795 </message> 7795 </message>
7796 <message name="IDS_OPTIONS_FACTORY_RESET_WARNING" desc="Warning text i n the 'Factory Reset' window"> 7796 <message name="IDS_OPTIONS_FACTORY_RESET_WARNING" desc="Warning text i n the 'Factory Reset' window">
7797 A restart is required before your device can be reset with Powerwash . 7797 A restart is required before your device can be reset with Powerwash .
7798 </message> 7798 </message>
7799 </if> 7799 </if>
7800 7800
7801 <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="Label for the impor t data button."> 7801 <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="Label for the impor t data button.">
7802 Import bookmarks and settings... 7802 Import bookmarks and settings...
7803 </message> 7803 </message>
7804 7804
7805 <message name="IDS_OPTIONS_CONTROLLED_SETTING_POLICY" desc="Text display ed in the controlled settings bubble when a setting's value is enforced by polic y.">
7806 This setting is enforced by your administrator.
7807 </message>
7808 <message name="IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION" desc="Text disp layed in the controlled settings bubble when a setting's value is enforced by an extension."> 7805 <message name="IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION" desc="Text disp layed in the controlled settings bubble when a setting's value is enforced by an extension.">
7809 This setting is enforced by an extension. 7806 This setting is enforced by an extension.
7810 </message> 7807 </message>
7811 <message name="IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION_WITH_NAME" desc= "Text displayed in the controlled settings bubble when a setting's value is enfo rced by an extension. The name of the extension would be displayed on the follow ing line, thus the ending with ':'."> 7808 <message name="IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION_WITH_NAME" desc= "Text displayed in the controlled settings bubble when a setting's value is enfo rced by an extension. The name of the extension would be displayed on the follow ing line, thus the ending with ':'.">
7812 This setting is controlled by: 7809 This setting is controlled by:
7813 </message> 7810 </message>
7814 <message name="IDS_OPTIONS_CONTROLLED_SETTING_MANAGE_EXTENSION" desc="Te xt displayed for a link to manage extension from the controlled settings bubble. "> 7811 <message name="IDS_OPTIONS_CONTROLLED_SETTING_MANAGE_EXTENSION" desc="Te xt displayed for a link to manage extension from the controlled settings bubble. ">
7815 Manage extension 7812 Manage extension
7816 </message> 7813 </message>
7817 <message name="IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED" desc="Text di splayed in the controlled settings bubble when a value is recommended for a sett ing through policy and the user has not overridden this recommendation."> 7814 <message name="IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED" desc="Text di splayed in the controlled settings bubble when a value is recommended for a sett ing through policy and the user has not overridden this recommendation.">
(...skipping 4497 matching lines...) Expand 10 before | Expand all | Expand 10 after
12315 <message name="IDS_VIDEO_AUDIO_CALL_NOTIFICATION_TEXT_2" desc="Text to be shown as a notification when a WebRTC video and audio call is in progress" forma tter_data="android_java"> 12312 <message name="IDS_VIDEO_AUDIO_CALL_NOTIFICATION_TEXT_2" desc="Text to be shown as a notification when a WebRTC video and audio call is in progress" forma tter_data="android_java">
12316 Accessing audio and video input 12313 Accessing audio and video input
12317 </message> 12314 </message>
12318 <message name="IDS_SCREEN_CAPTURE_NOTIFICATION_TEXT_2" desc="Text to be sh own as a notification when screen capture is in progress."> 12315 <message name="IDS_SCREEN_CAPTURE_NOTIFICATION_TEXT_2" desc="Text to be sh own as a notification when screen capture is in progress.">
12319 Sharing screen 12316 Sharing screen
12320 </message> 12317 </message>
12321 </if> 12318 </if>
12322 </messages> 12319 </messages>
12323 </release> 12320 </release>
12324 </grit> 12321 </grit>
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_delegate.cc ('k') | chrome/browser/chromeos/arc/arc_support_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698