Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 624e2a98 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-6.0.1_r22' of... 

Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/ExactCalculator into cm-13.0

Android 6.0.1 release 22
parents 1cb26711 cfec547a

res/values-af/strings.xml

+42 −56
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- 

  Copyright (C) 2015 The Android Open Source Project

  Copyright (C) 2014 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.
@@ -17,59 +17,45 @@ 


<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">"Sakrekenaar"</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">"uitgevee"</string>

    <string name="del" msgid="5878069000864178910">"del"</string>

    <string name="desc_const_e" msgid="1889187337970539507">"Euler-nommer"</string>

    <string name="desc_const_pi" msgid="5430918714009441655">"pi"</string>

    <string name="desc_dec_point" msgid="5725254504360445023">"punt"</string>

    <string name="desc_lparen" msgid="8688758170211924916">"beginhakie"</string>

    <string name="desc_rparen" msgid="7920608385146151731">"eindhakie"</string>

    <string name="desc_fun_cos" msgid="3787913784504974731">"kosinus"</string>

    <string name="desc_fun_ln" msgid="2505119732546227166">"natuurlike logaritme"</string>

    <string name="desc_fun_log" msgid="4202230639814060062">"logaritme"</string>

    <string name="desc_fun_sin" msgid="7425661271929838876">"sinus"</string>

    <string name="desc_fun_tan" msgid="3545496562069310036">"tangens"</string>

    <string name="desc_fun_arccos" msgid="7583077865497939123">"omgekeerde kosinus"</string>

    <string name="desc_fun_arcsin" msgid="8592309261123302915">"omgekeerde sinus"</string>

    <string name="desc_fun_arctan" msgid="6891388393360447455">"omgekeerde tangens"</string>

    <string name="desc_fun_10pow" msgid="3972646467174520812">"tien tot die mag"</string>

    <string name="desc_fun_exp" msgid="657106837530588390">"eksponentfunksie"</string>

    <string name="desc_op_sqr" msgid="693577095029219627">"kwadraat"</string>

    <string name="desc_op_add" msgid="5539599782598050813">"plus"</string>

    <string name="desc_op_div" msgid="3032399266115257498">"deel"</string>

    <string name="desc_op_fact" msgid="6142780103294179702">"faktoriaal"</string>

    <string name="desc_op_mul" msgid="6882122010553947015">"vermenigvuldig"</string>

    <string name="desc_op_pct" msgid="2466179646911499434">"persent"</string>

    <string name="desc_op_pow" msgid="6010144442344099030">"tot die mag"</string>

    <string name="desc_op_sqrt" msgid="6882241473601721767">"vierkantswortel"</string>

    <string name="desc_op_sub" msgid="2744940875059679129">"minus"</string>

    <string name="desc_mode_deg" msgid="4129831241246511710">"grademodus"</string>

    <string name="desc_mode_rad" msgid="730135521908627673">"straalhoekmodus"</string>

    <string name="desc_switch_deg" msgid="6675211986921592374">"skakel oor na grade"</string>

    <string name="desc_switch_rad" msgid="2845875847488919914">"skakel oor na straalhoeke"</string>

    <string name="desc_eq" msgid="3349320880874699285">"is gelyk aan"</string>

    <string name="desc_clr" msgid="737502124268890797">"maak skoon"</string>

    <string name="desc_del" msgid="7879515781929311432">"vee uit"</string>

    <string name="desc_inv_off" msgid="3672218250519616068">"wys omgekeerde funksies"</string>

    <string name="desc_inv_on" msgid="2515675590767677178">"versteek omgekeerde funksies"</string>

    <string name="error_nan" msgid="5674077944929888710">"Nie getal nie"</string>

    <string name="error_syntax" msgid="4786987111228645602">"Swak uitdrukking"</string>

    <string name="error_aborted" msgid="3402238176316342537">"Gestaak"</string>

    <string name="error_overflow" msgid="7800547394563434764">"Oneindig?"</string>

    <string name="error_zero_divide" msgid="458040988686661801">"Kan nie deur 0 deel"</string>

    <string name="text_copied_toast" msgid="2104264466812485425">"Teks is gekopieer"</string>

    <string name="cancelled" msgid="1618889609742874632">"Berekening is gekanselleer"</string>

    <string name="timeout" msgid="802690170415591535">"Het uitgetel. Waarde is dalk oneindig of ongedefinieer."</string>

    <string name="ok_remove_timeout" msgid="8344529153919268011">"Gebruik langer uitteltye"</string>

    <string name="dismiss" msgid="7872443888515066216">"Maak toe"</string>

    <string name="exact" msgid="2597237880041789948">"(presies)"</string>

    <string name="approximate" msgid="7117143366610670836">"(±1 in laaste syfer)"</string>

    <string name="menu_leading" msgid="2338520833272667740">"Antwoord met leidende syfers"</string>

    <string name="menu_fraction" msgid="1247477377840252234">"Antwoord as breuk"</string>

    <string name="menu_licenses" msgid="1890541368064108592">"Oopbronlisensies"</string>

    <string name="app_name" msgid="8095131950334945205">"Sakrekenaar"</string>

    <string name="error_nan" msgid="4071578355972369426">"Nie getal nie"</string>

    <string name="error_syntax" msgid="6940043994468390738">"Fout"</string>

    <string name="dec_point" msgid="6555721211126788808">","</string>

    <string name="digit_0" msgid="697966218778843272">"0"</string>

    <string name="digit_1" msgid="9009337429640544205">"1"</string>

    <string name="digit_2" msgid="7722707864768133877">"2"</string>

    <string name="digit_3" msgid="5813321444694024561">"3"</string>

    <string name="digit_4" msgid="4768173444612236144">"4"</string>

    <string name="digit_5" msgid="2015349411036328271">"5"</string>

    <string name="digit_6" msgid="7350999202882497047">"6"</string>

    <string name="digit_7" msgid="2386463125354638611">"7"</string>

    <string name="digit_8" msgid="6298159258090202166">"8"</string>

    <string name="digit_9" msgid="1221342734731110246">"9"</string>

    <string name="fun_cos" msgid="7312559527731358211">"cos"</string>

    <string name="fun_ln" msgid="6282013842946532944">"ln"</string>

    <string name="fun_log" msgid="6856905045055937519">"log"</string>

    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>

    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>

    <string name="clr" msgid="3126239559646368205">"vee"</string>

    <string name="del" msgid="6700172918709138470">"wis"</string>

    <string name="desc_const_e" msgid="7752508267661034194">"Euler-nommer"</string>

    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>

    <string name="desc_dec_point" msgid="6211527612960070934">"punt"</string>

    <string name="desc_lparen" msgid="3319203240269597504">"beginhakie"</string>

    <string name="desc_rparen" msgid="7629704943022422763">"eindhakie"</string>

    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinus"</string>

    <string name="desc_fun_ln" msgid="4943842219071979148">"natuurlike logaritme"</string>

    <string name="desc_fun_log" msgid="6163178034661345125">"logaritme"</string>

    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>

    <string name="desc_fun_tan" msgid="8547330421304946587">"tangens"</string>

    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>

    <string name="desc_op_div" msgid="8320455802423478031">"deel"</string>

    <string name="desc_op_fact" msgid="5004950609277631750">"fakulteit"</string>

    <string name="desc_op_mul" msgid="978652245185868311">"maal"</string>

    <string name="desc_op_pow" msgid="2620877401884059447">"mag"</string>

    <string name="desc_op_sqrt" msgid="4405610392216554239">"vierkantswortel"</string>

    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>

    <string name="desc_clr" msgid="8357371663749541924">"vee uit"</string>

    <string name="desc_del" msgid="1866733601083210032">"wis uit"</string>

    <string name="desc_eq" msgid="8068773095462472408">"gelyk aan"</string>

