summaryrefslogtreecommitdiffstats
path: root/packages/PrintSpooler
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2014-12-03 20:41:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-03 20:41:39 +0000
commitdc026bafa97ad0c2cc2446bfe8ae5992f660ed21 (patch)
tree2c1b1030e0b2b6775ac33e72e0456b9162b09b80 /packages/PrintSpooler
parent5a938481f3fc8c3e84d3ce07234363f4d6c26f40 (diff)
parent5303451efc8553f83d921185c6aac30a178d632f (diff)
downloadframeworks_base-dc026bafa97ad0c2cc2446bfe8ae5992f660ed21.zip
frameworks_base-dc026bafa97ad0c2cc2446bfe8ae5992f660ed21.tar.gz
frameworks_base-dc026bafa97ad0c2cc2446bfe8ae5992f660ed21.tar.bz2
am 5303451e: am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev
* commit '5303451efc8553f83d921185c6aac30a178d632f': Inconsistent media sizes for es-US locale.
Diffstat (limited to 'packages/PrintSpooler')
-rw-r--r--packages/PrintSpooler/res/values-es-rUS/arrays.xml33
1 files changed, 33 insertions, 0 deletions
diff --git a/packages/PrintSpooler/res/values-es-rUS/arrays.xml b/packages/PrintSpooler/res/values-es-rUS/arrays.xml
new file mode 100644
index 0000000..c1b149c
--- /dev/null
+++ b/packages/PrintSpooler/res/values-es-rUS/arrays.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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>