This commit was manufactured by cvs2git to create tag 'Display-0_42-1'.

Sprout from master 2016-01-06 22:05:39 UTC Jeffrey Lee <jlee@gitlab.riscosopen.org> 'Fix inconsistent error reporting when changing mode via the iconbar menu'
Cherrypick from master 2016-05-29 14:05:58 UTC Robert Sprowson <rsprowson@gitlab.riscosopen.org> 'Internationalise the info box properly':
    Makefile
    Resources/Germany/Messages
    Resources/UK/Templates,fec
    s/Window
Delete:
    Resources/UK/TemplRate,fec

Makefile

@@ -25,12 +25,8 @@
 COMPONENT  = DisplayManager
 TARGET     = Display
 ROM_SOURCE = GetAll.s
-
-#RESOURCEEXTRA = resources_templates
-RESOURCEEXTRA = resources_templrate
-
-resources_templrate ::
-	${CP} LocalRes:TemplRate ${RESFSDIR}.Templates ${CPFLAGS}
+INSTRES_FILES = Templates
+INSTRES_VERSION = Messages
 
 include StdTools
 include AAsmModule

s/Window

@@ -130,23 +130,10 @@ patch_info_version
         LDR     r2, [r1, #w_icons+i_size*ic_info_version+i_data+0]
         LDR     r3, [r1, #w_icons+i_size*ic_info_version+i_data+8]
         ADR     r1, Version_tag
-  [ :DEF: use_messages_version
         BL      MsgTrans_Lookup
         EXIT
 
-Version_tag     DCB     "Version",0
-  |
-10      LDRB    lr, [r1], #1
-        STRB    lr, [r2], #1
-        TEQ     lr, #0
-        SUBNES  r3, r3, #1
-        BNE     %BT10
-
-        MOV     lr, #0
-        STRB    lr, [r2, #-1]
-        EXIT
-Version_tag     DCB     "$Module_MajorVersion ($Module_ApplicationDate)", 0
-  ]
+Version_tag     DCB     "_Version",0
 
         ALIGN