More tweaks to UI for Search Sources, a=chris

Chris Pollett [2019-01-17 22:Jan:th]
More tweaks to UI for Search Sources, a=chris
Filename
src/locale/ar/configure.ini
src/locale/bn/configure.ini
src/locale/de/configure.ini
src/locale/en_US/configure.ini
src/locale/es/configure.ini
src/locale/fa/configure.ini
src/locale/fr_FR/configure.ini
src/locale/he/configure.ini
src/locale/hi/configure.ini
src/locale/in_ID/configure.ini
src/locale/it/configure.ini
src/locale/ja/configure.ini
src/locale/kn/configure.ini
src/locale/ko/configure.ini
src/locale/nl/configure.ini
src/locale/pl/configure.ini
src/locale/pt/configure.ini
src/locale/ru/configure.ini
src/locale/te/configure.ini
src/locale/th/configure.ini
src/locale/tr/configure.ini
src/locale/vi_VN/configure.ini
src/locale/zh_CN/configure.ini
src/views/elements/SearchsourcesElement.php
diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini
index 43bf4fac5..cee56d77a 100755
--- a/src/locale/ar/configure.ini
+++ b/src/locale/ar/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = "حالة الجهاز لم يعد ت
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = "إضافة مصدر الوسائط"
@@ -1140,20 +1148,11 @@ searchsources_element_url = "URL:"
 searchsources_element_locale_tag = "اللغة:"
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = "الإبهام:"
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = "تقديم"
 searchsources_element_media_sources = "مصادر إعلامية"
 searchsources_element_medianame = "الاسم"
diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini
index 3f747beb9..cca92d450 100755
--- a/src/locale/bn/configure.ini
+++ b/src/locale/bn/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini
index dc544ac03..1d39b9b81 100755
--- a/src/locale/de/configure.ini
+++ b/src/locale/de/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini
index b5000dafb..c8b19fc7b 100644
--- a/src/locale/en_US/configure.ini
+++ b/src/locale/en_US/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = "Machine status no longer updating..."
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = "Edit Source Form"
+searchsources_element_channelpath = "Channel:"
+searchsources_element_item_regex = "Item Separator:"
+searchsources_element_titlepath = "Title:"
+searchsources_element_descpath = "Description:"
+searchsources_element_linkpath = "Link:"
+searchsources_element_image_xpath = "Image XPath:"
+searchsource_element_alt_link_text = "Alternative Link Tag:"
+searchsources_element_wiki_destination = "Wiki Destination:"
 searchsources_element_addsource_form = "Add Source Form"
 searchsources_element_edit_media_source = "Edit Media Source"
 searchsources_element_add_media_source = "Add Media Source"
@@ -1140,20 +1148,11 @@ searchsources_element_url = "URL:"
 searchsources_element_locale_tag = "Language:"
 searchsources_element_category = "Category:"
 searchsources_element_expires = "Expires:"
-searchsources_element_thumbnail = "Thumb:"
 searchsources_element_feed_instruct = "Provide xpaths to feed components below:"
 searchsources_element_regex_instruct = "Enter feed regexes. Regexes except Item separator should have 1 capture group."
 searchsources_element_aux_url_xpath = "Aux Url XPaths:"
-searchsources_element_channelpath = "Channel:"
 searchsources_element_item_text = "Item:"
-searchsources_element_item_regex = "Item Separator:"
-searchsources_element_titlepath = "Title:"
-searchsources_element_descpath = "Description:"
-searchsources_element_linkpath = "Link:"
-link_xpath_text = "Download Xpath:"
-alt_link_text = "Alternative Link Tag:"
-searchsources_element_image_xpath = "Image XPath:"
-searchsources_element_wiki_destination = "Wiki Destination:"
+searchsources_element_link_xpath_text = "Download Xpath:"
 searchsources_element_submit = "Submit"
 searchsources_element_media_sources = "Media Sources"
 searchsources_element_medianame = "Name"
diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini
index 4c4aad250..cbfd9d266 100755
--- a/src/locale/es/configure.ini
+++ b/src/locale/es/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini
index 96433d60f..0ed17e529 100755
--- a/src/locale/fa/configure.ini
+++ b/src/locale/fa/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = "وضعیت دستگاه دیگر به
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = "منبع رسانه‌ای اضافه کن"
@@ -1140,20 +1148,11 @@ searchsources_element_url = "URL:"
 searchsources_element_locale_tag = "زبان:"
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = "تصویر کوچک:"
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = "ارسال"
 searchsources_element_media_sources = "منابع رسانه"
 searchsources_element_medianame = "نام"
diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini
index 4a20a76c4..f445fc5ae 100755
--- a/src/locale/fr_FR/configure.ini
+++ b/src/locale/fr_FR/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini
index d3d48380a..e54ea3eab 100755
--- a/src/locale/he/configure.ini
+++ b/src/locale/he/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini
index 6794ec4dd..b5b01efa5 100755
--- a/src/locale/hi/configure.ini
+++ b/src/locale/hi/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/in_ID/configure.ini b/src/locale/in_ID/configure.ini
index da0fffb22..fe9b47e9c 100755
--- a/src/locale/in_ID/configure.ini
+++ b/src/locale/in_ID/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini
index b3971e46c..12189a6f8 100755
--- a/src/locale/it/configure.ini
+++ b/src/locale/it/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = "Stato Macchine non aggiornato..."
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini
index 5632b2d92..c67e6e654 100755
--- a/src/locale/ja/configure.ini
+++ b/src/locale/ja/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini
index 6d969cdc5..137a14383 100755
--- a/src/locale/kn/configure.ini
+++ b/src/locale/kn/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini
index 2420ca009..7a838f04c 100755
--- a/src/locale/ko/configure.ini
+++ b/src/locale/ko/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini
index 5400ab541..472796292 100644
--- a/src/locale/nl/configure.ini
+++ b/src/locale/nl/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = "Status van de machine niet meer updat
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = "kanaal:"
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = "Titel:"
+searchsources_element_descpath = "beschrijving:"
+searchsources_element_linkpath = "Link:"
+searchsources_element_image_xpath = "Afbeelding XPath:"
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = "Bron Vorm toevoegen"
 searchsources_element_edit_media_source = "Media bewerken Bron"
 searchsources_element_add_media_source = "Voeg Media Source"
@@ -1140,20 +1148,11 @@ searchsources_element_url = "URL:"
 searchsources_element_locale_tag = "taal:"
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = "thumb:"
 searchsources_element_feed_instruct = "Bieden xpaths naar nieuwsfeed onderdelen hieronder:"
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = "kanaal:"
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = "Titel:"
-searchsources_element_descpath = "beschrijving:"
-searchsources_element_linkpath = "Link:"
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = "Afbeelding XPath:"
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = "voorleggen"
 searchsources_element_media_sources = "media Bronnen"
 searchsources_element_medianame = "naam"
diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini
index 9c00ab314..4acdf9e4f 100755
--- a/src/locale/pl/configure.ini
+++ b/src/locale/pl/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini
index eb609c53a..e20bf0f4c 100755
--- a/src/locale/pt/configure.ini
+++ b/src/locale/pt/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini
index 0531bdde2..21b9e2fb5 100755
--- a/src/locale/ru/configure.ini
+++ b/src/locale/ru/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini
index 64f47258b..2c5b9e306 100644
--- a/src/locale/te/configure.ini
+++ b/src/locale/te/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = "మెషిన్ స్టేటస
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini
index 6b553f42c..8c400df1a 100755
--- a/src/locale/th/configure.ini
+++ b/src/locale/th/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini
index 509d4a736..dbc1d9348 100755
--- a/src/locale/tr/configure.ini
+++ b/src/locale/tr/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini
index 3210e3de0..bb1b0f355 100755
--- a/src/locale/vi_VN/configure.ini
+++ b/src/locale/vi_VN/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini
index 4729cb5c2..4f108d519 100755
--- a/src/locale/zh_CN/configure.ini
+++ b/src/locale/zh_CN/configure.ini
@@ -1131,6 +1131,14 @@ managemachines_element_no_longer_update = ""
 ;
 ; SearchsourcesElement.php
 searchsources_element_editsource_form = ""