</resources>

res/values-am/strings.xml

+42 −56
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- 

  Copyright (C) 2015 The Android Open Source Project

  Copyright (C) 2014 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.
@@ -17,59 +17,45 @@ 


<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="dec_point" msgid="8920102493070918054">"."</string>

    <string name="mode_deg" msgid="1146123354434332479">"ዲግ"</string>

    <string name="mode_rad" msgid="1434228830085760996">"ራዲ"</string>

    <string name="clr" msgid="6730945431543327337">"አጽዳ"</string>

    <string name="cleared" msgid="3952521190281880880">"ጸድቷል"</string>

    <string name="del" msgid="5878069000864178910">"ሰርዝ"</string>

    <string name="desc_const_e" msgid="1889187337970539507">"የዩለር ቁጥር"</string>

    <string name="desc_const_pi" msgid="5430918714009441655">"ፓይ"</string>

    <string name="desc_dec_point" msgid="5725254504360445023">"ነጥብ"</string>

    <string name="desc_lparen" msgid="8688758170211924916">"የግራ ቅንፍ"</string>

    <string name="desc_rparen" msgid="7920608385146151731">"የቀኝ ቅንፍ"</string>

    <string name="desc_fun_cos" msgid="3787913784504974731">"ኮሳይን"</string>

    <string name="desc_fun_ln" msgid="2505119732546227166">"ተፈጥሯዊ ሎጋሪዝም"</string>

    <string name="desc_fun_log" msgid="4202230639814060062">"ሎጋሪዝም"</string>

    <string name="desc_fun_sin" msgid="7425661271929838876">"ሳይን"</string>

    <string name="desc_fun_tan" msgid="3545496562069310036">"ታንጀት"</string>

    <string name="desc_fun_arccos" msgid="7583077865497939123">"ግልብጥ ኮሳይን"</string>

    <string name="desc_fun_arcsin" msgid="8592309261123302915">"ግልብጥ ሳይን"</string>

    <string name="desc_fun_arctan" msgid="6891388393360447455">"ግልብጥ ታንጀንት"</string>

    <string name="desc_fun_10pow" msgid="3972646467174520812">"አስር በዚህ ኃይል ተባዝቶ፦"</string>

    <string name="desc_fun_exp" msgid="657106837530588390">"አርቢ ቅን ተዛምዶ"</string>

    <string name="desc_op_sqr" msgid="693577095029219627">"ዳግም ርቢ"</string>

    <string name="desc_op_add" msgid="5539599782598050813">"ሲደመር"</string>

    <string name="desc_op_div" msgid="3032399266115257498">"ሲካፈል"</string>

    <string name="desc_op_fact" msgid="6142780103294179702">"ብዜት"</string>

    <string name="desc_op_mul" msgid="6882122010553947015">"አባዛ"</string>

    <string name="desc_op_pct" msgid="2466179646911499434">"መቶኛ"</string>

    <string name="desc_op_pow" msgid="6010144442344099030">"ርቢ"</string>

    <string name="desc_op_sqrt" msgid="6882241473601721767">"ዳግም ዘር"</string>

    <string name="desc_op_sub" msgid="2744940875059679129">"ሲቀነስ"</string>

    <string name="desc_mode_deg" msgid="4129831241246511710">"የዲግሪ ሁነታ"</string>

    <string name="desc_mode_rad" msgid="730135521908627673">"የራዲያን ሁነታ"</string>

    <string name="desc_switch_deg" msgid="6675211986921592374">"ወደ ዲግሪ ቀይር"</string>

    <string name="desc_switch_rad" msgid="2845875847488919914">"ወደ ራዲያኖች ቀይር"</string>

    <string name="desc_eq" msgid="3349320880874699285">"ይሆናል"</string>

    <string name="desc_clr" msgid="737502124268890797">"አጽዳ"</string>

    <string name="desc_del" msgid="7879515781929311432">"ሰርዝ"</string>

    <string name="desc_inv_off" msgid="3672218250519616068">"የተገላቢጦሽ ተግባሮችን አሳይ"</string>

    <string name="desc_inv_on" msgid="2515675590767677178">"የተገላቢጦሽ ተግባሮችን ደብቅ"</string>

    <string name="error_nan" msgid="5674077944929888710">"ቁጥር አይደለም"</string>

    <string name="error_syntax" msgid="4786987111228645602">"መጥፎ የሒሳብ ሐረግ"</string>

    <string name="error_aborted" msgid="3402238176316342537">"ተቋርጧል"</string>

    <string name="error_overflow" msgid="7800547394563434764">"የትየለሌ?"</string>

    <string name="error_zero_divide" msgid="458040988686661801">"በ0 ማካፈል አይቻልም"</string>

    <string name="text_copied_toast" msgid="2104264466812485425">"ፅሁፍ ተቀድቷል"</string>

    <string name="cancelled" msgid="1618889609742874632">"ማስላት ተሰርዟል"</string>

    <string name="timeout" msgid="802690170415591535">"ጊዜው ቆሟል። እሴቱ የትየሌለ ወይም ያልተገለጸ ሊሆን ይችላል።"</string>

    <string name="ok_remove_timeout" msgid="8344529153919268011">"ረጅም የመጠበቂያ ጊዜ ይጠቀሙ"</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="app_name" msgid="8095131950334945205">"ማስያ"</string>

    <string name="error_nan" msgid="4071578355972369426">"ቁጥር አይደለም"</string>

    <string name="error_syntax" msgid="6940043994468390738">"ስህተት"</string>

    <string name="dec_point" msgid="6555721211126788808">"."</string>

    <string name="digit_0" msgid="697966218778843272">"0"</string>

    <string name="digit_1" msgid="9009337429640544205">"1"</string>

    <string name="digit_2" msgid="7722707864768133877">"2"</string>

    <string name="digit_3" msgid="5813321444694024561">"3"</string>

    <string name="digit_4" msgid="4768173444612236144">"4"</string>

    <string name="digit_5" msgid="2015349411036328271">"5"</string>

    <string name="digit_6" msgid="7350999202882497047">"6"</string>

    <string name="digit_7" msgid="2386463125354638611">"7"</string>

    <string name="digit_8" msgid="6298159258090202166">"8"</string>

    <string name="digit_9" msgid="1221342734731110246">"9"</string>

    <string name="fun_cos" msgid="7312559527731358211">"cos"</string>

    <string name="fun_ln" msgid="6282013842946532944">"ln"</string>

    <string name="fun_log" msgid="6856905045055937519">"log"</string>

    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>

    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>

    <string name="clr" msgid="3126239559646368205">"አጽዳ"</string>

    <string name="del" msgid="6700172918709138470">"ሰርዝ"</string>

    <string name="desc_const_e" msgid="7752508267661034194">"የዩለር ቁጥር"</string>

    <string name="desc_const_pi" msgid="5843835548313660468">"ፓይ"</string>

    <string name="desc_dec_point" msgid="6211527612960070934">"ነጥብ"</string>

    <string name="desc_lparen" msgid="3319203240269597504">"የግራ ቅንፍ"</string>

    <string name="desc_rparen" msgid="7629704943022422763">"የቀኝ ቅንፍ"</string>

    <string name="desc_fun_cos" msgid="3197307754450718348">"ኮሳይን"</string>

    <string name="desc_fun_ln" msgid="4943842219071979148">"ተፈጥሯዊ ሎጋሪዝም"</string>

    <string name="desc_fun_log" msgid="6163178034661345125">"ሎጋሪዝም"</string>

    <string name="desc_fun_sin" msgid="4010564022860883142">"ሳይን"</string>

    <string name="desc_fun_tan" msgid="8547330421304946587">"ታንጀት"</string>

    <string name="desc_op_add" msgid="1174812755738083078">"ሲደመር"</string>

    <string name="desc_op_div" msgid="8320455802423478031">"ሲካፈል"</string>

    <string name="desc_op_fact" msgid="5004950609277631750">"ብዜት"</string>

    <string name="desc_op_mul" msgid="978652245185868311">"ጊዜ"</string>

    <string name="desc_op_pow" msgid="2620877401884059447">"አርቢ"</string>

    <string name="desc_op_sqrt" msgid="4405610392216554239">"ዳግም ዘር"</string>

    <string name="desc_op_sub" msgid="2563060630032563021">"ሲቀነስ"</string>

    <string name="desc_clr" msgid="8357371663749541924">"አጽዳ"</string>

    <string name="desc_del" msgid="1866733601083210032">"ሰርዝ"</string>

    <string name="desc_eq" msgid="8068773095462472408">"ይሆናል"</string>

