summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2013-06-11 15:51:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-06-11 15:51:29 +0000
commit24ab4c0d0e9f002620fefc57c5cd05e7bf76ded0 (patch)
tree59316d803b830d55403ca53e7a5e07e5c7cb7f8c
parent85745a34db4f5080304f38aa877b1e5dfeb346e2 (diff)
parent5363b20a683b6c556817f76fd18778e03b9ad68f (diff)
downloadandroid_packages_apps_Gallery2-24ab4c0d0e9f002620fefc57c5cd05e7bf76ded0.tar.gz
android_packages_apps_Gallery2-24ab4c0d0e9f002620fefc57c5cd05e7bf76ded0.tar.bz2
android_packages_apps_Gallery2-24ab4c0d0e9f002620fefc57c5cd05e7bf76ded0.zip
Merge "Import translations. DO NOT MERGE"
-rw-r--r--res/values-es-rUS/strings.xml2
-rw-r--r--res/values-fa/strings.xml4
-rw-r--r--res/values-hr/strings.xml2
3 files changed, 4 insertions, 4 deletions
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 59a851ea4..ce9cdadff 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -131,7 +131,7 @@
<string name="duration" msgid="8160058911218541616">"Duración"</string>
<string name="mimetype" msgid="8024168704337990470">"Tipo de MIME"</string>
<string name="file_size" msgid="8486169301588318915">"Tamaño del archivo"</string>
- <string name="maker" msgid="7921835498034236197">"Creador"</string>
+ <string name="maker" msgid="7921835498034236197">"Fabricante"</string>
<string name="model" msgid="8240207064064337366">"Modelo"</string>
<string name="flash" msgid="2816779031261147723">"Flash"</string>
<string name="aperture" msgid="5920657630303915195">"Apertura"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d586aaf76..f9df9f882 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -256,10 +256,10 @@
<string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"۱۳ مگا پیکسل"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"۸ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"۵ مگاپیکسل"</string>
- <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"۴ مگاپیکسل"</string>
+ <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"‫۴ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"۳ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"۲ مگاپیکسل"</string>
- <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"۲ مگاپیکسل (۱۶:۹)"</string>
+ <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"‫۲ مگاپیکسل (۱۶:۹)‏"</string>
<string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"۱.۳ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"۱ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b86d5ec0e..2f489ee4c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -259,7 +259,7 @@
<string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 megapiksela"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapiksela"</string>
<string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapiksela"</string>
- <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M piks. (16:9)"</string>
+ <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 mpiks.(16:9)"</string>
<string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapiksela"</string>
<string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapiksel"</string>
<string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>