Merge "DO NOT MERGE: Merge Oreo MR1 into master"
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index e7d15e8..0d98742 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -39,7 +39,7 @@
     <string name="runningFaceDetection" msgid="2293932204708167704">"দয়া করে অপেক্ষা করুন..."</string>
     <string name="view" msgid="6277795271119411881">"দেখুন"</string>
     <string name="details" msgid="8415120088556445230">"বিশদ বিবরণ"</string>
-    <string name="show_on_map" msgid="441725587731006228">"মানচিত্রে দেখান"</string>
+    <string name="show_on_map" msgid="441725587731006228">"ম্যাপে দেখান"</string>
     <string name="rotate" msgid="460017689320955494">"ঘোরান"</string>
     <string name="rotate_left" msgid="5888273317282539839">"বামদিকে ঘোরান"</string>
     <string name="rotate_right" msgid="6776325835923384839">"ডানদিকে ঘোরান"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 8e15e19..8a38218 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -76,14 +76,14 @@
     <item msgid="1033164600689216410">"Mala"</item>
   </string-array>
     <string name="pref_gallery_sort_title" msgid="7447949250045443386">"Način rasporeda"</string>
-    <string name="pref_gallery_sort_summary" msgid="4406174975925645225">"Izaberite na koji način će biti poredane slike i videozapisi"</string>
+    <string name="pref_gallery_sort_summary" msgid="4406174975925645225">"Odaberite na koji način će biti poredane slike i videozapisi"</string>
     <string name="pref_gallery_sort_dialogtitle" msgid="5787417105532562739">"Poredati slike"</string>
   <string-array name="pref_gallery_sort_choices">
     <item msgid="5546009539334018063">"Prikaži prvo najnovije"</item>
     <item msgid="7931283047572866748">"Prikaži prvo najstarije"</item>
   </string-array>
     <string name="pref_gallery_slideshow_interval_title" msgid="6534904787962619832">"Interval dijaprojekcije"</string>
-    <string name="pref_gallery_slideshow_interval_summary" msgid="25973922639324614">"Izaberite koliko dugo će svaka slika biti prikazana tokom dijaprojekcije"</string>
+    <string name="pref_gallery_slideshow_interval_summary" msgid="25973922639324614">"Odaberite koliko dugo će svaka slika biti prikazana tokom dijaprojekcije"</string>
     <string name="pref_gallery_slideshow_interval_dialogtitle" msgid="6775543119826248900">"Interval dijaprojekcije"</string>
   <string-array name="pref_gallery_slideshow_interval_choices">
     <item msgid="3089037742117543119">"2 sekunde"</item>
@@ -91,7 +91,7 @@
     <item msgid="5670078787463530498">"4 sekunde"</item>
   </string-array>
     <string name="pref_gallery_slideshow_transition_title" msgid="3235158556228218846">"Prijelaz u dijaprojekciji"</string>
-    <string name="pref_gallery_slideshow_transition_summary" msgid="8294295294239125591">"Izaberite efekt koji će se koristiti prilikom prelaska sa slike na sliku"</string>
+    <string name="pref_gallery_slideshow_transition_summary" msgid="8294295294239125591">"Odaberite efekt koji će se koristiti prilikom prelaska sa slike na sliku"</string>
     <string name="pref_gallery_slideshow_transition_dialogtitle" msgid="5483406447721500371">"Prijelaz u dijaprojekciji"</string>
   <string-array name="pref_gallery_slideshow_transition_choices">
     <item msgid="2825716730899894863">"Postepeno pojavljivanje i nestajanje"</item>
@@ -134,9 +134,9 @@
     <string name="video_context_menu_header" msgid="7318971116949475029">"Opcije za videozapise"</string>
     <string name="multiface_crop_help" msgid="2554690102655855657">"Dodirnite lice za početak."</string>
     <string name="photos_gallery_title" msgid="6914406246471015448">"Galerija"</string>
-    <string name="pick_photos_gallery_title" msgid="8356086704733473321">"Izaberite sliku"</string>
+    <string name="pick_photos_gallery_title" msgid="8356086704733473321">"Odaberite sliku"</string>
     <string name="videos_gallery_title" msgid="6150354029982749479">"Galerija"</string>
-    <string name="pick_videos_gallery_title" msgid="568436323607491495">"Izaberite video"</string>
+    <string name="pick_videos_gallery_title" msgid="568436323607491495">"Odaberite video"</string>
     <string name="sendImage" msgid="7279510542799399570">"Podijeliti sliku koristeći aplikaciju"</string>
     <string name="setImage" msgid="7246975856983303047">"Postaviti sliku kao"</string>
     <string name="sendVideo" msgid="3598567735831863073">"Podijeliti videozapis koristeći"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a3e0c84..672eeb2 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -149,7 +149,7 @@
     <string name="resume_playing_restart" msgid="5471008499835769292">"Torna a començar"</string>
     <string name="gadget_title" msgid="259405922673466798">"Marc de la imatge"</string>
     <string name="file_info_title" msgid="1628963357466012538">"Informació del fitxer:"</string>
