diff options
| author | Camera Software Integration <camswint@localhost> | 2016-11-28 22:18:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-28 22:18:36 -0800 |
| commit | ee1f6a3083bc3e37bcf873e8ac4c2306c91b4022 (patch) | |
| tree | 5986e1e2a93b032e7e21161cc402df444ed09712 /res | |
| parent | 4dd0e20e044c8b93d9a84e0a5481968f9ce92f31 (diff) | |
| parent | a00285cb4fdc76cbbec34871cb62d58599ad74dc (diff) | |
| download | android_packages_apps_Snap-ee1f6a3083bc3e37bcf873e8ac4c2306c91b4022.tar.gz android_packages_apps_Snap-ee1f6a3083bc3e37bcf873e8ac4c2306c91b4022.tar.bz2 android_packages_apps_Snap-ee1f6a3083bc3e37bcf873e8ac4c2306c91b4022.zip | |
Merge "SnapdragonCamera: Some options are not translated to Chinese" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/qcomstrings.xml | 14 | ||||
| -rw-r--r-- | res/xml/setting_menu_preferences.xml | 6 |
2 files changed, 13 insertions, 7 deletions
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index df14f54de..d53b2c27a 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1041,10 +1041,10 @@ <string name="pref_camera2_shutter_sound_entry_off" translatable="true">Off</string> <string name="pref_camera2_shutter_sound_title" translatable="true">Shutter Sound</string> - <string name="pref_camera2_timer_entry_off" translatable="false">Off</string> - <string name="pref_camera2_timer_entry_2sec" translatable="false">2 seconds</string> - <string name="pref_camera2_timer_entry_5sec" translatable="false">5 seconds</string> - <string name="pref_camera2_timer_entry_10sec" translatable="false">10 seconds</string> + <string name="pref_camera2_timer_entry_off" translatable="true">Off</string> + <string name="pref_camera2_timer_entry_2sec" translatable="true">2 seconds</string> + <string name="pref_camera2_timer_entry_5sec" translatable="true">5 seconds</string> + <string name="pref_camera2_timer_entry_10sec" translatable="true">10 seconds</string> <string name="pref_camera2_timer_value_off" translatable="false">0</string> <string name="pref_camera2_timer_value_2sec" translatable="false">2</string> @@ -1057,5 +1057,11 @@ <string name="makeup_ui_ok_button" translatable="true">OK</string> <string name="makeup_seekbar_low" translatable="true">low</string> <string name="makeup_seekbar_high" translatable="true">high</string> + + <string name="perf_camera2_version_info" translatable="true">Version Info</string> + <string name="perf_camera2_preferences_category_general" translatable="true">General</string> + <string name="perf_camera2_preferences_category_photo" translatable="true">Still camera</string> + <string name="perf_camera2_preferences_category_video" translatable="true">Video camera</string> + <string name="perf_camera2_preferences_category_system" translatable="true">System</string> </resources> diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index 92b5db8c8..5cf6c0dd1 100644 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -31,7 +31,7 @@ <PreferenceCategory android:key="general" android:layout="@layout/preferences_category" - android:title="GENERAL"> + android:title="@string/perf_camera2_preferences_category_general"> <SwitchPreference android:defaultValue="false" android:icon="@drawable/gps_location" @@ -60,7 +60,7 @@ <PreferenceCategory android:key="photo" android:layout="@layout/preferences_category" - android:title="STILL CAMERA"> + android:title="@string/perf_camera2_preferences_category_photo"> <ListPreference android:defaultValue="@string/pref_camera2_timer_value_off" android:entries="@array/pref_camera2_timer_entries" @@ -169,7 +169,7 @@ <PreferenceCategory android:key="video" android:layout="@layout/preferences_category" - android:title="VIDEO CAMERA"> + android:title="@string/perf_camera2_preferences_category_video"> <ListPreference android:entries="@array/pref_camera2_video_quality_entries" android:entryValues="@array/pref_camera2_video_quality_entryvalues" |