Import translations. DO NOT MERGE

Change-Id: I21d52047faec06d7c1f7f1032303f7249e27aa05

5 files changed, 7 insertions, 10 deletions

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 11f6b8dc3..85710097c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -300,7 +300,7 @@
     <string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Hierdie rekening is nie opgestel om outomaties te sinkroniseer nie."\n"Raak "<b>"Sinkroniseer nou"</b>" om pos een keer te sinkroniseer, of "<b>"Verander sinkroniseer-instellings"</b>" om hierdie rekening op te stel om pos outomaties te sinkroniseer."</string>
     <string name="manual_sync" msgid="6743983544685622800">"Sinkroniseer nou"</string>
     <string name="change_sync_settings" msgid="5514293926214426577">"Verander sinkroniseer-instellings"</string>
-    <string name="photo_view_default_title" msgid="305616940993932174">"Foto\'s van \'n boodskap"</string>
+    <string name="photo_view_default_title" msgid="305616940993932174">"Foto\'s uit boodskap"</string>
     <string name="photo_view_load_error" msgid="1802859675974843136">"Foto kon nie gelaai word nie."</string>
     <string name="photo_view_video_not_ready" msgid="8488887700991406631">"Video nie tans beskikbaar nie. Verfris asseblief."</string>
     <string name="photo_view_placeholder_image" msgid="465734985000555852">"Item nie tans beskikbaar nie. Verfris asseblief."</string>
@@ -322,7 +322,7 @@
   </plurals>
   <plurals name="num_hours_ago">
     <item quantity="one" msgid="2178354472031148118">"<xliff:g id="COUNT">%d</xliff:g> uur"</item>
-    <item quantity="other" msgid="1470820825143524326">"<xliff:g id="COUNT">%d</xliff:g> uur"</item>
+    <item quantity="other" msgid="1470820825143524326">"<xliff:g id="COUNT">%d</xliff:g> ure"</item>
   </plurals>
   <plurals name="num_days_ago">
     <item quantity="one" msgid="5538890823169916595">"<xliff:g id="COUNT">%d</xliff:g> dag"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 349765941..cb9066f2d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -88,8 +88,7 @@
     <string name="quoted_text" msgid="7250749398672037355">"شامل نوشتار نقل قول"</string>
     <string name="quoted_text_label" msgid="541007446961960617">"نوشتار نقل قول شده"</string>
     <string name="respond_inline" msgid="6797117334768201180">"پاسخگویی درون برنامه"</string>
-    <!-- no translation found for formatted_email_address (7547733689030368784) -->
-    <skip />
+    <string name="formatted_email_address" msgid="7547733689030368784">"&lt;<xliff:g id="EMAIL">%1$s</xliff:g>&gt;"</string>
     <string name="bytes" msgid="8851050881674287386">"بایت"</string>
     <string name="kilobytes" msgid="8506546136898321025">"KB"</string>
     <string name="megabytes" msgid="1469217534120857347">"MB"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 25a7fb2c9..59b6ae265 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -88,8 +88,7 @@
     <string name="quoted_text" msgid="7250749398672037355">"Sertakan teks kutipan"</string>
     <string name="quoted_text_label" msgid="541007446961960617">"Kutip teks"</string>
     <string name="respond_inline" msgid="6797117334768201180">"Tanggapi sebaris"</string>
-    <!-- no translation found for formatted_email_address (7547733689030368784) -->
-    <skip />
+    <string name="formatted_email_address" msgid="7547733689030368784">"&lt;<xliff:g id="EMAIL">%1$s</xliff:g>&gt;"</string>
     <string name="bytes" msgid="8851050881674287386">"B"</string>
     <string name="kilobytes" msgid="8506546136898321025">"KB"</string>
     <string name="megabytes" msgid="1469217534120857347">"MB"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 6da481030..64b02b111 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -88,8 +88,7 @@
     <string name="quoted_text" msgid="7250749398672037355">"Vključi citirano besedilo"</string>
     <string name="quoted_text_label" msgid="541007446961960617">"Citirano besedilo"</string>
     <string name="respond_inline" msgid="6797117334768201180">"Odgovori v prejetem"</string>
-    <!-- no translation found for formatted_email_address (7547733689030368784) -->
-    <skip />
+    <string name="formatted_email_address" msgid="7547733689030368784">"&lt;<xliff:g id="EMAIL">%1$s</xliff:g>&gt;"</string>
     <string name="bytes" msgid="8851050881674287386">"B"</string>
     <string name="kilobytes" msgid="8506546136898321025">"KB"</string>
     <string name="megabytes" msgid="1469217534120857347">"MB"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 66cee9ab9..e57efdbe8 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -303,11 +303,11 @@
     <string name="photo_view_default_title" msgid="305616940993932174">"邮件中的照片"</string>
     <string name="photo_view_load_error" msgid="1802859675974843136">"无法加载照片。"</string>
     <string name="photo_view_video_not_ready" msgid="8488887700991406631">"视频目前无法播放，请刷新。"</string>
-    <string name="photo_view_placeholder_image" msgid="465734985000555852">"此项目前无法显示，请刷新。"</string>
+    <string name="photo_view_placeholder_image" msgid="465734985000555852">"此内容目前无法显示，请刷新。"</string>
     <string name="photo_network_error" msgid="6545183306958652345">"暂时无法下载照片。"</string>
     <string name="loading_photo" msgid="6784297653634402137">"正在加载…"</string>
     <string name="post_operation_pending" msgid="1312168212880219407">"正在发送…"</string>
-    <string name="download_photo_retry" msgid="1894223549069749239">"此图片过大，无法下载。是否重新尝试下载分辨率较低的图片？"</string>
+    <string name="download_photo_retry" msgid="1894223549069749239">"此图片过大，无法下载。是否重新尝试下载分辨率较低的版本？"</string>
     <string name="download_photo_error" msgid="7511376299526085797">"照片无法保存到设备中。"</string>
     <string name="yes" msgid="7474216525286833848">"是"</string>
     <string name="no" msgid="427548507197604096">"否"</string>