summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-09-06 14:12:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-06 14:12:29 -0700
commit3048199327b1b59b95732b14b6f90308134e454f (patch)
tree76696808af9b76024697962b9cc0e20a96e0500a
parenta4dbfd0eaac2e25b646bb7735a0bcb119244de45 (diff)
parentf64279241d6861e32aed534b2fb6ed3c5ee5faea (diff)
downloadandroid_packages_apps_Snap-3048199327b1b59b95732b14b6f90308134e454f.tar.gz
android_packages_apps_Snap-3048199327b1b59b95732b14b6f90308134e454f.tar.bz2
android_packages_apps_Snap-3048199327b1b59b95732b14b6f90308134e454f.zip
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
-rw-r--r--res/values-hr/strings.xml2
-rw-r--r--res/values-ja/strings.xml3
-rw-r--r--res/values-ms/strings.xml3
-rw-r--r--res/values-zh-rCN/strings.xml3
4 files changed, 4 insertions, 7 deletions
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 40b03752f..584893cb0 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -87,7 +87,7 @@
<string name="process_caching_requests" msgid="8722939570307386071">"Obrada zahtjeva za predmemoriju"</string>
<string name="caching_label" msgid="4521059045896269095">"U predmemoriju…"</string>
<string name="crop_action" msgid="3427470284074377001">"Obreži"</string>
- <string name="trim_action" msgid="703098114452883524">"Izreži"</string>
+ <string name="trim_action" msgid="703098114452883524">"Obreži"</string>
<string name="set_as" msgid="3636764710790507868">"Postavi kao"</string>
<string name="video_err" msgid="7003051631792271009">"Nije moguće reproducirati videozapis."</string>
<string name="group_by_location" msgid="316641628989023253">"Prema lokaciji"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0ff03e844..b68ae67ba 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -87,8 +87,7 @@
<string name="process_caching_requests" msgid="8722939570307386071">"キャッシュリクエストを処理しています"</string>
<string name="caching_label" msgid="4521059045896269095">"キャッシュ中..."</string>
<string name="crop_action" msgid="3427470284074377001">"トリミング"</string>
- <!-- no translation found for trim_action (703098114452883524) -->
- <skip />
+ <string name="trim_action" msgid="703098114452883524">"トリミング"</string>
<string name="set_as" msgid="3636764710790507868">"登録"</string>
<string name="video_err" msgid="7003051631792271009">"動画を再生できません。"</string>
<string name="group_by_location" msgid="316641628989023253">"地域別"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 6885b535f..e2e183b06 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -87,8 +87,7 @@
<string name="process_caching_requests" msgid="8722939570307386071">"Memproses permintaan cache"</string>
<string name="caching_label" msgid="4521059045896269095">"Mengcache..."</string>
<string name="crop_action" msgid="3427470284074377001">"Pangkas"</string>
- <!-- no translation found for trim_action (703098114452883524) -->
- <skip />
+ <string name="trim_action" msgid="703098114452883524">"Pangkas"</string>
<string name="set_as" msgid="3636764710790507868">"Tetapkan sebagai"</string>
<string name="video_err" msgid="7003051631792271009">"Tidak boleh memainkan video."</string>
<string name="group_by_location" msgid="316641628989023253">"Mengikut lokasi"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2674f623a..5b40d986f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -87,8 +87,7 @@
<string name="process_caching_requests" msgid="8722939570307386071">"正在处理缓存请求"</string>
<string name="caching_label" msgid="4521059045896269095">"正在缓存..."</string>
<string name="crop_action" msgid="3427470284074377001">"修剪"</string>
- <!-- no translation found for trim_action (703098114452883524) -->
- <skip />
+ <string name="trim_action" msgid="703098114452883524">"修剪"</string>
<string name="set_as" msgid="3636764710790507868">"设置为"</string>
<string name="video_err" msgid="7003051631792271009">"无法播放视频。"</string>
<string name="group_by_location" msgid="316641628989023253">"按位置分组"</string>