From d69d8eef4296de57cf2653bba874a4fc321a26db Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Mon, 23 Apr 2012 01:40:04 +0400
Subject: [PATCH] Release

---
 calculatorpp/AndroidManifest.xml                               | 2 +-
 calculatorpp/res/values-ru/text_strings.xml                    | 3 ++-
 calculatorpp/res/values-uk/text_strings.xml                    | 1 +
 calculatorpp/res/values/text_strings.xml                       | 1 +
 .../android/calculator/view/NumeralBaseConverterDialog.java    | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)

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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="73" android:versionName="1.2.35" package="org.solovyev.android.calculator">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="75" android:versionName="1.2.37" package="org.solovyev.android.calculator">
 
 	<uses-permission android:name="android.permission.VIBRATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
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 @@
 	<string name="c_history_item_status">Статус: </string>
 	<string name="c_history_item_comment">Комментарий: </string>
 	<string name="c_use">Использовать</string>
-	<string name="c_copy_expression">Копировать выражение</string>
+    <string name="c_use_short">Исп.</string>
+    <string name="c_copy_expression">Копировать выражение</string>
 	<string name="c_copy_result">Копировать результат</string>
 	<string name="c_history_expression">Значение</string>
 	<string name="c_history_item_already_saved">Сохранено (см. вкладку \'Сохранённая история\')</string>
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 @@
 	<string name="c_history_item_status">Статус: </string>
 	<string name="c_history_item_comment">Коментар: </string>
 	<string name="c_use">Використовувати</string>
+    <string name="c_use_short">Вик.</string>
 	<string name="c_copy_expression">Копіювати вираз</string>
 	<string name="c_copy_result">Копіювати результат</string>
 	<string name="c_history_expression">Значення</string>
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 @@
 	<string name="c_history_item_status">Status: </string>
 	<string name="c_history_item_comment">Comment: </string>
 	<string name="c_use">Use</string>
+	<string name="c_use_short">Use</string>
 	<string name="c_copy_expression">Copy expression</string>
 	<string name="c_copy_result">Copy result</string>
 	<string name="c_history_expression">Value</string>
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<String> fromUnits, @NotNull Unit<String> toUnits) {
                 String toUnitsValue = toUnits.getValue();