-    <string name="video_exceed_mms_limit" msgid="3835075281230780010">"El vídeo que heu enregistrat és massa gran per enviar-lo mitjançant MMS. Proveu d\'enregistrar un clip més curt."</string>
+    <string name="video_exceed_mms_limit" msgid="3835075281230780010">"El vídeo que heu enregistrat és massa gran per enviar-lo mitjançant MMS. Proveu de gravar un clip més curt."</string>
     <string name="multiselect_share" msgid="5261644537749253581">"Comparteix"</string>
     <string name="multiselect_delete" msgid="9113461994546744603">"Suprimeix"</string>
     <string name="multiselect_cancel" msgid="5969428692864002165">"Cancel·la"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index aace92f..2e0184b 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -32,10 +32,10 @@
     <string name="no_storage" product="default" msgid="6680362958795677723">"कॅमेरा वापरण्यापूर्वी आपल्‍याला एक SD कार्ड घालण्‍याची आवश्‍यकता आहे."</string>
     <string name="not_enough_space" product="nosdcard" msgid="7966388882416357252">"आपले सामायिक संचयन पूर्ण भरले."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"आपले SD कार्ड पूर्ण भरले."</string>
-    <string name="preparing_sd" product="nosdcard" msgid="183917364005592061">"सामायिक केलेले संचयन तयार करीत आहे…"</string>
-    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD कार्ड तयार करीत आहे..."</string>
-    <string name="wallpaper" msgid="140165383777262070">"वॉलपेपर सेट करीत आहे…"</string>
-    <string name="savingImage" msgid="3051745378545909260">"चित्र जतन करीत आहे..."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="183917364005592061">"सामायिक केलेले संचयन तयार करत आहे…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD कार्ड तयार करत आहे..."</string>
+    <string name="wallpaper" msgid="140165383777262070">"वॉलपेपर सेट करत आहे…"</string>
+    <string name="savingImage" msgid="3051745378545909260">"चित्र जतन करत आहे..."</string>
     <string name="runningFaceDetection" msgid="2293932204708167704">"कृपया प्रतीक्षा करा..."</string>
     <string name="view" msgid="6277795271119411881">"पहा"</string>
     <string name="details" msgid="8415120088556445230">"तपशील"</string>
@@ -47,7 +47,7 @@
     <string name="multiselect" msgid="4761682939945434146">"मल्‍टिसिलेक्‍ट"</string>
     <string name="capture_picture" msgid="4114265595549284643">"चित्र कॅप्‍चर करा"</string>
     <string name="capture_video" msgid="4047046282358697155">"व्‍हिडिओ कॅप्‍चर करा"</string>
-    <string name="crop_save_text" msgid="8140440041190264400">"जतन करा"</string>
+    <string name="crop_save_text" msgid="8140440041190264400">"सेव्ह करा"</string>
     <string name="crop_discard_text" msgid="5303657888280340603">"टाकून द्या"</string>
     <string name="confirm_delete_title" msgid="263478358046514887">"हटवा"</string>
     <string name="confirm_delete_message" msgid="2141726810668595858">"हे चित्र हटवायचे?"</string>
@@ -142,7 +142,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"याद्वारे व्‍हिडिओ सामायिक करा"</string>
     <string name="send_media_files" msgid="8201083279723850611">"याद्वारे मीडिया फायली सामायिक करा"</string>
     <string name="movieviewlabel" msgid="7363495772706775465">"चित्रपट"</string>
-    <string name="loading_video" msgid="4013492720121891585">"व्हिडिओ लोड करीत आहे..."</string>
+    <string name="loading_video" msgid="4013492720121891585">"व्हिडिओ लोड करत आहे..."</string>
     <string name="resume_playing_title" msgid="8996677350649355013">"व्हिडिओ पुन्हा सुरु करा"</string>
     <string name="resume_playing_message" msgid="8480340146814638566">"<xliff:g id="DURATION">%s</xliff:g> पासून व्हिडिओ प्ले करणे पुन्हा सुरु करायचे?"</string>
     <string name="resume_playing_resume" msgid="3847915469173852416">"प्ले करणे पुन्हा सुरु करा"</string>
@@ -153,5 +153,5 @@
     <string name="multiselect_share" msgid="5261644537749253581">"सामायिक करा"</string>
     <string name="multiselect_delete" msgid="9113461994546744603">"हटवा"</string>
     <string name="multiselect_cancel" msgid="5969428692864002165">"रद्द करा"</string>
-    <string name="delete_images_message" msgid="2332683687700452577">"प्रतिमा हटवित आहे..."</string>
+    <string name="delete_images_message" msgid="2332683687700452577">"इमेज हटवित आहे..."</string>
 </resources>