aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2019-11-03 19:41:16 +0100
committerChristian Schneppe <christian.schneppe@pix-art.de>2019-11-03 19:41:16 +0100
commitad75ab3f683391c26c2a99242210747c0bf881c2 (patch)
tree03cb3f2d2eb80e5a19a72315e09da0619f322316 /src/main/res/values
parent6a672b4aacfd62fcbbbe3ea031bf53c0daace132 (diff)
optionally search local muc rooms instead of jabber.network
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/arrays.xml9
-rw-r--r--src/main/res/values/defaults.xml1
-rw-r--r--src/main/res/values/strings.xml5
3 files changed, 15 insertions, 0 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index fecbff8a4..b0ba7423f 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -125,4 +125,13 @@
<item>@string/medium</item>
<item>@string/large</item>
</string-array>
+
+ <string-array name="channel_discovery_entries">
+ <item>@string/jabber_network</item>
+ <item>@string/local_server</item>
+ </string-array>
+ <string-array name="channel_discover_values">
+ <item>JABBER_NETWORK</item>
+ <item>LOCAL_SERVER</item>
+ </string-array>
</resources>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 7a32d23a3..e1e39fbe5 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -68,6 +68,7 @@
<string name="omemo_setting_default">default_off</string>
<string name="theme">auto</string>
<string name="default_font_size">small</string>
+ <string name="default_channel_discovery">JABBER_NETWORK</string>
<string-array name="domains">
<item>pix-art.de</item>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0716acf07..175f1c58b 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -977,4 +977,9 @@
<string name="no_results">No results</string>
<string name="file_transmission_cancelled">file transmission cancelled</string>
<string name="sharing_application_not_grant_permission">The sharing application did not grant permission to access this file.</string>
+ <string name="group_chats_and_channels"><![CDATA[Group Chats & Channels]]></string>
+ <string name="jabber_network">jabber.network</string>
+ <string name="local_server">Local server</string>
+ <string name="pref_channel_discovery_summary">Most users should choose ‘jabber.network’ for better suggestions from the entirety of the public XMPP ecosystem.</string>
+ <string name="pref_channel_discovery">Channel discovery method</string>
</resources>