Merge "Import translations. DO NOT MERGE"

8 files changed, 11 insertions, 11 deletions

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 846137699..b372dd6bd 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -55,7 +55,7 @@
     <item quantity="other" msgid="5874316486520635333">"የተመረጡት ንጥሎች ይሰረዙ?"</item>
   </plurals>
     <string name="confirm" msgid="8646870096527848520">"አረጋግጥ"</string>
-    <string name="cancel" msgid="3637516880917356226">"ይቅር"</string>
+    <string name="cancel" msgid="3637516880917356226">"ሰርዝ"</string>
     <string name="share" msgid="3619042788254195341">"አጋራ"</string>
     <string name="share_panorama" msgid="2569029972820978718">"ፓኖራማ አጋራ"</string>
     <string name="share_as_photo" msgid="8959225188897026149">"እንደ ፎቶ አጋራ"</string>
@@ -227,7 +227,7 @@
     <string name="preparing_sd" product="default" msgid="2914969119574812666">"የ SD  ካርድ በማዘጋጀት ላይ..."</string>
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB ማከማችን መድረስ አልተቻለም፡፡"</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD ካርድን መድረስ አልተቻለም፡፡"</string>
-    <string name="review_cancel" msgid="8188009385853399254">"ይቅር"</string>
+    <string name="review_cancel" msgid="8188009385853399254">"ሰርዝ"</string>
     <string name="review_ok" msgid="1156261588693116433">"ተከናውኗል"</string>
     <string name="time_lapse_title" msgid="4360632427760662691">"በመቅዳት የሚፈጀውን ጊዜ"</string>
     <string name="pref_camera_id_title" msgid="4040791582294635851">"ካሜራ ምረጥ"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 8b6780206..057fa9801 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -151,7 +151,7 @@
     <string name="ffx_bleach" msgid="8946700451603478453">"Pleekimine"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Sinine"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Mustvalge"</string>
-    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Punš"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"X-töötlus"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litorgaafia"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index ab733b406..09d847878 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -151,7 +151,7 @@
     <string name="ffx_bleach" msgid="8946700451603478453">"Bleach"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Plavo"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Crno-bijelo"</string>
-    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Žućkasto"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"X Process"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Bijela kava"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litografija"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index a640de826..618cc2980 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -233,7 +233,7 @@
     <string name="pref_camera_id_title" msgid="4040791582294635851">"ເລືອກກ້ອງ"</string>
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"ກັບ"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"ໜ້າ"</string>
-    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"ສະຖານທີ່ຈັດເກັບ"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"ບັນທຶກສະຖານທີ່"</string>
     <string name="pref_camera_location_label" msgid="2254270920298609161">"ສະຖານທີ່"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"ໂຕນັບເວລາຖອຍຫຼັງ"</string>
   <plurals name="pref_camera_timer_entry">
@@ -286,7 +286,7 @@
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"ໄຟຟລູອໍເຣສເຊນ"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"ຟ້າຄຶ້ມ"</string>
     <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ອັດຕະໂນມັດ"</string>
-    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ແສງກ້າ"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ຫຼອດໄຟສົ້ມ"</string>
     <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ກາງເວັນ"</string>
     <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ໄຟຟລູອໍເຣສເຊນ"</string>
     <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ຟ້າບົດ"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 32443c1c4..b9aeaf47b 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -242,13 +242,13 @@
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
-    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Bip semasa kira detik"</string>
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Bip kira detik"</string>
     <string name="setting_off" msgid="4480039384202951946">"Matikan"</string>
     <string name="setting_on" msgid="8602246224465348901">"Hidupkan"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Kualiti video"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Tinggi"</string>
     <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Rendah"</string>
-    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Selang masa"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Sela masa"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Tetapan kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Tetapan kamkorder"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Saiz gambar"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e1b8d1737..54d2b8362 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -151,7 +151,7 @@
     <string name="ffx_bleach" msgid="8946700451603478453">"Bleach"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Плаво"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Црно-бело"</string>
-    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Пунч"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"X Process"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Испрано"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Литографски"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index fe8addc3e..f19948269 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -151,7 +151,7 @@
     <string name="ffx_bleach" msgid="8946700451603478453">"Làm phai màu"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Màu xanh dương"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Đen/trắng"</string>
-    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Hơi vàng"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"Quá trình X"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litho"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3e8ac7c4c..725c76776 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -251,7 +251,7 @@
     <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"延时"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"相机设置"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"摄像机设置"</string>
-    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"照片大小"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"照片尺寸"</string>
     <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"1300万像素"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"800 万像素"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"500 万像素"</string>