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

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

Issue 7342009: Show a different banner in chrome://settings for extension-controlled settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/policy/managed_prefs_banner_base.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7800 matching lines...) Expand 10 before | Expand all | Expand 10 after
7811 <if expr="pp_ifdef('use_titlecase')"> 7811 <if expr="pp_ifdef('use_titlecase')">
7812 <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="In Title Case : The title of the 'Browsing data' group."> 7812 <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="In Title Case : The title of the 'Browsing data' group.">
7813 Browsing Data 7813 Browsing Data
7814 </message> 7814 </message>
7815 <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="In Title Case: Labe l for the import data button."> 7815 <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="In Title Case: Labe l for the import data button.">
7816 Import Data from Another Browser... 7816 Import Data from Another Browser...
7817 </message> 7817 </message>
7818 </if> 7818 </if>
7819 7819
7820 <if expr="pp_ifdef('chromeos')"> 7820 <if expr="pp_ifdef('chromeos')">
7821 <message name="IDS_OPTIONS_MANAGED_PREFS" desc="ChromeOS banner displaye d in case there are managed options the user won't be able to change."> 7821 <message name="IDS_OPTIONS_POLICY_MANAGED_PREFS" desc="Banner displayed in case there are policy-managed options the user won't be able to change.">
7822 Some settings have been disabled by your IT administrator. 7822 Some settings have been disabled by your administrator.
7823 </message>
7824 <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner display ed in case there are extension-managed options the user won't be able to change. ">
7825 Some settings are being managed by an extension.
7826 </message>
7827 <message name="IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are policy- and extension-managed options the user won't be able to change.">
7828 Some settings have been disabled by your administrator and others are being managed by an extension.
7823 </message> 7829 </message>
7824 </if> 7830 </if>
7825 <if expr="not pp_ifdef('chromeos') and is_posix"> 7831 <if expr="not pp_ifdef('chromeos') and is_posix">
7826 <message name="IDS_OPTIONS_MANAGED_PREFS" desc="Mac/Linux banner display ed in case there are managed options the user won't be able to change."> 7832 <message name="IDS_OPTIONS_POLICY_MANAGED_PREFS" desc="Banner displayed in case there are policy-managed options the user won't be able to change.">
7827 Some preferences have been disabled by your IT administrator. 7833 Some preferences have been disabled by your administrator.
7834 </message>
7835 <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner display ed in case there are extension-managed options the user won't be able to change. ">
7836 Some preferences are being managed by an extension.
7837 </message>
7838 <message name="IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are policy- and extension-managed options the user won't be able to change.">
7839 Some preferences have been disabled by your administrator and others a re being managed by an extension.
7828 </message> 7840 </message>
7829 </if> 7841 </if>
7830 <if expr="is_win"> 7842 <if expr="is_win">
7831 <message name="IDS_OPTIONS_MANAGED_PREFS" desc="Windows banner displayed in case there are managed options the user won't be able to change."> 7843 <message name="IDS_OPTIONS_POLICY_MANAGED_PREFS" desc="Banner displayed in case there are policy-managed options the user won't be able to change.">
7832 Some options have been disabled by your IT administrator. 7844 Some options have been disabled by your administrator.
7845 </message>
7846 <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner display ed in case there are extension-managed options the user won't be able to change. ">
7847 Some options are being managed by an extension.
7848 </message>
7849 <message name="IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are policy- and extension-managed options the user won't be able to change.">
7850 Some options have been disabled by your administrator and others are b eing managed by an extension.
7833 </message> 7851 </message>
7834 </if> 7852 </if>
7835 7853
7836 <!-- Options search page strings. --> 7854 <!-- Options search page strings. -->
7837 <message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page."> 7855 <message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page.">
7838 Search Results 7856 Search Results
7839 </message> 7857 </message>
7840 <message name="IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES" desc="Text description of a search that has no results."> 7858 <message name="IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES" desc="Text description of a search that has no results.">
7841 No matches were found. 7859 No matches were found.
7842 </message> 7860 </message>
7843 <message name="IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL" desc="Help text for a s erach that has no results."> 7861 <message name="IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL" desc="Help text for a s erach that has no results.">
7844 Can't find what you're looking for? 7862 Can't find what you're looking for?
7845 </message> 7863 </message>
(...skipping 5122 matching lines...) Expand 10 before | Expand all | Expand 10 after
12968 </includes> 12986 </includes>
12969 <structures fallback_to_english="true"> 12987 <structures fallback_to_english="true">
12970 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 12988 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
12971 </structure> 12989 </structure>
12972 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 12990 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
12973 </structure> 12991 </structure>
12974 </structures> 12992 </structures>
12975 12993
12976 </release> 12994 </release>
12977 </grit> 12995 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/managed_prefs_banner_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698