diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-27 15:58:32 -0700 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-08-27 15:58:32 -0700 |
| commit | 4d6fa18dce3add8e0714e43348a19110285f2ee4 (patch) | |
| tree | 6c798ac5f00b3a173ea4af5cec3052b274323a50 /res/values/strings.xml | |
| parent | cff180215ef0cb698808a2042163a12545063144 (diff) | |
| parent | e2c02932d03860a8100a96fad5f33867d83dfe4a (diff) | |
| download | LegacyCamera-4d6fa18dce3add8e0714e43348a19110285f2ee4.zip LegacyCamera-4d6fa18dce3add8e0714e43348a19110285f2ee4.tar.gz LegacyCamera-4d6fa18dce3add8e0714e43348a19110285f2ee4.tar.bz2 | |
resolved conflicts for merge of e2c02932 to master
Change-Id: Ie1ad37bf4cf70a70a5b21e4ec9513cf5244e101c
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index e82ed63..5f86317 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -114,6 +114,14 @@ Camcorder mode. [CHAR LIMIT=20] --> <string name="disable_time_lapse_mode">Disable Time Lapse</string> + <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] --> + <string name="pref_camera_id_title">Select camera</string> + + <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] --> + <string name="pref_camera_id_entry_back">Back</string> + <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] --> + <string name="pref_camera_id_entry_front">Front</string> + <!-- Settings screen, setting title text --> <string name="pref_camera_recordlocation_title">Store location</string> |