diff --git a/calculatorpp/AndroidManifest.xml b/calculatorpp/AndroidManifest.xml index 7fe22c02..117a6ffc 100644 --- a/calculatorpp/AndroidManifest.xml +++ b/calculatorpp/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/calculatorpp/res/values-ru/text_strings.xml b/calculatorpp/res/values-ru/text_strings.xml index 2496226d..e08e1975 100644 --- a/calculatorpp/res/values-ru/text_strings.xml +++ b/calculatorpp/res/values-ru/text_strings.xml @@ -145,7 +145,8 @@ Статус: Комментарий: Использовать - Копировать выражение + Исп. + Копировать выражение Копировать результат Значение Сохранено (см. вкладку \'Сохранённая история\') diff --git a/calculatorpp/res/values-uk/text_strings.xml b/calculatorpp/res/values-uk/text_strings.xml index 90ca1f44..edb747b0 100644 --- a/calculatorpp/res/values-uk/text_strings.xml +++ b/calculatorpp/res/values-uk/text_strings.xml @@ -145,6 +145,7 @@ Статус: Коментар: Використовувати + Вик. Копіювати вираз Копіювати результат Значення diff --git a/calculatorpp/res/values/text_strings.xml b/calculatorpp/res/values/text_strings.xml index 485419d6..007802b1 100644 --- a/calculatorpp/res/values/text_strings.xml +++ b/calculatorpp/res/values/text_strings.xml @@ -146,6 +146,7 @@ Status: Comment: Use + Use Copy expression Copy result Value diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java index f10bda21..2e3aa43c 100644 --- a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java +++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java @@ -64,7 +64,7 @@ public class NumeralBaseConverterDialog { } }); - b.setCustomButtonData(new UnitConverterViewBuilder.CustomButtonData(context.getString(R.string.c_use), new UnitConverterViewBuilder.CustomButtonOnClickListener() { + b.setCustomButtonData(new UnitConverterViewBuilder.CustomButtonData(context.getString(R.string.c_use_short), new UnitConverterViewBuilder.CustomButtonOnClickListener() { @Override public void onClick(@NotNull Unit fromUnits, @NotNull Unit toUnits) { String toUnitsValue = toUnits.getValue();