From b67c9b17f967b950a2666cda64510f6e4ddc4092 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 9 Oct 2016 13:39:36 +0200 Subject: workaound bug in russian translation with shorter translation: Thanks for all who told me about that bug --- main/build.gradle | 4 ++-- main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java | 2 +- main/src/main/res/values-ru/strings.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'main') diff --git a/main/build.gradle b/main/build.gradle index 570d21df..b42a1077 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -27,8 +27,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 24 - versionCode = 140 - versionName = "0.6.59" + versionCode = 141 + versionName = "0.6.60" } sourceSets { diff --git a/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java b/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java index b955532a..e832c527 100644 --- a/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java +++ b/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java @@ -60,8 +60,8 @@ public class DisconnectVPN extends Activity implements DialogInterface.OnClickLi builder.setTitle(R.string.title_cancel); builder.setMessage(R.string.cancel_connection_query); builder.setNegativeButton(android.R.string.no, this); - builder.setNeutralButton(R.string.reconnect, this); builder.setPositiveButton(android.R.string.yes, this); + builder.setNeutralButton(R.string.reconnect, this); builder.setOnCancelListener(this); builder.show(); diff --git a/main/src/main/res/values-ru/strings.xml b/main/src/main/res/values-ru/strings.xml index e8d1d6b9..999dfe99 100755 --- a/main/src/main/res/values-ru/strings.xml +++ b/main/src/main/res/values-ru/strings.xml @@ -410,7 +410,7 @@ Телефоны Samsung Не выбрано VPN. VPN, используемый при загрузке и для Always-On - Повторное подключение + переподключить Переключение VPN Подключиться к %s Отключиться от %s -- cgit v1.2.3