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_strings.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_strings.xml')
| -rw-r--r-- | res/values-ja/cm_strings.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml index e127daab2..faa498280 100644 --- a/res/values-ja/cm_strings.xml +++ b/res/values-ja/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">アプリの設定</string> <string name="setting_state_on">ON</string> <string name="setting_state_off">OFF</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CMホーム</string> <string name="themes_button_text">テーマ</string> <string name="scrolling_page_outlines">ページの外枠を表示</string> <string name="scrolling_fade_adjacent">側面のページをフェード</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Cozy</string> <string name="grid_size_condensed">Condensed</string> <string name="grid_size_custom">カスタム</string> + <string name="grid_size_custom_and_size">カスタム（%1$s）</string> <string name="preferences_interface_homescreen_custom">カスタムのサイズを選択</string> <string name="preferences_interface_homescreen_rows_title">行数</string> <string name="preferences_interface_homescreen_columns_title">列数</string> @@ -44,9 +47,11 @@ <string name="larger_icons_text">大きいアイコン</string> <string name="icon_labels">アイコンラベル</string> <string name="icon_labels_show">表示</string> - <string name="icon_labels_hide">非表示</string> + <string name="icon_labels_hide">表示しない</string> <string name="protected_app_settings">アプリの保護</string> <string name="search_screen_left_text">検索パネル</string> <string name="search_screen_left_unsupported_toast">この機能を利用するには、サポートされている検索アプリとCyanogenModが必要です。</string> <string name="dialog_confirm">確認</string> + <string name="permission_desc_read_extension_data">DashClockエクステンションデータのリクエストを許可します</string> + <string name="permission_label_read_extension_data">DashClockエクステンションデータのリクエスト</string> </resources> |