Don't offer to boot from floppy if there are no floppy drives

Detail:
  s/Desktop - "Floppy boot" option is now omitted from boot error message if machine has no ADFS floppy drives
  Resources/Germany/Messages, Resources/UK/Messages - Add new messages string for floppyless boot options
Admin:
  Tested on Raspberry Pi


Version 2.74. Tagged as 'Desktop-2_74'

Resources/UK/Messages

@@ -15,4 +15,5 @@ Desktop:Desktop
 BootErr:Machine startup has not completed successfully: '%0'
 BootErrSTB:Temporary loss of service: '%0'
 ErrButt:Retry,Cancel,Floppy boot
+ErrButtNoFlop:Retry,Cancel
 ErrButtSTB:Retry

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "2.73"
-Module_Version          SETA    273
+Module_MajorVersion     SETS    "2.74"
+Module_Version          SETA    274
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "11 Aug 2012"
-Module_ApplicationDate  SETS    "11-Aug-12"
+Module_Date             SETS    "08 Sep 2012"
+Module_ApplicationDate  SETS    "08-Sep-12"
 Module_ComponentName    SETS    "Desktop"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Desktop/Desktop"
-Module_FullVersion      SETS    "2.73"
-Module_HelpVersion      SETS    "2.73 (11 Aug 2012)"
+Module_FullVersion      SETS    "2.74"
+Module_HelpVersion      SETS    "2.74 (08 Sep 2012)"
                         END

VersionNum

-/* (2.73)
+/* (2.74)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        2.73
+#define Module_MajorVersion_CMHG        2.74
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                11 Aug 2012
+#define Module_Date_CMHG                08 Sep 2012
 
-#define Module_MajorVersion             "2.73"
-#define Module_Version                  273
+#define Module_MajorVersion             "2.74"
+#define Module_Version                  274
 #define Module_MinorVersion             ""
-#define Module_Date                     "11 Aug 2012"
+#define Module_Date                     "08 Sep 2012"
 
-#define Module_ApplicationDate          "11-Aug-12"
+#define Module_ApplicationDate          "08-Sep-12"
 
 #define Module_ComponentName            "Desktop"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Desktop/Desktop"
 
-#define Module_FullVersion              "2.73"
-#define Module_HelpVersion              "2.73 (11 Aug 2012)"
-#define Module_LibraryVersionInfo       "2:73"
+#define Module_FullVersion              "2.74"
+#define Module_HelpVersion              "2.74 (08 Sep 2012)"
+#define Module_LibraryVersionInfo       "2:74"

s/Desktop

@@ -44,6 +44,7 @@ Module_BaseAddr
         GET     Hdr:NDRDebug
         GET     Hdr:Sprite
         GET     Hdr:Squash
+        GET     Hdr:ADFS
 
         GBLL    DesktopAllAtOnce
 DesktopAllAtOnce SETL {TRUE}
@@ -542,7 +543,17 @@ StartAsTask
         SWI     XMessageTrans_Lookup
         BVS     Exit
 
-        ADR     r1, token_errorbuttons  ; Now get text for buttons.
+        ; Now get text for buttons.
+ [ Embedded_UI
+        ADR     r1, token_errorbuttons
+ |
+        SWI     XADFS_Drives            ; Don't offer floppy boot if no floppy drive
+        MOVVS   r1, #0
+        CMP     r1, #0
+        ADREQ   r1, token_errorbuttons_noflop
+        ADRNE   r1, token_errorbuttons
+        ADR     r0, MessageBlock
+ ]
         ADR     r2, scratchbuffer1
         MOV     r3, #?scratchbuffer1
         SWI     XMessageTrans_Lookup
@@ -595,6 +606,7 @@ token_errorbuttons DCB  "ErrButtSTB",0
  |
 token_booterror DCB     "BootErr",0
 token_errorbuttons DCB  "ErrButt",0
+token_errorbuttons_noflop DCB  "ErrButtNoFlop",0
  ]
                 ALIGN