merge in klp-release history after reset to klp-dev
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 35f2dff..357202d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -186,7 +186,7 @@
     <string name="set_timer_help" msgid="5007708849404589472">"مؤقت العد التنازلي متوقف. يُمكنك تشغيله لإجراء العد التنازلي قبل التقاط صورة."</string>
     <string name="set_duration" msgid="5578035312407161304">"تعيين المدة بالثواني"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"العد التنازلي لالتقاط صورة"</string>
-    <string name="remember_location_title" msgid="9060472929006917810">"هل تتذكر مواقع الصور؟"</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_yes" msgid="862884269285964180">"نعم"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 128ddc7..e995c41 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -30,7 +30,7 @@
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"No s\'ha pogut accedir a la targeta SD."</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCEL·LA"</string>
     <string name="review_ok" msgid="1156261588693116433">"FET"</string>
-    <string name="time_lapse_title" msgid="4360632427760662691">"S\'està enregistrant lapse de temps"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"S\'està enregistrant a intervals de temps"</string>
     <string name="pref_camera_id_title" msgid="4040791582294635851">"Tria de la càmera"</string>
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Enrere"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Frontal"</string>
@@ -48,16 +48,16 @@
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Qualitat de vídeo"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Alta"</string>
     <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Baixa"</string>
-    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Lapse de temps"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Interval de temps"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuració de la càmera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuració de la càmera de vídeo"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Mida de la imatge"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapíxels"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapíxels"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapíxels"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapíxels"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapíxels"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapíxel"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mp"</string>
+    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Mp"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Mp"</string>
+    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 Mp"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 Mp"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 Mp"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
     <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mode d\'enfocament"</string>
@@ -71,7 +71,7 @@
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Balanç de blancs"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automàtica"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescent"</string>
-    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Llum de dia"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Llum natural"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Fluorescent"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Ennuvolat"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Mode d\'escena"</string>
@@ -110,7 +110,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Posta del sol"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"El teu vídeo"</string>
     <string name="bg_replacement_message" msgid="9184270738916564608">"Deixa el dispositiu.\nSurt un moment de la visualització."</string>
-    <string name="video_snapshot_hint" msgid="18833576851372483">"Toca per fer una foto mentre enregistres."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Toca per fer una foto mentre enregistres un vídeo."</string>
     <string name="video_recording_started" msgid="4132915454417193503">"L\'enregistrament de vídeo ha començat."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"L\'enregistrament de vídeo s\'ha aturat."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Les instantànies del vídeo es desactiven quan hi ha els efectes especials activats."</string>
@@ -184,12 +184,12 @@
     <string name="time_lapse_hours" msgid="1776453661704997476">"hores"</string>
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"Fet"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"Definició d\'interval de temps"</string>
-    <string name="set_time_interval_help" msgid="6665849510484821483">"La funció de lapse de temps està desactivada. Activa-la per definir l\'interval de temps."</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"L\'interval de temps està desactivat. Activa aquesta funció per establir un interval de temps."</string>
     <string name="set_timer_help" msgid="5007708849404589472">"El temporitzador del compte enrere està desactivat. Activa el compte enrere abans de fer una foto."</string>
     <string name="set_duration" msgid="5578035312407161304">"Configuració de la durada en segons"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Compte enrere per fer una foto"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Vols que es recordin les ubicacions de les fotos?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Etiqueta les teves fotos i els teus vídeos amb les ubicacions des de les quals es fan.\n\nAltres aplicacions podran accedir a aquesta informació juntament amb les imatges desades."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Etiqueta les teves fotos i els teus vídeos amb les ubicacions on s\'han fet.\n\nAltres aplicacions podran accedir a aquesta informació i a les imatges desades."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"No, gràcies"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Sí"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2badca0..9fd78c2 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -52,7 +52,7 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavení fotoaparátu"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavení videokamery"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Velikost fotografií"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixelů"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mpx"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Mpx"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Mpx"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 Mpx"</string>
