[automerger skipped] Import translations. DO NOT MERGE
am: e73681a6c2  -s ours

Change-Id: I5a32640d7d793773b9cd04f8c9d2fdbeae1d8f37
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 87461f6..e680bd4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -17,7 +17,7 @@
 
 <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="3551052199033657984">"خدمة الطباعة التلقائية"</string>
+    <string name="app_name" msgid="3551052199033657984">"خدمة الطباعة الأساسية"</string>
     <string name="printer_busy" msgid="8604311528104955859">"مشغول"</string>
     <string name="printer_out_of_paper" msgid="4882186432807703877">"نفد الورق"</string>
     <string name="printer_out_of_ink" msgid="7361897651097675464">"نفد الحبر"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
deleted file mode 100644
index 343cf1f..0000000
--- a/res/values-as/strings.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<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="3551052199033657984">"ডিফ\'ল্ট প্ৰিণ্ট সেৱা"</string>
-    <string name="printer_busy" msgid="8604311528104955859">"ব্যস্ত"</string>
-    <string name="printer_out_of_paper" msgid="4882186432807703877">"কাগজ শেষ হৈছে"</string>
-    <string name="printer_out_of_ink" msgid="7361897651097675464">"চিয়াহী শেষ হৈছে"</string>
-    <string name="printer_out_of_toner" msgid="2077516357225364154">"ট\'নাৰ শেষ হৈছে"</string>
-    <string name="printer_low_on_ink" msgid="3515015872393897705">"চিয়াহী কম আছে"</string>
-    <string name="printer_low_on_toner" msgid="8807858294038587130">"ট\'নাৰ কম আছে"</string>
-    <string name="printer_door_open" msgid="2446302931916940874">"প্ৰিণ্টাৰৰ দুৱাৰ খোল খাই আছে"</string>
-    <string name="printer_jammed" msgid="5104099859384749499">"প্ৰিণ্টাৰত জাম লাগিছে"</string>
-    <string name="printer_offline" msgid="9196864753298645066">"প্ৰিণ্টাৰ অফলাইন হৈ আছে"</string>
-    <string name="printer_check" msgid="6428369671197132828">"প্ৰিণ্টাৰ পৰীক্ষা কৰক"</string>
-    <string name="waiting_to_send" msgid="2022115199902822180">"পঠাবলৈ ৰৈ থকা হৈছে"</string>
-    <string name="unreadable_input" msgid="2199948329556527912">"দস্তাবেজ পঢ়িবপৰা নগ\'ল"</string>
-    <string name="media_size_l" msgid="164416542021598181">"L"</string>
-    <string name="media_size_5x7in" msgid="1275128379533195285">"৫x৭ ইঞ্চি"</string>
-    <string name="media_size_89x119mm" msgid="6828167243395807385">"৮৯x১১৯ মি. মি."</string>
-    <string name="media_size_54x86mm" msgid="1301991206183343895">"৫৪x৮৬ মি. মি."</string>
-    <string name="media_size_8x10in" msgid="1872576638522812402">"৮x১০ ইঞ্চি"</string>
-    <string name="media_size_4x6in" msgid="3093276425529958253">"৪x৬ ইঞ্চি"</string>
-    <string name="printer_description" msgid="8580767673213837142">"%1$s: %2$s"</string>
-    <string name="title_activity_add_printer" msgid="9119216095769228566">"প্ৰিণ্টাৰ যোগ কৰক"</string>
-    <string name="add_printer_by_ip" msgid="562864787592910327">"আইপি ঠিকনাৰ জৰিয়তে প্ৰিণ্টাৰ যোগ কৰক"</string>
-    <string name="hostname_or_ip" msgid="3460546103553992915">"হ\'ষ্টৰ নাম বা আইপি ঠিকনা"</string>
-    <string name="ip_hint" msgid="7939777481941979799">"192.168.0.4"</string>
-    <string name="add" msgid="1950342261671100906">"যোগ দিয়ক"</string>
-    <string name="add_named" msgid="9074106244018070583">"প্ৰিণ্টাৰ যোগ কৰক <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
-    <string name="no_printer_found" msgid="4777867380924351173">"এই ঠিকনাত কোনো প্ৰিণ্টাৰ পোৱা নগ\'ল"</string>
-    <string name="printer_not_supported" msgid="281955849350938408">"এই প্ৰিণ্টাৰটো নচলে"</string>
-    <string name="wifi_direct" msgid="4629404342852294985">"ৱাই-ফাই ডাইৰেক্ট"</string>
-    <string name="find_wifi_direct" msgid="5270504288829123954">"ৱাই-ফাই ডাইৰেক্ট প্ৰিণ্টাৰ বিচাৰক"</string>
-    <string name="wifi_direct_printers" msgid="541168032444693191">"ৱাই-ফাই ডাইৰেক্ট প্ৰিণ্টাৰ"</string>
-    <string name="searching" msgid="2114018057619514587">"সন্ধান কৰি থকা হৈছে…"</string>
-    <string name="connect_hint_text" msgid="587112503851044234">"আপোনাৰ প্ৰিণ্টাৰৰ সন্মুখৰ পেনেলত আপুনি এই সংযোগটো অনুমোদন কৰিবলগীয়া হ\'ব পাৰে"</string>
-    <string name="connecting_to" msgid="2665161014972086194">"<xliff:g id="PRINTER">%1$s</xliff:g>ৰ লগত সংযোগ কৰি থকা হৈছে"</string>
-    <string name="failed_printer_connection" msgid="4196305972749960362">"প্ৰিণ্টাৰৰ লগত সংযোগ স্থাপন কৰিব পৰা নগ\'ল"</string>
-    <string name="failed_connection" msgid="8068661997318286575">"<xliff:g id="PRINTER">%1$s</xliff:g>ৰ লগত সংযোগ স্থাপন কৰিব পৰা নগ\'ল"</string>
-    <string name="saved_printers" msgid="4567534965213125526">"ছেভ কৰি ৰখা প্ৰিণ্টাৰ"</string>
-    <string name="forget" msgid="892068061425802502">"পাহৰক"</string>
-    <string name="connects_via_wifi_direct" msgid="652300632780158437">"ৱাই-ফাই ডাইৰেক্টৰ জৰিয়তে সংযোগ কৰে"</string>
-    <string name="connects_via_network" msgid="5990041581556733898">"<xliff:g id="IP_ADDRESS">%1$s</xliff:g> ঠিকনাত চলিত নেটৱৰ্কৰ জৰিয়তে সংযোগ কৰে"</string>
-</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index d505d6a..b2e512b 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -37,7 +37,7 @@
     <string name="media_size_8x10in" msgid="1872576638522812402">"8x10 in"</string>
     <string name="media_size_4x6in" msgid="3093276425529958253">"4x6 in"</string>
     <string name="printer_description" msgid="8580767673213837142">"%1$s - %2$s"</string>
