summaryrefslogtreecommitdiff
path: root/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values
diff options
context:
space:
mode:
authorlado <herrlado@gmail.com>2019-10-10 23:02:42 +0200
committerlado <herrlado@gmail.com>2019-10-10 23:02:42 +0200
commit3a8b944ee18ae2db7e60bce1fb600d2b0ce6428c (patch)
tree221a9b2a925c1df63eb6ad83461fbf810cc55cf1 /vdrmanager/de.bjusystems.vdrmanager/src/main/res/values
parentc2ce599d38e1ea8027df0fb7b5b76d0d42432db5 (diff)
parent0398f105bcc166d2695f3b8b2f91327c04acca48 (diff)
downloadvdr-manager-master.tar.gz
vdr-manager-master.tar.bz2
Merge branch 'master' of ssh://projects.vdr-developer.org/vdr-managerHEADmaster
Diffstat (limited to 'vdrmanager/de.bjusystems.vdrmanager/src/main/res/values')
-rw-r--r--vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml22
-rw-r--r--vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml11
2 files changed, 26 insertions, 7 deletions
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml
index 94d1831..e43e39e 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml
@@ -37,16 +37,23 @@
<item>vdr-smarttvweb</item>
</string-array>
- <string-array name="recent_channels_order_entry_values">
- <item>most</item>
- <item>last</item>
- </string-array>
- <array name="recstream_smarttvweb_entry_values">
- <item>progressive</item>
+ <string-array name="recent_channels_order_entry_values">
+ <item>most</item>
+ <item>last</item>
+ </string-array>
+ <array name="recstream_smarttvweb_entry_values">
+ <item>progressive</item>
<item>has</item>
<item>hls</item>
- </array>
+ </array>
+
+ <string-array name="vdr_ip46_mode_values">
+ <item>ip4</item>
+ <item>ip6</item>
+ <item>ip46</item>
+ <item>ip64</item>
+ </string-array>
<string-array name="font">
<item> 500px </item>
<item> address-book </item>
@@ -836,4 +843,5 @@
<item> youtube-square </item>
</string-array>
+
</resources>
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml
index 433f581..0ff0cd0 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml
@@ -148,6 +148,15 @@
<string name="vdr_password_summary">Password for the VDR plugin</string>
<string name="vdr_ssl_title">Secure connect</string>
<string name="vdr_ssl_summary">Use SSL for connections</string>
+ <string name="vdr_ip46_mode_title">IPv4/6 selection</string>
+ <string name="vdr_ip46_mode_summary">IPv4/6 selection mode</string>
+
+ <string-array name="vdr_ip46_mode">
+ <item>Use only IPv4</item>
+ <item>Use only IPv6</item>
+ <item>Prefer IPv4 over IPv6</item>
+ <item>Prefer IPv6 over IPv4</item>
+ </string-array>
<!-- channel filter preferences -->
<string name="channel_filter_preferences">Channel settings</string>
@@ -547,6 +556,8 @@
<string name="remote_enable_title">Enable VDR remote control</string>
<string name="svdrp_port_title">SVDRP Port</string>
<string name="svdrp_port_summary">Default is 6419</string>
+ <string name="svdrp_host_title">SVDRP Host</string>
+ <string name="svdrp_host_summary">Default is vdr host</string>
<string name="label">Label</string>
<string name="hitkcommand">HITK Command</string>
<string name="menu_reset">Reset</string>