summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-15 02:56:25 -0700
committerLinux Build Service Account <lnxbuild@localhost>2016-12-15 02:56:25 -0700
commitf49b33d794bdf335bb8c7deddf68600a3ec33aa8 (patch)
tree4fd7cdb7c7f5dd5a4ea3a251ac28d8055e2049c4
parent82d19f315fc49a972bc29bd86dbdddb45f13d3b6 (diff)
parentf6032573273d88d015148910d4e6ae600184f8f6 (diff)
downloadandroid_packages_apps_ExactCalculator-f49b33d794bdf335bb8c7deddf68600a3ec33aa8.tar.gz
android_packages_apps_ExactCalculator-f49b33d794bdf335bb8c7deddf68600a3ec33aa8.tar.bz2
android_packages_apps_ExactCalculator-f49b33d794bdf335bb8c7deddf68600a3ec33aa8.zip
Merge f6032573273d88d015148910d4e6ae600184f8f6 on remote branch
Change-Id: I159a938135b67007bddc3aaf12aad2a494477026
-rw-r--r--res/values-bs-rBA/strings.xml2
-rw-r--r--res/values-ko/strings.xml2
-rw-r--r--res/values-my-rMM/strings.xml2
-rw-r--r--res/values-pt-rBR/strings.xml75
-rw-r--r--res/values-pt/strings.xml2
-rwxr-xr-xres/values-small-port/styles.xml105
6 files changed, 184 insertions, 4 deletions
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index b24ecd5..7759882 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -71,5 +71,5 @@
<string name="approximate" msgid="7117143366610670836">"(±1 u posljednjoj cifri)"</string>
<string name="menu_leading" msgid="2338520833272667740">"Odgovor sa zaokruživanjem"</string>
<string name="menu_fraction" msgid="1247477377840252234">"Odgovor kao razlomak"</string>
- <string name="menu_licenses" msgid="1890541368064108592">"Open source licence"</string>
+ <string name="menu_licenses" msgid="1890541368064108592">"Licence otvorenog koda"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a594dd4..e968fb8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -70,6 +70,6 @@
<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_fraction" msgid="1247477377840252234">"결과를 분수로 표시"</string>
<string name="menu_licenses" msgid="1890541368064108592">"오픈소스 라이선스"</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 84731c6..fb45bb8 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -53,7 +53,7 @@
<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_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>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..0a04f55
--- /dev/null
+++ b/res/values-pt-rBR/strings.xml
@@ -0,0 +1,75 @@
+<?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">"Calculadora"</string>
+ <string name="dec_point" msgid="8920102493070918054">","</string>
+ <string name="mode_deg" msgid="1146123354434332479">"graus"</string>
+ <string name="mode_rad" msgid="1434228830085760996">"rad"</string>
+ <string name="clr" msgid="6730945431543327337">"limp"</string>
+ <string name="cleared" msgid="3952521190281880880">"apagados"</string>
+ <string name="del" msgid="5878069000864178910">"del"</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">"ponto"</string>
+ <string name="desc_lparen" msgid="8688758170211924916">"parêntese esquerdo"</string>
+ <string name="desc_rparen" msgid="7920608385146151731">"parêntese direito"</string>
+ <string name="desc_fun_cos" msgid="3787913784504974731">"cosseno"</string>
+ <string name="desc_fun_ln" msgid="2505119732546227166">"logaritmo natural"</string>
+ <string name="desc_fun_log" msgid="4202230639814060062">"logaritmo"</string>
+ <string name="desc_fun_sin" msgid="7425661271929838876">"seno"</string>
+ <string name="desc_fun_tan" msgid="3545496562069310036">"tangente"</string>
+ <string name="desc_fun_arccos" msgid="7583077865497939123">"cosseno inverso"</string>
+ <string name="desc_fun_arcsin" msgid="8592309261123302915">"seno inverso"</string>
+ <string name="desc_fun_arctan" msgid="6891388393360447455">"tangente inversa"</string>
+ <string name="desc_fun_10pow" msgid="3972646467174520812">"dez elevado a"</string>
+ <string name="desc_fun_exp" msgid="657106837530588390">"função exponencial"</string>
+ <string name="desc_op_sqr" msgid="693577095029219627">"ao quadrado"</string>
+ <string name="desc_op_add" msgid="5539599782598050813">"mais"</string>
+ <string name="desc_op_div" msgid="3032399266115257498">"dividir"</string>
+ <string name="desc_op_fact" msgid="6142780103294179702">"fatorial"</string>
+ <string name="desc_op_mul" msgid="6882122010553947015">"multiplicar"</string>
+ <string name="desc_op_pct" msgid="2466179646911499434">"porcentagem"</string>
+ <string name="desc_op_pow" msgid="6010144442344099030">"potência"</string>
+ <string name="desc_op_sqrt" msgid="6882241473601721767">"raiz quadrada"</string>
+ <string name="desc_op_sub" msgid="2744940875059679129">"menos"</string>
+ <string name="desc_mode_deg" msgid="4129831241246511710">"modo grau"</string>
+ <string name="desc_mode_rad" msgid="730135521908627673">"modo radiano"</string>
+ <string name="desc_switch_deg" msgid="6675211986921592374">"alterar para graus"</string>
+ <string name="desc_switch_rad" msgid="2845875847488919914">"alterar para radianos"</string>
+ <string name="desc_eq" msgid="3349320880874699285">"igual"</string>
+ <string name="desc_clr" msgid="737502124268890797">"limpar"</string>
+ <string name="desc_del" msgid="7879515781929311432">"excluir"</string>
+ <string name="desc_inv_off" msgid="3672218250519616068">"mostrar funções inversas"</string>
+ <string name="desc_inv_on" msgid="2515675590767677178">"ocultar funções inversas"</string>
+ <string name="error_nan" msgid="5674077944929888710">"Não é número"</string>
+ <string name="error_syntax" msgid="4786987111228645602">"Expressão ruim"</string>
+ <string name="error_aborted" msgid="3402238176316342537">"Cancelada"</string>
+ <string name="error_overflow" msgid="7800547394563434764">"Infinito?"</string>
+ <string name="error_zero_divide" msgid="458040988686661801">"Impos. dividir por 0"</string>
+ <string name="text_copied_toast" msgid="2104264466812485425">"Texto copiado"</string>
+ <string name="cancelled" msgid="1618889609742874632">"Cálculo cancelado"</string>
+ <string name="timeout" msgid="802690170415591535">"Tempo limite atingido. O valor pode ser infinito ou indefinido."</string>
+ <string name="ok_remove_timeout" msgid="8344529153919268011">"Usar tempos limite mais longos"</string>
+ <string name="dismiss" msgid="7872443888515066216">"Dispensar"</string>
+ <string name="exact" msgid="2597237880041789948">"(exato)"</string>
+ <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">"Lic. cód. aberto"</string>
+</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4d03145..0a04f55 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,7 +18,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">"Calculadora"</string>
- <string name="dec_point" msgid="8920102493070918054">"."</string>
+ <string name="dec_point" msgid="8920102493070918054">","</string>
<string name="mode_deg" msgid="1146123354434332479">"graus"</string>
<string name="mode_rad" msgid="1434228830085760996">"rad"</string>
<string name="clr" msgid="6730945431543327337">"limp"</string>
diff --git a/res/values-small-port/styles.xml b/res/values-small-port/styles.xml
new file mode 100755
index 0000000..0a868b2
--- /dev/null
+++ b/res/values-small-port/styles.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ -->
+
+<!-- Styles for small portrait in split-screen mode,
+although the device is in Landscape mode -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <style name="DisplayTextStyle.Formula">
+ <item name="android:paddingTop">2dip</item>
+ <item name="android:paddingBottom">6dip</item>
+ <item name="android:paddingStart">36dip</item>
+ <item name="android:paddingEnd">36dip</item>
+ <item name="android:textSize">23sp</item>
+ </style>
+
+ <style name="DisplayTextStyle.Result">
+ <item name="android:paddingTop">8dip</item>
+ <item name="android:paddingBottom">12dip</item>
+ <item name="android:paddingStart">36dip</item>
+ <item name="android:paddingEnd">36dip</item>
+ <item name="android:textSize">23sp</item>
+ </style>
+
+ <style name="PadButtonStyle.Advanced">
+ <item name="android:background">@drawable/pad_button_advanced_background</item>
+ <item name="android:textColor">@color/pad_button_advanced_text_color</item>
+ <item name="android:textSize">14sp</item>
+ </style>
+
+ <style name="PadButtonStyle.Advanced.Text">
+ <item name="android:textAllCaps">true</item>
+ <item name="android:textSize">12sp</item>
+ </style>
+
+ <style name="PadButtonStyle.Numeric">
+ <item name="android:textSize">22sp</item>
+ </style>
+
+ <style name="PadButtonStyle.Numeric.Equals">
+ <item name="android:visibility">visible</item>
+ </style>
+
+ <style name="PadButtonStyle.Operator">
+ <item name="android:textSize">22sp</item>
+ </style>
+
+ <style name="PadButtonStyle.Operator.Text">
+ <item name="android:textAllCaps">true</item>
+ <item name="android:textSize">12sp</item>
+ </style>
+
+ <style name="PadLayoutStyle.Advanced">
+ <item name="android:elevation">4dip</item>
+ <item name="android:paddingTop">4dip</item>
+ <item name="android:paddingBottom">4dip</item>
+ <item name="android:paddingStart">8dip</item>
+ <item name="android:paddingEnd">8dip</item>
+ </style>
+
+ <style name="PadLayoutStyle.Operator">
+ <item name="android:layout_width">0dip</item>
+ <item name="android:layout_weight">96</item>
+ <item name="android:paddingTop">4dip</item>
+ <item name="android:paddingBottom">4dip</item>
+ <item name="android:paddingStart">4dip</item>
+ <item name="android:paddingEnd">28dip</item>
+ </style>
+
+ <style name="PadLayoutStyle.Numeric">
+ <item name="android:layout_width">0dip</item>
+ <item name="android:layout_weight">264</item>
+ <item name="android:paddingTop">4dip</item>
+ <item name="android:paddingBottom">4dip</item>
+ <item name="android:paddingStart">8dip</item>
+ <item name="android:paddingEnd">8dip</item>
+ </style>
+
+</resources>