-    <string name="title_activity_add_printer" msgid="9119216095769228566">"Dodajte štampač"</string>
+    <string name="title_activity_add_printer" msgid="9119216095769228566">"Dodaj štampač"</string>
     <string name="add_printer_by_ip" msgid="562864787592910327">"Dodaj štampač prema IP adresi"</string>
     <string name="hostname_or_ip" msgid="3460546103553992915">"Naziv glavnog računara ili IP adresa"</string>
     <string name="ip_hint" msgid="7939777481941979799">"192.168.0.4"</string>
@@ -45,9 +45,9 @@
     <string name="add_named" msgid="9074106244018070583">"Dodaj štampač <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
     <string name="no_printer_found" msgid="4777867380924351173">"Nije pronađen štampač na ovoj adresi"</string>
     <string name="printer_not_supported" msgid="281955849350938408">"Štampač nije podržan"</string>
-    <string name="wifi_direct" msgid="4629404342852294985">"WiFi Direct"</string>
-    <string name="find_wifi_direct" msgid="5270504288829123954">"Pronađi štampače s opcijom WiFi Direct"</string>
-    <string name="wifi_direct_printers" msgid="541168032444693191">"Štampači s opcijom WiFi Direct"</string>
+    <string name="wifi_direct" msgid="4629404342852294985">"Wi-Fi Direct"</string>
+    <string name="find_wifi_direct" msgid="5270504288829123954">"Pronađi štampače s opcijom Wi-Fi Direct"</string>
+    <string name="wifi_direct_printers" msgid="541168032444693191">"Štampači s opcijom Wi-Fi Direct"</string>
     <string name="searching" msgid="2114018057619514587">"Pretraživanje…"</string>
     <string name="connect_hint_text" msgid="587112503851044234">"Možda ćete morati odobriti ovo povezivanje na prednjoj tabli vašeg štampača"</string>
     <string name="connecting_to" msgid="2665161014972086194">"Povezivanje sa štampačem <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
