diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-02 11:17:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-02 11:17:18 -0700 |
| commit | 66c70e13d9f39cf82df8542fe53f2049d3f2062e (patch) | |
| tree | 592607f78192270c93e56f314ad215d7b244d8eb /core | |
| parent | 040571aa2f71031376ff37ffa827d3612eb89340 (diff) | |
| parent | c87d25215c842cea370c6a86ce67585fa8da4900 (diff) | |
| download | frameworks_base-66c70e13d9f39cf82df8542fe53f2049d3f2062e.zip frameworks_base-66c70e13d9f39cf82df8542fe53f2049d3f2062e.tar.gz frameworks_base-66c70e13d9f39cf82df8542fe53f2049d3f2062e.tar.bz2 | |
Merge change 23529 into eclair
* changes:
Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values-en-rUS/donottranslate-names.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/values-en-rUS/donottranslate-names.xml b/core/res/res/values-en-rUS/donottranslate-names.xml index 42c8ab4..82ba310 100644 --- a/core/res/res/values-en-rUS/donottranslate-names.xml +++ b/core/res/res/values-en-rUS/donottranslate-names.xml @@ -147,7 +147,7 @@ MD, MS, PH.D., PHD, SR, V, VI, VII, VIII, X </string> <string name="common_last_name_prefixes"> - D', DE, DEL, DI, LA, LE, MC, SAN, ST, TER, VAN, VON + D\', DE, DEL, DI, LA, LE, MC, SAN, ST, TER, VAN, VON </string> <string name="common_name_conjunctions"> &, AND, OR |