+searchsources_element_channelpath = ""
+searchsources_element_item_regex = ""
+searchsources_element_titlepath = ""
+searchsources_element_descpath = ""
+searchsources_element_linkpath = ""
+searchsources_element_image_xpath = ""
+searchsource_element_alt_link_text = ""
+searchsources_element_wiki_destination = ""
 searchsources_element_addsource_form = ""
 searchsources_element_edit_media_source = ""
 searchsources_element_add_media_source = ""
@@ -1140,20 +1148,11 @@ searchsources_element_url = ""
 searchsources_element_locale_tag = ""
 searchsources_element_category = ""
 searchsources_element_expires = ""
-searchsources_element_thumbnail = ""
 searchsources_element_feed_instruct = ""
 searchsources_element_regex_instruct = ""
 searchsources_element_aux_url_xpath = ""
-searchsources_element_channelpath = ""
 searchsources_element_item_text = ""
-searchsources_element_item_regex = ""
-searchsources_element_titlepath = ""
-searchsources_element_descpath = ""
-searchsources_element_linkpath = ""
-link_xpath_text = ""
-alt_link_text = ""
-searchsources_element_image_xpath = ""
-searchsources_element_wiki_destination = ""
+searchsources_element_link_xpath_text = ""
 searchsources_element_submit = ""
 searchsources_element_media_sources = ""
 searchsources_element_medianame = ""
diff --git a/src/views/elements/SearchsourcesElement.php b/src/views/elements/SearchsourcesElement.php
index 5406d7d73..495acdcd5 100644
--- a/src/views/elements/SearchsourcesElement.php
+++ b/src/views/elements/SearchsourcesElement.php
@@ -90,6 +90,26 @@ class SearchsourcesElement extends Element
         $localize_url = $pre_base_url . "&a=manageLocales".
             "&arg=editstrings&selectlocale=".$data['LOCALE_TAG'].
             "&previous_activity=searchSources";
+        $scrape_feeds = [tl('searchsources_element_channelpath') => 0,
+            tl('searchsources_element_item_regex') => 1,
+            tl('searchsources_element_titlepath') => 2,
+            tl('searchsources_element_descpath') => 3,
+            tl('searchsources_element_linkpath') => 4,
+            tl('searchsources_element_image_xpath') => 5
+        ];
+        $type_fields = [
+            "rss" => [tl('searchsources_element_image_xpath') => 0 ],
+            "json" => $scrape_feeds,
+            "html" => $scrape_feeds,
+            "regex" => $scrape_feeds,
+            "feed_podcast" => [tl('searchsource_element_alt_link_text') => 4,
+                tl('searchsources_element_wiki_destination') => 5
+            ],
+            "scrape_podcast" => [
+                tl('searchsources_element_aux_url_xpath') => 0,
+                tl('searchsources_element_link_xpath_text') => 4,
+                tl('searchsources_element_wiki_destination') => 5],
+        ];
         ?>
         <div class="current-activity">
         <?php if ($data["SOURCE_FORM_TYPE"] == "editsource") {
@@ -163,13 +183,6 @@ class SearchsourcesElement extends Element
             $this->view->helper("options")->render("source-expires",
             "expires", $data['PODCAST_EXPIRES'],
              $data['CURRENT_SOURCE']['category']); ?></td></tr>
-        <tr><td><label for="source-thumbnail"><b id="thumb-text"><?php
-            e(tl('searchsources_element_thumbnail'));
-            ?></b></label></td><td>
-            <input type="text" id="source-thumbnail" name="aux_info"
-                value="<?= $data['CURRENT_SOURCE']['aux_info'] ?>"
-                maxlength="<?= $aux_info_len
-                ?>" class="wide-field" /></td></tr>
         <tr><td colspan="2" class="instruct"><span id='instruct'><?=
             tl('searchsources_element_feed_instruct')
             ?></span><span id='instruct-regex'><?=
@@ -206,8 +219,9 @@ class SearchsourcesElement extends Element
                 class="wide-field" /></td></tr>
         <tr><td><label for="date-path"><b><span id="link-text"><?=
             tl('searchsources_element_linkpath')?></span><span
-            id='link-xpath-text'><?= tl('link_xpath_text')
-                ?></span><span id='alt-link-text'><?= tl('alt_link_text')
+            id='link-xpath-text'><?= tl('searchsources_element_link_xpath_text')
+                ?></span><span id='alt-link-text'><?=
+                tl('searchsource_element_alt_link_text')
                 ?></span></b></label></td><td>
             <input type="text" id="link-path" name="link_path"
                 value="<?= $data['CURRENT_SOURCE']['link_path'] ?>"
@@ -256,8 +270,10 @@ class SearchsourcesElement extends Element
             <th colspan="3"><?= tl('searchsources_element_action')
                 ?></th></tr><?php
         foreach ($data['MEDIA_SOURCES'] as $source) {
-            $encode_source = urlencode(
-                urlencode($source['NAME']));
+            $encode_source = urlencode(urlencode($source['NAME']));
+            $current_aux_fields = empty($type_fields[$source['TYPE']]) ?
+                $type_fields['rss']: $type_fields[$source['TYPE']];
+            $aux_info_parts = explode("###", $source['AUX_INFO']);
             ?>
             <tr><td><?php
             $is_feed = false;
@@ -287,9 +303,11 @@ class SearchsourcesElement extends Element
                     }
                 ?><br />
                 <b><?= tl('searchsources_element_url') ?></b>
-                <pre><?= $source['SOURCE_URL']?></pre>
-                <b><?= tl('searchsources_element_aux_info') ?></b><br />
-                <pre><?= $source['AUX_INFO'] ?></pre>
+                <pre><?= $source['SOURCE_URL']?></pre><?php
+                foreach ($current_aux_fields as $aux_name => $aux_index) {
+                    ?><b><?=$aux_name ?></b><br />
+                    <pre><?= $aux_info_parts[$aux_index]?></pre><?php
+                } ?>
             </td>
             <td><a href="<?=$base_url."&amp;arg=testsource&amp;ts=".
                 $source['TIMESTAMP'] . $paging1 . $paging2 ?>"><?=
@@ -443,7 +461,6 @@ class SearchsourcesElement extends Element
                 channel_string +'</textarea>';
             stype = stype.options[stype.selectedIndex].value;
             if (stype == "html" || stype == 'json' || stype == 'regex') {
-                setDisplay("thumb-text", false);
                 setDisplay("source-thumbnail", false);
                 if (stype == 'regex') {
                     setDisplay("instruct-regex", true);
@@ -482,7 +499,6 @@ class SearchsourcesElement extends Element
                     elt('source-category').value = "news";
                 }
             } else if (stype == "feed_podcast") {
-                setDisplay("thumb-text", false);
                 setDisplay("source-thumbnail", false);
                 setDisplay("instruct", false);
                 setDisplay("instruct-regex", false);
@@ -511,7 +527,6 @@ class SearchsourcesElement extends Element
                 setDisplay("source-locale-tag", true);
                 elt('source-category').value = "";
             }  else if (stype == "scrape_podcast") {
-                setDisplay("thumb-text", false);
                 setDisplay("source-thumbnail", false);
                 setDisplay("instruct", false);
                 setDisplay("instruct-regex", false);
@@ -541,7 +556,6 @@ class SearchsourcesElement extends Element
                 setDisplay("source-locale-tag", true);
                 elt('source-category').value = "";
             } else {
-                setDisplay("thumb-text", false);
                 setDisplay("source-thumbnail", false);
                 setDisplay("instruct", true);
                 setDisplay("instruct-regex", false);
ViewGit