summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-es-rUS/strings.xml29
-rw-r--r--res/values-ko/strings.xml43
-rw-r--r--res/values-nb/strings.xml43
-rw-r--r--res/values-nl-rNL/strings.xml29
-rw-r--r--src/com/android/calculator2/PanelSwitcher.java2
5 files changed, 87 insertions, 59 deletions
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
deleted file mode 100644
index cbc9b97..0000000
--- a/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name">"Calculadora"</string>
- <string name="error">"Error"</string>
- <string name="digit0">"0"</string>
- <string name="digit1">"1"</string>
- <string name="digit2">"2"</string>
- <string name="digit3">"3"</string>
- <string name="digit4">"4"</string>
- <string name="digit5">"5"</string>
- <string name="digit6">"6"</string>
- <string name="digit7">"7"</string>
- <string name="digit8">"8"</string>
- <string name="digit9">"9"</string>
- <string name="del">"ELIMINAR"</string>
- <string name="clear">"BORRAR"</string>
- <string name="sin">"sin"</string>
- <string name="cos">"cos"</string>
- <string name="tan">"tan"</string>
- <string name="e">"e"</string>
- <string name="ln">"En"</string>
- <string name="lg">"log"</string>
- <string name="leftParen">"("</string>
- <string name="rightParen">")"</string>
- <string name="basic">"Panel básico"</string>
- <string name="advanced">"Panel avanzado"</string>
- <string name="clear_history">"Borrar historial"</string>
-</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
new file mode 100644
index 0000000..e7e537c
--- /dev/null
+++ b/res/values-ko/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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">"계산기"</string>
+ <string name="error">"오류"</string>
+ <string name="digit0">"0"</string>
+ <string name="digit1">"1"</string>
+ <string name="digit2">"2"</string>
+ <string name="digit3">"3"</string>
+ <string name="digit4">"4"</string>
+ <string name="digit5">"5"</string>
+ <string name="digit6">"6"</string>
+ <string name="digit7">"7"</string>
+ <string name="digit8">"8"</string>
+ <string name="digit9">"9"</string>
+ <string name="del">"삭제"</string>
+ <string name="clear">"지우기"</string>
+ <string name="sin">"sin"</string>
+ <string name="cos">"cos"</string>
+ <string name="tan">"tan"</string>
+ <string name="e">"e"</string>
+ <string name="ln">"ln"</string>
+ <string name="lg">"log"</string>
+ <string name="leftParen">"("</string>
+ <string name="rightParen">")"</string>
+ <string name="basic">"기본 패널"</string>
+ <string name="advanced">"고급 패널"</string>
+ <string name="clear_history">"기록 지우기"</string>
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
new file mode 100644
index 0000000..ff4c824
--- /dev/null
+++ b/res/values-nb/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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">"Kalkulator"</string>
+ <string name="error">"Feil"</string>
+ <string name="digit0">"0"</string>
+ <string name="digit1">"1"</string>
+ <string name="digit2">"2"</string>
+ <string name="digit3">"3"</string>
+ <string name="digit4">"4"</string>
+ <string name="digit5">"5"</string>
+ <string name="digit6">"6"</string>
+ <string name="digit7">"7"</string>
+ <string name="digit8">"8"</string>
+ <string name="digit9">"9"</string>
+ <string name="del">"SLETT"</string>
+ <string name="clear">"RYDD"</string>
+ <string name="sin">"sin"</string>
+ <string name="cos">"cos"</string>
+ <string name="tan">"tan"</string>
+ <string name="e">"e"</string>
+ <string name="ln">"ln"</string>
+ <string name="lg">"log"</string>
+ <string name="leftParen">"("</string>
+ <string name="rightParen">")"</string>
+ <string name="basic">"Grunnleggende panel"</string>
+ <string name="advanced">"Avansert panel"</string>
+ <string name="clear_history">"Nullstill historie"</string>
+</resources>
diff --git a/res/values-nl-rNL/strings.xml b/res/values-nl-rNL/strings.xml
deleted file mode 100644
index 357b5b4..0000000
--- a/res/values-nl-rNL/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name">"Rekenmachine"</string>
- <string name="error">"Fout"</string>
- <string name="digit0">"0"</string>
- <string name="digit1">"1"</string>
- <string name="digit2">"2"</string>
- <string name="digit3">"3"</string>
- <string name="digit4">"4"</string>
- <string name="digit5">"5"</string>
- <string name="digit6">"6"</string>
- <string name="digit7">"7"</string>
- <string name="digit8">"8"</string>
- <string name="digit9">"9"</string>
- <string name="del">"VERWIJDEREN"</string>
- <string name="clear">"WISSEN"</string>
- <string name="sin">"sin"</string>
- <string name="cos">"cos"</string>
- <string name="tan">"tan"</string>
- <string name="e">"e"</string>
- <string name="ln">"ln"</string>
- <string name="lg">"log"</string>
- <string name="leftParen">"("</string>
- <string name="rightParen">")"</string>
- <string name="basic">"Basispaneel"</string>
- <string name="advanced">"Geavanceerd paneel"</string>
- <string name="clear_history">"Geschiedenis wissen"</string>
-</resources>
diff --git a/src/com/android/calculator2/PanelSwitcher.java b/src/com/android/calculator2/PanelSwitcher.java
index 90b3daf..c64022c 100644
--- a/src/com/android/calculator2/PanelSwitcher.java
+++ b/src/com/android/calculator2/PanelSwitcher.java
@@ -51,7 +51,7 @@ class PanelSwitcher extends FrameLayout {
public PanelSwitcher(Context context, AttributeSet attrs) {
super(context, attrs);
mCurrentView = 0;
- mGestureDetector = new GestureDetector(new GestureDetector.SimpleOnGestureListener() {
+ mGestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() {
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
float velocityY) {
int dx = (int) (e2.getX() - e1.getX());
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 17:46:18 +0000