commit 9aee58d2c1ccfce76d6d43d67a6edf70a05dcb7c
author Xin Li <delphij@google.com> Thu Dec 07 06:40:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 07 06:40:04 2017 +0000
tree 544ec15bf7f8969c692e7c3047bbd3c026fc2b53
parent f0d8257a0670e7f09a957f5ba44fbec1513fc337
parent 83e17abb9dc69e67a2d6035040b6b80c574e8312

DO NOT MERGE: Merge Oreo MR1 into master am: 46d00723b8  -s ours
am: 83e17abb9d

Change-Id: I8b723fa0775a5faa5d82af67832f0f273d904d16

res/values-bn/strings.xml

diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index cd9bcb8..29c8d9e 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -20,6 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="COUNT">%d</xliff:g>টির মধ্যে <xliff:g id="CURRENT_POS">%d</xliff:g>টি"</string>
     <string name="retry" msgid="3319517143224679074">"পুনরায় চেষ্টা করুন"</string>
-    <string name="failed" msgid="1458877219699376279">"ছবিটি লোড করা যায়নি"</string>
+    <string name="failed" msgid="1458877219699376279">"চিত্রটি লোড করা যায়নি"</string>
     <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>

res/values-mr/strings.xml

diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index c39db90..7574256 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -20,6 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="COUNT">%d</xliff:g> पैकी <xliff:g id="CURRENT_POS">%d</xliff:g>"</string>
     <string name="retry" msgid="3319517143224679074">"पुन्हा प्रयत्न करा"</string>
-    <string name="failed" msgid="1458877219699376279">"इमेज लोड करू शकलो नाही"</string>
+    <string name="failed" msgid="1458877219699376279">"प्रतिमा लोड करू शकलो नाही"</string>
     <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>

sample/res/values-pa/strings.xml

diff --git a/sample/res/values-pa/strings.xml b/sample/res/values-pa/strings.xml
index 4f28945..0216e33 100644
--- a/sample/res/values-pa/strings.xml
+++ b/sample/res/values-pa/strings.xml
@@ -4,5 +4,5 @@
     <string name="app_name" msgid="559800164925277094">"PhotoViewerSample"</string>
     <string name="menu_settings" msgid="1259682084875185697">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="title_activity_main" msgid="7695239211427024237">"MainActivity"</string>
-    <string name="launch" msgid="2345080120370773520">"ਫ਼ੋਟੋ ਵਿਊਅਰ ਲਾਂਚ ਕਰੋ"</string>
+    <string name="launch" msgid="2345080120370773520">"ਫ਼ੋਟੋ ਵਿਊਅਰ ਲੌਂਚ ਕਰੋ"</string>
 </resources>

sample/res/values-te/strings.xml

diff --git a/sample/res/values-te/strings.xml b/sample/res/values-te/strings.xml
index 75924e0..6f7179e 100644
--- a/sample/res/values-te/strings.xml
+++ b/sample/res/values-te/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="559800164925277094">"PhotoViewerSample"</string>
     <string name="menu_settings" msgid="1259682084875185697">"సెట్టింగ్‌లు"</string>
-    <string name="title_activity_main" msgid="7695239211427024237">"ప్రధాన కార్యకలాపం"</string>
+    <string name="title_activity_main" msgid="7695239211427024237">"ప్రధాన కార్యాచరణ"</string>
     <string name="launch" msgid="2345080120370773520">"ఫోటో వ్యూయర్‌ను ప్రారంభించండి"</string>
 </resources>