Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xabber-android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
xabber-android
Commits
b30c89e8
Commit
b30c89e8
authored
Mar 25, 2015
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature/expanding_toolbar
parents
fc0aaa98
9a7822f5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
0 deletions
+14
-0
README.rst
README.rst
+5
-0
account_editor_oauth.xml
app/src/main/res/xml/account_editor_oauth.xml
+1
-0
account_editor_xmpp.xml
app/src/main/res/xml/account_editor_xmpp.xml
+3
-0
preference_connection.xml
app/src/main/res/xml/preference_connection.xml
+5
-0
No files found.
README.rst
View file @
b30c89e8
...
@@ -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
app/src/main/res/xml/account_editor_oauth.xml
View file @
b30c89e8
...
@@ -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
...
...
app/src/main/res/xml/account_editor_xmpp.xml
View file @
b30c89e8
...
@@ -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
...
...
app/src/main/res/xml/preference_connection.xml
View file @
b30c89e8
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment