Import translations. DO NOT MERGE am: 9223c18a08 -s ours am: 5c965d7a0e -s ours
am: 81ffbe540e -s ours
Change-Id: Ibb6587e01a339ec59ad3303829ea2c70f05ba75e
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 706bcb4..067ad1a 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -75,7 +75,7 @@
<string name="approximate" msgid="7117143366610670836">"(±1 a l\'últim dígit)"</string>
<string name="menu_leading" msgid="2338520833272667740">"Resposta dígits inicials"</string>
<string name="menu_fraction" msgid="1247477377840252234">"Resposta fracció"</string>
- <string name="menu_licenses" msgid="1890541368064108592">"Llic. codi obert"</string>
+ <string name="menu_licenses" msgid="1890541368064108592">"Llic. prog. lliure"</string>
<string name="menu_history" msgid="9006222701220105452">"Historial"</string>
<string name="menu_clear_history" msgid="2336526604226069572">"Esborra"</string>
<string name="title_history" msgid="7820912156315181539">"Historial"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..5f5aab3
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2015 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="1756503303878374382">"Calculator"</string>
+ <string name="dec_point" msgid="8920102493070918054">"."</string>
+ <string name="mode_deg" msgid="1146123354434332479">"deg"</string>
+ <string name="mode_rad" msgid="1434228830085760996">"rad"</string>
+ <string name="clr" msgid="6730945431543327337">"clr"</string>
+ <string name="cleared" msgid="3952521190281880880">"cleared"</string>
+ <string name="del" msgid="5878069000864178910">"del"</string>
+ <string name="desc_const_e" msgid="1889187337970539507">"Euler\'s number"</string>
+ <string name="desc_const_pi" msgid="5430918714009441655">"pi"</string>
+ <string name="desc_dec_point" msgid="5725254504360445023">"point"</string>
+ <string name="desc_lparen" msgid="8688758170211924916">"left parenthesis"</string>
+ <string name="desc_rparen" msgid="7920608385146151731">"right parenthesis"</string>
+ <string name="desc_fun_cos" msgid="3787913784504974731">"cosine"</string>
+ <string name="desc_fun_ln" msgid="2505119732546227166">"natural logarithm"</string>
+ <string name="desc_fun_log" msgid="4202230639814060062">"logarithm"</string>
+ <string name="desc_fun_sin" msgid="7425661271929838876">"sine"</string>
+ <string name="desc_fun_tan" msgid="3545496562069310036">"tangent"</string>
+ <string name="desc_fun_arccos" msgid="7583077865497939123">"inverse cosine"</string>
+ <string name="desc_fun_arcsin" msgid="8592309261123302915">"inverse sine"</string>
+ <string name="desc_fun_arctan" msgid="6891388393360447455">"inverse tangent"</string>
+ <string name="desc_fun_10pow" msgid="3972646467174520812">"ten to the power of"</string>
+ <string name="desc_fun_exp" msgid="657106837530588390">"exponential function"</string>
+ <string name="desc_op_sqr" msgid="693577095029219627">"squared"</string>
+ <string name="desc_op_add" msgid="5539599782598050813">"plus"</string>
+ <string name="desc_op_div" msgid="3032399266115257498">"divide"</string>
+ <string name="desc_op_fact" msgid="6142780103294179702">"factorial"</string>
+ <string name="desc_op_mul" msgid="6882122010553947015">"multiply"</string>
+ <string name="desc_op_pct" msgid="2466179646911499434">"percent"</string>
+ <string name="desc_op_pow" msgid="6010144442344099030">"power"</string>
+ <string name="desc_op_sqrt" msgid="6882241473601721767">"square root"</string>
+ <string name="desc_op_sub" msgid="2744940875059679129">"minus"</string>
+ <string name="desc_mode_deg" msgid="4129831241246511710">"degree mode"</string>
+ <string name="desc_mode_rad" msgid="730135521908627673">"radian mode"</string>
+ <string name="desc_switch_deg" msgid="6675211986921592374">"switch to degrees"</string>
+ <string name="desc_switch_rad" msgid="2845875847488919914">"switch to radians"</string>
+ <string name="desc_eq" msgid="3349320880874699285">"equals"</string>
+ <string name="desc_clr" msgid="737502124268890797">"clear"</string>
+ <string name="desc_del" msgid="7879515781929311432">"Delete"</string>
+ <string name="desc_inv_off" msgid="3672218250519616068">"show inverse functions"</string>
+ <string name="desc_inv_on" msgid="2515675590767677178">"hide inverse functions"</string>
+ <string name="desc_formula" msgid="8056588859637585007">"No formula"</string>
+ <string name="desc_result" msgid="1794073190203126821">"No result"</string>
+ <string name="desc_num_pad" msgid="515720457459745571">"Numbers and basic operations"</string>
+ <string name="desc_adv_pad" msgid="3794276256462677914">"Advanced operations"</string>
+ <string name="error_nan" msgid="5674077944929888710">"Not a number"</string>
+ <string name="error_syntax" msgid="4786987111228645602">"Bad expression"</string>
+ <string name="error_aborted" msgid="3402238176316342537">"Aborted"</string>
+ <string name="error_overflow" msgid="7800547394563434764">"Infinite?"</string>
+ <string name="error_zero_divide" msgid="458040988686661801">"Can\'t divide by 0"</string>
+ <string name="text_copied_toast" msgid="2104264466812485425">"Text copied"</string>
+ <string name="cancelled" msgid="2207323593183640994">"Computation cancelled."</string>
+ <string name="timeout" msgid="5461892570729418573">"Value may be infinite or undefined."</string>
+ <string name="ok_remove_timeout" msgid="8344529153919268011">"Use longer timeouts"</string>
+ <string name="dismiss" msgid="7872443888515066216">"Dismiss"</string>
+ <string name="exact" msgid="2597237880041789948">"(exact)"</string>
+ <string name="approximate" msgid="7117143366610670836">"(±1 in last digit)"</string>
+ <string name="menu_leading" msgid="2338520833272667740">"Answer with leading digits"</string>
+ <string name="menu_fraction" msgid="1247477377840252234">"Answer as fraction"</string>
+ <string name="menu_licenses" msgid="1890541368064108592">"Open-source licences"</string>
+ <string name="menu_history" msgid="9006222701220105452">"History"</string>
+ <string name="menu_clear_history" msgid="2336526604226069572">"Clear"</string>
+ <string name="title_history" msgid="7820912156315181539">"History"</string>
+ <string name="desc_navigate_up" msgid="6208699569165589623">"Navigate up"</string>
+ <string name="dialog_timeout" msgid="9069768442342329065">"Timeout"</string>
+ <string name="dialog_clear" msgid="7137395395908350702">"Clear history and memory?"</string>
+ <string name="title_current_expression" msgid="2442754548537900591">"Current Expression"</string>
+ <string name="no_history" msgid="4331262030447527188">"No history"</string>
+</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..2f1b4a8
--- /dev/null
+++ b/res/values-en-rXC/strings.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2015 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="1756503303878374382">"Calculator"</string>
+ <string name="dec_point" msgid="8920102493070918054">"."</string>
+ <string name="mode_deg" msgid="1146123354434332479">"deg"</string>
+ <string name="mode_rad" msgid="1434228830085760996">"rad"</string>
+ <string name="clr" msgid="6730945431543327337">"clr"</string>
+ <string name="cleared" msgid="3952521190281880880">"cleared"</string>
+ <string name="del" msgid="5878069000864178910">"del"</string>
+ <string name="desc_const_e" msgid="1889187337970539507">"Euler\'s number"</string>
+ <string name="desc_const_pi" msgid="5430918714009441655">"pi"</string>
+ <string name="desc_dec_point" msgid="5725254504360445023">"point"</string>
+ <string name="desc_lparen" msgid="8688758170211924916">"left parenthesis"</string>
+ <string name="desc_rparen" msgid="7920608385146151731">"right parenthesis"</string>
+ <string name="desc_fun_cos" msgid="3787913784504974731">"cosine"</string>
+ <string name="desc_fun_ln" msgid="2505119732546227166">"natural logarithm"</string>
+ <string name="desc_fun_log" msgid="4202230639814060062">"logarithm"</string>
+ <string name="desc_fun_sin" msgid="7425661271929838876">"sine"</string>
+ <string name="desc_fun_tan" msgid="3545496562069310036">"tangent"</string>
+ <string name="desc_fun_arccos" msgid="7583077865497939123">"inverse cosine"</string>
+ <string name="desc_fun_arcsin" msgid="8592309261123302915">"inverse sine"</string>
+ <string name="desc_fun_arctan" msgid="6891388393360447455">"inverse tangent"</string>
+ <string name="desc_fun_10pow" msgid="3972646467174520812">"ten to the power of"</string>
+ <string name="desc_fun_exp" msgid="657106837530588390">"exponential function"</string>
+ <string name="desc_op_sqr" msgid="693577095029219627">"squared"</string>
+ <string name="desc_op_add" msgid="5539599782598050813">"plus"</string>
+ <string name="desc_op_div" msgid="3032399266115257498">"divide"</string>
+ <string name="desc_op_fact" msgid="6142780103294179702">"factorial"</string>
+ <string name="desc_op_mul" msgid="6882122010553947015">"multiply"</string>
+ <string name="desc_op_pct" msgid="2466179646911499434">"percent"</string>
+ <string name="desc_op_pow" msgid="6010144442344099030">"power"</string>
+ <string name="desc_op_sqrt" msgid="6882241473601721767">"square root"</string>
+ <string name="desc_op_sub" msgid="2744940875059679129">"minus"</string>
+ <string name="desc_mode_deg" msgid="4129831241246511710">"degree mode"</string>
+ <string name="desc_mode_rad" msgid="730135521908627673">"radian mode"</string>
+ <string name="desc_switch_deg" msgid="6675211986921592374">"switch to degrees"</string>
+ <string name="desc_switch_rad" msgid="2845875847488919914">"switch to radians"</string>
+ <string name="desc_eq" msgid="3349320880874699285">"equals"</string>
+ <string name="desc_clr" msgid="737502124268890797">"clear"</string>
+ <string name="desc_del" msgid="7879515781929311432">"delete"</string>
+ <string name="desc_inv_off" msgid="3672218250519616068">"show inverse functions"</string>
+ <string name="desc_inv_on" msgid="2515675590767677178">"hide inverse functions"</string>
+ <string name="desc_formula" msgid="8056588859637585007">"No formula"</string>
+ <string name="desc_result" msgid="1794073190203126821">"No result"</string>
+ <string name="desc_num_pad" msgid="515720457459745571">"Numbers and basic operations"</string>
+ <string name="desc_adv_pad" msgid="3794276256462677914">"Advanced operations"</string>
+ <string name="error_nan" msgid="5674077944929888710">"Not a number"</string>
+ <string name="error_syntax" msgid="4786987111228645602">"Bad expression"</string>
+ <string name="error_aborted" msgid="3402238176316342537">"Aborted"</string>
+ <string name="error_overflow" msgid="7800547394563434764">"Infinite?"</string>
+ <string name="error_zero_divide" msgid="458040988686661801">"Can\'t divide by 0"</string>
+ <string name="text_copied_toast" msgid="2104264466812485425">"Text copied"</string>
+ <string name="cancelled" msgid="2207323593183640994">"Computation cancelled."</string>
+ <string name="timeout" msgid="5461892570729418573">"Value may be infinite or undefined."</string>
+ <string name="ok_remove_timeout" msgid="8344529153919268011">"Use longer timeouts"</string>
+ <string name="dismiss" msgid="7872443888515066216">"Dismiss"</string>
+ <string name="exact" msgid="2597237880041789948">"(exact)"</string>
+ <string name="approximate" msgid="7117143366610670836">"(±1 in last digit)"</string>
+ <string name="menu_leading" msgid="2338520833272667740">"Answer with leading digits"</string>
+ <string name="menu_fraction" msgid="1247477377840252234">"Answer as fraction"</string>
+ <string name="menu_licenses" msgid="1890541368064108592">"Open source licenses"</string>
+ <string name="menu_history" msgid="9006222701220105452">"History"</string>
+ <string name="menu_clear_history" msgid="2336526604226069572">"Clear"</string>
+ <string name="title_history" msgid="7820912156315181539">"History"</string>
+ <string name="desc_navigate_up" msgid="6208699569165589623">"Navigate up"</string>
+ <string name="dialog_timeout" msgid="9069768442342329065">"Timeout"</string>
+ <string name="dialog_clear" msgid="7137395395908350702">"Clear history and memory?"</string>
+ <string name="title_current_expression" msgid="2442754548537900591">"Current Expression"</string>
+ <string name="no_history" msgid="4331262030447527188">"No History"</string>
+</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 7012533..276e487 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/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="1756503303878374382">"ಕ್ಯಾಲ್ಕುಲೇಟರ್"</string>
+ <string name="app_name" msgid="1756503303878374382">"ಕ್ಯಾಲ್ಕ್ಯುಲೇಟರ್"</string>
<string name="dec_point" msgid="8920102493070918054">"."</string>
<string name="mode_deg" msgid="1146123354434332479">"deg"</string>
<string name="mode_rad" msgid="1434228830085760996">"rad"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f316b60..310301d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/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="1756503303878374382">"Calculator"</string>
+ <string name="app_name" msgid="1756503303878374382">"Rekenmachine"</string>
<string name="dec_point" msgid="8920102493070918054">","</string>
<string name="mode_deg" msgid="1146123354434332479">"deg"</string>
<string name="mode_rad" msgid="1434228830085760996">"rad"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 7a21377..bb129a6 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -70,18 +70,18 @@
<string name="cancelled" msgid="2207323593183640994">"గణన రద్దు చేసారు."</string>
<string name="timeout" msgid="5461892570729418573">"విలువ అనంతం లేదా నిర్వచించబడనిది కావచ్చు."</string>
<string name="ok_remove_timeout" msgid="8344529153919268011">"దీర్ఘకాల సమయ ముగింపులను ఉపయోగించు"</string>
- <string name="dismiss" msgid="7872443888515066216">"తీసివేయి"</string>
+ <string name="dismiss" msgid="7872443888515066216">"విస్మరించు"</string>
<string name="exact" msgid="2597237880041789948">"(సరిగ్గా)"</string>
<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_history" msgid="9006222701220105452">"చరిత్ర"</string>
- <string name="menu_clear_history" msgid="2336526604226069572">"తీసివేయి"</string>
+ <string name="menu_clear_history" msgid="2336526604226069572">"క్లియర్ చేయి"</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>
</resources>