diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:22:01 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:22:01 -0800 |
| commit | 3e6b195ee15966b47335d76ffead3ee6f92eceac (patch) | |
| tree | 464dd99f913a7059e45dc507e6e361367d7187b7 /res/values-en-rGB | |
| parent | ef203f8eefd51036bff2dc3d1498a250624d20dc (diff) | |
| parent | 0a7aca406cfc19fcf0ba65ee720d058cf2808121 (diff) | |
| download | android_packages_apps_Camera2-3e6b195ee15966b47335d76ffead3ee6f92eceac.tar.gz android_packages_apps_Camera2-3e6b195ee15966b47335d76ffead3ee6f92eceac.tar.bz2 android_packages_apps_Camera2-3e6b195ee15966b47335d76ffead3ee6f92eceac.zip | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Camera2 into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
Diffstat (limited to 'res/values-en-rGB')
| -rw-r--r-- | res/values-en-rGB/strings.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 5c5627a6e..6af6658b2 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -68,7 +68,6 @@ <string name="error_cannot_connect_camera" msgid="2713059773224193128">"Can\'t connect to the camera."</string> <string name="error_camera_disabled" msgid="5582398275657419692">"Camera has been disabled because of security policies."</string> <string name="error_media_storage_failure" msgid="7711687330673245629">"There was a problem saving your photo or video."</string> - <string name="error_permissions" msgid="3454167403425651254">"The app does not have critical permissions needed to run. Please check your permissions settings."</string> <string name="reason_storage_failure" msgid="6818898304774654969">"Photo storage failure."</string> <string name="wait" msgid="765601745709933047">"Please wait…"</string> <string name="no_storage" product="default" msgid="5922012950780548098">"Insert an SD card before using the camera."</string> @@ -276,7 +275,7 @@ <string name="set_duration" msgid="1638453882581604341">"Set duration in seconds"</string> <string name="count_down_title_text" msgid="7586031110595513050">"Counting down to take a photo"</string> <string name="remember_location_title" msgid="3045040613094030429">"Remember photo locations?"</string> - <string name="remember_location_prompt" msgid="3006013504489919474">"Tag your photos and videos with the locations where they\'re taken."</string> + <string name="remember_location_prompt" msgid="5104210757873140169">"Tag your photos and videos with the locations where they are taken.\n\nOther apps can access this information along with your saved images."</string> <string name="remember_location_no" msgid="4412802756840226925">"No, thanks"</string> <string name="remember_location_yes" msgid="4339424460683531388">"Yes"</string> <string name="camera_menu_more_label" msgid="7951917844735828365">"MORE OPTIONS"</string> |