@@ -177,9 +177,9 @@
     <string name="pref_video_time_lapse_frame_interval_43200000" msgid="285992046818504906">"12 hodin"</string>
     <string name="pref_video_time_lapse_frame_interval_54000000" msgid="5740227373848829515">"15 hodin"</string>
     <string name="pref_video_time_lapse_frame_interval_86400000" msgid="9040201678470052298">"24 hodin"</string>
-    <string name="time_lapse_seconds" msgid="2105521458391118041">"sekundy"</string>
-    <string name="time_lapse_minutes" msgid="7738520349259013762">"minuty"</string>
-    <string name="time_lapse_hours" msgid="1776453661704997476">"hodiny"</string>
+    <string name="time_lapse_seconds" msgid="2105521458391118041">"s"</string>
+    <string name="time_lapse_minutes" msgid="7738520349259013762">"min"</string>
+    <string name="time_lapse_hours" msgid="1776453661704997476">"hod"</string>
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"Hotovo"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"Nastavit časový interval"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"Funkce časosběr je vypnutá. Zapněte ji a nastavte časový interval."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 64a8465..d508b2a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -185,7 +185,7 @@
     <string name="set_duration" msgid="5578035312407161304">"Indstil varigheden i sekunder"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Tælle ned for at tage et foto"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Husk, hvor fotoet er fra?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Tag dine fotos og videoer med de placeringer, hvor de blev taget.\n\nAndre apps kan få adgang til disse oplysninger sammen med dine gemte billeder."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Mærk dine billeder og videoer med de placeringer, hvor de blev taget.\n\nAndre apps kan få adgang til disse oplysninger sammen med dine gemte billeder."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nej tak"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Ja"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 41576dd..dcde8b2 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/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>
@@ -80,7 +80,7 @@
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Ενέργεια"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Νύχτα"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Ηλιοβασίλεμα"</string>
-    <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Πάρτι"</string>
+    <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Πάρτυ"</string>
     <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Δεν υπάρχει δυνατότητα επιλογής στη λειτουργία σκηνής."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Έκθεση"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 431c64c..90b189c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -52,7 +52,7 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Camera settings"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcorder settings"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Picture size"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M pixels"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 M pixels"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M pixels"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M pixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 M pixels"</string>
@@ -188,6 +188,6 @@
     <string name="count_down_title_text" msgid="4976386810910453266">"Counting down to take a photo"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Remember photo locations?"</string>
     <string name="remember_location_prompt" msgid="724592331305808098">"Tag your photos and videos with the locations where they are taken.\n\nOther apps can access this information along with your saved images."</string>
-    <string name="remember_location_no" msgid="7541394381714894896">"No thanks"</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"No, thanks"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Yes"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 431c64c..90b189c 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -52,7 +52,7 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Camera settings"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcorder settings"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Picture size"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M pixels"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 M pixels"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M pixels"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M pixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 M pixels"</string>
@@ -188,6 +188,6 @@
     <string name="count_down_title_text" msgid="4976386810910453266">"Counting down to take a photo"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Remember photo locations?"</string>
     <string name="remember_location_prompt" msgid="724592331305808098">"Tag your photos and videos with the locations where they are taken.\n\nOther apps can access this information along with your saved images."</string>
-    <string name="remember_location_no" msgid="7541394381714894896">"No thanks"</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"No, thanks"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Yes"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index cf9e4eb..bd7ebf4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -43,7 +43,7 @@
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
     <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Pitido en cuenta"</string>
-    <string name="setting_off" msgid="4480039384202951946">"Desactivada"</string>
+    <string name="setting_off" msgid="4480039384202951946">"Desactiv."</string>
     <string name="setting_on" msgid="8602246224465348901">"Activada"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Calidad del video"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Alta"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index baf9522..77d6ad7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -43,7 +43,7 @@
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
     <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Utilizar pitido"</string>
