Merge "Import translations. DO NOT MERGE"

7 files changed, 24 insertions, 24 deletions

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 924fda086..cd91c96ee 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -366,7 +366,7 @@
     <string name="accessibility_switch_to_video" msgid="4991396355234561505">"Canvia a vídeo"</string>
     <string name="accessibility_switch_to_panorama" msgid="604756878371875836">"Canvia a panorama"</string>
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Canvia al panorama nou"</string>
-    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Canvia a l\'opció per tornar a enfocar"</string>
+    <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Canvia a reenfocament"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Cancel·la en mode de revisió"</string>
     <string name="accessibility_review_ok" msgid="7793302834271343168">"Fet en mode de revisió"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Revisa la foto o el vídeo nou"</string>
@@ -426,7 +426,7 @@
     <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>
     <string name="menu_camera" msgid="3476709832879398998">"Càmera"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 352b7e603..38cf76640 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -147,12 +147,12 @@
     <string name="unknown" msgid="3506693015896912952">"Desconocido"</string>
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
-    <string name="ffx_instant" msgid="726968618715691987">"Instantánea"</string>
+    <string name="ffx_instant" msgid="726968618715691987">"Instant"</string>
     <string name="ffx_bleach" msgid="8946700451603478453">"Decolorar"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Azul"</string>
-    <string name="ffx_bw_contrast" msgid="517988490066217206">"Blanco y negro"</string>
+    <string name="ffx_bw_contrast" msgid="517988490066217206">"B/N"</string>
     <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
-    <string name="ffx_x_process" msgid="4779398678661811765">"Procesamiento X"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"Proceso X"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litho"</string>
   <plurals name="make_albums_available_offline">
@@ -243,7 +243,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>
@@ -260,7 +260,7 @@
     <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 MP (16:9)"</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>
@@ -271,10 +271,10 @@
     <string name="pref_camera_focusmode_label_infinity" msgid="4272904160062531778">"INFINITO"</string>
     <string name="pref_camera_focusmode_label_macro" msgid="8749317592620908054">"MACRO"</string>
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Flash"</string>
-    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODO FLASH"</string>
+    <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODO DE 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_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTOMÁTICO"</string>
     <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLASH ACTIVADO"</string>
     <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLASH DESACTIVADO"</string>
@@ -313,7 +313,7 @@
     <string name="pref_exposure_label" msgid="552624394642497940">"EXPOSICIÓN"</string>
     <!-- no translation found for pref_camera_hdr_default (1336869406134365882) -->
     <skip />
-    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"ARD"</string>
+    <string name="pref_camera_hdr_label" msgid="7217211253357027510">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="8745553500400332333">"CÁMARA FRONTAL"</string>
     <string name="pref_camera_id_label_front" msgid="8699439330056996709">"CÁMARA TRASERA"</string>
     <string name="dialog_ok" msgid="6263301364153382152">"Aceptar"</string>
@@ -373,7 +373,7 @@
     <string name="accessibility_time_bar" msgid="1414029843602604531">"Barra de tiempo del reproductor de vídeo"</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>
@@ -417,10 +417,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-iw/strings.xml b/res/values-iw/strings.xml
index 7a6e56577..7104209a1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -423,7 +423,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>
     <string name="menu_camera" msgid="3476709832879398998">"מצלמה"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6024e645d..9bda35912 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -341,7 +341,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-pt/strings.xml b/res/values-pt/strings.xml
index 4141a8390..d6015d352 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -148,11 +148,11 @@
     <string name="ffx_original" msgid="372686331501281474">"Original"</string>
     <string name="ffx_vintage" msgid="8348759951363844780">"Vintage"</string>
     <string name="ffx_instant" msgid="726968618715691987">"Instant."</string>
-    <string name="ffx_bleach" msgid="8946700451603478453">"Branqueamento"</string>
+    <string name="ffx_bleach" msgid="8946700451603478453">"Desbotar"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Azul"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"P&amp;B"</string>
     <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
-    <string name="ffx_x_process" msgid="4779398678661811765">"Proc. cruzado"</string>
+    <string name="ffx_x_process" msgid="4779398678661811765">"X-pro"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litografia"</string>
   <plurals name="make_albums_available_offline">
@@ -423,7 +423,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>
     <string name="menu_camera" msgid="3476709832879398998">"Câmera"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 084a51a25..e1b8d1737 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -225,8 +225,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-tr/strings.xml b/res/values-tr/strings.xml
index 63de5b0b3..8c76d01c4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -233,9 +233,9 @@
     <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_recordlocation_title" msgid="371208839215448917">"Konumu kaydet"</string>
     <string name="pref_camera_location_label" msgid="2254270920298609161">"KONUM"</string>
-    <string name="pref_camera_timer_title" msgid="3105232208281893389">"Zamanlayıcı"</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>
@@ -302,7 +302,7 @@
     <string name="pref_camera_scenemode_label_night" msgid="1269871886845854574">"GECE"</string>
     <string name="pref_camera_scenemode_label_sunset" msgid="2802732082948866877">"GÜN BATIMI"</string>
     <string name="pref_camera_scenemode_label_party" msgid="1409459091844374828">"PARTİ"</string>
-    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"GERİ SAYIM ZAMANLAYICI"</string>
+    <string name="pref_camera_countdown_label" msgid="7592784692450586126">"GERİ SAYIM SAATİ"</string>
     <string name="pref_camera_countdown_label_off" msgid="4987856883590176585">"ZAMANLAYICI KAPALI"</string>
     <string name="pref_camera_countdown_label_one" msgid="1101814103087928898">"1 SANİYE"</string>
     <string name="pref_camera_countdown_label_three" msgid="1047399297342955649">"3 SANİYE"</string>
@@ -419,7 +419,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>