@@ -55,6 +55,6 @@
     <string name="failed_connection" msgid="8068661997318286575">"Povezivanje sa štampačem <xliff:g id="PRINTER">%1$s</xliff:g> nije uspjelo"</string>
     <string name="saved_printers" msgid="4567534965213125526">"Sačuvani štampači"</string>
     <string name="forget" msgid="892068061425802502">"Zaboravi"</string>
-    <string name="connects_via_wifi_direct" msgid="652300632780158437">"Povezivanje putem opcije WiFi Direct"</string>
+    <string name="connects_via_wifi_direct" msgid="652300632780158437">"Povezivanje putem opcije Wi-Fi Direct"</string>
     <string name="connects_via_network" msgid="5990041581556733898">"Povezivanje putem trenutne mreže na <xliff:g id="IP_ADDRESS">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 2bf5fa2..7ae7c8c 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -39,7 +39,7 @@
     <string name="printer_description" msgid="8580767673213837142">"%1$s – %2$s"</string>
     <string name="title_activity_add_printer" msgid="9119216095769228566">"પ્રિન્ટર ઉમેરો"</string>
     <string name="add_printer_by_ip" msgid="562864787592910327">"IP ઍડ્રેસ દ્વારા પ્રિન્ટર ઉમેરો"</string>
-    <string name="hostname_or_ip" msgid="3460546103553992915">"હોસ્ટનું નામ અથવા IP ઍડ્રેસ"</string>
+    <string name="hostname_or_ip" msgid="3460546103553992915">"હોસ્ટનું નામ અથવા IP સરનામું"</string>
     <string name="ip_hint" msgid="7939777481941979799">"192.168.0.4"</string>
     <string name="add" msgid="1950342261671100906">"ઉમેરો"</string>
     <string name="add_named" msgid="9074106244018070583">"<xliff:g id="PRINTER">%1$s</xliff:g> ઉમેરો"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 665e083..e18e161 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -45,7 +45,7 @@
     <string name="add_named" msgid="9074106244018070583">"Dodaj pisač <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
     <string name="no_printer_found" msgid="4777867380924351173">"Na ovoj adresi nije pronađen pisač"</string>
     <string name="printer_not_supported" msgid="281955849350938408">"Pisač nije podržan"</string>
-    <string name="wifi_direct" msgid="4629404342852294985">"Wi-Fi Direct"</string>
+    <string name="wifi_direct" msgid="4629404342852294985">"Izravni Wi-Fi"</string>
     <string name="find_wifi_direct" msgid="5270504288829123954">"Pronađi pisače s Izravnim Wi-Fi-jem"</string>
     <string name="wifi_direct_printers" msgid="541168032444693191">"Pisači s Izravnim Wi-Fi-jem"</string>
     <string name="searching" msgid="2114018057619514587">"Pretraživanje…"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 5d90879..75b99bd 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -37,7 +37,7 @@
     <string name="media_size_8x10in" msgid="1872576638522812402">"၈x၁၀ လက်မ"</string>
     <string name="media_size_4x6in" msgid="3093276425529958253">"၄x၆ လက်မ"</string>
     <string name="printer_description" msgid="8580767673213837142">"%1$s – %2$s"</string>
