diff --git a/Makefile b/Makefile
index 23de1cd8118c1ad25cb6b5d3653f2d3f9cab14e0..eaf1045cde9509609ac4f823808ac30d6a9f9f38 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ resources: resources-${CMDHELP}
resources_common:
${MKDIR} ${RESDIR}.${COMPONENT}
- IfThere LocalRes:<UserIF>.Messages Then ${CP} LocalRes:<UserIF>.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
+ IfThere LocalRes:<UserIF>.Messages Then ${CP} LocalRes:<UserIF>.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS} Else IfThere LocalRes:Messages Then ${CP} LocalRes:Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
IfThere LocalRes:<UserIF>.Templates Then ${CP} LocalRes:<UserIF>.Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
IfThere LocalRes:<UserIF>.Sprites Then ${CP} LocalRes:<UserIF>.Sprites ${RESDIR}.${COMPONENT}.Sprites ${CPFLAGS}
IfThere LocalRes:<UserIF>.Sprites22 Then ${CP} LocalRes:<UserIF>.Sprites22 ${RESDIR}.${COMPONENT}.Sprites22 ${CPFLAGS}
@@ -94,7 +94,7 @@ resources-None: resources_common
@
resources-: resources_common
- print LocalRes:<UserIF>.CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
+ IfThere LocalRes:CmdHelp Then Print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
${OBJECT}: ${SOURCE}
${MKDIR} o
diff --git a/Resources/UK/Lazarus/CmdHelp b/Resources/Denmark/CmdHelp
similarity index 100%
rename from Resources/UK/Lazarus/CmdHelp
rename to Resources/Denmark/CmdHelp
diff --git a/Resources/Denmark/NC2/Messages b/Resources/Denmark/Messages
similarity index 96%
rename from Resources/Denmark/NC2/Messages
rename to Resources/Denmark/Messages
index 377a4f76207717c0cd6e507a7fb0565ca91b0033..7b63ebf8e5a0422639839ad202df8f7a3febb2eb 100644
--- a/Resources/Denmark/NC2/Messages
+++ b/Resources/Denmark/Messages
@@ -59,7 +59,7 @@ Space:Press SPACE or click mouse to continue
ErrorF:Message from %0
ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
ErrMemS:There is not enough free memory to start this application.
-ErrMem:%0K free memory is needed before the application will start.
+ErrMem:%0K free memory is needed before the application will start. Quit any unwanted applications or see the RISC OS User Guide for ways to maximise memory.
ErrNoMv:Unable to move memory
KillApp:Press Stop to terminate %0.
KillProg:Press the return key to stop the program or
diff --git a/Resources/UK/NC2/CmdHelp b/Resources/Finland/CmdHelp
similarity index 100%
rename from Resources/UK/NC2/CmdHelp
rename to Resources/Finland/CmdHelp
diff --git a/Resources/UK/Ursula/Messages b/Resources/Finland/Messages
similarity index 99%
rename from Resources/UK/Ursula/Messages
rename to Resources/Finland/Messages
index 171d98f3b47f6cfd80da384277209b57b0d86573..089a45ac599f701f3a5581dd49681d3e737a5b4f 100644
--- a/Resources/UK/Ursula/Messages
+++ b/Resources/Finland/Messages
@@ -3,8 +3,8 @@ NoError:%0
Watchdog:Stop,Cancel,Next Task
Modifiers:^ ‹ ^‹ ‹^
KeyNames:Esc ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Print PRINT Break BREAK Pause PAUSE Tab TAB Return RETURN Insert INSERT Home HOME PageUp PAGE UP Delete DELETE Copy COPY End END PageDown PAGE DOWN Enter ENTER Up UP Down DOWN Left LEFT Right RIGHT Acorn ACORN Select SELECT Menu MENU Adjust ADJUST
-OK:OK
-Continue:Continue
+OK:Jatka
+Continue:Jatka
Quit:Quit
OSUnits: OS Units
DeciSec: * 1/10 second
diff --git a/Resources/UK/Ursula/CmdHelp b/Resources/Japan/CmdHelp
similarity index 100%
rename from Resources/UK/Ursula/CmdHelp
rename to Resources/Japan/CmdHelp
diff --git a/Resources/Norway/CmdHelp b/Resources/Norway/CmdHelp
new file mode 100644
index 0000000000000000000000000000000000000000..b8e95cb1b2e4a71fefe6c056e0918c56955d1d60
Binary files /dev/null and b/Resources/Norway/CmdHelp differ
diff --git a/Resources/Finland/NC2/Messages b/Resources/Norway/Messages
similarity index 95%
rename from Resources/Finland/NC2/Messages
rename to Resources/Norway/Messages
index 9a5bdc9beaaa66468c48044267a6b23b17a54471..21d6fbfeb69f60b74cf61a5852aa989565fa52f1 100644
--- a/Resources/Finland/NC2/Messages
+++ b/Resources/Norway/Messages
@@ -3,8 +3,8 @@ NoError:%0
Watchdog:Stop,Cancel,Next Task
Modifiers:^ ‹ ^‹ ‹^
KeyNames:Esc ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Print PRINT Break BREAK Pause PAUSE Tab TAB Return RETURN Insert INSERT Home HOME PageUp PAGE UP Delete DELETE Copy COPY End END PageDown PAGE DOWN Enter ENTER Up UP Down DOWN Left LEFT Right RIGHT Acorn ACORN Select SELECT Menu MENU Adjust ADJUST
-OK:Jatka
-Continue:Jatka
+OK:Fortsett
+Continue:Fortsett
Quit:Quit
OSUnits: OS Units
DeciSec: * 1/10 second
@@ -58,7 +58,7 @@ ID:Please insert %0 '%1'
Space:Press SPACE or click mouse to continue
ErrorF:Message from %0
ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
-ErrMemS:There is not enough free memory to start this application.
+ErrMemS:There is not enough free memory to start this application. Quit any unwanted applications or see the RISC OS User Guide for ways to maximise memory.
ErrMem:%0K free memory is needed before the application will start.
ErrNoMv:Unable to move memory
KillApp:Press Stop to terminate %0.
diff --git a/Resources/Sweden/CmdHelp b/Resources/Sweden/CmdHelp
new file mode 100644
index 0000000000000000000000000000000000000000..b8e95cb1b2e4a71fefe6c056e0918c56955d1d60
Binary files /dev/null and b/Resources/Sweden/CmdHelp differ
diff --git a/Resources/Sweden/NC2/Messages b/Resources/Sweden/Messages
similarity index 96%
rename from Resources/Sweden/NC2/Messages
rename to Resources/Sweden/Messages
index fd5e19919bbfcabd496f3a77ade51adce96490fd..f2132cf0d74979ece9c5eddb6d68cb13474938bf 100644
--- a/Resources/Sweden/NC2/Messages
+++ b/Resources/Sweden/Messages
@@ -59,7 +59,7 @@ Space:Press SPACE or click mouse to continue
ErrorF:Message from %0
ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
ErrMemS:There is not enough free memory to start this application.
-ErrMem:%0K free memory is needed before the application will start.
+ErrMem:%0K free memory is needed before the application will start. Quit any unwanted applications or see the RISC OS User Guide for ways to maximise memory.
ErrNoMv:Unable to move memory
KillApp:Press Stop to terminate %0.
KillProg:Press the return key to stop the program or
diff --git a/Resources/UK/Lazarus/Messages b/Resources/UK/Lazarus/Messages
deleted file mode 100644
index a611bca5a9d4419e213bd4fa5e80f060389d2f64..0000000000000000000000000000000000000000
--- a/Resources/UK/Lazarus/Messages
+++ /dev/null
@@ -1,65 +0,0 @@
-Error:Error
-NoError:%0
-Watchdog:Stop,Cancel,Next Task
-Modifiers:^ ‹ ^‹ ‹^
-KeyNames:Esc ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Print PRINT Break BREAK Pause PAUSE Tab TAB Return RETURN Insert INSERT Home HOME PageUp PAGE UP Delete DELETE Copy COPY End END PageDown PAGE DOWN Enter ENTER Up UP Down DOWN Left LEFT Right RIGHT Acorn ACORN Select SELECT Menu MENU Adjust ADJUST
-OK:Continue
-Continue:Continue
-Quit:Quit
-OSUnits: OS Units
-DeciSec: * 1/10 second
-OSUperSec: OS Units / second
-OSUperSec2: OS Units / second˛
-WSP:Wimp sprite pool
-
-#{DictTokens}
-NoClaim:Wimp unable to claim work area
-BadSprite:Sprite doesn't exist
-BadSprites:Squashed or missing sprite file
-BadOp:Invalid Wimp operation in this context
-RectFull:Rectangle area full
-TooBig:There is not enough memory to create this window or menu
-GetRect:Get_Rectangle not called correctly
-Focus:Input focus window not found
-BadHandle:Illegal window handle
-TooMenus:Too many menus
-BadExtent:Bad work area extent
-BadPointer:Syntax: *Pointer [0|1]
-NoTemplateFile:Template file not found
-BadTemplate:Template entry invalid
-BadFonts:Unable to bind font handle
-BadSyntax:Syntax error in validation string
-NoTasks:Too many tasks
-NoTemplate:Template entry not found
-InUse:Window manager in use
-BadPalFile:Error in palette file
-BadPalFile2:The window manager does not understand this type of palette file
-BadVersion:Bad version number passed to Wimp_Initialise
-BadMessageSize:Message block is too big / not a multiple of 4
-BadReasonCode:Illegal reason code given to SendMessage
-BadTaskHandle:Illegal task handle
-CantTask:Can't start task from here
-BadSubMenu:Submenus require a parent menu tree
-OwnerWindow:Access to window denied
-BadMode:This screen mode is unsuitable for displaying the desktop
-BadTransfer:Wimp transfer out of range
-BadSlot:One of the task slots is wrong!!!
-BadSysInfo:Bad parameter passed to Wimp in R0
-BadPtrInR1:Bad pointer passed to Wimp in R1
-BadEscapeState:Wimp_Poll called with escape enabled!
-BadIconHandle:Illegal icon handle
-BadR3:Illegal Wimp_Poll pointer in R3
-BadParent:Bad parent window
-NoSprites:There is not enough memory to load all of the available sprites. This may affect the appearance of files and applications.
-TemplateEOF:End of file while reading template file.
-CantKill:Window manager is currently active
-MF:Message from %0
-ID:Please insert %0 '%1'
-Space:Press SPACE or click mouse to continue
-ErrorF:Message from %0
-ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
-ErrMemS:There is not enough free memory to start this application.
-ErrMem:%0K free memory is needed before the application will start.
-ErrNoMv:Unable to move memory
-KillApp:Press Stop to terminate %0.
-KillProg:Press the return key to stop the program or
diff --git a/Resources/UK/Messages b/Resources/UK/Messages
index 171d98f3b47f6cfd80da384277209b57b0d86573..30f63f984c1e81d374b080ba6c8f399f50d631a4 100644
--- a/Resources/UK/Messages
+++ b/Resources/UK/Messages
@@ -58,6 +58,7 @@ ID:Please insert %0 '%1'
Space:Press SPACE or click mouse to continue
ErrorF:Message from %0
ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
+# The appropriate ErrMem token is selected based upon the Wimp's internal STB flag (which includes NC builds)
ErrMemS:There is not enough free memory to start this application.
ErrMem:%0K free memory is needed before the application will start. Quit any unwanted applications or see the RISC OS User Guide for ways to maximise memory.
ErrNoMv:Unable to move memory
diff --git a/Resources/UK/NC2/Messages b/Resources/UK/NC2/Messages
deleted file mode 100644
index a611bca5a9d4419e213bd4fa5e80f060389d2f64..0000000000000000000000000000000000000000
--- a/Resources/UK/NC2/Messages
+++ /dev/null
@@ -1,65 +0,0 @@
-Error:Error
-NoError:%0
-Watchdog:Stop,Cancel,Next Task
-Modifiers:^ ‹ ^‹ ‹^
-KeyNames:Esc ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Print PRINT Break BREAK Pause PAUSE Tab TAB Return RETURN Insert INSERT Home HOME PageUp PAGE UP Delete DELETE Copy COPY End END PageDown PAGE DOWN Enter ENTER Up UP Down DOWN Left LEFT Right RIGHT Acorn ACORN Select SELECT Menu MENU Adjust ADJUST
-OK:Continue
-Continue:Continue
-Quit:Quit
-OSUnits: OS Units
-DeciSec: * 1/10 second
-OSUperSec: OS Units / second
-OSUperSec2: OS Units / second˛
-WSP:Wimp sprite pool
-
-#{DictTokens}
-NoClaim:Wimp unable to claim work area
-BadSprite:Sprite doesn't exist
-BadSprites:Squashed or missing sprite file
-BadOp:Invalid Wimp operation in this context
-RectFull:Rectangle area full
-TooBig:There is not enough memory to create this window or menu
-GetRect:Get_Rectangle not called correctly
-Focus:Input focus window not found
-BadHandle:Illegal window handle
-TooMenus:Too many menus
-BadExtent:Bad work area extent
-BadPointer:Syntax: *Pointer [0|1]
-NoTemplateFile:Template file not found
-BadTemplate:Template entry invalid
-BadFonts:Unable to bind font handle
-BadSyntax:Syntax error in validation string
-NoTasks:Too many tasks
-NoTemplate:Template entry not found
-InUse:Window manager in use
-BadPalFile:Error in palette file
-BadPalFile2:The window manager does not understand this type of palette file
-BadVersion:Bad version number passed to Wimp_Initialise
-BadMessageSize:Message block is too big / not a multiple of 4
-BadReasonCode:Illegal reason code given to SendMessage
-BadTaskHandle:Illegal task handle
-CantTask:Can't start task from here
-BadSubMenu:Submenus require a parent menu tree
-OwnerWindow:Access to window denied
-BadMode:This screen mode is unsuitable for displaying the desktop
-BadTransfer:Wimp transfer out of range
-BadSlot:One of the task slots is wrong!!!
-BadSysInfo:Bad parameter passed to Wimp in R0
-BadPtrInR1:Bad pointer passed to Wimp in R1
-BadEscapeState:Wimp_Poll called with escape enabled!
-BadIconHandle:Illegal icon handle
-BadR3:Illegal Wimp_Poll pointer in R3
-BadParent:Bad parent window
-NoSprites:There is not enough memory to load all of the available sprites. This may affect the appearance of files and applications.
-TemplateEOF:End of file while reading template file.
-CantKill:Window manager is currently active
-MF:Message from %0
-ID:Please insert %0 '%1'
-Space:Press SPACE or click mouse to continue
-ErrorF:Message from %0
-ErrorP:%0 may have gone wrong. Click Continue to try to resume or Quit to stop %0.
-ErrMemS:There is not enough free memory to start this application.
-ErrMem:%0K free memory is needed before the application will start.
-ErrNoMv:Unable to move memory
-KillApp:Press Stop to terminate %0.
-KillProg:Press the return key to stop the program or
diff --git a/VersionASM b/VersionASM
index 9cb1c567c43a5571e61c881d8a1244761c85ea86..1a5765f2a6cae9c358cadbc674b4236873fd0d5a 100644
--- a/VersionASM
+++ b/VersionASM
@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
-Module_MajorVersion SETS "4.41"
-Module_Version SETA 441
+Module_MajorVersion SETS "4.42"
+Module_Version SETA 442
Module_MinorVersion SETS ""
-Module_Date SETS "07 Mar 2000"
-Module_FullVersion SETS "4.41"
+Module_Date SETS "29 Mar 2000"
+Module_FullVersion SETS "4.42"
END
diff --git a/VersionNum b/VersionNum
index c568c9f9ed8f2451bd9e8d6f282f2d2b300106db..b748ee24add260e55c4e5fb7e61ea41d7878632b 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,15 +1,15 @@
-/* (4.41)
+/* (4.42)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 4.41
+#define Module_MajorVersion_CMHG 4.42
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 07 Mar 2000
+#define Module_Date_CMHG 29 Mar 2000
-#define Module_MajorVersion "4.41"
-#define Module_Version 441
+#define Module_MajorVersion "4.42"
+#define Module_Version 442
#define Module_MinorVersion ""
-#define Module_Date "07 Mar 2000"
+#define Module_Date "29 Mar 2000"
-#define Module_FullVersion "4.41"
+#define Module_FullVersion "4.42"
diff --git a/s/Wimp04 b/s/Wimp04
index 227c9129ed584968c97c2cdf50ac4814b0c75b89..fe75c65b33a490157132e350685e20312b0b0b64 100644
--- a/s/Wimp04
+++ b/s/Wimp04
@@ -7452,6 +7452,7 @@ measure_symbols
; Exit: EQ => needs mapping
test_arrow
ROUT
+ [ RegisterWIMPSymbolFont
Push "LR"
CMP R9, #&80
Pull "PC", LT ; optimisation for ASCII: return NE
@@ -7476,6 +7477,10 @@ test_arrow
Pull "R0,R1,PC"
LTORG
+ |
+ TEQ PC, #0 ; clear Z - no WIMPSymbol font fitted
+ MOV PC, LR
+ ]
]
END
diff --git a/s/Wimp07 b/s/Wimp07
index 6aa70ec7828fab3c57eb3575b54398d139f9ac73..aa82bb27248b1cfedc101bcd8e47c47663e88b5b 100644
--- a/s/Wimp07
+++ b/s/Wimp07
@@ -2304,7 +2304,11 @@ starterrorbox_draw
MOV R1,#11
B oldapploop
+ [ STB
+oklabel DCB "Continue",0
+ |
oklabel DCB "OK",0,0
+ ]
contlabel DCB "Continue",0
noappname DCB "switcher",0
[ true