From 6950eeb832ced522dc20c0e04b5d3a8199c66e38 Mon Sep 17 00:00:00 2001 From: serso Date: Mon, 16 May 2016 12:29:42 +0200 Subject: [PATCH] Translations --- app/src/main/AndroidManifest.xml | 6 +-- .../android/calculator/FragmentTab.java | 2 +- .../functions/BaseFunctionFragment.java | 37 +++++++++++++++---- .../variables/VariablesActivity.java | 6 ++- app/src/main/res/values-ar/strings.xml | 4 +- app/src/main/res/values-cs/strings.xml | 4 +- app/src/main/res/values-de/strings.xml | 4 +- app/src/main/res/values-es/strings.xml | 4 +- app/src/main/res/values-fi/strings.xml | 4 +- app/src/main/res/values-fr/strings.xml | 4 +- app/src/main/res/values-it/strings.xml | 4 +- app/src/main/res/values-ja/strings.xml | 4 +- app/src/main/res/values-nl/strings.xml | 4 +- app/src/main/res/values-pl/strings.xml | 4 +- app/src/main/res/values-pt-rBR/strings.xml | 4 +- app/src/main/res/values-pt-rPT/strings.xml | 4 +- app/src/main/res/values-ru/strings.xml | 4 +- app/src/main/res/values-tr/strings.xml | 4 +- app/src/main/res/values-uk/strings.xml | 4 +- app/src/main/res/values-vi/strings.xml | 4 +- app/src/main/res/values-zh-rCN/strings.xml | 4 +- app/src/main/res/values-zh-rTW/strings.xml | 4 +- app/src/main/res/values/strings.xml | 6 +-- 23 files changed, 77 insertions(+), 52 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 358764af..deb1bcdf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -112,11 +112,11 @@ + android:label="@string/cpp_vars_and_constants" /> diff --git a/app/src/main/java/org/solovyev/android/calculator/FragmentTab.java b/app/src/main/java/org/solovyev/android/calculator/FragmentTab.java index f6dc38a0..cd574fa1 100644 --- a/app/src/main/java/org/solovyev/android/calculator/FragmentTab.java +++ b/app/src/main/java/org/solovyev/android/calculator/FragmentTab.java @@ -38,7 +38,7 @@ public enum FragmentTab { history(RecentHistoryFragment.class, R.string.cpp_history_tab_recent), saved_history(SavedHistoryFragment.class, R.string.cpp_history_tab_saved), - variables(VariablesFragment.class, R.string.c_vars_and_constants), + variables(VariablesFragment.class, R.string.cpp_vars_and_constants), functions(FunctionsFragment.class, R.string.c_functions), operators(OperatorsFragment.class, R.string.c_operators), about(AboutFragment.class, R.string.cpp_about), diff --git a/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java b/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java index 38b47ae9..de07169a 100644 --- a/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java +++ b/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java @@ -33,22 +33,45 @@ import android.support.design.widget.TextInputLayout; import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextUtils; -import android.view.*; +import android.view.ContextMenu; +import android.view.KeyEvent; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.view.ViewParent; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; -import butterknife.Bind; -import butterknife.ButterKnife; -import jscl.math.function.IConstant; + import org.solovyev.android.Check; -import org.solovyev.android.calculator.*; +import org.solovyev.android.calculator.AppComponent; +import org.solovyev.android.calculator.BaseDialogFragment; +import org.solovyev.android.calculator.Calculator; +import org.solovyev.android.calculator.Engine; +import org.solovyev.android.calculator.FloatingCalculatorKeyboard; +import org.solovyev.android.calculator.Keyboard; +import org.solovyev.android.calculator.ParseException; +import org.solovyev.android.calculator.PreparedExpression; +import org.solovyev.android.calculator.R; +import org.solovyev.android.calculator.VariablesRegistry; import org.solovyev.android.calculator.keyboard.FloatingKeyboardWindow; import org.solovyev.android.calculator.view.EditTextCompat; import org.solovyev.common.math.MathRegistry; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.inject.Inject; -import java.util.*; + +import butterknife.Bind; +import butterknife.ButterKnife; +import jscl.math.function.IConstant; import static org.solovyev.android.calculator.functions.CppFunction.NO_ID; @@ -457,7 +480,7 @@ public abstract class BaseFunctionFragment extends BaseDialogFragment implements if (id == R.id.function_body) { menu.clear(); // can't use sub-menus as AlertDialog doesn't support them - menu.add(MENU_CATEGORY, MENU_CONSTANT, Menu.NONE, R.string.c_vars_and_constants).setOnMenuItemClickListener(KeyboardUser.this); + menu.add(MENU_CATEGORY, MENU_CONSTANT, Menu.NONE, R.string.cpp_vars_and_constants).setOnMenuItemClickListener(KeyboardUser.this); menu.add(MENU_CATEGORY, MENU_FUNCTION, Menu.NONE, R.string.c_functions).setOnMenuItemClickListener(KeyboardUser.this); unregisterForContextMenu(bodyView); } diff --git a/app/src/main/java/org/solovyev/android/calculator/variables/VariablesActivity.java b/app/src/main/java/org/solovyev/android/calculator/variables/VariablesActivity.java index ab0d1a80..11043a82 100644 --- a/app/src/main/java/org/solovyev/android/calculator/variables/VariablesActivity.java +++ b/app/src/main/java/org/solovyev/android/calculator/variables/VariablesActivity.java @@ -26,22 +26,24 @@ import android.content.Context; import android.os.Bundle; import android.support.annotation.NonNull; import android.view.View; + import org.solovyev.android.calculator.App; import org.solovyev.android.calculator.BaseActivity; import org.solovyev.android.calculator.FragmentTab; import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.view.Tabs; +import java.util.Arrays; + import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.Arrays; public class VariablesActivity extends BaseActivity { public static final String EXTRA_VARIABLE = "variable"; public VariablesActivity() { - super(R.string.c_vars_and_constants); + super(R.string.cpp_vars_and_constants); } @Nonnull diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 4a2676fd..81316622 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1,8 +1,8 @@ الآلة الحاسبة++ - الآلة الحاسبة++ (نمط النافذة) - المتغيرات والثوابت + الآلة الحاسبة++ (نمط النافذة) + المتغيرات والثوابت رسم الدالّة دقة النتيجة حفظ diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index f591c910..883caf9c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,8 +1,8 @@ Calculator++ - Kalkulačka ++ (Režim okna) - Proměnné a Konstanty + Kalkulačka ++ (Režim okna) + Proměnné a Konstanty Vykreslit graf Přesnost výsledku Uložit diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d09b1fad..2a7e4c29 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,8 +1,8 @@ Calculator++ - Calculator++ (Fenstermodus) - Variablen und Konstanten + Calculator++ (Fenstermodus) + Variablen und Konstanten Graph zeichnen Genauigkeit des Ergebnisses Speichern diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 72a48d09..95b1958f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,8 +1,8 @@ Calculadora++ - Calculadora++ (Modo ventana) - Variables y Constantes + Calculadora++ (Modo ventana) + Variables y Constantes Trazar gráfico Precisión del resultado Grabar diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 42757f2c..ee03deca 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1,8 +1,8 @@ Laskin++ - Laskin++ (ikkuna-tilassa) - Muuttujien ja vakioiden + Laskin++ (ikkuna-tilassa) + Muuttujien ja vakioiden Kaavion tulostamisessa Tarkka tulos Tallenna diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 25411455..bc3cb9d6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,8 +1,8 @@ Calculator++ - Calculator++ (mode fenêtre) - Variables et constantes + Calculator++ (mode fenêtre) + Variables et constantes Tracer le graphe Précision du résultat Enregistrer diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 3bd8cab5..18892e5e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,8 +1,8 @@ Calcolatrice++ - Calcolatrice++ (Modalità finestra) - Variabili e costanti + Calcolatrice++ (Modalità finestra) + Variabili e costanti Plot grafico Precisione del risultato Salva diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ae9b790d..1a3ce096 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1,8 +1,8 @@ Calculator++ - Calculator++ (ウィンドウモード) - 変数と定数 + Calculator++ (ウィンドウモード) + 変数と定数 グラフをプロット 計算結果の有効桁数 保存 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2b5f3032..0b0cd335 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1,8 +1,8 @@ Calculator++ - Calculator++ (Window mode) - Variabelen en constanten + Calculator++ (Window mode) + Variabelen en constanten Uitzetten van grafiek Nauwkeurigheid van resultaat Opslaan diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 4be677e4..d10ca873 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,8 +1,8 @@ Calculator++ - Calculator++ (tryb okna) - Zmienne i stałe + Calculator++ (tryb okna) + Zmienne i stałe Stwórz wykres Dokładność wyniku Zapisz diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 2f8022d2..8950ee66 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,8 +1,8 @@ Calculator++ - Calculator++ (Modo Janela) - Variáveis e constantes + Calculator++ (Modo Janela) + Variáveis e constantes Desenhar o gráfico Precisão do resultado Salvar diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 68f99055..ba87abe0 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1,8 +1,8 @@ Calculator++ - Calculator++ (Modo de Janela) - Variáveis e Constantes + Calculator++ (Modo de Janela) + Variáveis e Constantes Desenhar gráfico Precisão do resultado Guardar diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ef2bde72..99fbe199 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,8 +1,8 @@ Калькулятор++ - Калькулятор++ (В отдельном окне) - Переменные и константы + Калькулятор++ (В отдельном окне) + Переменные и константы Построить график Точность Сохранить diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e9719bb4..bc975f27 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,8 +1,8 @@ Calculator++ - Calculator++ (Pencere modu) - Değişkenler ve sabitler + Calculator++ (Pencere modu) + Değişkenler ve sabitler Grafik Çiz Sonuç hassasiyeti Kaydet diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 66791e00..ee214ec2 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1,8 +1,8 @@ Калькулятор++ - Калькулятор + + (віконний режим) - Змінні та константи + Калькулятор + + (віконний режим) + Змінні та константи Побудувати графік Точність результату Зберегти diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 5e3da880..18342307 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1,8 +1,8 @@ Máy tính ++ - Máy tính ++ (chế độ cửa sổ) - Biến và hằng + Máy tính ++ (chế độ cửa sổ) + Biến và hằng Vẽ đồ thị Độ chính xác của kết quả Lưu diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1ced1c78..c1e28e9d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,8 +1,8 @@ Calculator++ - Calculator++(悬浮) - 变量与常数 + Calculator++(悬浮) + 变量与常数 作图 保留小数点后位数 保存 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 78fecee3..6b1b8bc1 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,8 +1,8 @@ Calculator++ - Calculator++(視窗模式) - 變數與常數 + Calculator++(視窗模式) + 變數與常數 繪圖 計算結果精確度 儲存 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 68c0e737..0be5eb4e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,8 +1,8 @@ - Calculator++ - Calculator++ (Window mode) - Variables And Constants + Calculator++ + Calculator++ (Window mode) + Variables And Constants Plot graph Precision Save