-    <string name="title_activity_add_printer" msgid="9119216095769228566">"ပုံနှိပ်စက် ထည့်ရန်"</string>
+    <string name="title_activity_add_printer" msgid="9119216095769228566">"ပရင်တာ ထည့်ရန်"</string>
     <string name="add_printer_by_ip" msgid="562864787592910327">"ပရင်တာကို အိုင်ပီလိပ်စာဖြင့် ထည့်ရန်"</string>
     <string name="hostname_or_ip" msgid="3460546103553992915">"အင်တာနက်လက်ခံဝန်ဆောင်ပေးသူအမည် သို့မဟုတ် အိုင်ပီလိပ်စာ"</string>
     <string name="ip_hint" msgid="7939777481941979799">"၁၉၂.၁၆၈.၀.၄"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
deleted file mode 100644
index f927213..0000000
--- a/res/values-or/strings.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<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="3551052199033657984">"ଡିଫଲ୍ଟ ପ୍ରିଣ୍ଟ ସେବା"</string>
-    <string name="printer_busy" msgid="8604311528104955859">"ବ୍ୟସ୍ତ"</string>
-    <string name="printer_out_of_paper" msgid="4882186432807703877">"ପେପର୍‍ ଶେଷ ହୋଇଯାଇଛି"</string>
-    <string name="printer_out_of_ink" msgid="7361897651097675464">"ଇଙ୍କ ଶେଷ ହୋଇଯାଇଛି"</string>
-    <string name="printer_out_of_toner" msgid="2077516357225364154">"ଟୋନର୍‍ ନାହିଁ"</string>
-    <string name="printer_low_on_ink" msgid="3515015872393897705">"ଇଙ୍କ କମ୍‍ ଅଛି"</string>
-    <string name="printer_low_on_toner" msgid="8807858294038587130">"ଟୋନର୍‍ କମ୍‍ ଅଛି"</string>
-    <string name="printer_door_open" msgid="2446302931916940874">"ଡୋର୍‍ ଖୋଲା ଅଛି"</string>
-    <string name="printer_jammed" msgid="5104099859384749499">"ଜାମ୍‍ ହୋଇଯାଇଛି"</string>
-    <string name="printer_offline" msgid="9196864753298645066">"ଅଫଲାଇନ୍"</string>
-    <string name="printer_check" msgid="6428369671197132828">"ପ୍ରିଣ୍ଟର୍‍ ଖୋଜନ୍ତୁ"</string>
-    <string name="waiting_to_send" msgid="2022115199902822180">"ପଠାଇବାକୁ ଅପେକ୍ଷା କରାଯାଉଛି"</string>
-    <string name="unreadable_input" msgid="2199948329556527912">"ଡକ୍ୟୁମେଣ୍ଟ ପଢ଼ିପାରିଲା ନାହିଁ"</string>
-    <string name="media_size_l" msgid="164416542021598181">"L"</string>
-    <string name="media_size_5x7in" msgid="1275128379533195285">"5x7 ଇଞ୍ଚ"</string>
-    <string name="media_size_89x119mm" msgid="6828167243395807385">"89x119 ମିମି"</string>
-    <string name="media_size_54x86mm" msgid="1301991206183343895">"54x86 ମିମି"</string>
-    <string name="media_size_8x10in" msgid="1872576638522812402">"8x10 ଇଞ୍ଚ"</string>
-    <string name="media_size_4x6in" msgid="3093276425529958253">"4x6 ଇଞ୍ଚ"</string>
-    <string name="printer_description" msgid="8580767673213837142">"%1$s – %2$s"</string>
-    <string name="title_activity_add_printer" msgid="9119216095769228566">"ପ୍ରିଣ୍ଟର୍‌ ଯୋଡ଼ନ୍ତୁ"</string>
-    <string name="add_printer_by_ip" msgid="562864787592910327">"IP ଠିକଣା ମାଧ୍ୟମରେ ପ୍ରିଣ୍ଟର୍‌କୁ ଯୋଡ଼ନ୍ତୁ"</string>
-    <string name="hostname_or_ip" msgid="3460546103553992915">"ହୋଷ୍ଟନେମ୍‍ କିମ୍ବା IP ଠିକଣା"</string>
-    <string name="ip_hint" msgid="7939777481941979799">"192.168.0.4"</string>
-    <string name="add" msgid="1950342261671100906">"ଯୋଡ଼ନ୍ତୁ"</string>
-    <string name="add_named" msgid="9074106244018070583">"<xliff:g id="PRINTER">%1$s</xliff:g>କୁ ଯୋଡ଼ନ୍ତୁ"</string>
-    <string name="no_printer_found" msgid="4777867380924351173">"ଏହି ଠିକଣାରେ କୌଣସି ପ୍ରିଣ୍ଟର ମିଳିଲା ନାହିଁ"</string>
-    <string name="printer_not_supported" msgid="281955849350938408">"ପ୍ରିଣ୍ଟର୍‍ ସପୋର୍ଟ କରୁନାହିଁ"</string>
-    <string name="wifi_direct" msgid="4629404342852294985">"ୱାଇ-ଫାଇ ଡାଇରେକ୍ଟ"</string>
-    <string name="find_wifi_direct" msgid="5270504288829123954">"ୱାଇ-ଫାଇ ଡାଇରେକ୍ଟ ପ୍ରିଣ୍ଟର୍‌ ଖୋଜନ୍ତୁ"</string>
-    <string name="wifi_direct_printers" msgid="541168032444693191">"ୱାଇ-ଫାଇ ଡାଇରେକ୍ଟ ପ୍ରିଣ୍ଟର୍"</string>
-    <string name="searching" msgid="2114018057619514587">"ଖୋଜୁଛି…"</string>
-    <string name="connect_hint_text" msgid="587112503851044234">"ପ୍ରିଣ୍ଟର୍‌ର ସାମ୍ନା ପ୍ୟାନେଲ୍‌ରୁ ଆପଣ ଏହି କନେକ୍ସନ୍‌କୁ ଅନୁମୋଦନ କରିପାରିବେ"</string>
-    <string name="connecting_to" msgid="2665161014972086194">"<xliff:g id="PRINTER">%1$s</xliff:g> ସହିତ କନେକ୍ଟ ହେଉଛି"</string>
-    <string name="failed_printer_connection" msgid="4196305972749960362">"ପ୍ରିଣ୍ଟର ସହିତ କନେକ୍ଟ ହେଲାନାହିଁ"</string>
-    <string name="failed_connection" msgid="8068661997318286575">"<xliff:g id="PRINTER">%1$s</xliff:g> ସହିତ କନେକ୍ଟ ହେଲାନାହିଁ"</string>
-    <string name="saved_printers" msgid="4567534965213125526">"ସେଭ୍ ହୋଇଥିବା ପ୍ରିଣ୍ଟର୍"</string>
-    <string name="forget" msgid="892068061425802502">"ଭୁଲିଯାଆନ୍ତୁ"</string>
-    <string name="connects_via_wifi_direct" msgid="652300632780158437">"ୱାଇ-ଫାଇ ଡାଇରେକ୍ଟ ମାଧ୍ୟମରେ କନେକ୍ଟ ହେବ"</string>
-    <string name="connects_via_network" msgid="5990041581556733898">"<xliff:g id="IP_ADDRESS">%1$s</xliff:g>ରେ ବର୍ତ୍ତମାନର ନେଟ୍‌ୱର୍କ ମାଧ୍ୟମରେ କନେକ୍ଟ କରାଯାଇଥାଏ"</string>
-</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 75de110..568b4b9 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -54,7 +54,7 @@
     <string name="failed_printer_connection" msgid="4196305972749960362">"Printerga ulanmadi"</string>
     <string name="failed_connection" msgid="8068661997318286575">"Ulanmadi: <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
     <string name="saved_printers" msgid="4567534965213125526">"Saqlangan printerlar"</string>
-    <string name="forget" msgid="892068061425802502">"Olib tashlash"</string>
+    <string name="forget" msgid="892068061425802502">"Unutish"</string>
     <string name="connects_via_wifi_direct" msgid="652300632780158437">"Wi-Fi Direct orqali ulanadi"</string>
     <string name="connects_via_network" msgid="5990041581556733898">"<xliff:g id="IP_ADDRESS">%1$s</xliff:g> manzilida joriy tarmoq orqali ulanadi"</string>
 </resources>