Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I6c109802677d1ba4176d516ba16f9bfd608479f9

18 files changed, 22 insertions, 22 deletions

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c055afd..35cb6ff 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 в последната цифра)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Отг. с първите цифри"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Отг. като дроб"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Лицензи за отворен код"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Лицензи за отв. код"</string>
     <string name="menu_history" msgid="9006222701220105452">"История"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Изчистване"</string>
     <string name="title_history" msgid="7820912156315181539">"История"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 1387b25..7cd4318 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±১ শেষের ডিজিটের মধ্যে)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"লিডিং সংখ্যায় উত্তর"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"ভগ্নাংশ হিসাবে উত্তর"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"ওপেন সোর্স লাইসেন্স"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"মুক্ত উৎস লাইসেন্সগুলি"</string>
     <string name="menu_history" msgid="9006222701220105452">"ইতিহাস"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"সাফ করুন"</string>
     <string name="title_history" msgid="7820912156315181539">"ইতিহাস"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 61bafb7..7701b11 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -21,9 +21,9 @@
     <string name="dec_point" msgid="8920102493070918054">"."</string>
     <string name="mode_deg" msgid="1146123354434332479">"º"</string>
     <string name="mode_rad" msgid="1434228830085760996">"rad"</string>
-    <string name="clr" msgid="6730945431543327337">"BT"</string>
+    <string name="clr" msgid="6730945431543327337">"be"</string>
     <string name="cleared" msgid="3952521190281880880">"borrados"</string>
-    <string name="del" msgid="5878069000864178910">"BC"</string>
+    <string name="del" msgid="5878069000864178910">"c"</string>
     <string name="desc_const_e" msgid="1889187337970539507">"número de Euler"</string>
     <string name="desc_const_pi" msgid="5430918714009441655">"pi"</string>
     <string name="desc_dec_point" msgid="5725254504360445023">"punto"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 1ffe00c..2f479ef 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 viimases numbris)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Vasta esimeste numbritega"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Vasta murdarvuga"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Avatud lähtekoodi litsentsid"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Avat. lähtek. lits."</string>
     <string name="menu_history" msgid="9006222701220105452">"Ajalugu"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Kustuta"</string>
     <string name="title_history" msgid="7820912156315181539">"Ajalugu"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8a4fb5d..a1674eb 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(છેલ્લા અંકમાં ±1)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"આગળ વાળા અંકો સાથે જવાબ"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"અપૂર્ણાંક તરીકે જવાબ"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"ઓપન સૉર્સ લાઇસન્સ"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"ખુલ્લા સ્ત્રોત લાઇસન્સીસ"</string>
     <string name="menu_history" msgid="9006222701220105452">"ઇતિહાસ"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"સાફ કરો"</string>
     <string name="title_history" msgid="7820912156315181539">"ઇતિહાસ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 905996a..765b379 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -81,7 +81,7 @@
     <string name="title_history" msgid="7820912156315181539">"इतिहास"</string>
     <string name="desc_navigate_up" msgid="6208699569165589623">"ऊपर नेविगेट करें"</string>
     <string name="dialog_timeout" msgid="9069768442342329065">"समयबाह्य"</string>
-    <string name="dialog_clear" msgid="7137395395908350702">"इतिहास और मेमोरी मिटाना चाहते हैं?"</string>
+    <string name="dialog_clear" msgid="7137395395908350702">"इतिहास और मेमोरी साफ़ करना है?"</string>
     <string name="title_current_expression" msgid="2442754548537900591">"वर्तमान अभिव्यक्ति"</string>
     <string name="no_history" msgid="4331262030447527188">"कोई इतिहास नहीं"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cad8732..4a11525 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 dalam digit terakhir)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Jawab dengan digit depan"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Jawab sebagai pecahan"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Lisensi open source"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Lisensi sumber terbuka"</string>
     <string name="menu_history" msgid="9006222701220105452">"Histori"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Hapus"</string>
     <string name="title_history" msgid="7820912156315181539">"Histori"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 40ba9db..cdea789 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 ក្នុងខ្ទង់ចុងក្រោយ)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"ចម្លើយជាមួយខ្ទង់នាំមុខ"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"ចម្លើយជាប្រភាគ"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"អាជ្ញាបណ្ណកូដចំហ"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"អាជ្ញាប័ណ្ណប្រភពកូដចំហ"</string>
     <string name="menu_history" msgid="9006222701220105452">"ប្រវត្តិ"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"សម្អាត"</string>
     <string name="title_history" msgid="7820912156315181539">"ប្រវត្តិ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 2f079f3..276e487 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 ಕೊನೆಯ ಅಂಕಿಯಲ್ಲಿ)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"ಮೊದಲ ಅಂಕೆ ಜೊತೆ ಉತ್ತರಿಸಿ"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"ಭಾಗದಂತೆ ಉತ್ತರಿಸಿ"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"ಓಪನ್ ಸೋರ್ಸ್ ಪರವಾನಗಿಗಳು"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
     <string name="menu_history" msgid="9006222701220105452">"ಇತಿಹಾಸ"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="title_history" msgid="7820912156315181539">"ಇತಿಹಾಸ"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 1902bf6..bdf842e 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -81,7 +81,7 @@
     <string name="title_history" msgid="7820912156315181539">"Таржымал"</string>
     <string name="desc_navigate_up" msgid="6208699569165589623">"Жогору чабыттоо"</string>
     <string name="dialog_timeout" msgid="9069768442342329065">"Таймаут"</string>
