diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-19 15:44:15 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-19 15:44:15 +0000 |
| commit | 8e0e5606e559efc238fe065ebd0b7a3ff54d8e0d (patch) | |
| tree | 9cf48fd1e26ce83c43c88060a601b622cdf63d1e /android | |
| parent | 2dc1bb7614a1b424e2b54b2793431b17ece4a662 (diff) | |
| download | mullvadvpn-8e0e5606e559efc238fe065ebd0b7a3ff54d8e0d.tar.xz mullvadvpn-8e0e5606e559efc238fe065ebd0b7a3ff54d8e0d.zip | |
Remove repeated string resource
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt | 4 | ||||
| -rw-r--r-- | android/src/main/res/layout/out_of_time.xml | 2 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt index 85b25e74ee..01a35b8d51 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt @@ -39,8 +39,8 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) tunnelState = this@OutOfTimeFragment.tunnelState } - view.findViewById<TextView>(R.id.no_more_vpn_time_left).text = - parentActivity.getString(R.string.no_more_vpn_time_left) + " " + + view.findViewById<TextView>(R.id.account_credit_has_expired).text = + parentActivity.getString(R.string.account_credit_has_expired) + " " + parentActivity.getString(R.string.add_time_to_account) disconnectButton = view.findViewById<Button>(R.id.disconnect).apply { diff --git a/android/src/main/res/layout/out_of_time.xml b/android/src/main/res/layout/out_of_time.xml index ca1016ad61..cc5cb1af5e 100644 --- a/android/src/main/res/layout/out_of_time.xml +++ b/android/src/main/res/layout/out_of_time.xml @@ -26,7 +26,7 @@ android:textSize="@dimen/text_huge" android:textStyle="bold" android:text="@string/out_of_time" /> - <TextView android:id="@+id/no_more_vpn_time_left" + <TextView android:id="@+id/account_credit_has_expired" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/side_margin" diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index a83bf8b5d7..c4b38a424d 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -49,7 +49,6 @@ <string name="account_credit_has_expired">You have no more VPN time left on this account.</string> <string name="out_of_time">Out of time</string> - <string name="no_more_vpn_time_left">You have no more VPN time left on this account.</string> <string name="add_time_to_account">Either buy credit on our website or redeem a voucher.</string> <string name="settings_preferences">Preferences</string> |