-    <string name="setting_off" msgid="4480039384202951946">"Desactivado"</string>
+    <string name="setting_off" msgid="4480039384202951946">"No"</string>
     <string name="setting_on" msgid="8602246224465348901">"Activado"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Calidad de vídeo"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Alta"</string>
@@ -57,7 +57,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 MP"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 MP"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 MP"</string>
+    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapíxel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
     <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modo de enfoque"</string>
@@ -67,7 +67,7 @@
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Flash"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automático"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Activado"</string>
-    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Desactivado"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"No"</string>
     <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Balance de blancos"</string>
     <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automático"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Incandescente"</string>
@@ -137,7 +137,7 @@
     <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>
-    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Desactivado"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"No"</string>
     <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0,5 segundos"</string>
     <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 segundo"</string>
     <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1,5 segundos"</string>
@@ -181,10 +181,10 @@
     <string name="time_lapse_minutes" msgid="7738520349259013762">"minutos"</string>
     <string name="time_lapse_hours" msgid="1776453661704997476">"horas"</string>
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"Listo"</string>
-    <string name="set_time_interval" msgid="2970567717633813771">"Establecer intervalo de tiempo"</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Establece el intervalo de tiempo"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"El intervalo de tiempo está desactivado. Activa esta función para establecer un intervalo."</string>
     <string name="set_timer_help" msgid="5007708849404589472">"El temporizador de cuenta atrás está desactivado. Activa esta opción para ver la cuenta atrás antes de hacer una foto."</string>
-    <string name="set_duration" msgid="5578035312407161304">"Definir duración en segundos"</string>
+    <string name="set_duration" msgid="5578035312407161304">"Define la duración en segundos"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Cuenta atrás para hacer una foto"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"¿Recordar ubicaciones de las fotos?"</string>
     <string name="remember_location_prompt" msgid="724592331305808098">"Etiqueta tus fotos y vídeos con las ubicaciones donde se han realizado.\n\nOtras aplicaciones pueden acceder a esta información, así como a las imágenes guardadas."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 5bba9c3..cc99d01 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -42,7 +42,7 @@
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
-    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Cte à reb sonore"</string>
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Compte à rebours sonore"</string>
     <string name="setting_off" msgid="4480039384202951946">"DÉSACTIVÉE"</string>
     <string name="setting_on" msgid="8602246224465348901">"ACTIVÉE"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Qualité vidéo"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index af7fd16..27277ed 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -35,7 +35,7 @@
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Arrière"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Avant"</string>
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Enregist. position"</string>
-    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Compte à rebours"</string>
+    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Retardateur"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 seconde"</item>
     <item quantity="other" msgid="6455381617076792481">"%d secondes"</item>
@@ -52,7 +52,7 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Paramètres appareil photo"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mode Caméra"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Taille d\'image"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 mégapixels"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mpx"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M pixels"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M pixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 M pixels"</string>
@@ -183,7 +183,7 @@
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"OK"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"Définir l\'intervalle de temps"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"La fonctionnalité Time Lapse est désactivée. Veuillez l\'activer pour définir un intervalle."</string>
-    <string name="set_timer_help" msgid="5007708849404589472">"La fonctionnalité de compte à rebours est désactivée. Activez-la pour effectuer un compte à rebours avant de prendre une photo."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Le retardateur est désactivé. Activez-le pour déclencher un compte à rebours avant de prendre une photo."</string>
     <string name="set_duration" msgid="5578035312407161304">"Définir la durée en secondes"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Compte à rebours avant la photo"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Se souvenir du lieu des photos ?"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f4abd33..b7970c1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -187,7 +187,7 @@
     <string name="set_duration" msgid="5578035312407161304">"הגדר משך זמן בשניות"</string>
     <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_prompt" msgid="724592331305808098">"מתייג את התמונות והסרטונים שלך לציון המקומות שבהם צולמו.\n\nאפליקציות אחרות יכולות לגשת למידע זה, כולל תמונות שנשמרו."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"לא, תודה"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"כן"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 509f71c..85e1726 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -42,7 +42,7 @@
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
-    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"카운트다운하는 동안 신호음 울리기"</string>
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"카운트다운 신호음 켜기"</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">"동영상 화질"</string>
@@ -56,7 +56,7 @@
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M 픽셀"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M 픽셀"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M 픽셀"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M 픽셀"</string>
+    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"130만 픽셀"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M 픽셀"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
     <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
