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

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

Issue 8949056: This adds support for encrypted ONC import (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed merge Created 8 years, 11 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/chromeos/cros/network_library.cc » ('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 11745 matching lines...) Expand 10 before | Expand all | Expand 10 after
11756 </message> 11756 </message>
11757 <message name="IDS_NETWORK_CONFIG_ERROR_CERT_DATA_MALFORMED" desc="Error f or network configuration: Certificate data malformed."> 11757 <message name="IDS_NETWORK_CONFIG_ERROR_CERT_DATA_MALFORMED" desc="Error f or network configuration: Certificate data malformed.">
11758 Certificate data malformed 11758 Certificate data malformed
11759 </message> 11759 </message>
11760 <message name="IDS_NETWORK_CONFIG_ERROR_CERT_DELETE" desc="Error for netwo rk configuration: Certificate delete error."> 11760 <message name="IDS_NETWORK_CONFIG_ERROR_CERT_DELETE" desc="Error for netwo rk configuration: Certificate delete error.">
11761 Certificate delete error 11761 Certificate delete error
11762 </message> 11762 </message>
11763 <message name="IDS_NETWORK_CONFIG_ERROR_CERT_IMPORT" desc="Error for netwo rk configuration: Certificate import error."> 11763 <message name="IDS_NETWORK_CONFIG_ERROR_CERT_IMPORT" desc="Error for netwo rk configuration: Certificate import error.">
11764 Certificate import error 11764 Certificate import error
11765 </message> 11765 </message>
11766 <message name="IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_MALFORMED" desc="Dis played when importing an encrypted ONC file and the ONC file is malformed.">
11767 Encrypted ONC file is malformed.
11768 </message>
11769 <message name="IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_UNSUPPORTED_ENCRYPTI ON" desc="Displayed when importing an encrypted ONC file and the ONC file uses a n encryption protocol that is not supported.">
11770 Encrypted ONC file uses an unsupported encryption scheme.
11771 </message>
11772 <message name="IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_UNABLE_TO_DECODE" de sc="Displayed when importing an encrypted ONC file and the encryption parameters are not able to be parsed.">
11773 Unable to parse some parameters in the encrypted ONC file.
11774 </message>
11775 <message name="IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_UNABLE_TO_DECRYPT" d esc="Displayed when importing an encrypted ONC file and it is not able to be dec rypted.">
11776 Unable to decrypt the encrypted ONC file.
11777 </message>
11778 <message name="IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_TOO_MANY_ITERATIONS" desc="Displayed when importing an encrypted ONC file and the iteration count is too large.">
11779 Passphrase iteration count is too large.
11780 </message>
11766 <message name="IDS_NETWORK_PURCHASE_MORE_MESSAGE" desc="Message for purcha se more link on notification when there is no cellular plan"> 11781 <message name="IDS_NETWORK_PURCHASE_MORE_MESSAGE" desc="Message for purcha se more link on notification when there is no cellular plan">
11767 Buy plan... 11782 Buy plan...
11768 </message> 11783 </message>
11769 <message name="IDS_NETWORK_MORE_INFO_MESSAGE" desc="Message for more info link on cellular plan low data notification"> 11784 <message name="IDS_NETWORK_MORE_INFO_MESSAGE" desc="Message for more info link on cellular plan low data notification">
11770 More info... 11785 More info...
11771 </message> 11786 </message>
11772 <message name="IDS_NETWORK_LOW_DATA_TITLE" desc="Title for network low dat a notification"> 11787 <message name="IDS_NETWORK_LOW_DATA_TITLE" desc="Title for network low dat a notification">
11773 Low <ph name="network">$1<ex>YBH</ex></ph> data 11788 Low <ph name="network">$1<ex>YBH</ex></ph> data
11774 </message> 11789 </message>
11775 <message name="IDS_NETWORK_OUT_OF_DATA_TITLE" desc="Title for network out of data notification"> 11790 <message name="IDS_NETWORK_OUT_OF_DATA_TITLE" desc="Title for network out of data notification">
(...skipping 3039 matching lines...) Expand 10 before | Expand all | Expand 10 after
14815 </messages> 14830 </messages>
14816 <structures fallback_to_english="true"> 14831 <structures fallback_to_english="true">
14817 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14832 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14818 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14833 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14819 </structure> 14834 </structure>
14820 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14835 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14821 </structure> 14836 </structure>
14822 </structures> 14837 </structures>
14823 </release> 14838 </release>
14824 </grit> 14839 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/network_library.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698