merge in klp-release history after reset to klp-dev
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index eda70ae..b141de3 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -28,7 +28,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-es/strings.xml b/res/values-es/strings.xml
index 77d6ad7..746ddb2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -133,7 +133,7 @@
<string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Cambiar a modo panorámico"</string>
<string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Cambiar a nueva panorámica"</string>
<string name="accessibility_review_cancel" msgid="9070531914908644686">"Cancelar"</string>
- <string name="accessibility_review_ok" msgid="7793302834271343168">"Listo"</string>
+ <string name="accessibility_review_ok" msgid="7793302834271343168">"Revisión terminada"</string>
<string name="accessibility_review_retake" msgid="659300290054705484">"Revisar repetición"</string>
<string name="capital_on" msgid="5491353494964003567">"SÍ"</string>
<string name="capital_off" msgid="7231052688467970897">"NO"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index dddd269..4d60ead 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -120,7 +120,7 @@
<string name="accessibility_shutter_button" msgid="2664037763232556307">"शटर बटन"</string>
<string name="accessibility_menu_button" msgid="7140794046259897328">"मेनू बटन"</string>
<string name="accessibility_review_thumbnail" msgid="8961275263537513017">"हाल ही का फ़ोटो"</string>
- <string name="accessibility_camera_picker" msgid="8807945470215734566">"अगला और पिछला कैमरा स्विच"</string>
+ <string name="accessibility_camera_picker" msgid="8807945470215734566">"सामने और पीछे के कैमरा का स्विच"</string>
<string name="accessibility_mode_picker" msgid="3278002189966833100">"कैमरा, वीडियो या पैनोरामा चयनकर्ता"</string>
<string name="accessibility_second_level_indicators" msgid="3855951632917627620">"अधिक सेटिंग नियंत्रण"</string>
<string name="accessibility_back_to_first_level" msgid="5234411571109877131">"सेटिंग नियंत्रण बंद करें"</string>
@@ -188,6 +188,6 @@
<string name="count_down_title_text" msgid="4976386810910453266">"फ़ोटो लेने के लिए उल्टी गिनती कर रहा है"</string>
<string name="remember_location_title" msgid="9060472929006917810">"फ़ोटो के स्थान याद रखना हैं?"</string>
<string name="remember_location_prompt" msgid="724592331305808098">"अपने फ़ोटो और वीडियो को उन स्थानों के साथ टैग करें जहां वे लिए गए हैं.\n\nअन्य एप्स आपके सहेजे गए चित्रों सहित इस जानकारी का उपयोग कर सकते हैं."</string>
- <string name="remember_location_no" msgid="7541394381714894896">"नहीं, धन्यवाद"</string>
+ <string name="remember_location_no" msgid="7541394381714894896">"नहीं, रहने दें"</string>
<string name="remember_location_yes" msgid="862884269285964180">"हां"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ac09df6..09c3c41 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -43,8 +43,8 @@
<!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
<skip />
<string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Bip conto alla rov."</string>
- <string name="setting_off" msgid="4480039384202951946">"Disattivata"</string>
- <string name="setting_on" msgid="8602246224465348901">"Attiva"</string>
+ <string name="setting_off" msgid="4480039384202951946">"OFF"</string>
+ <string name="setting_on" msgid="8602246224465348901">"ON"</string>
<string name="pref_video_quality_title" msgid="8245379279801096922">"Qualità video"</string>
<string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Alta"</string>
<string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Bassa"</string>
@@ -66,8 +66,8 @@
<string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string>
<string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Modalità flash"</string>
<string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatica"</string>
- <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Attiva"</string>
- <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Non attiva"</string>
+ <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"ON"</string>
+ <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"OFF"</string>
<string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Bilanciamento bianco"</string>
<string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automatico"</string>
<string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Luce incandescenza"</string>
@@ -137,7 +137,7 @@
<string name="accessibility_review_retake" msgid="659300290054705484">"Scatta/Riprendi di nuovo per recensione"</string>
<string name="capital_on" msgid="5491353494964003567">"ON"</string>
<string name="capital_off" msgid="7231052688467970897">"OFF"</string>
- <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Non attivo"</string>
+ <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"OFF"</string>
<string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0,5 secondi"</string>
<string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 secondo"</string>
<string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1,5 secondi"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 6e859d3..f0647bf 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -34,7 +34,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_timer_title" msgid="3105232208281893389">"ໂຕນັບເວລາຖອຍຫຼັງ"</string>
<plurals name="pref_camera_timer_entry">
<item quantity="one" msgid="1654523400981245448">"1 ວິນາທີ"</item>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 1b9a792..2308a39 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -42,13 +42,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-sk/strings.xml b/res/values-sk/strings.xml
index eea0548..69d2369 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -52,7 +52,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavenia fotoaparátu"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavenie videokamery"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Veľkosť fotografie"</string>
- <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixelov"</string>
+ <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mpx"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixlov"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixle"</string>
<string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapixle"</string>
@@ -186,8 +186,8 @@
<string name="set_timer_help" msgid="5007708849404589472">"Časovač odpočítavania je vypnutý. Ak chcete odpočítavať pred aktivovaním spúšte fotoaparátu, zapnite ho."</string>
<string name="set_duration" msgid="5578035312407161304">"Nastavte dobu trvania v sekundách"</string>
<string name="count_down_title_text" msgid="4976386810910453266">"Odpočítavanie spúšte fotoaparátu"</string>
- <string name="remember_location_title" msgid="9060472929006917810">"Zapamätať si, kde boli fotografie vytvorené?"</string>
- <string name="remember_location_prompt" msgid="724592331305808098">"Označte pre fotografie a videá polohy, kde boli zaznamenané.\n\nOstatné aplikácie môžu pristupovať k týmto informáciám aj k vašim uloženým snímkam."</string>
+ <string name="remember_location_title" msgid="9060472929006917810">"Zapamätať si, kde boli fotky vytvorené?"</string>
+ <string name="remember_location_prompt" msgid="724592331305808098">"Pridajte k fotkám a videám polohy, kde boli zaznamenané.\n\nOstatné aplikácie môžu pristupovať k týmto informáciám spolu s prístupom k vašim uloženým snímkam."</string>
<string name="remember_location_no" msgid="7541394381714894896">"Nie, ďakujem"</string>
<string name="remember_location_yes" msgid="862884269285964180">"Áno"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 751e725..2c9c405 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -139,7 +139,7 @@
<string name="accessibility_review_retake" msgid="659300290054705484">"Kagua ukaguzi"</string>
<string name="capital_on" msgid="5491353494964003567">"IMEWASHWA"</string>
<string name="capital_off" msgid="7231052688467970897">"IMEZIMWA"</string>
- <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Imezimwa"</string>
+ <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Kimezimwa"</string>
<string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"Sekunde 0.5"</string>
<string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"Sekunde 1"</string>
<string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"Sekunde 1.5"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d4839d8..e1b04d6 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -51,7 +51,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_8mp" msgid="259953780932849079">"800 万像素"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"500 万像素"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"300 万像素"</string>