@@ -187,7 +187,7 @@
     <string name="set_duration" msgid="5578035312407161304">"시간 설정(초)"</string>
     <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_prompt" msgid="724592331305808098">"촬영한 위치로 사진과 동영상에 태그를 지정하세요.\n\n다른 앱이 저장된 이미지와 함께 이 정보를 볼 수 있습니다."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"아니요"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"예"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 986357f..1b9a792 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -42,7 +42,7 @@
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
-    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Bip utk htg dtk"</string>
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Bip semasa 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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2051de2..3272c5c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -110,7 +110,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Zonsondergang"</string>
     <string name="effect_backdropper_gallery" msgid="959158844620991906">"Uw video"</string>
     <string name="bg_replacement_message" msgid="9184270738916564608">"Zet uw apparaat neer.\nStap even uit beeld."</string>
-    <string name="video_snapshot_hint" msgid="18833576851372483">"Raak aan om een foto te maken tijdens een opname."</string>
+    <string name="video_snapshot_hint" msgid="18833576851372483">"Tik op het scherm en maak een foto tijdens een opname"</string>
     <string name="video_recording_started" msgid="4132915454417193503">"Video-opname is gestart."</string>
     <string name="video_recording_stopped" msgid="5086919511555808580">"Video-opname is gestopt."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videosnapshot staat uit als speciale effecten zijn ingeschakeld."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 46c9a80..605fa2d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -52,7 +52,7 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Ustawienia aparatu"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Ustawienia kamery"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Rozmiar zdjęcia"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapikseli"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mpix"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Mpix"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Mpix"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 Mpix"</string>
@@ -181,8 +181,8 @@
     <string name="time_lapse_minutes" msgid="7738520349259013762">"min"</string>
     <string name="time_lapse_hours" msgid="1776453661704997476">"godz."</string>
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"Gotowe"</string>
-    <string name="set_time_interval" msgid="2970567717633813771">"Ustaw interwał czasu"</string>
-    <string name="set_time_interval_help" msgid="6665849510484821483">"Funkcja filmu poklatkowego jest wyłączona. Włącz ją, by ustawić interwał czasu."</string>
+    <string name="set_time_interval" msgid="2970567717633813771">"Ustaw odstęp czasu"</string>
+    <string name="set_time_interval_help" msgid="6665849510484821483">"Funkcja filmu poklatkowego jest wyłączona. Włącz ją, by ustawić odstęp czasu."</string>
     <string name="set_timer_help" msgid="5007708849404589472">"Samowyzwalacz jest wyłączony. Włącz go, by odliczał czas pozostały do wykonania zdjęcia."</string>
     <string name="set_duration" msgid="5578035312407161304">"Ustaw czas w sekundach"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Odliczanie czasu pozostałego do zrobienia zdjęcia"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b20fb03..a6002a2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -187,7 +187,7 @@
     <string name="set_duration" msgid="5578035312407161304">"Definir duração em segundos"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Contagem regressiva para tirar foto"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Memorizar locais de fotos?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Marque seus vídeos e fotos com os locais onde foram gerados.\n\nOutros aplicativos podem acessar essas informações juntamente com suas imagens salvas."</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Marque seus vídeos e fotos com os locais onde foram gerados.\n\nOutros aplicativos podem acessar essas informações junto com suas imagens salvas."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Não, obrigado"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Sim"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 31222f6..e4ab8c5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -48,7 +48,7 @@
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Качество видео"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Высокое качество"</string>
     <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Низкое качество"</string>
