diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2016-10-10 00:54:46 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2016-10-10 00:54:46 +0200 |
| commit | 20f6958942e6c1511230eb04a5de1e21e67233c1 (patch) | |
| tree | 4f602aed3adfb19b914e5e181f139204e2096cfc | |
| parent | 216bc0e853e2e8620d32703b3dd065bd898cd63c (diff) | |
| parent | b67c9b17f967b950a2666cda64510f6e4ddc4092 (diff) | |
Merge commit 'b67c9b17f967b950a2666cda64510f6e4ddc4092'
| -rw-r--r-- | main/build.gradle | 4 | ||||
| -rw-r--r-- | main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java | 2 | ||||
| -rwxr-xr-x | main/src/main/res/values-ru/strings.xml | 2 |
3 files changed, 4 insertions, 4 deletions
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 @@ <string name="samsung_broken_title">Телефоны Samsung</string> <string name="novpn_selected">Не выбрано VPN.</string> <string name="alwaysonvpn">VPN, используемый при загрузке и для Always-On</string> - <string name="reconnect">Повторное подключение</string> + <string name="reconnect">переподключить</string> <string name="qs_title">Переключение VPN</string> <string name="qs_connect">Подключиться к %s</string> <string name="qs_disconnect">Отключиться от %s</string> |