diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-08-20 19:54:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-08-20 19:54:44 -0700 |
| commit | 7cf2600729b59517a259e3824850733048ca2b61 (patch) | |
| tree | b9743a925c70d369b7dc60452c56e75c616c2ab8 | |
| parent | 17f3dcbb3faf9d9378899e5f4b0b0042834bf26a (diff) | |
| parent | 426552246f021487fc83e2a26433a39b64bbc86e (diff) | |
| download | android_packages_apps_Snap-7cf2600729b59517a259e3824850733048ca2b61.tar.gz android_packages_apps_Snap-7cf2600729b59517a259e3824850733048ca2b61.tar.bz2 android_packages_apps_Snap-7cf2600729b59517a259e3824850733048ca2b61.zip | |
Merge "SnapdragonCamera: string changes"
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 4 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index d803bf107..4ea9734b5 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -544,8 +544,8 @@ <string name="all_in_focus">全焦</string> <string name="refocus_toast">点击此处可重新对焦照片</string> - <string name="refocus_prompt_title">Macro+</string> - <string name="refocus_prompt_message">开启Macro+模式后，相机会连续拍摄5张照片并将其合成一张全焦照片。您还可以事后重新对焦。</string> + <string name="refocus_prompt_title">UbiFocus</string> + <string name="refocus_prompt_message">开启UbiFocus模式后，相机会连续拍摄5张照片并将其合成一张全焦照片。您还可以事后重新对焦。</string> <!-- Settings menu, setting title text for Manual white balance --> <string name="pref_camera_manual_wb_title">手动白平衡</string> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 5a9d5fc4b..deb578dfb 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -889,8 +889,8 @@ <string name="all_in_focus">All in Focus</string> <string name="refocus_toast">To re-focus last photo, tap here</string> - <string name="refocus_prompt_title">Macro+</string> - <string name="refocus_prompt_message">With Macro+, your camera will take 5 pictures, each time that you press the shutter button. The 5 pictures will be combined into 1 picture, where everything is in focus. You can choose to re-focus, after you take the picture.</string> + <string name="refocus_prompt_title">UbiFocus</string> + <string name="refocus_prompt_message">With UbiFocus, your camera will take 5 pictures, each time that you press the shutter button. The 5 pictures will be combined into 1 picture, where everything is in focus. You can choose to re-focus, after you take the picture.</string> <string name="camera_thermal_shutdown">Phone overheated, closing camera.</string> <string name="camera_server_died">Media server died, closing camera.</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index c149e997d..36b6507f0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -397,8 +397,8 @@ <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] --> <string name="pref_camera_scenemode_entry_party">Party</string> <!-- Scene mode for refocus feature [CHAR LIMIT=16] --> - <string name="pref_camera_scenemode_entry_refocus">Macro+</string> - <string name="pref_camera_scenemode_entry_optizoom">Opti-Zoom</string> + <string name="pref_camera_scenemode_entry_refocus">UbiFocus</string> + <string name="pref_camera_scenemode_entry_optizoom">OptiZoom</string> <!-- Settings menu, scene mode labels [CHAR LIMIT=50] --> <string name="pref_camera_scenemode_label_auto">NONE</string> |