Translations

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

@@ -110,7 +110,8 @@ public class CalculatorActivity extends BaseActivity implements SharedPreference
     private void updateModeMenuItem() {
         final Menu menu = toolbar.getMenu();
         final MenuItem modeMenuItem = menu.findItem(R.id.menu_mode);
-        modeMenuItem.setTitle(getString(R.string.cpp_mode_status, getString(getActivityMode().name)));
+        final String modeName = getString(getActivityMode().name);
+        modeMenuItem.setTitle(getString(R.string.cpp_mode) + ": " + modeName);
     }
 
     @Override

app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java

@@ -45,7 +45,7 @@ public class FloatingCalculatorActivity extends AppCompatActivity {
         @Override
         protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
             final String permission = getString(R.string.cpp_permission_overlay);
-            builder.setMessage(getString(R.string.cpp_missing_permission_msg, permission));
+            builder.setMessage(getString(R.string.cpp_missing_permission_message, permission));
             builder.setTitle(R.string.cpp_missing_permission_title);
             builder.setPositiveButton(android.R.string.ok, null);
         }

app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java

@@ -309,10 +309,10 @@ public abstract class BaseFunctionFragment extends BaseDialogFragment implements
                 clearError(paramLabel);
             } else if (!Engine.isValidName(parameter)) {
                 valid = false;
-                setError(paramLabel, getString(R.string.invalid_name));
+                setError(paramLabel, getString(R.string.cpp_invalid_name));
             } else if (usedParameters.contains(parameter)) {
                 valid = false;
-                setError(paramLabel, getString(R.string.function_duplicate_parameter));
+                setError(paramLabel, getString(R.string.cpp_fn_duplicate_parameter));
             } else {
                 usedParameters.add(parameter);
                 clearError(paramLabel);

app/src/main/java/org/solovyev/android/calculator/functions/FunctionParamsView.java

@@ -200,7 +200,7 @@ public class FunctionParamsView extends LinearLayout {
         paramView.setInputType(EditorInfo.TYPE_CLASS_TEXT);
         paramView.setId(id);
         paramView.setTag(PARAM_VIEW_TAG);
-        paramView.setHint(R.string.c_function_parameter);
+        paramView.setHint(R.string.cpp_fn_parameter);
         paramLabel.addView(paramView, new TextInputLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
 
         rowView.addView(paramLabel, new LayoutParams(0, WRAP_CONTENT, 1));

app/src/main/java/org/solovyev/android/views/AutoResizeTextView.java

@@ -14,6 +14,7 @@ package org.solovyev.android.views; /**
  * 0. You just DO WHAT YOU WANT TO.
  */
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.text.Layout.Alignment;
 import android.text.StaticLayout;
@@ -223,6 +224,7 @@ public class AutoResizeTextView extends TextView {
     /**
      * Resize the text size with specified width and height
      */
+    @SuppressLint("SetTextI18n")
     public void resizeText(int width, int height) {
         mTimer.reset(TAG, "resizeText");
         CharSequence text = getText();

app/src/main/res/layout/cpp_unit_converter.xml

@@ -71,7 +71,6 @@
                         android:id="@+id/converter_edittext_from"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:hint="@string/cpp_units_from"
                         android:inputType="numberDecimal"
                         android:singleLine="true" />
                 </android.support.design.widget.TextInputLayout>
@@ -102,7 +101,6 @@
                         android:editable="false"
                         android:focusable="false"
                         android:focusableInTouchMode="false"
-                        android:hint="@string/cpp_units_to"
                         android:inputType="none"
                         android:singleLine="true"
                         tools:ignore="Deprecated" />

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">إغلاق</string>
    <string name="cpp_switch">تبديل</string>
    <string name="cpp_add">إضافة</string>
+   <string name="cpp_mode">الوضع</string>
    <string name="cpp_edit">تعديل</string>
    <string name="cpp_delete">حذف</string>
    <string name="cpp_done">تم</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">إذا كنت تستمتع بـ %1$s، يرجى أن تستغرق لحظة وتعطينا تقييمًا بخمس نجوم في Google Play.</string>
    <string name="cpp_rateus_ok">ضع تقييمًا الآن</string>
    <string name="cpp_rateus_cancel">لا، شكرًا</string>
+   <string name="cpp_dont_show_again">عدم الإظهار مرة أخرى</string>
+   <string name="cpp_missing_permission_title">إذن مفقود</string>
+   <string name="cpp_missing_permission_message">يرجى تمكين إذن %1$s في إعدادات النظام</string>
 </resources>

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

@@ -116,6 +116,4 @@
     <string name="cpp_new_in_version">الجديد في الإصدار %1$s</string>
     <string name="cpp_release_notes_choose_theme">هل تريد محاولة المواضيع المادية الجديدة؟ اختر منهم من القائمة:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">إذن مفقود</string>
-    <string name="cpp_missing_permission_msg">يرجى تمكين إذن \"%1$s\" في إعدادات النظام</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Zavřít</string>
    <string name="cpp_switch">Přepnout</string>
    <string name="cpp_add">Přidat</string>
+   <string name="cpp_mode">Režim určování polohy</string>
    <string name="cpp_edit">Upravit</string>
    <string name="cpp_delete">Smazat</string>
    <string name="cpp_done">Hotovo</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Pokud se vám aplikace %1$s líbí, prosím věnujte nám okamžik a udělte nám pětihvězdičkové hodnocení na Google Play.</string>
    <string name="cpp_rateus_ok">Ohodnotit nyní</string>
    <string name="cpp_rateus_cancel">Ne, díky</string>
+   <string name="cpp_dont_show_again">Již nezobrazovat</string>
+   <string name="cpp_missing_permission_title">Chybějící oprávnění</string>
+   <string name="cpp_missing_permission_message">Prosím, povolte v nastaveních systému oprávnění pro %1$s</string>
 </resources>

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

@@ -114,6 +114,4 @@ Platební informace jsou uloženy na serveru společně s vaším účtem.\n\n K
     <string name="cpp_new_in_version">Nové ve verzi %1$s</string>
     <string name="cpp_release_notes_choose_theme">Chcete vyzkoušet nové Material témata? Vyberte je ze seznamu:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Chybějící oprávnění</string>
-    <string name="cpp_missing_permission_msg">Prosím, povolte v nastaveních systému oprávnění pro \"%1$s\"</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Schließen</string>
    <string name="cpp_switch">Wechseln</string>
    <string name="cpp_add">Hinzufügen</string>
+   <string name="cpp_mode">Modus</string>
    <string name="cpp_edit">Bearbeiten</string>
    <string name="cpp_delete">Löschen</string>
    <string name="cpp_done">Fertig</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Wenn Ihnen %1$s gefällt, würden wir uns über Ihre Fünf-Sterne-Bewertung in Google Play freuen.</string>
    <string name="cpp_rateus_ok">Jetzt bewerten</string>
    <string name="cpp_rateus_cancel">Nein danke</string>
+   <string name="cpp_dont_show_again">Nicht erneut zeigen</string>
+   <string name="cpp_missing_permission_title">Berechtigung fehlt</string>
+   <string name="cpp_missing_permission_message">Bitte aktivieren Sie die Berechtigung %1$s in den Systemeinstellungen</string>
 </resources>

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

@@ -115,6 +115,4 @@ Klicken Sie auf \"Weiter\" und Sie werden zu Google Play weitergeleitet, wo Sie
     <string name="cpp_new_in_version">Neu in Version %1$s</string>
     <string name="cpp_release_notes_choose_theme">Wollen Sie das neue Material-Design ausprobieren? Wählen sie aus der Liste:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Berechtigung fehlt</string>
-    <string name="cpp_missing_permission_msg">Bitte aktivieren Sie die Berechtigung \"%1$s\" in den Systemeinstellungen</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Cerrar</string>
    <string name="cpp_switch">Cambiar</string>
    <string name="cpp_add">Añadir</string>
+   <string name="cpp_mode">Modo</string>
    <string name="cpp_edit">Editar</string>
    <string name="cpp_delete">Eliminar</string>
    <string name="cpp_done">Listo</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Si disfrutas usar %1$s, por favor dedica un instante y regálanos una calificación de cinco estrellas en Google Play.</string>
    <string name="cpp_rateus_ok">Danos tu calificación</string>
    <string name="cpp_rateus_cancel">No, gracias</string>
+   <string name="cpp_dont_show_again">No mostrar nuevamente</string>
+   <string name="cpp_missing_permission_title">Falta el permiso</string>
+   <string name="cpp_missing_permission_message">Por favor activa el permiso para %1$s en las opciones del sistema</string>
 </resources>

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

@@ -118,6 +118,4 @@
   <string name="cpp_release_notes_choose_theme">¿Desea probar nuevos temas Material?
 Escojalos de la lista:</string>
     <string name="cpp_system_language">System language</string>
-  <string name="cpp_missing_permission_title">Falta el permiso</string>
-  <string name="cpp_missing_permission_msg">Por favor, activa el permiso \"%1$s\" en la configuración del sistema</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Sulje</string>
    <string name="cpp_switch">Vaihda</string>
    <string name="cpp_add">Lisää</string>
+   <string name="cpp_mode">Tila</string>
    <string name="cpp_edit">Muokkaa</string>
    <string name="cpp_delete">Poista</string>
    <string name="cpp_done">Valmis</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Jos pidät %1$s -sovelluksesta, anna meille viiden tähden arvostelu Google Play -palvelussa.</string>
    <string name="cpp_rateus_ok">Arvostele nyt</string>
    <string name="cpp_rateus_cancel">Ei kiitos</string>
+   <string name="cpp_dont_show_again">Älä näytä uudelleen</string>
+   <string name="cpp_missing_permission_title">Käyttöoikeus puuttuu</string>
+   <string name="cpp_missing_permission_message">Salli kohteen %1$s käyttöoikeus järjestelmäasetuksissa</string>
 </resources>

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

@@ -113,6 +113,4 @@
     <string name="cpp_new_in_version">Uutta versiossa %1$s</string>
     <string name="cpp_release_notes_choose_theme">Haluatko kokeilla uusia materiaaliteemoja? Valitse luettelosta:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Käyttöoikeus puuttuu</string>
-    <string name="cpp_missing_permission_msg">Salli kohteen \"%1$s\" käyttöoikeus järjestelmäasetuksissa</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Fermer</string>
    <string name="cpp_switch">Changer</string>
    <string name="cpp_add">Ajouter</string>
+   <string name="cpp_mode">Mode</string>
    <string name="cpp_edit">Modifier</string>
    <string name="cpp_delete">Supprimer</string>
    <string name="cpp_done">OK</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Si vous appréciez %1$s, prenez un moment et donnez-nous 5 étoiles dans Google Play.</string>
    <string name="cpp_rateus_ok">Noter maintenant</string>
    <string name="cpp_rateus_cancel">Non, merci</string>
+   <string name="cpp_dont_show_again">Ne plus afficher</string>
+   <string name="cpp_missing_permission_title">Autorisation manquante</string>
+   <string name="cpp_missing_permission_message">Veuillez activer l\&apos;autorisation %1$s dans les réglages systèmes</string>
 </resources>

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

@@ -116,6 +116,4 @@ En cliquant sur le bouton \'Continuer\' vous serez redirigés vers l\'applicatio
     <string name="cpp_new_in_version">Nouveautés de la version %1$s</string>
     <string name="cpp_release_notes_choose_theme">Voulez-vous essayer les nouveaux thèmes Material ? Choisissez-en dans la liste :</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Autorisation manquante</string>
-    <string name="cpp_missing_permission_msg">Veuillez activer l\'autorisation \"%1$s\" dans les réglages systèmes</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Chiudi</string>
    <string name="cpp_switch">Cambia</string>
    <string name="cpp_add">Aggiungi</string>
+   <string name="cpp_mode">Modalità</string>
    <string name="cpp_edit">Modifica</string>
    <string name="cpp_delete">Elimina</string>
    <string name="cpp_done">Salva</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Se ti piace %1$s, per favore dedica un minuto del tuo tempo per attribuirci 5 stelle su Google Play.</string>
    <string name="cpp_rateus_ok">Vota adesso</string>
    <string name="cpp_rateus_cancel">No, grazie</string>
+   <string name="cpp_dont_show_again">Non mostrare più</string>
+   <string name="cpp_missing_permission_title">Permesso assente</string>
+   <string name="cpp_missing_permission_message">Per favore garantisci il permesso: %1$s nelle impostazioni</string>
 </resources>

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

@@ -120,6 +120,4 @@ premendo \'continua\' sarai indirizzato all\'applicazione Google play per effett
     <string name="cpp_new_in_version">Novità nella versione %1$s</string>
     <string name="cpp_release_notes_choose_theme">Vuoi provare nuove temi Material design? Selezionali dalla lista:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Permesso assente</string>
-    <string name="cpp_missing_permission_msg">Per favore garantisci il permesso: \"%1$s\" nelle impostazioni</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">閉じる</string>
    <string name="cpp_switch">切り替え</string>
    <string name="cpp_add">追加</string>
+   <string name="cpp_mode">モード</string>
    <string name="cpp_edit">編集</string>
    <string name="cpp_delete">削除</string>
    <string name="cpp_done">完了</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">%1$s を楽しまれている場合には、Google Play での評価にご協力ください。</string>
    <string name="cpp_rateus_ok">今すぐ評価する</string>
    <string name="cpp_rateus_cancel">今回はしない</string>
+   <string name="cpp_dont_show_again">再度表示しない</string>
+   <string name="cpp_missing_permission_title">不足している権限</string>
+   <string name="cpp_missing_permission_message">システム設定で %1$s へのアクセス権限を許可してください</string>
 </resources>

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

@@ -118,6 +118,4 @@
     <string name="cpp_new_in_version">%1$sバージョンの新機能</string>
     <string name="cpp_release_notes_choose_theme">新しいマテリアルテーマを試してみたいですか？リストから選択してください:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">不足している権限</string>
-    <string name="cpp_missing_permission_msg">システム設定で \"%1$s\" へのアクセス権限を許可してください</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Sluiten</string>
    <string name="cpp_switch">Overschakelen</string>
    <string name="cpp_add">Toevoegen</string>
+   <string name="cpp_mode">Modus</string>
    <string name="cpp_edit">Bewerken</string>
    <string name="cpp_delete">Verwijderen</string>
    <string name="cpp_done">Gereed</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Als je %1$s leuk vindt, neem dan even de tijd en geef ons een beoordeling van vijf sterren bij Google Play.</string>
    <string name="cpp_rateus_ok">Nu beoordelen</string>
    <string name="cpp_rateus_cancel">Nee, bedankt</string>
+   <string name="cpp_dont_show_again">Niet meer laten zien</string>
+   <string name="cpp_missing_permission_title">Toestemming ontbreekt</string>
+   <string name="cpp_missing_permission_message">Schakel %1$s toestemming in in systeeminstellingen</string>
 </resources>

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

@@ -117,6 +117,4 @@ Door op volgende te drukken, wordt u doorverwezen naar de Google Play store om d
     <string name="cpp_new_in_version">Nieuw in versie %1$s</string>
     <string name="cpp_release_notes_choose_theme">Wilt u nieuwe Material themes proberen? Kies ze uit de lijst:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Toestemming ontbreekt</string>
-    <string name="cpp_missing_permission_msg">Schakel \"%1$s\" toestemming in in systeeminstellingen</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Zamknij</string>
    <string name="cpp_switch">Przełącz</string>
    <string name="cpp_add">Dodaj</string>
+   <string name="cpp_mode">Tryb lokalizacji</string>
    <string name="cpp_edit">Edytuj</string>
    <string name="cpp_delete">Usuń</string>
    <string name="cpp_done">Gotowe</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Jeśli podoba Ci się %1$s, poświęć chwilę i daj nam pięć gwiazdek w usłudze Google Play.</string>
    <string name="cpp_rateus_ok">Oceń ją teraz</string>
    <string name="cpp_rateus_cancel">Nie, dziękuję</string>
+   <string name="cpp_dont_show_again">Nie pokazuj ponownie</string>
+   <string name="cpp_missing_permission_title">Brak uprawnienia</string>
+   <string name="cpp_missing_permission_message">Włącz uprawnienie „%1$s” w ustawieniach systemu</string>
 </resources>

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

@@ -113,6 +113,4 @@
     <string name="cpp_new_in_version">Nowści w wersji %1$s</string>
     <string name="cpp_release_notes_choose_theme">Czy chcesz wypróbować nowe motywy Material? Wybierz je z listy:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Brak uprawnienia</string>
-    <string name="cpp_missing_permission_msg">Włącz uprawnienie „\"%1$s\"” w ustawieniach systemu</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Fechar</string>
    <string name="cpp_switch">Alternar</string>
    <string name="cpp_add">Adicionar</string>
+   <string name="cpp_mode">Modo</string>
    <string name="cpp_edit">Editar</string>
    <string name="cpp_delete">Excluir</string>
    <string name="cpp_done">Concluído</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Se você gosta do %1$s, atribua a classificação de cinco estrelas no Google Play.</string>
    <string name="cpp_rateus_ok">Classificar agora</string>
    <string name="cpp_rateus_cancel">Não, obrigado</string>
+   <string name="cpp_dont_show_again">Não mostrar novamente</string>
+   <string name="cpp_missing_permission_title">Sem permissão</string>
+   <string name="cpp_missing_permission_message">Habilite a permissão de %1$s nas configurações do sistema</string>
 </resources>

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

@@ -113,6 +113,4 @@
     <string name="cpp_new_in_version">Novo na versão %1$s</string>
     <string name="cpp_release_notes_choose_theme">Você deseja testar novos temas? Escolha-os pela lista:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Sem permissão</string>
-    <string name="cpp_missing_permission_msg">Habilite a permissão de \"%1$s\" nas configurações do sistema</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Fechar</string>
    <string name="cpp_switch">Alternar</string>
    <string name="cpp_add">Adicionar</string>
+   <string name="cpp_mode">Modo</string>
    <string name="cpp_edit">Editar</string>
    <string name="cpp_delete">Eliminar</string>
    <string name="cpp_done">Concluído</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Se gosta de %1$s, por favor avalie-nos com cinco estrelas na Google Play.</string>
    <string name="cpp_rateus_ok">Avaliar agora</string>
    <string name="cpp_rateus_cancel">Não, obrigado</string>
+   <string name="cpp_dont_show_again">Não mostrar novamente</string>
+   <string name="cpp_missing_permission_title">Sem permissão</string>
+   <string name="cpp_missing_permission_message">Por favor active as permissões de %1$s nas definiçõe de sistema</string>
 </resources>

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

@@ -113,6 +113,4 @@
     <string name="cpp_new_in_version">New in %1$s version</string>
     <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Sem permissão</string>
-    <string name="cpp_missing_permission_msg">Por favor active as permissões de \"%1$s\" nas definiçõe de sistema</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Закрыть</string>
    <string name="cpp_switch">Сменить аккаунт</string>
    <string name="cpp_add">Добавить</string>
+   <string name="cpp_mode">Режим</string>
    <string name="cpp_edit">Изменить</string>
    <string name="cpp_delete">Удалить</string>
    <string name="cpp_done">Готово</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Если вам нравится %1$s, отвлекитесь на минутку и поставьте нам 5 звездочек в Google Play.</string>
    <string name="cpp_rateus_ok">Оценить</string>
    <string name="cpp_rateus_cancel">Нет, спасибо</string>
+   <string name="cpp_dont_show_again">Не показывать снова</string>
+   <string name="cpp_missing_permission_title">Отсутствует разрешение</string>
+   <string name="cpp_missing_permission_message">В системных настройках разрешите приложению доступ к следующему компоненту:%1$s</string>
 </resources>

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

@@ -68,7 +68,8 @@
     <string name="c_copy_result">Копировать результат</string>
     <string name="c_history_expression">Значение</string>
     <string name="c_history_comment">Комментарий</string>
-    <string name="cpp_history_tab_saved">Сохранённая история</string>
+    <string name="cpp_history_tab_saved">Сохранённая</string>
+    <string name="cpp_history_tab_recent">Недавняя</string>
     <string name="c_first_start_text">Спасибо за выбор Калькулятора++!\n\nКалькулятор++ - это мощный инструмент для проведения ежедневных расчётов.</string>
     <string name="c_calc_show_release_notes_title">Показывать примечания к выпуску</string>
   <string name="c_calc_show_release_notes_summary">Определяет показывать или нет всплывающее окно с примечаниями к
@@ -139,6 +140,7 @@
     <string name="cpp_new_in_version">Новое в версии %1$s</string>
     <string name="cpp_release_notes_choose_theme">Хотите попробовать новые темы в стиле Матириал? Выберите их из списка:</string>
     <string name="cpp_system_language">Язык системы</string>
-  <string name="cpp_missing_permission_title">Отсутствует разрешение</string>
+  <string name="cpp_fn_parameter">Параметр</string>
-  <string name="cpp_missing_permission_msg">В системных настройках разрешите приложению доступ к следующему компоненту:\"%1$s\"</string>
+  <string name="cpp_fn_duplicate_parameter">Параметр с таким именем уже существует</string>
+  <string name="cpp_invalid_name">Имя содержит недопустимые символы</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Kapat</string>
    <string name="cpp_switch">Değiştir</string>
    <string name="cpp_add">Ekle</string>
+   <string name="cpp_mode">Mod</string>
    <string name="cpp_edit">Düzenle</string>
    <string name="cpp_delete">Sil</string>
    <string name="cpp_done">Bitti</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">%1$s\&apos;yı sevdiyseniz, lütfen birkaç dakikanızı ayırın ve bize Google Play\&apos;de beş yıldızlı bir puan verin.</string>
    <string name="cpp_rateus_ok">Hemen değerlendirin</string>
    <string name="cpp_rateus_cancel">Hayır, teşekkürler</string>
+   <string name="cpp_dont_show_again">Tekrar gösterme</string>
+   <string name="cpp_missing_permission_title">Eksik izin</string>
+   <string name="cpp_missing_permission_message">%1$s Sistem ayarlarından izini etkinleştir</string>
 </resources>

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

@@ -113,6 +113,4 @@
     <string name="cpp_new_in_version">%1$s sürümünde yeni</string>
     <string name="cpp_release_notes_choose_theme">Yeni materyal temaları denemek istiyor musunuz?Listeden seçin:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Eksik izin</string>
-    <string name="cpp_missing_permission_msg">\"%1$s\" Sistem ayarlarından izini etkinleştir</string>
 </resources>

app/src/main/res/values-uk/text_imported_aosp.xml

@@ -14,6 +14,7 @@
    <string name="cpp_close">Закрити</string>
    <string name="cpp_switch">Змінити користувача</string>
    <string name="cpp_add">Додати</string>
+   <string name="cpp_mode">Режим</string>
    <string name="cpp_edit">Редагувати</string>
    <string name="cpp_delete">Видалити</string>
    <string name="cpp_done">Готово</string>

app/src/main/res/values-uk/text_imported_other.xml

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Якщо вам подобається %1$s, будь ласка, приділіть секундочку часу і поставте нам оцінку у п’ять зірочок на Google Play.</string>
    <string name="cpp_rateus_ok">Оцінити зараз</string>
    <string name="cpp_rateus_cancel">Ні, дякую</string>
+   <string name="cpp_dont_show_again">Більше не показувати</string>
+   <string name="cpp_missing_permission_title">Бракує дозволу</string>
+   <string name="cpp_missing_permission_message">Будь ласка, відкрийте доступ до додатка %1$s у параметрах системи</string>
 </resources>

app/src/main/res/values-uk/text_strings.xml

@@ -119,6 +119,4 @@
     <string name="cpp_new_in_version">Нове у версії %1$s</string>
     <string name="cpp_release_notes_choose_theme">Кортить спробувати нові теми Матеріал? Вибирайте одну з них у списку:</string>
     <string name="cpp_system_language">System language</string>
-  <string name="cpp_missing_permission_title">Бракує дозволу</string>
-  <string name="cpp_missing_permission_msg">Будь ласка, відкрийте доступ до додатка \"%1$s\" у параметрах системи</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Đóng</string>
    <string name="cpp_switch">Chuyển đổi</string>
    <string name="cpp_add">Thêm</string>
+   <string name="cpp_mode">Chế độ</string>
    <string name="cpp_edit">Chỉnh sửa</string>
    <string name="cpp_delete">Xóa</string>
    <string name="cpp_done">Xong</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">Nếu bạn thích %1$s, vui lòng dành thời gian và xếp hạng chúng tôi 5 sao trong Google Play.</string>
    <string name="cpp_rateus_ok">Xếp hạng nó bây giờ</string>
    <string name="cpp_rateus_cancel">Không, cảm ơn</string>
+   <string name="cpp_dont_show_again">Không hiển thị lại</string>
+   <string name="cpp_missing_permission_title">Thiếu quyền</string>
+   <string name="cpp_missing_permission_message">Vui lòng cho bật %1$s Quyền trong thiết lập hệ thống</string>
 </resources>

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

@@ -115,6 +115,4 @@ Qua việc click nút \'Tiếp tục\' bạn được chuyển qua úng dụng G
     <string name="cpp_new_in_version">Mới trong phiên bản %1$s</string>
     <string name="cpp_release_notes_choose_theme">Bạn có muốn thử chủ đề Material mới? Chọn chúng từ danh sách:</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Thiếu quyền</string>
-    <string name="cpp_missing_permission_msg">Vui lòng cho bật \"%1$s\" Quyền trong thiết lập hệ thống</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">关闭</string>
    <string name="cpp_switch">切换</string>
    <string name="cpp_add">添加</string>
+   <string name="cpp_mode">模式</string>
    <string name="cpp_edit">编辑</string>
    <string name="cpp_delete">删除</string>
    <string name="cpp_done">完成</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">如果您喜欢 %1$s，请抽出片刻在 Google Play 中给我们五星评分。</string>
    <string name="cpp_rateus_ok">立即给它评分</string>
    <string name="cpp_rateus_cancel">忍泪拒绝</string>
+   <string name="cpp_dont_show_again">不再显示</string>
+   <string name="cpp_missing_permission_title">缺失许可</string>
+   <string name="cpp_missing_permission_message">请在系统设置中启用 %1$s 许可</string>
 </resources>

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

@@ -114,6 +114,4 @@
     <string name="cpp_new_in_version">%1$s 版本的新功能</string>
     <string name="cpp_release_notes_choose_theme">你想尝试新的Material Design主题吗？请从列表中选择：</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">缺失许可</string>
-    <string name="cpp_missing_permission_msg">请在系统设置中启用 \"%1$s\" 许可</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">關閉</string>
    <string name="cpp_switch">切換</string>
    <string name="cpp_add">新增</string>
+   <string name="cpp_mode">模式</string>
    <string name="cpp_edit">編輯</string>
    <string name="cpp_delete">刪除</string>
    <string name="cpp_done">完成</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">如果你喜歡 %1$s，請花點時間在 Google Play 上給我們五顆星評價。</string>
    <string name="cpp_rateus_ok">現在就去評分</string>
    <string name="cpp_rateus_cancel">不用了，謝謝</string>
+   <string name="cpp_dont_show_again">不要再顯示</string>
+   <string name="cpp_missing_permission_title">缺少權限</string>
+   <string name="cpp_missing_permission_message">請在系統設定中啟用 %1$s 權限</string>
 </resources>

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

@@ -115,6 +115,4 @@
     <string name="cpp_new_in_version">%1$s 版本的新功能</string>
     <string name="cpp_release_notes_choose_theme">你想要嘗試新的 Material 主題風格嗎？ 從清單中選擇：</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">缺少權限</string>
-    <string name="cpp_missing_permission_msg">請在系統設定中啟用 \"%1$s\" 權限</string>
 </resources>

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

@@ -14,6 +14,7 @@
    <string name="cpp_close">Close</string>
    <string name="cpp_switch">Switch</string>
    <string name="cpp_add">Add</string>
+   <string name="cpp_mode">Mode</string>
    <string name="cpp_edit">Edit</string>
    <string name="cpp_delete">Delete</string>
    <string name="cpp_done">Done</string>

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

@@ -4,4 +4,7 @@
    <string name="cpp_rateus_message">If you enjoy %1$s, please take a moment and give us a five-star rating in Google Play.</string>
    <string name="cpp_rateus_ok">Rate it now</string>
    <string name="cpp_rateus_cancel">No, thanks</string>
+   <string name="cpp_dont_show_again">Do not show again</string>
+   <string name="cpp_missing_permission_title">Missing permission</string>
+   <string name="cpp_missing_permission_message">Please enable %1$s permission in system settings</string>
 </resources>

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

@@ -78,14 +78,14 @@
     <string name="other">Other</string>
     <string name="derivatives">Derivatives/Integrals</string>
     <string name="c_function_name">Name</string>
-    <string name="c_function_parameter">Parameter</string>
+    <string name="cpp_fn_parameter">Parameter</string>
     <string name="function_create_function">Create function</string>
     <string name="function_edit_function">Edit function</string>
     <string name="function_name_is_not_valid">Name of function is not valid: name must start with a letter, can contain letters, digits and underscore.</string>
     <string name="function_already_exists">Function with the same name already exists!</string>
     <string name="function_is_empty">Function body could not be empty!</string>
-    <string name="invalid_name">Invalid name</string>
+    <string name="cpp_invalid_name">Name contains an illegal character</string>
-    <string name="function_duplicate_parameter">There is already a parameter with the same name</string>
+    <string name="cpp_fn_duplicate_parameter">There is already a parameter with the same name</string>
     <string name="function_removal_confirmation_question">Do you really want to delete \'%s\' function?</string>
     <string name="fix">Fix</string>
     <string name="p_preferred_numeral_base_title">Default numeral system</string>
@@ -121,12 +121,5 @@
     <string name="cpp_clear_history">Clear</string>
     <string name="cpp_new_in_version">New in %1$s version</string>
     <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
-    <string name="cpp_dont_show_again">Don\'t show again</string>
     <string name="cpp_system_language">System language</string>
-    <string name="cpp_missing_permission_title">Missing permission</string>
-    <string name="cpp_missing_permission_msg">Please enable \"%1$s\" permission in system settings</string>
-    <string name="cpp_mode">Mode</string>
-    <string name="cpp_mode_status">Mode: %1$s</string>
-    <string name="cpp_units_from" comment="Hint to be used in 'From' input field in unit converter window">From</string>
-    <string name="cpp_units_to" comment="Hint to be used in 'To' input field in unit converter window">To</string>
 </resources>

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

@@ -30,6 +30,7 @@ public class Android {
         settingsLinks.add(new TranslationLink("dlg_close", "cpp_close"));
         settingsLinks.add(new TranslationLink("dlg_switch", "cpp_switch"));
         settingsLinks.add(new TranslationLink("user_dict_settings_add_menu_title", "cpp_add"));
+        settingsLinks.add(new TranslationLink("location_mode_title", "cpp_mode"));
 
         calendarLinks.add(new TranslationLink("edit_label", "cpp_edit"));
         calendarLinks.add(new TranslationLink("delete_label", "cpp_delete"));