diff --git a/app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java index 9842e7d6..ed1b3dfa 100644 --- a/app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java +++ b/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 diff --git a/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java b/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java index 488d7beb..020db385 100644 --- a/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java +++ b/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); } 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 bc07ecd4..5d79134c 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 @@ -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); diff --git a/app/src/main/java/org/solovyev/android/calculator/functions/FunctionParamsView.java b/app/src/main/java/org/solovyev/android/calculator/functions/FunctionParamsView.java index 0f58905f..e44dda93 100644 --- a/app/src/main/java/org/solovyev/android/calculator/functions/FunctionParamsView.java +++ b/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)); diff --git a/app/src/main/java/org/solovyev/android/views/AutoResizeTextView.java b/app/src/main/java/org/solovyev/android/views/AutoResizeTextView.java index 68c352fa..f4002d2d 100644 --- a/app/src/main/java/org/solovyev/android/views/AutoResizeTextView.java +++ b/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(); diff --git a/app/src/main/res/layout/cpp_unit_converter.xml b/app/src/main/res/layout/cpp_unit_converter.xml index 2ad540cd..9877258a 100644 --- a/app/src/main/res/layout/cpp_unit_converter.xml +++ b/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" /> @@ -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" /> diff --git a/app/src/main/res/values-ar/text_imported_aosp.xml b/app/src/main/res/values-ar/text_imported_aosp.xml index 0ae5ef32..35f65f24 100644 --- a/app/src/main/res/values-ar/text_imported_aosp.xml +++ b/app/src/main/res/values-ar/text_imported_aosp.xml @@ -14,6 +14,7 @@ إغلاق تبديل إضافة + الوضع تعديل حذف تم diff --git a/app/src/main/res/values-ar/text_imported_other.xml b/app/src/main/res/values-ar/text_imported_other.xml index 449f7932..cf9c7e9b 100644 --- a/app/src/main/res/values-ar/text_imported_other.xml +++ b/app/src/main/res/values-ar/text_imported_other.xml @@ -4,4 +4,7 @@ إذا كنت تستمتع بـ %1$s، يرجى أن تستغرق لحظة وتعطينا تقييمًا بخمس نجوم في Google Play. ضع تقييمًا الآن لا، شكرًا + عدم الإظهار مرة أخرى + إذن مفقود + يرجى تمكين إذن %1$s في إعدادات النظام \ No newline at end of file diff --git a/app/src/main/res/values-ar/text_strings.xml b/app/src/main/res/values-ar/text_strings.xml index 0a01b014..068ab99b 100644 --- a/app/src/main/res/values-ar/text_strings.xml +++ b/app/src/main/res/values-ar/text_strings.xml @@ -116,6 +116,4 @@ الجديد في الإصدار %1$s هل تريد محاولة المواضيع المادية الجديدة؟ اختر منهم من القائمة: System language - إذن مفقود - يرجى تمكين إذن \"%1$s\" في إعدادات النظام diff --git a/app/src/main/res/values-cs/text_imported_aosp.xml b/app/src/main/res/values-cs/text_imported_aosp.xml index 9f967f39..5cd57c6d 100644 --- a/app/src/main/res/values-cs/text_imported_aosp.xml +++ b/app/src/main/res/values-cs/text_imported_aosp.xml @@ -14,6 +14,7 @@ Zavřít Přepnout Přidat + Režim určování polohy Upravit Smazat Hotovo diff --git a/app/src/main/res/values-cs/text_imported_other.xml b/app/src/main/res/values-cs/text_imported_other.xml index 4792be0b..954fdf93 100644 --- a/app/src/main/res/values-cs/text_imported_other.xml +++ b/app/src/main/res/values-cs/text_imported_other.xml @@ -4,4 +4,7 @@ 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. Ohodnotit nyní Ne, díky + Již nezobrazovat + Chybějící oprávnění + Prosím, povolte v nastaveních systému oprávnění pro %1$s \ No newline at end of file diff --git a/app/src/main/res/values-cs/text_strings.xml b/app/src/main/res/values-cs/text_strings.xml index c754a2ad..6f12ab5c 100644 --- a/app/src/main/res/values-cs/text_strings.xml +++ b/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 Nové ve verzi %1$s Chcete vyzkoušet nové Material témata? Vyberte je ze seznamu: System language - Chybějící oprávnění - Prosím, povolte v nastaveních systému oprávnění pro \"%1$s\" diff --git a/app/src/main/res/values-de/text_imported_aosp.xml b/app/src/main/res/values-de/text_imported_aosp.xml index 5d1e81ae..9ac1c51a 100644 --- a/app/src/main/res/values-de/text_imported_aosp.xml +++ b/app/src/main/res/values-de/text_imported_aosp.xml @@ -14,6 +14,7 @@ Schließen Wechseln Hinzufügen + Modus Bearbeiten Löschen Fertig diff --git a/app/src/main/res/values-de/text_imported_other.xml b/app/src/main/res/values-de/text_imported_other.xml index 84ece937..05e47832 100644 --- a/app/src/main/res/values-de/text_imported_other.xml +++ b/app/src/main/res/values-de/text_imported_other.xml @@ -4,4 +4,7 @@ Wenn Ihnen %1$s gefällt, würden wir uns über Ihre Fünf-Sterne-Bewertung in Google Play freuen. Jetzt bewerten Nein danke + Nicht erneut zeigen + Berechtigung fehlt + Bitte aktivieren Sie die Berechtigung %1$s in den Systemeinstellungen \ No newline at end of file diff --git a/app/src/main/res/values-de/text_strings.xml b/app/src/main/res/values-de/text_strings.xml index bcea1c4a..c977cc6b 100644 --- a/app/src/main/res/values-de/text_strings.xml +++ b/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 Neu in Version %1$s Wollen Sie das neue Material-Design ausprobieren? Wählen sie aus der Liste: System language - Berechtigung fehlt - Bitte aktivieren Sie die Berechtigung \"%1$s\" in den Systemeinstellungen diff --git a/app/src/main/res/values-es/text_imported_aosp.xml b/app/src/main/res/values-es/text_imported_aosp.xml index 44693b5a..fdb78e08 100644 --- a/app/src/main/res/values-es/text_imported_aosp.xml +++ b/app/src/main/res/values-es/text_imported_aosp.xml @@ -14,6 +14,7 @@ Cerrar Cambiar Añadir + Modo Editar Eliminar Listo diff --git a/app/src/main/res/values-es/text_imported_other.xml b/app/src/main/res/values-es/text_imported_other.xml index 784700cc..09d5c213 100644 --- a/app/src/main/res/values-es/text_imported_other.xml +++ b/app/src/main/res/values-es/text_imported_other.xml @@ -4,4 +4,7 @@ Si disfrutas usar %1$s, por favor dedica un instante y regálanos una calificación de cinco estrellas en Google Play. Danos tu calificación No, gracias + No mostrar nuevamente + Falta el permiso + Por favor activa el permiso para %1$s en las opciones del sistema \ No newline at end of file diff --git a/app/src/main/res/values-es/text_strings.xml b/app/src/main/res/values-es/text_strings.xml index 1db2f398..bc90b014 100644 --- a/app/src/main/res/values-es/text_strings.xml +++ b/app/src/main/res/values-es/text_strings.xml @@ -118,6 +118,4 @@ ¿Desea probar nuevos temas Material? Escojalos de la lista: System language - Falta el permiso - Por favor, activa el permiso \"%1$s\" en la configuración del sistema diff --git a/app/src/main/res/values-fi/text_imported_aosp.xml b/app/src/main/res/values-fi/text_imported_aosp.xml index f98f39a5..55406ec2 100644 --- a/app/src/main/res/values-fi/text_imported_aosp.xml +++ b/app/src/main/res/values-fi/text_imported_aosp.xml @@ -14,6 +14,7 @@ Sulje Vaihda Lisää + Tila Muokkaa Poista Valmis diff --git a/app/src/main/res/values-fi/text_imported_other.xml b/app/src/main/res/values-fi/text_imported_other.xml index 67a2cab6..77655aca 100644 --- a/app/src/main/res/values-fi/text_imported_other.xml +++ b/app/src/main/res/values-fi/text_imported_other.xml @@ -4,4 +4,7 @@ Jos pidät %1$s -sovelluksesta, anna meille viiden tähden arvostelu Google Play -palvelussa. Arvostele nyt Ei kiitos + Älä näytä uudelleen + Käyttöoikeus puuttuu + Salli kohteen %1$s käyttöoikeus järjestelmäasetuksissa \ No newline at end of file diff --git a/app/src/main/res/values-fi/text_strings.xml b/app/src/main/res/values-fi/text_strings.xml index 3ddccc8b..41d38536 100644 --- a/app/src/main/res/values-fi/text_strings.xml +++ b/app/src/main/res/values-fi/text_strings.xml @@ -113,6 +113,4 @@ Uutta versiossa %1$s Haluatko kokeilla uusia materiaaliteemoja? Valitse luettelosta: System language - Käyttöoikeus puuttuu - Salli kohteen \"%1$s\" käyttöoikeus järjestelmäasetuksissa diff --git a/app/src/main/res/values-fr/text_imported_aosp.xml b/app/src/main/res/values-fr/text_imported_aosp.xml index 71bbd40d..3c62bf8d 100644 --- a/app/src/main/res/values-fr/text_imported_aosp.xml +++ b/app/src/main/res/values-fr/text_imported_aosp.xml @@ -14,6 +14,7 @@ Fermer Changer Ajouter + Mode Modifier Supprimer OK diff --git a/app/src/main/res/values-fr/text_imported_other.xml b/app/src/main/res/values-fr/text_imported_other.xml index f1cfc456..d30bfef0 100644 --- a/app/src/main/res/values-fr/text_imported_other.xml +++ b/app/src/main/res/values-fr/text_imported_other.xml @@ -4,4 +4,7 @@ Si vous appréciez %1$s, prenez un moment et donnez-nous 5 étoiles dans Google Play. Noter maintenant Non, merci + Ne plus afficher + Autorisation manquante + Veuillez activer l\'autorisation %1$s dans les réglages systèmes \ No newline at end of file diff --git a/app/src/main/res/values-fr/text_strings.xml b/app/src/main/res/values-fr/text_strings.xml index 148387e8..194af4e6 100644 --- a/app/src/main/res/values-fr/text_strings.xml +++ b/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 Nouveautés de la version %1$s Voulez-vous essayer les nouveaux thèmes Material ? Choisissez-en dans la liste : System language - Autorisation manquante - Veuillez activer l\'autorisation \"%1$s\" dans les réglages systèmes diff --git a/app/src/main/res/values-it/text_imported_aosp.xml b/app/src/main/res/values-it/text_imported_aosp.xml index 62aee235..b109d79f 100644 --- a/app/src/main/res/values-it/text_imported_aosp.xml +++ b/app/src/main/res/values-it/text_imported_aosp.xml @@ -14,6 +14,7 @@ Chiudi Cambia Aggiungi + Modalità Modifica Elimina Salva diff --git a/app/src/main/res/values-it/text_imported_other.xml b/app/src/main/res/values-it/text_imported_other.xml index 0c5fbced..80602947 100644 --- a/app/src/main/res/values-it/text_imported_other.xml +++ b/app/src/main/res/values-it/text_imported_other.xml @@ -4,4 +4,7 @@ Se ti piace %1$s, per favore dedica un minuto del tuo tempo per attribuirci 5 stelle su Google Play. Vota adesso No, grazie + Non mostrare più + Permesso assente + Per favore garantisci il permesso: %1$s nelle impostazioni \ No newline at end of file diff --git a/app/src/main/res/values-it/text_strings.xml b/app/src/main/res/values-it/text_strings.xml index 9d206e6b..1e8b6641 100644 --- a/app/src/main/res/values-it/text_strings.xml +++ b/app/src/main/res/values-it/text_strings.xml @@ -120,6 +120,4 @@ premendo \'continua\' sarai indirizzato all\'applicazione Google play per effett Novità nella versione %1$s Vuoi provare nuove temi Material design? Selezionali dalla lista: System language - Permesso assente - Per favore garantisci il permesso: \"%1$s\" nelle impostazioni diff --git a/app/src/main/res/values-ja/text_imported_aosp.xml b/app/src/main/res/values-ja/text_imported_aosp.xml index 610bf26b..349aafba 100644 --- a/app/src/main/res/values-ja/text_imported_aosp.xml +++ b/app/src/main/res/values-ja/text_imported_aosp.xml @@ -14,6 +14,7 @@ 閉じる 切り替え 追加 + モード 編集 削除 完了 diff --git a/app/src/main/res/values-ja/text_imported_other.xml b/app/src/main/res/values-ja/text_imported_other.xml index 295c4909..45f94101 100644 --- a/app/src/main/res/values-ja/text_imported_other.xml +++ b/app/src/main/res/values-ja/text_imported_other.xml @@ -4,4 +4,7 @@ %1$s を楽しまれている場合には、Google Play での評価にご協力ください。 今すぐ評価する 今回はしない + 再度表示しない + 不足している権限 + システム設定で %1$s へのアクセス権限を許可してください \ No newline at end of file diff --git a/app/src/main/res/values-ja/text_strings.xml b/app/src/main/res/values-ja/text_strings.xml index b680670e..081d0dff 100644 --- a/app/src/main/res/values-ja/text_strings.xml +++ b/app/src/main/res/values-ja/text_strings.xml @@ -118,6 +118,4 @@ %1$sバージョンの新機能 新しいマテリアルテーマを試してみたいですか？リストから選択してください: System language - 不足している権限 - システム設定で \"%1$s\" へのアクセス権限を許可してください diff --git a/app/src/main/res/values-nl/text_imported_aosp.xml b/app/src/main/res/values-nl/text_imported_aosp.xml index bd8f1130..d1320b97 100644 --- a/app/src/main/res/values-nl/text_imported_aosp.xml +++ b/app/src/main/res/values-nl/text_imported_aosp.xml @@ -14,6 +14,7 @@ Sluiten Overschakelen Toevoegen + Modus Bewerken Verwijderen Gereed diff --git a/app/src/main/res/values-nl/text_imported_other.xml b/app/src/main/res/values-nl/text_imported_other.xml index 4fdfb597..9a282d90 100644 --- a/app/src/main/res/values-nl/text_imported_other.xml +++ b/app/src/main/res/values-nl/text_imported_other.xml @@ -4,4 +4,7 @@ Als je %1$s leuk vindt, neem dan even de tijd en geef ons een beoordeling van vijf sterren bij Google Play. Nu beoordelen Nee, bedankt + Niet meer laten zien + Toestemming ontbreekt + Schakel %1$s toestemming in in systeeminstellingen \ No newline at end of file diff --git a/app/src/main/res/values-nl/text_strings.xml b/app/src/main/res/values-nl/text_strings.xml index b523d97d..8c0bea67 100644 --- a/app/src/main/res/values-nl/text_strings.xml +++ b/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 Nieuw in versie %1$s Wilt u nieuwe Material themes proberen? Kies ze uit de lijst: System language - Toestemming ontbreekt - Schakel \"%1$s\" toestemming in in systeeminstellingen diff --git a/app/src/main/res/values-pl/text_imported_aosp.xml b/app/src/main/res/values-pl/text_imported_aosp.xml index e17b6b0a..ad277ae3 100644 --- a/app/src/main/res/values-pl/text_imported_aosp.xml +++ b/app/src/main/res/values-pl/text_imported_aosp.xml @@ -14,6 +14,7 @@ Zamknij Przełącz Dodaj + Tryb lokalizacji Edytuj Usuń Gotowe diff --git a/app/src/main/res/values-pl/text_imported_other.xml b/app/src/main/res/values-pl/text_imported_other.xml index 51d48fa8..d04d45bc 100644 --- a/app/src/main/res/values-pl/text_imported_other.xml +++ b/app/src/main/res/values-pl/text_imported_other.xml @@ -4,4 +4,7 @@ Jeśli podoba Ci się %1$s, poświęć chwilę i daj nam pięć gwiazdek w usłudze Google Play. Oceń ją teraz Nie, dziękuję + Nie pokazuj ponownie + Brak uprawnienia + Włącz uprawnienie „%1$s” w ustawieniach systemu \ No newline at end of file diff --git a/app/src/main/res/values-pl/text_strings.xml b/app/src/main/res/values-pl/text_strings.xml index 681597d5..b2b34348 100644 --- a/app/src/main/res/values-pl/text_strings.xml +++ b/app/src/main/res/values-pl/text_strings.xml @@ -113,6 +113,4 @@ Nowści w wersji %1$s Czy chcesz wypróbować nowe motywy Material? Wybierz je z listy: System language - Brak uprawnienia - Włącz uprawnienie „\"%1$s\"” w ustawieniach systemu diff --git a/app/src/main/res/values-pt-rBR/text_imported_aosp.xml b/app/src/main/res/values-pt-rBR/text_imported_aosp.xml index ce74428b..0075f46f 100644 --- a/app/src/main/res/values-pt-rBR/text_imported_aosp.xml +++ b/app/src/main/res/values-pt-rBR/text_imported_aosp.xml @@ -14,6 +14,7 @@ Fechar Alternar Adicionar + Modo Editar Excluir Concluído diff --git a/app/src/main/res/values-pt-rBR/text_imported_other.xml b/app/src/main/res/values-pt-rBR/text_imported_other.xml index c29703c0..a12b0f99 100644 --- a/app/src/main/res/values-pt-rBR/text_imported_other.xml +++ b/app/src/main/res/values-pt-rBR/text_imported_other.xml @@ -4,4 +4,7 @@ Se você gosta do %1$s, atribua a classificação de cinco estrelas no Google Play. Classificar agora Não, obrigado + Não mostrar novamente + Sem permissão + Habilite a permissão de %1$s nas configurações do sistema \ No newline at end of file diff --git a/app/src/main/res/values-pt-rBR/text_strings.xml b/app/src/main/res/values-pt-rBR/text_strings.xml index dbed5a81..70426b7e 100644 --- a/app/src/main/res/values-pt-rBR/text_strings.xml +++ b/app/src/main/res/values-pt-rBR/text_strings.xml @@ -113,6 +113,4 @@ Novo na versão %1$s Você deseja testar novos temas? Escolha-os pela lista: System language - Sem permissão - Habilite a permissão de \"%1$s\" nas configurações do sistema diff --git a/app/src/main/res/values-pt-rPT/text_imported_aosp.xml b/app/src/main/res/values-pt-rPT/text_imported_aosp.xml index 4173d3f7..ace98b54 100644 --- a/app/src/main/res/values-pt-rPT/text_imported_aosp.xml +++ b/app/src/main/res/values-pt-rPT/text_imported_aosp.xml @@ -14,6 +14,7 @@ Fechar Alternar Adicionar + Modo Editar Eliminar Concluído diff --git a/app/src/main/res/values-pt-rPT/text_imported_other.xml b/app/src/main/res/values-pt-rPT/text_imported_other.xml index 60f8ed7c..3520daa6 100644 --- a/app/src/main/res/values-pt-rPT/text_imported_other.xml +++ b/app/src/main/res/values-pt-rPT/text_imported_other.xml @@ -4,4 +4,7 @@ Se gosta de %1$s, por favor avalie-nos com cinco estrelas na Google Play. Avaliar agora Não, obrigado + Não mostrar novamente + Sem permissão + Por favor active as permissões de %1$s nas definiçõe de sistema \ No newline at end of file diff --git a/app/src/main/res/values-pt-rPT/text_strings.xml b/app/src/main/res/values-pt-rPT/text_strings.xml index 69034279..66fdb92d 100644 --- a/app/src/main/res/values-pt-rPT/text_strings.xml +++ b/app/src/main/res/values-pt-rPT/text_strings.xml @@ -113,6 +113,4 @@ New in %1$s version Do you want to try new Material themes? Choose them from the list: System language - Sem permissão - Por favor active as permissões de \"%1$s\" nas definiçõe de sistema diff --git a/app/src/main/res/values-ru/text_imported_aosp.xml b/app/src/main/res/values-ru/text_imported_aosp.xml index ceb69317..c86ab4fe 100644 --- a/app/src/main/res/values-ru/text_imported_aosp.xml +++ b/app/src/main/res/values-ru/text_imported_aosp.xml @@ -14,6 +14,7 @@ Закрыть Сменить аккаунт Добавить + Режим Изменить Удалить Готово diff --git a/app/src/main/res/values-ru/text_imported_other.xml b/app/src/main/res/values-ru/text_imported_other.xml index bddcabe4..339d0df6 100644 --- a/app/src/main/res/values-ru/text_imported_other.xml +++ b/app/src/main/res/values-ru/text_imported_other.xml @@ -4,4 +4,7 @@ Если вам нравится %1$s, отвлекитесь на минутку и поставьте нам 5 звездочек в Google Play. Оценить Нет, спасибо + Не показывать снова + Отсутствует разрешение + В системных настройках разрешите приложению доступ к следующему компоненту:%1$s \ No newline at end of file diff --git a/app/src/main/res/values-ru/text_strings.xml b/app/src/main/res/values-ru/text_strings.xml index 38638832..19a0d4c2 100644 --- a/app/src/main/res/values-ru/text_strings.xml +++ b/app/src/main/res/values-ru/text_strings.xml @@ -68,7 +68,8 @@ Копировать результат Значение Комментарий - Сохранённая история + Сохранённая + Недавняя Спасибо за выбор Калькулятора++!\n\nКалькулятор++ - это мощный инструмент для проведения ежедневных расчётов. Показывать примечания к выпуску Определяет показывать или нет всплывающее окно с примечаниями к @@ -139,6 +140,7 @@ Новое в версии %1$s Хотите попробовать новые темы в стиле Матириал? Выберите их из списка: Язык системы - Отсутствует разрешение - В системных настройках разрешите приложению доступ к следующему компоненту:\"%1$s\" + Параметр + Параметр с таким именем уже существует + Имя содержит недопустимые символы diff --git a/app/src/main/res/values-tr/text_imported_aosp.xml b/app/src/main/res/values-tr/text_imported_aosp.xml index fda5e7a9..ca83016f 100644 --- a/app/src/main/res/values-tr/text_imported_aosp.xml +++ b/app/src/main/res/values-tr/text_imported_aosp.xml @@ -14,6 +14,7 @@ Kapat Değiştir Ekle + Mod Düzenle Sil Bitti diff --git a/app/src/main/res/values-tr/text_imported_other.xml b/app/src/main/res/values-tr/text_imported_other.xml index 7f835195..f21fc85b 100644 --- a/app/src/main/res/values-tr/text_imported_other.xml +++ b/app/src/main/res/values-tr/text_imported_other.xml @@ -4,4 +4,7 @@ %1$s\'yı sevdiyseniz, lütfen birkaç dakikanızı ayırın ve bize Google Play\'de beş yıldızlı bir puan verin. Hemen değerlendirin Hayır, teşekkürler + Tekrar gösterme + Eksik izin + %1$s Sistem ayarlarından izini etkinleştir \ No newline at end of file diff --git a/app/src/main/res/values-tr/text_strings.xml b/app/src/main/res/values-tr/text_strings.xml index 11d2a7da..9149b2fc 100644 --- a/app/src/main/res/values-tr/text_strings.xml +++ b/app/src/main/res/values-tr/text_strings.xml @@ -113,6 +113,4 @@ %1$s sürümünde yeni Yeni materyal temaları denemek istiyor musunuz?Listeden seçin: System language - Eksik izin - \"%1$s\" Sistem ayarlarından izini etkinleştir diff --git a/app/src/main/res/values-uk/text_imported_aosp.xml b/app/src/main/res/values-uk/text_imported_aosp.xml index 694b2f0b..fa66ef57 100644 --- a/app/src/main/res/values-uk/text_imported_aosp.xml +++ b/app/src/main/res/values-uk/text_imported_aosp.xml @@ -14,6 +14,7 @@ Закрити Змінити користувача Додати + Режим Редагувати Видалити Готово diff --git a/app/src/main/res/values-uk/text_imported_other.xml b/app/src/main/res/values-uk/text_imported_other.xml index abffcbf4..b68b83eb 100644 --- a/app/src/main/res/values-uk/text_imported_other.xml +++ b/app/src/main/res/values-uk/text_imported_other.xml @@ -4,4 +4,7 @@ Якщо вам подобається %1$s, будь ласка, приділіть секундочку часу і поставте нам оцінку у п’ять зірочок на Google Play. Оцінити зараз Ні, дякую + Більше не показувати + Бракує дозволу + Будь ласка, відкрийте доступ до додатка %1$s у параметрах системи \ No newline at end of file diff --git a/app/src/main/res/values-uk/text_strings.xml b/app/src/main/res/values-uk/text_strings.xml index 9e60595e..ed8c2c5d 100644 --- a/app/src/main/res/values-uk/text_strings.xml +++ b/app/src/main/res/values-uk/text_strings.xml @@ -119,6 +119,4 @@ Нове у версії %1$s Кортить спробувати нові теми Матеріал? Вибирайте одну з них у списку: System language - Бракує дозволу - Будь ласка, відкрийте доступ до додатка \"%1$s\" у параметрах системи diff --git a/app/src/main/res/values-vi/text_imported_aosp.xml b/app/src/main/res/values-vi/text_imported_aosp.xml index d4b8636c..7c78ef32 100644 --- a/app/src/main/res/values-vi/text_imported_aosp.xml +++ b/app/src/main/res/values-vi/text_imported_aosp.xml @@ -14,6 +14,7 @@ Đóng Chuyển đổi Thêm + Chế độ Chỉnh sửa Xóa Xong diff --git a/app/src/main/res/values-vi/text_imported_other.xml b/app/src/main/res/values-vi/text_imported_other.xml index 03929500..2cba4427 100644 --- a/app/src/main/res/values-vi/text_imported_other.xml +++ b/app/src/main/res/values-vi/text_imported_other.xml @@ -4,4 +4,7 @@ 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. Xếp hạng nó bây giờ Không, cảm ơn + Không hiển thị lại + Thiếu quyền + Vui lòng cho bật %1$s Quyền trong thiết lập hệ thống \ No newline at end of file diff --git a/app/src/main/res/values-vi/text_strings.xml b/app/src/main/res/values-vi/text_strings.xml index 37a5c8fe..16609ace 100644 --- a/app/src/main/res/values-vi/text_strings.xml +++ b/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 Mới trong phiên bản %1$s Bạn có muốn thử chủ đề Material mới? Chọn chúng từ danh sách: System language - Thiếu quyền - Vui lòng cho bật \"%1$s\" Quyền trong thiết lập hệ thống diff --git a/app/src/main/res/values-zh-rCN/text_imported_aosp.xml b/app/src/main/res/values-zh-rCN/text_imported_aosp.xml index d2253055..c37e9c53 100644 --- a/app/src/main/res/values-zh-rCN/text_imported_aosp.xml +++ b/app/src/main/res/values-zh-rCN/text_imported_aosp.xml @@ -14,6 +14,7 @@ 关闭 切换 添加 + 模式 编辑 删除 完成 diff --git a/app/src/main/res/values-zh-rCN/text_imported_other.xml b/app/src/main/res/values-zh-rCN/text_imported_other.xml index bd661b13..27b73897 100644 --- a/app/src/main/res/values-zh-rCN/text_imported_other.xml +++ b/app/src/main/res/values-zh-rCN/text_imported_other.xml @@ -4,4 +4,7 @@ 如果您喜欢 %1$s，请抽出片刻在 Google Play 中给我们五星评分。 立即给它评分 忍泪拒绝 + 不再显示 + 缺失许可 + 请在系统设置中启用 %1$s 许可 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/text_strings.xml b/app/src/main/res/values-zh-rCN/text_strings.xml index 56f662ed..d34f3a2b 100644 --- a/app/src/main/res/values-zh-rCN/text_strings.xml +++ b/app/src/main/res/values-zh-rCN/text_strings.xml @@ -114,6 +114,4 @@ %1$s 版本的新功能 你想尝试新的Material Design主题吗？请从列表中选择： System language - 缺失许可 - 请在系统设置中启用 \"%1$s\" 许可 diff --git a/app/src/main/res/values-zh-rTW/text_imported_aosp.xml b/app/src/main/res/values-zh-rTW/text_imported_aosp.xml index 0057ab88..25fb5aa0 100644 --- a/app/src/main/res/values-zh-rTW/text_imported_aosp.xml +++ b/app/src/main/res/values-zh-rTW/text_imported_aosp.xml @@ -14,6 +14,7 @@ 關閉 切換 新增 + 模式 編輯 刪除 完成 diff --git a/app/src/main/res/values-zh-rTW/text_imported_other.xml b/app/src/main/res/values-zh-rTW/text_imported_other.xml index 270ed184..79bb4bcd 100644 --- a/app/src/main/res/values-zh-rTW/text_imported_other.xml +++ b/app/src/main/res/values-zh-rTW/text_imported_other.xml @@ -4,4 +4,7 @@ 如果你喜歡 %1$s，請花點時間在 Google Play 上給我們五顆星評價。 現在就去評分 不用了，謝謝 + 不要再顯示 + 缺少權限 + 請在系統設定中啟用 %1$s 權限 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/text_strings.xml b/app/src/main/res/values-zh-rTW/text_strings.xml index a899a0a7..50077864 100644 --- a/app/src/main/res/values-zh-rTW/text_strings.xml +++ b/app/src/main/res/values-zh-rTW/text_strings.xml @@ -115,6 +115,4 @@ %1$s 版本的新功能 你想要嘗試新的 Material 主題風格嗎？ 從清單中選擇： System language - 缺少權限 - 請在系統設定中啟用 \"%1$s\" 權限 diff --git a/app/src/main/res/values/text_imported_aosp.xml b/app/src/main/res/values/text_imported_aosp.xml index d5b647c7..c867fac3 100644 --- a/app/src/main/res/values/text_imported_aosp.xml +++ b/app/src/main/res/values/text_imported_aosp.xml @@ -14,6 +14,7 @@ Close Switch Add + Mode Edit Delete Done diff --git a/app/src/main/res/values/text_imported_other.xml b/app/src/main/res/values/text_imported_other.xml index ffa04df2..cd07e0e2 100644 --- a/app/src/main/res/values/text_imported_other.xml +++ b/app/src/main/res/values/text_imported_other.xml @@ -4,4 +4,7 @@ If you enjoy %1$s, please take a moment and give us a five-star rating in Google Play. Rate it now No, thanks + Do not show again + Missing permission + Please enable %1$s permission in system settings \ No newline at end of file diff --git a/app/src/main/res/values/text_strings.xml b/app/src/main/res/values/text_strings.xml index 0920f54d..04e20d2a 100644 --- a/app/src/main/res/values/text_strings.xml +++ b/app/src/main/res/values/text_strings.xml @@ -78,14 +78,14 @@ Other Derivatives/Integrals Name - Parameter + Parameter Create function Edit function Name of function is not valid: name must start with a letter, can contain letters, digits and underscore. Function with the same name already exists! Function body could not be empty! - Invalid name - There is already a parameter with the same name + Name contains an illegal character + There is already a parameter with the same name Do you really want to delete \'%s\' function? Fix Default numeral system @@ -121,12 +121,5 @@ Clear New in %1$s version Do you want to try new Material themes? Choose them from the list: - Don\'t show again System language - Missing permission - Please enable \"%1$s\" permission in system settings - Mode - Mode: %1$s - From - To diff --git a/translations/src/main/java/org/solovyev/android/translations/Android.java b/translations/src/main/java/org/solovyev/android/translations/Android.java index 6d1c2fb6..ee84f455 100644 --- a/translations/src/main/java/org/solovyev/android/translations/Android.java +++ b/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"));