</resources>

res/values-ar/strings.xml

+42 −56

File changed.

Preview size limit exceeded, changes collapsed.

res/values-az-rAZ/strings.xml

deleted100644 → 0
+0 −75
Original line number Diff line number Diff line 
<?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">"Kalkulyator"</string>

    <string name="dec_point" msgid="8920102493070918054">"."</string>

    <string name="mode_deg" msgid="1146123354434332479">"dər"</string>

    <string name="mode_rad" msgid="1434228830085760996">"rad"</string>

    <string name="clr" msgid="6730945431543327337">"clr"</string>

    <string name="cleared" msgid="3952521190281880880">"təmizlənib"</string>

    <string name="del" msgid="5878069000864178910">"del"</string>

    <string name="desc_const_e" msgid="1889187337970539507">"Euler nömrəsi"</string>

    <string name="desc_const_pi" msgid="5430918714009441655">"pi"</string>

    <string name="desc_dec_point" msgid="5725254504360445023">"nöqtə"</string>

    <string name="desc_lparen" msgid="8688758170211924916">"sol mötərizə"</string>

    <string name="desc_rparen" msgid="7920608385146151731">"sağ mötərizə"</string>

    <string name="desc_fun_cos" msgid="3787913784504974731">"kosinus"</string>

    <string name="desc_fun_ln" msgid="2505119732546227166">"təbii loqaritm"</string>

    <string name="desc_fun_log" msgid="4202230639814060062">"loqaritm"</string>

    <string name="desc_fun_sin" msgid="7425661271929838876">"sinus"</string>

    <string name="desc_fun_tan" msgid="3545496562069310036">"tangens"</string>

    <string name="desc_fun_arccos" msgid="7583077865497939123">"tərs kosinus"</string>

    <string name="desc_fun_arcsin" msgid="8592309261123302915">"tərs sinus"</string>

    <string name="desc_fun_arctan" msgid="6891388393360447455">"tərs tangens"</string>

    <string name="desc_fun_10pow" msgid="3972646467174520812">"on üstü"</string>

    <string name="desc_fun_exp" msgid="657106837530588390">"əmsal funksiyası"</string>

    <string name="desc_op_sqr" msgid="693577095029219627">"kvadrat"</string>

    <string name="desc_op_add" msgid="5539599782598050813">"plus"</string>

    <string name="desc_op_div" msgid="3032399266115257498">"böl"</string>

    <string name="desc_op_fact" msgid="6142780103294179702">"faktorial"</string>

    <string name="desc_op_mul" msgid="6882122010553947015">"çoxaltma"</string>

    <string name="desc_op_pct" msgid="2466179646911499434">"faiz"</string>

    <string name="desc_op_pow" msgid="6010144442344099030">"güc"</string>

    <string name="desc_op_sqrt" msgid="6882241473601721767">"kvadrat kök"</string>

    <string name="desc_op_sub" msgid="2744940875059679129">"minus"</string>

    <string name="desc_mode_deg" msgid="4129831241246511710">"dərəcə rejimi"</string>

    <string name="desc_mode_rad" msgid="730135521908627673">"radian rejimi"</string>

    <string name="desc_switch_deg" msgid="6675211986921592374">"dərəcəyə keçid"</string>

    <string name="desc_switch_rad" msgid="2845875847488919914">"radiana keçid"</string>

    <string name="desc_eq" msgid="3349320880874699285">"bərabərlik"</string>

    <string name="desc_clr" msgid="737502124268890797">"təmizləyin"</string>

    <string name="desc_del" msgid="7879515781929311432">"silin"</string>

    <string name="desc_inv_off" msgid="3672218250519616068">"əks funksiyaları göstərin"</string>

    <string name="desc_inv_on" msgid="2515675590767677178">"əks funksiyaları gizlədin"</string>

    <string name="error_nan" msgid="5674077944929888710">"Rəqəm deyil"</string>

    <string name="error_syntax" msgid="4786987111228645602">"Yalnış ifadə"</string>

    <string name="error_aborted" msgid="3402238176316342537">"Ləğv edilib"</string>

    <string name="error_overflow" msgid="7800547394563434764">"Sonsuzluq?"</string>

    <string name="error_zero_divide" msgid="458040988686661801">"0-a bölmək olmaz"</string>

    <string name="text_copied_toast" msgid="2104264466812485425">"Mətn kopyalandı"</string>

    <string name="cancelled" msgid="1618889609742874632">"Hesablama ləğv edildi"</string>

    <string name="timeout" msgid="802690170415591535">"Vaxt keçdi. Dəyər sonzu və ya bəlirlənməmiş ola bilər."</string>

    <string name="ok_remove_timeout" msgid="8344529153919268011">"Daha uzun taymaut istifadə edin"</string>

    <string name="dismiss" msgid="7872443888515066216">"Rədd edin"</string>

    <string name="exact" msgid="2597237880041789948">"(dəqiq)"</string>

    <string name="approximate" msgid="7117143366610670836">"(±1 son rəqəmdə)"</string>

    <string name="menu_leading" msgid="2338520833272667740">"Aparıcı rəqəmlər ilə cavablandırın"</string>

    <string name="menu_fraction" msgid="1247477377840252234">"Kəsr kimi cavab verin"</string>

    <string name="menu_licenses" msgid="1890541368064108592">"Açıq mənbə lisenziyaları"</string>

</resources>

res/values-bg/strings.xml

+42 −56

File changed.

Preview size limit exceeded, changes collapsed.