diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-10-10 19:17:27 -0700 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2013-10-10 19:17:27 -0700 |
| commit | 93e12a7c25b778d16124df83de40b6b0a8129d07 (patch) | |
| tree | 4e95e7182204ff708836b9db4c7d5db2f1970a5d /packages/PrintSpooler/res | |
| parent | 5cfd2b045956ae5eec3f886ca5f5b0db2de6e836 (diff) | |
| parent | 92aa5f4ed21f2baa2d48a3d8aa249d6e856d0777 (diff) | |
| download | frameworks_base-93e12a7c25b778d16124df83de40b6b0a8129d07.zip frameworks_base-93e12a7c25b778d16124df83de40b6b0a8129d07.tar.gz frameworks_base-93e12a7c25b778d16124df83de40b6b0a8129d07.tar.bz2 | |
resolved conflicts for merge of 92aa5f4e to klp-dev-plus-aosp
Change-Id: Ib2a3bd688256cb2e6bed13ebac01a31bd2601788
Diffstat (limited to 'packages/PrintSpooler/res')
| -rw-r--r-- | packages/PrintSpooler/res/values-ca/arrays.xml | 33 | ||||
| -rw-r--r-- | packages/PrintSpooler/res/values-ca/donottranslate.xml | 22 | ||||
| -rw-r--r-- | packages/PrintSpooler/res/values-ja/arrays.xml | 1 |
3 files changed, 55 insertions, 1 deletions
diff --git a/packages/PrintSpooler/res/values-ca/arrays.xml b/packages/PrintSpooler/res/values-ca/arrays.xml new file mode 100644 index 0000000..d40278c --- /dev/null +++ b/packages/PrintSpooler/res/values-ca/arrays.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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> + + <string-array name="pdf_printer_media_sizes" translatable="false"> + <item>NA_LETTER</item> + <item>NA_GOVT_LETTER</item> + <item>NA_LEGAL</item> + <item>NA_JUNIOR_LEGAL</item> + <item>NA_LEDGER</item> + <item>NA_TABLOID</item> + <item>NA_INDEX_3X5</item> + <item>NA_INDEX_4X6</item> + <item>NA_INDEX_5X8</item> + <item>NA_MONARCH</item> + <item>NA_QUARTO</item> + <item>NA_FOOLSCAP</item> + </string-array> + +</resources> diff --git a/packages/PrintSpooler/res/values-ca/donottranslate.xml b/packages/PrintSpooler/res/values-ca/donottranslate.xml new file mode 100644 index 0000000..7537aa5 --- /dev/null +++ b/packages/PrintSpooler/res/values-ca/donottranslate.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2013 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> + + <string name="mediasize_default">NA_LETTER</string> + <string name="mediasize_standard">@string/mediasize_standard_north_america</string> + +</resources> diff --git a/packages/PrintSpooler/res/values-ja/arrays.xml b/packages/PrintSpooler/res/values-ja/arrays.xml index 57088c8..3364979 100644 --- a/packages/PrintSpooler/res/values-ja/arrays.xml +++ b/packages/PrintSpooler/res/values-ja/arrays.xml @@ -36,7 +36,6 @@ <item>JPN_KAHU</item> <item>JPN_KAKU2</item> <item>JPN_YOU4</item> - </string-array> </resources> |