diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-07-29 11:18:40 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-07-29 11:18:40 -0700 |
| commit | 0017e8687a1f80cea17d20ffac25ecea78e5050d (patch) | |
| tree | c10d3732fdfe88288a6519a582e4451103b53eae /res/values-ja/cm_caf.xml | |
| parent | 48b187fc093e81e93885ad48d8e265513e818818 (diff) | |
| parent | 7b7ee6d5eb19ee24adfc85a47f2a436ea6c4ca8e (diff) | |
| download | android_packages_apps_Trebuchet-0017e8687a1f80cea17d20ffac25ecea78e5050d.tar.gz android_packages_apps_Trebuchet-0017e8687a1f80cea17d20ffac25ecea78e5050d.tar.bz2 android_packages_apps_Trebuchet-0017e8687a1f80cea17d20ffac25ecea78e5050d.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0
Conflicts:
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/OverviewSettingsPanel.java
src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
Change-Id: I752b61f7db8bb9dc69d64bbf3ac3fd7926cdc4e3
Diffstat (limited to 'res/values-ja/cm_caf.xml')
| -rw-r--r-- | res/values-ja/cm_caf.xml | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/res/values-ja/cm_caf.xml b/res/values-ja/cm_caf.xml new file mode 100644 index 000000000..52dc8cd00 --- /dev/null +++ b/res/values-ja/cm_caf.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.net--> +<!-- + Copyright (C) 2014 The CyanogenMod 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="migration_cling_title">アプリのアイコンをコピー</string> + <string name="migration_cling_description">以前のホーム画面からアイコンやフォルダをインポートしますか？</string> + <string name="migration_cling_copy_apps">アイコンをコピー</string> + <string name="migration_cling_use_default">新しく始める</string> +</resources> |