From 7e0d09a0c950b3db42a4cbb38b99b08c66d249a3 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Sun, 1 May 2016 23:55:53 +0300
Subject: Revert "Merge tag 'android-6.0.1_r22' of
 https://android.googlesource.com/platform/packages/apps/ExactCalculator into
 cm-13.0"

This reverts commit 624e2a9859ffd1dcca4c185cc71624fc087e7f67, reversing
changes made to 1cb26711896704773efc43e961de3e4a1027d155.

Change-Id: Ieb1e9132fb7908ea634c5fc2072067c610fc494d
---
 res/values-zh-rCN/strings.xml | 98 ++++++++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 42 deletions(-)

(limited to 'res/values-zh-rCN/strings.xml')

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a30962b..6b1a045 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-  Copyright (C) 2014 The Android Open Source Project
+  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.
@@ -17,45 +17,59 @@
 
 <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="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>
+    <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>
+    <string name="clr" msgid="6730945431543327337">"清除"</string>
+    <string name="cleared" msgid="3952521190281880880">"已清除"</string>
+    <string name="del" msgid="5878069000864178910">"del"</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">"10 的次方"</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>
 </resources>
-- 
cgit v1.2.3