From faa3727a4a84fa8a041ba9164b2a08e61f50c192 Mon Sep 17 00:00:00 2001
From: ROOL <code@riscosopen.org>
Date: Sun, 29 May 2016 14:05:59 +0000
Subject: [PATCH] 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 | 8 ++------
Resources/Germany/Messages | Bin 2727 -> 2743 bytes
Resources/UK/TemplRate,fec | Bin 1296 -> 0 bytes
Resources/UK/Templates,fec | Bin 1306 -> 1296 bytes
s/Window | 15 +--------------
5 files changed, 3 insertions(+), 20 deletions(-)
delete mode 100644 Resources/UK/TemplRate,fec
diff --git a/Makefile b/Makefile
index 7398fdb..ab4452a 100644
--- a/Makefile
+++ b/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
diff --git a/Resources/Germany/Messages b/Resources/Germany/Messages
index e8d2f9ce2632ba2eb713002f28d7ddcfc0901745..3395c956cb40bfb1a6ecc6e331828ad97d79140f 100644
GIT binary patch
delta 49
zcmZ23x?OaFq(ppJYEf}!ex8+QUU6zsNotBhQl&y-dG<!5X`Gz-DXB#Yt}dP~lMiq{
F2LQdb5)%Lb
delta 40
wcmdlkx?FUEq-0oXQE_H|o|S=~v6+H~p^=_~Z(^o`fq~{m!)ct8Z*blR0R7SozW@LL
diff --git a/Resources/UK/TemplRate,fec b/Resources/UK/TemplRate,fec
deleted file mode 100644
index 1fd4e53df5afdea1ac72e8edca484c32f96adfe7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1296
zcmZuxO=}ZT6un6+iP%@F72=}E+qFW#MzL5lB_%}!TP;N-3qhvom<*;f!<z|44cbKo
z7ySWJtgZ{)2repAa8a>~F7!Vrbg9rq1tp#{ozX1%$jyCo&i$HsXQtEXbfjzD#lD;t
zNx@G!f#0wmDbjC%y@e+}<1N?`i2ZDj$VY(09rwPM;JB0><Sg}yWRHooV97$u&ME1A
zo=Im?J*mD3&H^hTo~xLWVHrKFSxO(sCW<qs1nvY3C1o4e+wceQC+8(s_8MN(1WHY)
zXUm8m0Dc+urr?W(bnZPc&Y6kxU&Q%a%&$uBQ{02o^dWC2&fkY0EXe0C;J?D~lN}iQ
z_act{i<acRf%pz9#XReiXMOT};C^-SoUe`RWWL|n_aL70vHuEq&c6xI{#opg!w?qT
z|1@yk{}Mds9|DJMhx2nj^6XEZ{fDv7!%E;-e-=3Fx8Yg;Jock7)>q}a<<@LvF6A$(
zIXmzg&Cu~&1>j0hGfu4@=KVvj)Z7I%iltkc|09)3<s7lH<yP&+VTq&it{H35*2W5L
zq+fr`l%vANFwzJlmd2U4;gf}_At71rme2;UUCxgM2}O%;H+5TH!ZU{|L`fNd@n{+d
z_yJ%1DVa53uVEz^kLDflZTRSj3zAz0z5(MH(JP>QKQ#9q8V5IV>xP;e!{ch9I?r++
z1Mjm_yin`kz<vGyHQ$b7x(9AU^A*%!&LHx$uvai@E<}8yxd(`O0^`k)r{>5fntKXv
z6*d&})CBoN6Kml3UL-s<Nj}mfG_wWn1MCd)Ct!RhR^j=;PNpSy6Gy02O7Hy<-4A>v
z=K0{r&o+(k1qcCu7Cbe_{8r3QHp9ASluGhX$Nbfpzhj#q(jD?A=e=gA!@3h_-*`2s
zN5!8fJ!836%{GzhC|t*_A<))A)!4SH7virN6t=D>tDbRn*<19RA*$=?a3QY?<Kxgd
H1PJ>Jx`}n-
diff --git a/Resources/UK/Templates,fec b/Resources/UK/Templates,fec
index 680edb255481ac1eb1eae51100eba194e7104a62..1fd4e53df5afdea1ac72e8edca484c32f96adfe7 100644
GIT binary patch
delta 243
zcmbQmHGyk_h^{je0|O%i1A|LuaY0UEB`=W4Fdrzk5lDl?ee+XN!Gb_`z(hxBz7s&n
z1{MYe4ps(+3f75Pa?%|C|NnOYih_VGBZE4F0Ys|<(~pUZO*sXC(iT8zmx&LjgE=)o
zb6qAkGMaPx0Huxqbu~;r$S4lxv4BjU{1C_sfNHCm%*Zr%@(Lz-Muy2Jm?p_r09E_}
pn(zhahA&WCK{f-G{}*Clm|V&1$XGIYH?usDybUIQgGp(Y{{SCCLcIV0
delta 254
zcmbQhHH&M4h^{Xa0|O%i1A|LuaY0UEB`=W4uo5V?5lDl?ee+XN!Gb_`)I>*Vz8q!-
zh8|W1hBZL!!8S2VPTJ-F|Njm^Eg)da$e_+(0MY8ev}fXCQ%)bCv;|PQVdBH-U``Ft
z+=j`GjOLtw{{8=d1gOhk@<B#%FpmYO&|vaIAddm6&0sPk(_Aj=f`XEw_}tXI(#i9f
z<QWwv?_-)I53=(Ikf;OV4?t(Z08r<DAqIuX`OJ=t6_YnI%LB=aVDclF6lD1i00ewT
AM*si-
diff --git a/s/Window b/s/Window
index 63e814f..642cfaf 100644
--- a/s/Window
+++ b/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
--
GitLab