diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-11-13 18:43:32 -0800 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2013-11-13 18:43:32 -0800 |
| commit | 1b967a1b23cd237d3df49f7b0e0af771c8aef077 (patch) | |
| tree | f47e8c6692808f93ab445278b3da1de68d00e15f /packages/PrintSpooler | |
| parent | ef6a8aeb43d076653f6d30e69f0c21cb2041cf10 (diff) | |
| parent | 9358d98d83dc79734ca2da00a371e0966e9ddfe1 (diff) | |
| download | frameworks_base-1b967a1b23cd237d3df49f7b0e0af771c8aef077.zip frameworks_base-1b967a1b23cd237d3df49f7b0e0af771c8aef077.tar.gz frameworks_base-1b967a1b23cd237d3df49f7b0e0af771c8aef077.tar.bz2 | |
resolved conflicts for merge of 9358d98d to master
Change-Id: I1facdcec6eeaa10805300c9d634957fbb86815d3
Diffstat (limited to 'packages/PrintSpooler')
| -rw-r--r-- | packages/PrintSpooler/res/values-ja/arrays.xml | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/packages/PrintSpooler/res/values-ja/arrays.xml b/packages/PrintSpooler/res/values-ja/arrays.xml new file mode 100644 index 0000000..3187cbe --- /dev/null +++ b/packages/PrintSpooler/res/values-ja/arrays.xml @@ -0,0 +1,41 @@ +<?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>JIS_B10</item> + <item>JIS_B9</item> + <item>JIS_B8</item> + <item>JIS_B7</item> + <item>JIS_B6</item> + <item>JIS_B5</item> + <item>JIS_B4</item> + <item>JIS_B3</item> + <item>JIS_B2</item> + <item>JIS_B1</item> + <item>JIS_B0</item> + <item>JIS_EXEC</item> + <item>JPN_CHOU4</item> + <item>JPN_CHOU3</item> + <item>JPN_CHOU2</item> + <item>JPN_HAGAKI</item> + <item>JPN_OUFUKU</item> + <item>JPN_KAHU</item> + <item>JPN_KAKU2</item> + <item>JPN_YOU4</item> + </string-array> + +</resources> |