diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-09-08 10:37:59 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 10:37:59 -0700 |
| commit | 8f8581e5c0d1e616ce1542af133e011fc5a31e09 (patch) | |
| tree | 79c5a208861194f718357e54e1656a1413963b22 /java/res/values-ja | |
| parent | cb8a8d327d521340b9fbf261e46cfbe24892d57b (diff) | |
| parent | aada63bd751b061a03b7d9e8e9af7920e4ab3a90 (diff) | |
| download | latinime-8f8581e5c0d1e616ce1542af133e011fc5a31e09.tar.gz latinime-8f8581e5c0d1e616ce1542af133e011fc5a31e09.tar.xz latinime-8f8581e5c0d1e616ce1542af133e011fc5a31e09.zip | |
am aada63bd: am 12b6fef3: Merge "Extract alternates_for_X from strings.xml into altchars.xml" into gingerbread
Merge commit 'aada63bd751b061a03b7d9e8e9af7920e4ab3a90'
* commit 'aada63bd751b061a03b7d9e8e9af7920e4ab3a90':
Extract alternates_for_X from strings.xml into altchars.xml
Diffstat (limited to 'java/res/values-ja')
| -rw-r--r-- | java/res/values-ja/altchars.xml | 30 | ||||
| -rw-r--r-- | java/res/values-ja/strings.xml | 9 |
2 files changed, 30 insertions, 9 deletions
diff --git a/java/res/values-ja/altchars.xml b/java/res/values-ja/altchars.xml new file mode 100644 index 000000000..c165b11c5 --- /dev/null +++ b/java/res/values-ja/altchars.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, 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"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">èéêë</string> + <string name="alternates_for_i">ìíîï</string> + <string name="alternates_for_o">òóôõöœø</string> + <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ</string> +</resources> diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index fa7745a31..6a5d643e8 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"高度"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>:保存しました"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"キー長押しでアクセント文字を表示（ø、öなど）"</string> <string name="tip_dismiss" msgid="7585579046862204381">"戻るキーでキーボードを閉じます"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"数字と記号"</string> |