Snap for 4818837 from d9bc5eb37198434193d3ad5ff3b8d5110bd59a49 to pi-release

Change-Id: I9277ca335aa1bf1f3ec0d16704c962fe59608103
diff --git a/res/values-hi/mimes.xml b/res/values-hi/mimes.xml
index ffff6e9..f5a78ae 100644
--- a/res/values-hi/mimes.xml
+++ b/res/values-hi/mimes.xml
@@ -39,7 +39,7 @@
     <string name="gdraw_file_type" msgid="655688091676820371">"Google आरेखण"</string>
     <string name="gtable_file_type" msgid="7332773878374650335">"Google टेबल"</string>
     <string name="gform_file_type" msgid="4803176103746107611">"Google फ़ॉर्म"</string>
-    <string name="gmap_file_type" msgid="6684180781808007016">"Google मानचित्र"</string>
+    <string name="gmap_file_type" msgid="6684180781808007016">"Google मैप"</string>
     <string name="gsite_file_type" msgid="3742812051249149526">"Google साइट"</string>
     <string name="directory_type" msgid="2702987727566226354">"फ़ोल्डर"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d9a3f74..8e823e1 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -119,8 +119,8 @@
     <string name="delete_preparing" msgid="7339349837842802508">"Inaandaa..."</string>
     <string name="delete_progress" msgid="2627631054702306423">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="TOTALCOUNT">%2$d</xliff:g>"</string>
     <plurals name="copy_error_notification_title" formatted="false" msgid="3188432450429390963">
-      <item quantity="other">Imeshindwa kunakili vipengee <xliff:g id="COUNT_1">%1$d</xliff:g></item>
-      <item quantity="one">Imeshindwa kunakili kipengee <xliff:g id="COUNT_0">%1$d</xliff:g></item>
+      <item quantity="other">Imeshindwa kunakili faili <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+      <item quantity="one">Imeshindwa kunakili faili <xliff:g id="COUNT_0">%1$d</xliff:g></item>
     </plurals>
     <plurals name="compress_error_notification_title" formatted="false" msgid="3043630066678213644">
       <item quantity="other">Haikuweza kubana faili <xliff:g id="COUNT_1">%1$d</xliff:g></item>