Commit 9a7822f5 authored by Grigory Fedorov's avatar Grigory Fedorov

Merge branch 'lizardlab-master' into develop

parents 8d44dfc7 0faca864
...@@ -37,3 +37,8 @@ All related resources are automatically generated from files got with webtransla ...@@ -37,3 +37,8 @@ All related resources are automatically generated from files got with webtransla
If you want to update any translation please email us to info[at]xabber.com and specify all the translation languages you want to edit. If you want to update any translation please email us to info[at]xabber.com and specify all the translation languages you want to edit.
Then we'll send an invitation to our project on webtranslateit.com. Then we'll send an invitation to our project on webtranslateit.com.
Please don't create pull requests with translation fixes as any changes will be overwritten with the next update from webtranslateit.com. Please don't create pull requests with translation fixes as any changes will be overwritten with the next update from webtranslateit.com.
Wiki
====
Visit our wiki pages for additional information: https://github.com/redsolution/xabber-android/wiki
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<EditTextPreference <EditTextPreference
android:key="@string/account_proxy_port_key" android:key="@string/account_proxy_port_key"
android:title="@string/account_proxy_port" android:title="@string/account_proxy_port"
android:inputType="number"
android:singleLine="true" android:singleLine="true"
/> />
<EditTextPreference <EditTextPreference
......
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
android:key="@string/account_port_key" android:key="@string/account_port_key"
android:title="@string/account_port" android:title="@string/account_port"
android:singleLine="true" android:singleLine="true"
android:inputType="number"
android:dependency="@string/account_custom_key" android:dependency="@string/account_custom_key"
/> />
<EditTextPreference <EditTextPreference
...@@ -76,6 +77,7 @@ ...@@ -76,6 +77,7 @@
<com.xabber.android.ui.widget.PriorityPreference <com.xabber.android.ui.widget.PriorityPreference
android:key="@string/account_priority_key" android:key="@string/account_priority_key"
android:title="@string/account_priority" android:title="@string/account_priority"
android:inputType="numberSigned"
android:singleLine="true" android:singleLine="true"
/> />
<CheckBoxPreference <CheckBoxPreference
...@@ -108,6 +110,7 @@ ...@@ -108,6 +110,7 @@
<EditTextPreference <EditTextPreference
android:key="@string/account_proxy_port_key" android:key="@string/account_proxy_port_key"
android:title="@string/account_proxy_port" android:title="@string/account_proxy_port"
android:inputType="number"
android:singleLine="true" android:singleLine="true"
/> />
<EditTextPreference <EditTextPreference
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
android:defaultValue="@string/connection_priority_chat_default" android:defaultValue="@string/connection_priority_chat_default"
android:dependency="@string/connection_adjust_priority_key" android:dependency="@string/connection_adjust_priority_key"
android:title="@string/chat" android:title="@string/chat"
android:inputType="numberSigned"
android:singleLine="true" android:singleLine="true"
/> />
<com.xabber.android.ui.widget.PriorityPreference <com.xabber.android.ui.widget.PriorityPreference
...@@ -54,6 +55,7 @@ ...@@ -54,6 +55,7 @@
android:defaultValue="@string/connection_priority_available_default" android:defaultValue="@string/connection_priority_available_default"
android:dependency="@string/connection_adjust_priority_key" android:dependency="@string/connection_adjust_priority_key"
android:title="@string/available" android:title="@string/available"
android:inputType="numberSigned"
android:singleLine="true" android:singleLine="true"
/> />
<com.xabber.android.ui.widget.PriorityPreference <com.xabber.android.ui.widget.PriorityPreference
...@@ -61,6 +63,7 @@ ...@@ -61,6 +63,7 @@
android:defaultValue="@string/connection_priority_away_default" android:defaultValue="@string/connection_priority_away_default"
android:dependency="@string/connection_adjust_priority_key" android:dependency="@string/connection_adjust_priority_key"
android:title="@string/away" android:title="@string/away"
android:inputType="numberSigned"
android:singleLine="true" android:singleLine="true"
/> />
<com.xabber.android.ui.widget.PriorityPreference <com.xabber.android.ui.widget.PriorityPreference
...@@ -68,6 +71,7 @@ ...@@ -68,6 +71,7 @@
android:defaultValue="@string/connection_priority_xa_default" android:defaultValue="@string/connection_priority_xa_default"
android:dependency="@string/connection_adjust_priority_key" android:dependency="@string/connection_adjust_priority_key"
android:title="@string/xa" android:title="@string/xa"
android:inputType="numberSigned"
android:singleLine="true" android:singleLine="true"
/> />
<com.xabber.android.ui.widget.PriorityPreference <com.xabber.android.ui.widget.PriorityPreference
...@@ -75,6 +79,7 @@ ...@@ -75,6 +79,7 @@
android:defaultValue="@string/connection_priority_dnd_default" android:defaultValue="@string/connection_priority_dnd_default"
android:dependency="@string/connection_adjust_priority_key" android:dependency="@string/connection_adjust_priority_key"
android:title="@string/dnd" android:title="@string/dnd"
android:inputType="numberSigned"
android:singleLine="true" android:singleLine="true"
/> />
</PreferenceCategory> </PreferenceCategory>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment