summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-01-12 02:40:53 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-01-12 02:40:53 -0800
commit8fe224d377b8731dcecc33d88d514445caee22b7 (patch)
tree9a95784b999fc1db577e3001b1ec4f04ef1a576b /res/values
parent1a260764f4442a3e6c3277ff9e882f160a10334d (diff)
parent3be69402630daac812f32ee152fd0d536b74e39e (diff)
downloadandroid_packages_apps_Gallery2-8fe224d377b8731dcecc33d88d514445caee22b7.tar.gz
android_packages_apps_Gallery2-8fe224d377b8731dcecc33d88d514445caee22b7.tar.bz2
android_packages_apps_Gallery2-8fe224d377b8731dcecc33d88d514445caee22b7.zip
Merge "Gallery2: Fix force close issue when trim video"
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7f347a1d6..7fe8fb2e0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1146,4 +1146,5 @@ CHAR LIMIT = NONE] -->
<!-- The tips of trimming video -->
<string name="fail_trim">Sorry, this video file can not be trimmed</string>
+ <string name="can_not_trim">Only mp4 and 3gp file can be trimmed</string>
</resources>