diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-25 00:56:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-25 00:56:32 -0700 |
| commit | 944ea123683b14225297d451c86e97fc73be3a02 (patch) | |
| tree | 6fb7089394aaf606050247d127828d8ee1dc48e0 /core/res | |
| parent | 82392e84b9bcf618d1c41730ec14fb8dab841990 (diff) | |
| parent | 9399695aa27fd6da78eb2f7b8836fc3d9d58a85d (diff) | |
| download | frameworks_base-944ea123683b14225297d451c86e97fc73be3a02.zip frameworks_base-944ea123683b14225297d451c86e97fc73be3a02.tar.gz frameworks_base-944ea123683b14225297d451c86e97fc73be3a02.tar.bz2 | |
Merge change 2407 into donut
* changes:
Manual merge from cupcake_dcm.
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values-ja/donottranslate.xml | 23 | ||||
| -rw-r--r-- | core/res/res/values/donottranslate.xml | 23 |
2 files changed, 46 insertions, 0 deletions
diff --git a/core/res/res/values-ja/donottranslate.xml b/core/res/res/values-ja/donottranslate.xml new file mode 100644 index 0000000..f7c3566 --- /dev/null +++ b/core/res/res/values-ja/donottranslate.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/assets/res/any/strings.xml +** +** Copyright 2009, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Default text encoding for WebSettings. --> + <string name="default_text_encoding">Shift_JIS</string> +</resources> diff --git a/core/res/res/values/donottranslate.xml b/core/res/res/values/donottranslate.xml new file mode 100644 index 0000000..6def3bf --- /dev/null +++ b/core/res/res/values/donottranslate.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/assets/res/any/strings.xml +** +** Copyright 2009, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Default text encoding for WebSettings. --> + <string name="default_text_encoding">Latin-1</string> +</resources> |