New translations

app/src/main/AndroidManifest.xml

@@ -58,11 +58,11 @@
 
         <activity
             android:name=".preferences.PreferencesActivity"
-            android:label="@string/c_app_settings" />
+            android:label="@string/cpp_settings" />
 
         <activity
             android:name=".preferences.PreferencesActivity$Dialog"
-            android:label="@string/c_app_settings"
+            android:label="@string/cpp_settings"
             android:theme="@style/Cpp.Theme.Dialog" />
 
         <activity
@@ -83,11 +83,11 @@
 
         <activity
             android:name=".about.AboutActivity"
-            android:label="@string/c_about" />
+            android:label="@string/cpp_about" />
 
         <activity
             android:name=".about.AboutActivity$Dialog"
-            android:label="@string/c_about"
+            android:label="@string/cpp_about"
             android:theme="@style/Cpp.Theme.Dialog" />
 
         <activity

app/src/main/java/org/solovyev/android/calculator/DisplayFragment.java

@@ -119,7 +119,7 @@ public class DisplayFragment extends BaseFragment implements View.OnClickListene
         if (!state.valid) {
             return;
         }
-        addMenu(menu, R.string.c_copy, this);
+        addMenu(menu, R.string.cpp_copy_text, this);
 
         final Generic result = state.getResult();
         final JsclOperation operation = state.getOperation();
@@ -185,7 +185,7 @@ public class DisplayFragment extends BaseFragment implements View.OnClickListene
         final DisplayState state = display.getState();
         final Generic result = state.getResult();
         switch (item.getItemId()) {
-            case R.string.c_copy:
+            case R.string.cpp_copy_text:
                 display.copy();
                 return true;
             case R.string.convert_to_bin:

app/src/main/java/org/solovyev/android/calculator/FragmentTab.java

@@ -42,7 +42,7 @@ public enum FragmentTab {
     variables(VariablesFragment.class, R.string.c_vars),
     functions(FunctionsFragment.class, R.string.c_functions),
     operators(OperatorsFragment.class, R.string.c_operators),
-    about(AboutFragment.class, R.string.c_about),
+    about(AboutFragment.class, R.string.cpp_about),
 
     // todo serso: strings
     matrix_edit(EditMatrixFragment.class, R.string.c_release_notes),
@@ -60,9 +60,4 @@ public enum FragmentTab {
         this.title = title;
         this.tag = name();
     }
-
-    @Nonnull
-    public String subTag(@Nonnull String subTag) {
-        return tag + "_" + subTag;
-    }
 }

app/src/main/java/org/solovyev/android/calculator/converter/ConverterFragment.java

@@ -124,7 +124,7 @@ public class ConverterFragment extends BaseDialogFragment
     protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
         builder.setPositiveButton(R.string.c_use, null);
         builder.setNegativeButton(R.string.cpp_cancel, null);
-        builder.setNeutralButton(R.string.c_copy, null);
+        builder.setNeutralButton(R.string.cpp_copy_text, null);
     }
 
     @Override

app/src/main/java/org/solovyev/android/calculator/plot/PlotActivity.java

@@ -7,7 +7,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
-
+import butterknife.Bind;
+import butterknife.ButterKnife;
 import org.solovyev.android.calculator.AppComponent;
 import org.solovyev.android.calculator.BaseActivity;
 import org.solovyev.android.calculator.BaseFragment;
