commit 2af05baa77381d88b3b4eaedacd2b7371f65a5d5
author Xin Li <delphij@google.com> Mon Oct 19 10:08:26 2020 -0700
committer Xin Li <delphij@google.com> Mon Oct 19 10:08:26 2020 -0700
tree 745be4970e69cf0f5b54ba1794c883b35867f33a
parent 11fdc44c1e4fea46e214a65291376240d76f7284
parent 27ce4df9e5069c7f4117097ba9c04e4ff8189cea

Merge redfin/bramble support.

Bug: 171218636
Merged-In: I921547b6666d3287330847cecc60fa08f09e4306
Change-Id: I6381709e708dd007a5198f2c1832319042596775

res/values-en-rCA/strings.xml

diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index a7d4e0a..134b15f 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -41,7 +41,7 @@
     <string name="printer_description" msgid="8580767673213837142">"%1$s – %2$s"</string>
     <string name="title_activity_add_printer" msgid="9119216095769228566">"Add printer"</string>
     <string name="add_printer_by_ip" msgid="562864787592910327">"Add printer by IP address"</string>
-    <string name="hostname_or_ip" msgid="3460546103553992915">"Hostname or IP address"</string>
+    <string name="hostname_or_ip" msgid="3460546103553992915">"Host name or IP address"</string>
     <string name="ip_hint" msgid="7939777481941979799">"192.168.0.4"</string>
     <string name="add" msgid="1950342261671100906">"Add"</string>
     <string name="add_named" msgid="9074106244018070583">"Add <xliff:g id="PRINTER">%1$s</xliff:g>"</string>

res/values-en-rIN/strings.xml

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index a7d4e0a..134b15f 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -41,7 +41,7 @@
     <string name="printer_description" msgid="8580767673213837142">"%1$s – %2$s"</string>
     <string name="title_activity_add_printer" msgid="9119216095769228566">"Add printer"</string>
     <string name="add_printer_by_ip" msgid="562864787592910327">"Add printer by IP address"</string>
-    <string name="hostname_or_ip" msgid="3460546103553992915">"Hostname or IP address"</string>
+    <string name="hostname_or_ip" msgid="3460546103553992915">"Host name or IP address"</string>
     <string name="ip_hint" msgid="7939777481941979799">"192.168.0.4"</string>
     <string name="add" msgid="1950342261671100906">"Add"</string>
     <string name="add_named" msgid="9074106244018070583">"Add <xliff:g id="PRINTER">%1$s</xliff:g>"</string>