RISC OS: Add "Disable CSS" option to content choices UI

6 files changed, 21 insertions, 21 deletions

diff --git a/frontends/riscos/configure/con_content.c b/frontends/riscos/configure/con_content.c
index 50bbd15ef..bdf147bd4 100644
--- a/frontends/riscos/configure/con_content.c
+++ b/frontends/riscos/configure/con_content.c
@@ -30,7 +30,7 @@
 
 #define CONTENT_BLOCK_ADVERTISEMENTS 2
 #define CONTENT_BLOCK_POPUPS 3
-#define CONTENT_NO_PLUGINS 4
+#define CONTENT_BLOCK_CSS 4
 #define CONTENT_TARGET_BLANK 7
 #define CONTENT_DEFAULT_BUTTON 8
 #define CONTENT_CANCEL_BUTTON 9
@@ -47,8 +47,8 @@ bool ro_gui_options_content_initialise(wimp_w w)
                                        nsoption_bool(block_advertisements));
 	ro_gui_set_icon_selected_state(w, CONTENT_BLOCK_POPUPS,
                                        nsoption_bool(block_popups));
-	ro_gui_set_icon_selected_state(w, CONTENT_NO_PLUGINS,
-                                       nsoption_bool(no_plugins));
+	ro_gui_set_icon_selected_state(w, CONTENT_BLOCK_CSS,
+                                       !nsoption_bool(author_level_css));
 	ro_gui_set_icon_selected_state(w, CONTENT_TARGET_BLANK,
                                        nsoption_bool(target_blank));
 	ro_gui_set_icon_selected_state(w, CONTENT_NO_JAVASCRIPT,
@@ -57,7 +57,7 @@ bool ro_gui_options_content_initialise(wimp_w w)
 	/* initialise all functions for a newly created window */
 	ro_gui_wimp_event_register_checkbox(w, CONTENT_BLOCK_ADVERTISEMENTS);
 	ro_gui_wimp_event_register_checkbox(w, CONTENT_BLOCK_POPUPS);
-	ro_gui_wimp_event_register_checkbox(w, CONTENT_NO_PLUGINS);
+	ro_gui_wimp_event_register_checkbox(w, CONTENT_BLOCK_CSS);
 	ro_gui_wimp_event_register_checkbox(w, CONTENT_TARGET_BLANK);
 	ro_gui_wimp_event_register_checkbox(w, CONTENT_NO_JAVASCRIPT);
 	ro_gui_wimp_event_register_button(w, CONTENT_DEFAULT_BUTTON,
@@ -78,7 +78,7 @@ void ro_gui_options_content_default(wimp_pointer *pointer)
 			false);
 	ro_gui_set_icon_selected_state(pointer->w, CONTENT_BLOCK_POPUPS,
 			false);
-	ro_gui_set_icon_selected_state(pointer->w, CONTENT_NO_PLUGINS,
+	ro_gui_set_icon_selected_state(pointer->w, CONTENT_BLOCK_CSS,
 			false);
 	ro_gui_set_icon_selected_state(pointer->w, CONTENT_TARGET_BLANK,
 			true);
@@ -93,8 +93,8 @@ bool ro_gui_options_content_ok(wimp_w w)
 
 	nsoption_set_bool(block_popups,
 			  ro_gui_get_icon_selected_state(w, CONTENT_BLOCK_POPUPS));
-	nsoption_set_bool(no_plugins,
-			  ro_gui_get_icon_selected_state(w, CONTENT_NO_PLUGINS));
+	nsoption_set_bool(author_level_css,
+			  !ro_gui_get_icon_selected_state(w, CONTENT_BLOCK_CSS));
 
 	nsoption_set_bool(target_blank,
 			  ro_gui_get_icon_selected_state(w, CONTENT_TARGET_BLANK));
diff --git a/frontends/riscos/templates/de b/frontends/riscos/templates/de
index a6c137266..b5710d467 100644
--- a/frontends/riscos/templates/de
+++ b/frontends/riscos/templates/de
@@ -3370,11 +3370,11 @@ wimp_window {
   }
   wimp_icon {
     extent:32,-256,496,-212
-    icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_DELETED | wimp_BUTTON_RADIO
+    icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
     icon_esg:0
     icon_fg:wimp_COLOUR_BLACK
     icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
-    text_and_sprite.text:"Plugins nicht benutzen"
+    text_and_sprite.text:"CSS nicht benutzen"
     text_and_sprite.size:42
     text_and_sprite.validation:"Soptoff,opton"
   }
diff --git a/frontends/riscos/templates/en b/frontends/riscos/templates/en
index 8b84d1513..6ea18a859 100644
--- a/frontends/riscos/templates/en
+++ b/frontends/riscos/templates/en
@@ -3040,11 +3040,11 @@ wimp_window {
   }
   wimp_icon {
     extent:32,-256,344,-212
-    icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_DELETED | wimp_BUTTON_RADIO
+    icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
     icon_esg:0
     icon_fg:wimp_COLOUR_BLACK
     icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
-    text_and_sprite.text:"Disable plug-ins"
+    text_and_sprite.text:"Disable CSS"
     text_and_sprite.size:42
     text_and_sprite.validation:"Soptoff,opton"
   }
diff --git a/frontends/riscos/templates/fr b/frontends/riscos/templates/fr
index 6128d3f62..e2741df4a 100644
--- a/frontends/riscos/templates/fr
+++ b/frontends/riscos/templates/fr
@@ -2842,11 +2842,11 @@ wimp_window {
   }
   wimp_icon {
     extent:32,-256,404,-212
-    icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_DELETED | wimp_BUTTON_RADIO
+    icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
     icon_esg:0
     icon_fg:wimp_COLOUR_BLACK
     icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
-    text_and_sprite.text:"Désactiver les plug-ins"
+    text_and_sprite.text:"Désactiver les CSS"
     text_and_sprite.size:42
     text_and_sprite.validation:"Soptoff,opton"
   }
diff --git a/frontends/riscos/templates/nl b/frontends/riscos/templates/nl
index 2fba8b5c9..24b176891 100644
--- a/frontends/riscos/templates/nl
+++ b/frontends/riscos/templates/nl
@@ -3090,11 +3090,11 @@ wimp_window {
   }
   wimp_icon {
     extent:32,-256,540,-212
-    icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_DELETED | wimp_BUTTON_RADIO
+    icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO
     icon_esg:0
     icon_fg:wimp_COLOUR_BLACK
     icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
-    text_and_sprite.text:"Plug-ins uitschakelen"
+    text_and_sprite.text:"CSS uitschakelen"
     text_and_sprite.size:42
     text_and_sprite.validation:"Soptoff,opton"
   }
diff --git a/resources/FatMessages b/resources/FatMessages
index 3492c3f0a..b02b640a9 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -7449,12 +7449,12 @@ it.ro.HelpContentConfig3:Indica se NetSurf impedirà ai siti Web di aprire autom
 nl.ro.HelpContentConfig3:Deze optie geeft aan of NetSurf websites, die automatisch nieuwe pagina's proberen te openen blokkeerd.
 zh_CN.ro.HelpContentConfig3:这表示NetSurf是�会阻止网站在您的桌�上自动打开新窗�。
 
-en.ro.HelpContentConfig4:This indicates whether NetSurf will allow external plug-ins to handle additional types of content, such as Flash.
-de.ro.HelpContentConfig4:Stellt ein, ob externe Pluginroutinen genutzt werden dürfen, um Zusatzinhalte darzustellen (z.B. Flash).
-fr.ro.HelpContentConfig4:Ceci indique si Netsurf doit autoriser les plug-ins externes à manipuler des types de contenu supplémentaires, comme le Flash.
-it.ro.HelpContentConfig4:Indica se NetSurf consentirà ai plug-in esterni di gestire tipi di contenuto aggiuntivi come il Flash.
-nl.ro.HelpContentConfig4:Deze optie geeft aan of NetSurf externe plug-ins, voor aanvullende soorten inhoud zoals Flash toestaat.
-zh_CN.ro.HelpContentConfig4:这表示 NetSurf 是��许外部�件�处�其他类型的内容，如 Flash �件。
+en.ro.HelpContentConfig4:This indicates whether NetSurf will allow web pages to style their content with CSS.
+de.ro.HelpContentConfig4:This indicates whether NetSurf will allow web pages to style their content with CSS.
+fr.ro.HelpContentConfig4:This indicates whether NetSurf will allow web pages to style their content with CSS.
+it.ro.HelpContentConfig4:This indicates whether NetSurf will allow web pages to style their content with CSS.
+nl.ro.HelpContentConfig4:This indicates whether NetSurf will allow web pages to style their content with CSS.
+zh_CN.ro.HelpContentConfig4:This indicates whether NetSurf will allow web pages to style their content with CSS.
 
 en.ro.HelpContentConfig7:This indicates whether NetSurf will allow links to open in new windows.
 de.ro.HelpContentConfig7:Stellt ein, ob NetSurf erlaubt, daß Links beim Aufruf neue Browserfenster öffnen dürfen.