@@ -19,9 +20,6 @@ import org.solovyev.android.plotter.Plotter;
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
-import butterknife.Bind;
-import butterknife.ButterKnife;
-
 public class PlotActivity extends BaseActivity {
 
     public static class MyFragment extends BaseFragment implements PlotViewFrame.Listener {

app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesActivity.java

@@ -36,7 +36,7 @@ public class PreferencesActivity extends BaseActivity implements SharedPreferenc
     }
 
     static {
-        preferences.append(R.xml.preferences, new PrefDef("screen-main", R.string.c_app_settings));
+        preferences.append(R.xml.preferences, new PrefDef("screen-main", R.string.cpp_settings));
         preferences.append(R.xml.preferences_calculations, new PrefDef("screen-calculations", R.string.c_prefs_calculations_category));
         preferences.append(R.xml.preferences_appearance, new PrefDef("screen-appearance", R.string.c_prefs_appearance_category));
         preferences.append(R.xml.preferences_plot, new PrefDef("screen-plot", R.string.prefs_graph_screen_title));

app/src/main/res/menu/main.xml

@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/menu_settings"
-        android:title="@string/c_settings"
+        android:title="@string/cpp_settings"
         app:showAsAction="never" />
 
     <item
@@ -24,6 +24,6 @@
 
     <item
         android:id="@+id/menu_about"
-        android:title="@string/c_about"
+        android:title="@string/cpp_about"
         app:showAsAction="never" />
 </menu>

app/src/main/res/menu/plot.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ 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.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<menu xmlns:a="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        a:id="@+id/menu_plot_2d"
-        a:icon="@drawable/ab_stats"
-        a:title="@string/cpp_plot_2d"
-        app:showAsAction="ifRoom" />
-
-    <item
-        a:id="@+id/menu_plot_3d"
-        a:icon="@drawable/ab_stats_3d"
-        a:title="@string/cpp_plot_3d"
-        app:showAsAction="ifRoom" />
-
-    <item
-        a:id="@+id/menu_plot_range"
-        a:icon="@drawable/ab_range"
-        a:title="@string/cpp_plot_range"
-        app:showAsAction="ifRoom" />
-
-    <item
-        a:id="@+id/menu_plot_functions"
-        a:icon="@drawable/ab_functions"
-        a:title="@string/cpp_plot_functions"
-        app:showAsAction="ifRoom" />
-
-    <item
-        a:id="@+id/menu_plot_schreeshot"
-        a:icon="@drawable/ab_disk"
-        a:title="@string/cpp_plot_screenshot"
-        app:showAsAction="ifRoom" />
-
-    <item
-        a:id="@+id/menu_plot_settings"
-        a:icon="@drawable/ab_settings"
-        a:title="@string/c_settings"
-        app:showAsAction="ifRoom" />
-
-</menu>

app/src/main/res/values-ar/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">تم</string>
    <string name="cpp_cancel">إلغاء</string>
    <string name="cpp_description">الوصف</string>
+   <string name="cpp_about">حول</string>
    <string name="cpp_copy_text">نسخ إلى الحافظة</string>
    <string name="cpp_text_copied">تم نسخ النص</string>
    <string name="cpp_name">الاسم</string>
+   <string name="cpp_settings">الإعدادات</string>
    <string name="cpp_nan">ليس رقمًا</string>
    <string name="cpp_error">خطأ</string>
 </resources>

app/src/main/res/values-cs/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Hotovo</string>
    <string name="cpp_cancel">Zrušit</string>
    <string name="cpp_description">Popis</string>
+   <string name="cpp_about">O aplikaci</string>
    <string name="cpp_copy_text">Zkopírovat do schránky</string>
    <string name="cpp_text_copied">Text zkopírován</string>
    <string name="cpp_name">Jméno</string>
+   <string name="cpp_settings">Nastavení</string>
    <string name="cpp_nan">Není číslo</string>
    <string name="cpp_error">Chyba</string>
 </resources>

app/src/main/res/values-de/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Fertig</string>
    <string name="cpp_cancel">Abbrechen</string>
    <string name="cpp_description">Beschreibung</string>
+   <string name="cpp_about">Details</string>
    <string name="cpp_copy_text">In Zwischenablage kopieren</string>
    <string name="cpp_text_copied">Text kopiert</string>
    <string name="cpp_name">Name</string>
+   <string name="cpp_settings">Einstellungen</string>
    <string name="cpp_nan">Keine Zahl</string>
    <string name="cpp_error">Fehler</string>
 </resources>

app/src/main/res/values-es/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Listo</string>
    <string name="cpp_cancel">Cancelar</string>
    <string name="cpp_description">Descripción</string>
+   <string name="cpp_about">Información de la aplicación</string>
    <string name="cpp_copy_text">Copiar en el portapapeles</string>
    <string name="cpp_text_copied">Texto copiado</string>
    <string name="cpp_name">Nombre</string>
+   <string name="cpp_settings">Ajustes</string>
    <string name="cpp_nan">No es un número</string>
    <string name="cpp_error">Error</string>
 </resources>

app/src/main/res/values-fi/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Valmis</string>
    <string name="cpp_cancel">Peruuta</string>
    <string name="cpp_description">Kuvaus</string>
+   <string name="cpp_about">Tietoja</string>
    <string name="cpp_copy_text">Kopioi leikepöydälle</string>
    <string name="cpp_text_copied">Teksti kopioitu</string>
    <string name="cpp_name">Nimi</string>
+   <string name="cpp_settings">Asetukset</string>
    <string name="cpp_nan">Ei ole numero</string>
    <string name="cpp_error">Virhe</string>
 </resources>

app/src/main/res/values-fr/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">OK</string>
    <string name="cpp_cancel">Annuler</string>
    <string name="cpp_description">Description</string>
+   <string name="cpp_about">À propos de</string>
    <string name="cpp_copy_text">Copier dans le presse-papiers</string>
    <string name="cpp_text_copied">Texte copié</string>
    <string name="cpp_name">Nom</string>
+   <string name="cpp_settings">Paramètres</string>
    <string name="cpp_nan">Pas un nombre.</string>
    <string name="cpp_error">Erreur</string>
 </resources>

app/src/main/res/values-it/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Salva</string>
    <string name="cpp_cancel">Annulla</string>
    <string name="cpp_description">Descrizione</string>
+   <string name="cpp_about">Informazioni</string>
    <string name="cpp_copy_text">Copia negli appunti</string>
    <string name="cpp_text_copied">Testo copiato</string>
    <string name="cpp_name">Nome</string>
+   <string name="cpp_settings">Impostazioni</string>
    <string name="cpp_nan">Non è un numero</string>
    <string name="cpp_error">Errore</string>
 </resources>

app/src/main/res/values-ja/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">完了</string>
    <string name="cpp_cancel">キャンセル</string>
    <string name="cpp_description">説明</string>
+   <string name="cpp_about">概要</string>
    <string name="cpp_copy_text">クリップボードにコピー</string>
    <string name="cpp_text_copied">テキストをコピーしました</string>
    <string name="cpp_name">名前</string>
+   <string name="cpp_settings">設定</string>
    <string name="cpp_nan">数字以外の値</string>
    <string name="cpp_error">エラー</string>
 </resources>

app/src/main/res/values-nl/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Gereed</string>
    <string name="cpp_cancel">Annuleren</string>
    <string name="cpp_description">Beschrijving</string>
+   <string name="cpp_about">Over</string>
    <string name="cpp_copy_text">Kopiëren naar klembord</string>
    <string name="cpp_text_copied">Tekst gekopieerd</string>
    <string name="cpp_name">Naam</string>
+   <string name="cpp_settings">Instellingen</string>
    <string name="cpp_nan">Is geen getal</string>
    <string name="cpp_error">Fout</string>
 </resources>

app/src/main/res/values-pl/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Gotowe</string>
    <string name="cpp_cancel">Anuluj</string>
    <string name="cpp_description">Opis</string>
+   <string name="cpp_about">Informacje</string>
    <string name="cpp_copy_text">Kopiuj do schowka</string>
    <string name="cpp_text_copied">Tekst skopiowany</string>
    <string name="cpp_name">Imię i nazwisko</string>
+   <string name="cpp_settings">Ustawienia</string>
    <string name="cpp_nan">To nie liczba</string>
    <string name="cpp_error">Błąd</string>
 </resources>

app/src/main/res/values-pt-rBR/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Concluído</string>
    <string name="cpp_cancel">Cancelar</string>
    <string name="cpp_description">Descrição</string>
+   <string name="cpp_about">Sobre</string>
    <string name="cpp_copy_text">Copiar para área de transferência</string>
    <string name="cpp_text_copied">Texto copiado</string>
    <string name="cpp_name">Nome</string>
+   <string name="cpp_settings">Configurações</string>
    <string name="cpp_nan">Não é número</string>
    <string name="cpp_error">Erro</string>
 </resources>

app/src/main/res/values-pt-rPT/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Concluído</string>
    <string name="cpp_cancel">Cancelar</string>
    <string name="cpp_description">Descrição</string>
+   <string name="cpp_about">Acerca de</string>
    <string name="cpp_copy_text">Copiar para área de transf.</string>
    <string name="cpp_text_copied">Texto copiado</string>
    <string name="cpp_name">Nome</string>
+   <string name="cpp_settings">Definições</string>
    <string name="cpp_nan">Não é um núm.</string>
    <string name="cpp_error">Erro</string>
 </resources>

app/src/main/res/values-ru/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Готово</string>
    <string name="cpp_cancel">Отмена</string>
    <string name="cpp_description">Описание</string>
+   <string name="cpp_about">О программе</string>
    <string name="cpp_copy_text">Копировать в буфер обмена</string>
    <string name="cpp_text_copied">Текст скопирован</string>
    <string name="cpp_name">Имя</string>
+   <string name="cpp_settings">Настройки</string>
    <string name="cpp_nan">Не число</string>
    <string name="cpp_error">Ошибка</string>
 </resources>

app/src/main/res/values-tr/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Bitti</string>
    <string name="cpp_cancel">İptal</string>
    <string name="cpp_description">Açıklama</string>
+   <string name="cpp_about">Hakkında</string>
    <string name="cpp_copy_text">Panoya kopyala</string>
    <string name="cpp_text_copied">Metin kopyalandı</string>
    <string name="cpp_name">Ad</string>
+   <string name="cpp_settings">Ayarlar</string>
    <string name="cpp_nan">Sayı değil</string>
    <string name="cpp_error">Hata</string>
 </resources>

app/src/main/res/values-vi/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Xong</string>
    <string name="cpp_cancel">Hủy</string>
    <string name="cpp_description">Mô tả</string>
+   <string name="cpp_about">Giới thiệu về</string>
    <string name="cpp_copy_text">Sao chép vào khay nhớ tạm</string>
    <string name="cpp_text_copied">Đã sao chép văn bản</string>
    <string name="cpp_name">Tên</string>
+   <string name="cpp_settings">Cài đặt</string>
    <string name="cpp_nan">Không phải số</string>
    <string name="cpp_error">Lỗi</string>
 </resources>

app/src/main/res/values-zh-rCN/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">完成</string>
    <string name="cpp_cancel">取消</string>
    <string name="cpp_description">说明</string>
+   <string name="cpp_about">应用信息</string>
    <string name="cpp_copy_text">复制到剪贴板</string>
    <string name="cpp_text_copied">文本已复制</string>
    <string name="cpp_name">姓名</string>
+   <string name="cpp_settings">设置</string>
    <string name="cpp_nan">不是数字</string>
    <string name="cpp_error">错误</string>
 </resources>

app/src/main/res/values-zh-rTW/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">完成</string>
    <string name="cpp_cancel">取消</string>
    <string name="cpp_description">說明</string>
+   <string name="cpp_about">相關資訊</string>
    <string name="cpp_copy_text">複製到剪貼簿</string>
    <string name="cpp_text_copied">文字已複製</string>
    <string name="cpp_name">姓名</string>
+   <string name="cpp_settings">設定</string>
    <string name="cpp_nan">非數字</string>
    <string name="cpp_error">錯誤</string>
 </resources>

app/src/main/res/values/text_imported.xml

@@ -19,9 +19,11 @@
    <string name="cpp_done">Done</string>
    <string name="cpp_cancel">Cancel</string>
    <string name="cpp_description">Description</string>
+   <string name="cpp_about">About</string>
    <string name="cpp_copy_text">Copy to clipboard</string>
    <string name="cpp_text_copied">Text copied</string>
    <string name="cpp_name">Name</string>
+   <string name="cpp_settings">Settings</string>
    <string name="cpp_nan">Not a number</string>
    <string name="cpp_error">Error</string>
 </resources>

translations/src/main/java/org/solovyev/android/translations/Android.java

@@ -35,10 +35,12 @@ public class Android {
         calendarLinks.add(new TranslationLink("save_label", "cpp_done"));
         calendarLinks.add(new TranslationLink("discard_label", "cpp_cancel"));
         calendarLinks.add(new TranslationLink("hint_description", "cpp_description"));
+        calendarLinks.add(new TranslationLink("preferences_about_title", "cpp_about"));
 
         contactsLinks.add(new TranslationLink("copy_text", "cpp_copy_text"));
         contactsLinks.add(new TranslationLink("toast_text_copied", "cpp_text_copied"));
         contactsLinks.add(new TranslationLink("header_name_entry", "cpp_name"));
+        contactsLinks.add(new TranslationLink("activity_title_settings", "cpp_settings"));
 
         calculatorLinks.add(new TranslationLink("error_nan", "cpp_nan"));
         calculatorLinks.add(new TranslationLink("error_syntax", "cpp_error"));