summaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-10-07 20:29:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-07 20:29:21 -0700
commita406decd9d3242e4c2381eb8a6d43182089bf249 (patch)
treea9124b9c2b9c082e453c9d6840e7e07f4952210e /res/values/strings.xml
parent4e90efbc3187a51358ee2da1e76e55912c55ea48 (diff)
parent94f5f216821c1090bd8a0660483935456dc13df1 (diff)
downloadandroid_packages_apps_Snap-a406decd9d3242e4c2381eb8a6d43182089bf249.tar.gz
android_packages_apps_Snap-a406decd9d3242e4c2381eb8a6d43182089bf249.tar.bz2
android_packages_apps_Snap-a406decd9d3242e4c2381eb8a6d43182089bf249.zip
am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad
* commit '94f5f216821c1090bd8a0660483935456dc13df1': Increase character limit.
Diffstat (limited to 'res/values/strings.xml')
-rw-r--r--res/values/strings.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 880da21c8..ae8ac0b05 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -112,7 +112,7 @@
<string name="height">Height</string>
<!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
<string name="orientation">Orientation</string>
- <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=14] -->
+ <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
<string name="duration">Duration</string>
<!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
<string name="mimetype">MIME type</string>
@@ -128,7 +128,7 @@
<string name="aperture">Aperture</string>
<!-- Text indicating the focal length of a media item in details window [CHAR LIMIT=14] -->
<string name="focal_length">Focal Length</string>
- <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=14] -->
+ <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
<string name="white_balance">White balance</string>
<!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
<string name="exposure_time">Exposure time</string>
@@ -137,9 +137,9 @@
<!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
<!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
<string name="unit_mm">mm</string>
- <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=8] -->
+ <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
<string name="manual">Manual</string>
- <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=8] -->
+ <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12 -->
<string name="auto">Auto</string>
<!-- String indicating camera flash is fired. [CHAR LIMIT=14] -->
<string name="flash_on">Flash fired</string>