summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-05 16:53:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-09-05 16:53:35 +0000
commit3f9b1fac1ab0500509324c129a3d9b1a8e86f5e2 (patch)
treefcc0349353273aa62f307117a83b9f1fdb7bbef0
parent327af49c7e2bbc46d9c8c13e204976c59cfaefc6 (diff)
parent6622e9ed599b6fbbf926d225c5fff7623a228c27 (diff)
downloadBasic-3f9b1fac1ab0500509324c129a3d9b1a8e86f5e2.tar.gz
Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21
-rw-r--r--res/values-as/strings.xml2
-rw-r--r--res/values-or/strings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 57c38e9..465ecd1 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -17,5 +17,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="6121278918841215202">"ডে\'ড্ৰিমৰ প্ৰাথমিক সংস্কৰণ"</string>
- <string name="color_dream_name" msgid="9063813186991472050">"ৰং"</string>
+ <string name="color_dream_name" msgid="9063813186991472050">"ৰংবোৰ"</string>
</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 6dd4b1e..148e2d9 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -17,5 +17,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="6121278918841215202">"ସାଧାରଣ ଡେ-ଡ୍ରିମ୍‌"</string>
- <string name="color_dream_name" msgid="9063813186991472050">"ରଙ୍ଗଗୁଡିକ"</string>
+ <string name="color_dream_name" msgid="9063813186991472050">"ରଙ୍ଗ"</string>
</resources>