diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java index 53773e676..5ba594363 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java @@ -140,7 +140,7 @@ public class VpnProfileDetailActivity extends AppCompatActivity private EditText mEspProposal; private TextView mProfileIdLabel; private TextView mProfileId; - private MultiAutoCompleteTextView mDnsServers; + private EditText mDnsServers; private TextInputLayoutHelper mDnsServersWrap; @Override @@ -180,8 +180,8 @@ public class VpnProfileDetailActivity extends AppCompatActivity mRemoteId = (MultiAutoCompleteTextView)findViewById(R.id.remote_id); mRemoteIdWrap = (TextInputLayoutHelper) findViewById(R.id.remote_id_wrap); - mDnsServers = (MultiAutoCompleteTextView)findViewById(R.id.dns_servers); - mDnsServersWrap = (TextInputLayoutHelper) findViewById(R.id.dns_servers_wrap); + mDnsServers = findViewById(R.id.dns_servers); + mDnsServersWrap = findViewById(R.id.dns_servers_wrap); mMTU = (EditText)findViewById(R.id.mtu); mMTUWrap = (TextInputLayoutHelper) findViewById(R.id.mtu_wrap); mPort = (EditText)findViewById(R.id.port); diff --git a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml index 0bdbc1d68..0adbe6efd 100644 --- a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml +++ b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml @@ -216,17 +216,15 @@ android:id="@+id/dns_servers_wrap" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dp" android:hint="@string/profile_dns_servers_label" app:helper_text="@string/profile_dns_servers_hint" > - + android:inputType="textNoSuggestions" /> diff --git a/src/frontends/android/app/src/main/res/values-de/strings.xml b/src/frontends/android/app/src/main/res/values-de/strings.xml index f7fc36dc8..77542aa18 100644 --- a/src/frontends/android/app/src/main/res/values-de/strings.xml +++ b/src/frontends/android/app/src/main/res/values-de/strings.xml @@ -86,7 +86,7 @@ Standardwert ist der konfigurierte Server. Eigene Werte werden explizit an den Server gesendet und während der Authentifizierung erzwungen Standardwert ist \"%1$s\". Eigene Werte werden explizit an den Server gesendet und während der Authentifizierung erzwungen DNS Server - Benutzerdefinierte DNS Server bei Verbindung zum VPN (mit Leerzeichen getrennt, z.B.. \"8.8.8.8 2001:4860:4860::8888\", standardmässig werden die vom VPN Server erhaltenen Server verwendet) + Benutzerdefinierte DNS Server bei Verbindung zum VPN (mit Leerzeichen getrennt, z.B.. \"8.8.8.8 2001:4860:4860::8888\"), standardmässig werden die vom VPN Server erhaltenen Server verwendet MTU des VPN Tunnel-Device Falls der Standardwert in einem bestimmten Netzwerk nicht geeignet ist Server Port diff --git a/src/frontends/android/app/src/main/res/values-pl/strings.xml b/src/frontends/android/app/src/main/res/values-pl/strings.xml index b202b6706..90523be5a 100644 --- a/src/frontends/android/app/src/main/res/values-pl/strings.xml +++ b/src/frontends/android/app/src/main/res/values-pl/strings.xml @@ -86,7 +86,7 @@ Defaults to the configured server. Custom values are explicitly sent to the server and enforced during authentication Defaults to \"%1$s\". Custom values are explicitly sent to the server and enforced during authentication DNS servers - Custom DNS servers to use when connected to the VPN (separated by spaces, e.g. \"8.8.8.8 2001:4860:4860::8888\", defaults to those received from the VPN server) + Custom DNS servers to use when connected to the VPN (separated by spaces, e.g. \"8.8.8.8 2001:4860:4860::8888\"), defaults to those received from the VPN server MTU of the VPN tunnel device In case the default value is unsuitable for a particular network Server port diff --git a/src/frontends/android/app/src/main/res/values-ru/strings.xml b/src/frontends/android/app/src/main/res/values-ru/strings.xml index 1f81587dc..c6a38de9d 100644 --- a/src/frontends/android/app/src/main/res/values-ru/strings.xml +++ b/src/frontends/android/app/src/main/res/values-ru/strings.xml @@ -83,7 +83,7 @@ Defaults to the configured server. Custom values are explicitly sent to the server and enforced during authentication Defaults to \"%1$s\". Custom values are explicitly sent to the server and enforced during authentication DNS servers - Custom DNS servers to use when connected to the VPN (separated by spaces, e.g. \"8.8.8.8 2001:4860:4860::8888\", defaults to those received from the VPN server) + Custom DNS servers to use when connected to the VPN (separated by spaces, e.g. \"8.8.8.8 2001:4860:4860::8888\"), defaults to those received from the VPN server MTU of the VPN tunnel device In case the default value is unsuitable for a particular network Server port diff --git a/src/frontends/android/app/src/main/res/values-ua/strings.xml b/src/frontends/android/app/src/main/res/values-ua/strings.xml index 95fdd428a..b133525f6 100644 --- a/src/frontends/android/app/src/main/res/values-ua/strings.xml +++ b/src/frontends/android/app/src/main/res/values-ua/strings.xml @@ -84,7 +84,7 @@ Defaults to the configured server. Custom values are explicitly sent to the server and enforced during authentication Defaults to \"%1$s\". Custom values are explicitly sent to the server and enforced during authentication DNS servers - Custom DNS servers to use when connected to the VPN (separated by spaces, e.g. \"8.8.8.8 2001:4860:4860::8888\", defaults to those received from the VPN server) + Custom DNS servers to use when connected to the VPN (separated by spaces, e.g. \"8.8.8.8 2001:4860:4860::8888\"), defaults to those received from the VPN server MTU of the VPN tunnel device In case the default value is unsuitable for a particular network Server port diff --git a/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml b/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml index 006ad5359..359439151 100644 --- a/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml @@ -82,6 +82,8 @@ 服务器ID 默认为已配置的服务器地址。自义定值将在鉴权期间被显式地发送至服务器 默认为 \"%1$s\"。自义定值将在鉴权期间被显式地发送至服务器 + DNS servers + Custom DNS servers to use when connected to the VPN (separated by spaces, e.g. \"8.8.8.8 2001:4860:4860::8888\"), defaults to those received from the VPN server VPN隧道设备的MTU值 假如在某一网络下默认值不合适 服务器端口 diff --git a/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml b/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml index 12666ca55..2330283c0 100644 --- a/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml @@ -83,7 +83,7 @@ 預設為已設定的伺服器位置。自訂值會在授權期間送到伺服器 預設為 \"%1$s\"。自訂值會在授權期間送到伺服器 DNS servers - Custom DNS servers to use when connected to the VPN (separated by spaces, e.g. \"8.8.8.8 2001:4860:4860::8888\", defaults to those received from the VPN server) + Custom DNS servers to use when connected to the VPN (separated by spaces, e.g. \"8.8.8.8 2001:4860:4860::8888\"), defaults to those received from the VPN server VPN通道裝置的MTU值 如果在某個網路下預設值不適合 伺服器Port diff --git a/src/frontends/android/app/src/main/res/values/strings.xml b/src/frontends/android/app/src/main/res/values/strings.xml index e86e84b5a..243231609 100644 --- a/src/frontends/android/app/src/main/res/values/strings.xml +++ b/src/frontends/android/app/src/main/res/values/strings.xml @@ -86,7 +86,7 @@ Defaults to the configured server. Custom values are explicitly sent to the server and enforced during authentication Defaults to \"%1$s\". Custom values are explicitly sent to the server and enforced during authentication DNS servers - Custom DNS servers to use when connected to the VPN (separated by spaces, e.g. \"8.8.8.8 2001:4860:4860::8888\", defaults to those received from the VPN server) + Custom DNS servers to use when connected to the VPN (separated by spaces, e.g. \"8.8.8.8 2001:4860:4860::8888\"), defaults to those received from the VPN server MTU of the VPN tunnel device In case the default value is unsuitable for a particular network Server port