-    <string name="dialog_clear" msgid="7137395395908350702">"Буга чейин эсептелген нерселер тазалансынбы?"</string>
+    <string name="dialog_clear" msgid="7137395395908350702">"Таржымал менен эстутум тазалансынбы?"</string>
     <string name="title_current_expression" msgid="2442754548537900591">"Учурдагы туюнтма"</string>
     <string name="no_history" msgid="4331262030447527188">"Таржымал жок"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 65fa3b8..2d2fff2 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -81,7 +81,7 @@
     <string name="title_history" msgid="7820912156315181539">"Историја"</string>
     <string name="desc_navigate_up" msgid="6208699569165589623">"Одете нагоре"</string>
     <string name="dialog_timeout" msgid="9069768442342329065">"Времето истече"</string>
-    <string name="dialog_clear" msgid="7137395395908350702">"Да се исчисти историја и меморија?"</string>
+    <string name="dialog_clear" msgid="7137395395908350702">"Исчистете историја и меморија?"</string>
     <string name="title_current_expression" msgid="2442754548537900591">"Тековен израз"</string>
     <string name="no_history" msgid="4331262030447527188">"Нема историја"</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 766bc48..aa1122c 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 no último dígito)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Resposta c/ dígitos iniciais"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Responder como fração"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Licenças de código aberto"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Lic. cód. aberto"</string>
     <string name="menu_history" msgid="9006222701220105452">"Histórico"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Limpar"</string>
     <string name="title_history" msgid="7820912156315181539">"Histórico"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 766bc48..aa1122c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 no último dígito)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Resposta c/ dígitos iniciais"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Responder como fração"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Licenças de código aberto"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Lic. cód. aberto"</string>
     <string name="menu_history" msgid="9006222701220105452">"Histórico"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Limpar"</string>
     <string name="title_history" msgid="7820912156315181539">"Histórico"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b6c0e68..52e81bb 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -59,7 +59,7 @@
     <string name="desc_inv_on" msgid="2515675590767677178">"ซ่อนฟังก์ชันผกผัน"</string>
     <string name="desc_formula" msgid="8056588859637585007">"ไม่มีสูตร"</string>
     <string name="desc_result" msgid="1794073190203126821">"ไม่พบผลลัพธ์"</string>
-    <string name="desc_num_pad" msgid="515720457459745571">"แป้นตัวเลขและการคำนวณขั้นต้น"</string>
+    <string name="desc_num_pad" msgid="515720457459745571">"แป้นตัวเลขและการคำนวนขั้นต้น"</string>
     <string name="desc_adv_pad" msgid="3794276256462677914">"การใช้งานขั้นสูง"</string>
     <string name="error_nan" msgid="5674077944929888710">"ไม่ใช่ตัวเลข"</string>
     <string name="error_syntax" msgid="4786987111228645602">"นิพจน์ไม่ถูกต้อง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 862ef11..1f9c900 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 sa huling digit)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Sagutin gamit ang leading digits"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Sagutin bilang fraction"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Mga lisensyang open source"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Mga lisensya ng open source"</string>
     <string name="menu_history" msgid="9006222701220105452">"History"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"I-clear"</string>
     <string name="title_history" msgid="7820912156315181539">"History"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 65949ce..44fc753 100755
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 в останній цифрі)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Показати перші цифри"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Показати дріб"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Ліцензії відкритого коду"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Ліценз. відкр. коду"</string>
     <string name="menu_history" msgid="9006222701220105452">"Історія"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Очистити"</string>
     <string name="title_history" msgid="7820912156315181539">"Історія"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 183770c..599093f 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -83,5 +83,5 @@
     <string name="dialog_timeout" msgid="9069768442342329065">"Tanaffus"</string>
     <string name="dialog_clear" msgid="7137395395908350702">"Hisob-kitob tarixi va xotiradagi qiymatlar tozalab tashlansinmi?"</string>
     <string name="title_current_expression" msgid="2442754548537900591">"Joriy amal"</string>
-    <string name="no_history" msgid="4331262030447527188">"Hech narsa topilmadi"</string>
+    <string name="no_history" msgid="4331262030447527188">"Hech narsa yo‘q"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 51d2c71..7eb064d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -76,12 +76,12 @@
     <string name="menu_leading" msgid="2338520833272667740">"在結果中顯示前導數"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"以分數顯示結果"</string>
     <string name="menu_licenses" msgid="1890541368064108592">"開放原始碼授權"</string>
-    <string name="menu_history" msgid="9006222701220105452">"記錄"</string>
+    <string name="menu_history" msgid="9006222701220105452">"紀錄"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"清除"</string>
-    <string name="title_history" msgid="7820912156315181539">"記錄"</string>
+    <string name="title_history" msgid="7820912156315181539">"紀錄"</string>
     <string name="desc_navigate_up" msgid="6208699569165589623">"向上瀏覽"</string>
     <string name="dialog_timeout" msgid="9069768442342329065">"逾時"</string>
-    <string name="dialog_clear" msgid="7137395395908350702">"要清除歷史記錄和儲存內容嗎？"</string>
+    <string name="dialog_clear" msgid="7137395395908350702">"要清除歷史紀錄和儲存內容嗎？"</string>
     <string name="title_current_expression" msgid="2442754548537900591">"目前的運算式"</string>
-    <string name="no_history" msgid="4331262030447527188">"沒有任何記錄"</string>
+    <string name="no_history" msgid="4331262030447527188">"沒有任何紀錄"</string>
 </resources>