-    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Замедленная съемка"</string>
+    <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>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e455a13..2b7b4af 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -26,8 +26,8 @@
     <string name="no_storage" product="default" msgid="5137703033746873624">"Уметните SD картицу пре коришћења камере."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Припрема USB меморије…"</string>
     <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="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_ok" msgid="1156261588693116433">"ГОТОВО"</string>
     <string name="time_lapse_title" msgid="4360632427760662691">"Снимањe у дужем интервалу"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e1fabf5..751e725 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -64,7 +64,7 @@
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Otomatiki"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Pasipo mwisho"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
-    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Hali ya mweka"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Hali ya mmweko"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Otomatiki"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Washa"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Zima"</string>
@@ -182,7 +182,7 @@
     <string name="time_lapse_seconds" msgid="2105521458391118041">"sekunde"</string>
     <string name="time_lapse_minutes" msgid="7738520349259013762">"dakika"</string>
     <string name="time_lapse_hours" msgid="1776453661704997476">"saa"</string>
-    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Imekamilika"</string>
+    <string name="time_lapse_interval_set" msgid="2486386210951700943">"Nimemaliza"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"Weka Nafasi ya Muda"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"Kipengele cha muda kupita kimezimika. Kiwashe ili kuweka nafasi ya muda."</string>
     <string name="set_timer_help" msgid="5007708849404589472">"Kipima muda kimezimwa. Kiwashe ili kihesabu kabla ya kupiga picha."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e61f00c..520a81e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -34,8 +34,8 @@
     <string name="pref_camera_id_title" msgid="4040791582294635851">"Kamera seç"</string>
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Arka"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Ön"</string>
-    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Depo konumu"</string>
-    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Zamanlayıcı"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Konumu kaydet"</string>
+    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Geri sayım saati"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="1654523400981245448">"1 saniye"</item>
     <item quantity="other" msgid="6455381617076792481">"%d saniye"</item>
@@ -183,7 +183,7 @@
     <string name="time_lapse_interval_set" msgid="2486386210951700943">"Bitti"</string>
     <string name="set_time_interval" msgid="2970567717633813771">"Zaman Aralığını Ayarla"</string>
     <string name="set_time_interval_help" msgid="6665849510484821483">"Zaman atlama özelliği kapalı. Zaman aralığını ayarlamak için etkinleştirin."</string>
-    <string name="set_timer_help" msgid="5007708849404589472">"Zamanlayıcı kapalı. Fotoğraf çekmeden önce geri saymak için açın."</string>
+    <string name="set_timer_help" msgid="5007708849404589472">"Geri sayım saati kapalı. Fotoğraf çekmeden önce geri saymak için açın."</string>
     <string name="set_duration" msgid="5578035312407161304">"Süreyi saniye cinsinden ayarlayın"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Fotoğraf çekmek için geri sayılıyor"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"Fotoğrafların çekildiği yerler hatırlansın mı?"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index eae683e..d4839d8 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"相机故障"</string>
     <string name="cannot_connect_camera" msgid="955440687597185163">"无法连接到相机。"</string>
-    <string name="camera_disabled" msgid="8923911090533439312">"由于安全政策的限制,相机已被停用。"</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"由于安全政策的限制,相机已被禁用。"</string>
     <string name="camera_label" msgid="6346560772074764302">"相机"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"摄像机"</string>
     <string name="wait" msgid="8600187532323801552">"请稍候..."</string>
@@ -187,7 +187,7 @@
     <string name="set_duration" msgid="5578035312407161304">"设置倒数时间(秒)"</string>
     <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_prompt" msgid="724592331305808098">"为您的照片和视频标明拍摄地点。\n\n其他应用在查看您保存的照片和视频时将可以使用这些信息。"</string>
     <string name="remember_location_no" msgid="7541394381714894896">"不用了"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"好"</string>
 </resources>