[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1111
Date : Wed May 17 19:58:56 BST 2006
Changed paths:
M /Trunk/XaraLX/Scripts/rc2xml.pl
M /Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bevres-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/camelot.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/hotlink-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/jason-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/liveeffectres-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/mario-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/plugres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/resimmap-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/richard-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/richard.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/textres-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/tmpltdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/webprvw-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/webster.xrc
Fixed some double-quoted resource strings (and the underlying conversion problem)
Diff:
Index: Trunk/XaraLX/Scripts/rc2xml.pl
===================================================================
--- Trunk/XaraLX/Scripts/rc2xml.pl (revision 1110)
+++ Trunk/XaraLX/Scripts/rc2xml.pl (revision 1111)
@@ -263,18 +263,18 @@
sub WriteLabel
{
my $t=shift @_;
+ $t=~s/&/&/g;
$t=~s/</</g;
$t=~s/>/>/g;
- $t=~s/&/&/g;
print OUTPUT " <label>$t</label>
";
}
sub WriteLabel2
{
my $t=shift @_;
+ $t=~s/&/&/g;
$t=~s/</</g;
$t=~s/>/>/g;
- $t=~s/&/&/g;
print OUTPUT " <label>$t</label>
";
}
@@ -316,18 +316,18 @@
sub WriteTitle
{
my $t=shift @_;
+ $t=~s/&/&/g;
$t=~s/</</g;
$t=~s/>/>/g;
- $t=~s/&/&/g;
print OUTPUT " <title>$t</title>
";
}
sub WriteTooltip
{
my $t=shift @_;
+ $t=~s/&/&/g;
$t=~s/</</g;
$t=~s/>/>/g;
- $t=~s/&/&/g;
print OUTPUT " <tooltip>$t</tooltip>
";
}
Index: Trunk/XaraLX/wxOil/xrc/EN/richard-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/richard-strings.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/richard-strings.xrc (revision 1111)
@@ -301,7 +301,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_FONTS_GALLERY_MEDIUM_TEXT">
- <label>&lt;FontName&gt;</label>
+ <label><FontName></label>
</object>
</object>
<object class="sizeritem">
@@ -691,7 +691,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_TEXTTOOL_MULTIPLE">
- <label>&lt;Multiple&gt;</label>
+ <label><Multiple></label>
</object>
</object>
<object class="sizeritem">
Index: Trunk/XaraLX/wxOil/xrc/EN/resimmap-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/resimmap-strings.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/resimmap-strings.xrc (revision 1111)
@@ -115,7 +115,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_BITMAPFILTER_HTMLTAG">
- <label>&lt;img src="#1%S" width=#2%ld height=#3%ld&gt;</label>
+ <label><img src="#1%S" width=#2%ld height=#3%ld></label>
</object>
</object>
<object class="sizeritem">
@@ -193,7 +193,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTMLEXPORT_CLOSETAGSTART">
- <label>&lt;/</label>
+ <label></</label>
</object>
</object>
<object class="sizeritem">
@@ -247,13 +247,13 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTMLEXPORT_IMAGEMAP_BODY">
- <label>&lt;BODY&gt;
&lt;IMG SRC="#1%s" USEMAP="##2%s" BORDER=0&gt;
&lt;/BODY&gt;
</label>
+ <label><BODY>
<IMG SRC="#1%s" USEMAP="##2%s" BORDER=0>
</BODY>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTMLEXPORT_IMAGEMAP_HEAD">
- <label>&lt;HEAD&gt;
&lt;TITLE&gt;#1%s&lt;/TITLE&gt;
&lt;/HEAD&gt;
</label>
+ <label><HEAD>
<TITLE>#1%s</TITLE>
</HEAD>
</label>
</object>
</object>
<object class="sizeritem">
@@ -313,13 +313,13 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTMLEXPORT_TAGEND">
- <label>&gt;</label>
+ <label>></label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTMLEXPORT_TAGSTART">
- <label>&lt;</label>
+ <label><</label>
</object>
</object>
<object class="sizeritem">
@@ -499,7 +499,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_WEBFILTER_HTMLTAG">
- <label>&lt;embed src="#1%S" width=#2%ld height=#3%ld type="application/vnd.xara" pluginspage="http://www.xara.com/downloads/plugin.html"&gt;</label>
+ <label><embed src="#1%S" width=#2%ld height=#3%ld type="application/vnd.xara" pluginspage="http://www.xara.com/downloads/plugin.html"></label>
</object>
</object>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/webster.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webster.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/webster.xrc (revision 1111)
@@ -64,7 +64,7 @@
</object>
<object class="wxRadioButton" name="IDC_ISDN">
<pos>15,109d</pos> <size>120,12d</size>
- <label>Dual ISDN or better (&gt;128 Kbs)</label>
+ <label>Dual ISDN or better (>128 Kbs)</label>
</object>
<object class="wxStaticBox" name="IDC_STATIC">
<pos>5,130d</pos> <size>195,50d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/mario-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/mario-strings.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/mario-strings.xrc (revision 1111)
@@ -511,7 +511,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_EDIT_OLE_OBJECT">
- <label>&Object;&lt;Help dependent on sel object. User should NOT see this message&gt;</label>
+ <label>&Object;<Help dependent on sel object. User should NOT see this message></label>
</object>
</object>
<object class="sizeritem">
Index: Trunk/XaraLX/wxOil/xrc/EN/jason-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/jason-strings.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/jason-strings.xrc (revision 1111)
@@ -883,13 +883,13 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_EDIT_LESS">
- <label>&lt;&lt;</label>
+ <label><<</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_EDIT_MORE">
- <label>&gt;&gt;</label>
+ <label>>></label>
</object>
</object>
<object class="sizeritem">
Index: Trunk/XaraLX/wxOil/xrc/EN/richard.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/richard.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/richard.xrc (revision 1111)
@@ -166,11 +166,11 @@
</object>
<object class="wxStaticText" name="IDC_LIBPATH_PATHNAME">
<pos>34,122d</pos> <size>260,12d</size>
- <label>&lt;Pathname here&gt;</label>
+ <label><Pathname here></label>
</object>
<object class="wxStaticText" name="IDC_LIBPATH_ISLIBRARY">
<pos>212,125d</pos> <size>200,12d</size>
- <label>&lt;Does index exist&gt;</label>
+ <label><Does index exist></label>
</object>
<object class="wxStaticText" name="-1">
<pos>7,3d</pos> <size>260,8d</size>
@@ -207,11 +207,11 @@
</object>
<object class="wxStaticText" name="IDC_LIBPATH_PATHNAME">
<pos>34,122d</pos> <size>260,12d</size>
- <label>&lt;Pathname here&gt;</label>
+ <label><Pathname here></label>
</object>
<object class="wxStaticText" name="IDC_LIBPATH_ISLIBRARY">
<pos>212,125d</pos> <size>200,12d</size>
- <label>&lt;Does index exist&gt;</label>
+ <label><Does index exist></label>
</object>
<object class="wxStaticText" name="-1">
<pos>7,3d</pos> <size>260,8d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/camelot.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/camelot.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/camelot.xrc (revision 1111)
@@ -135,7 +135,7 @@
<help>Edit linked objects</help>
</object>
<object class="wxMenuItem" name="ID_OLE_VERB_FIRST">
- <label>&lt;&lt;OLE VERBS GO HERE&gt;&gt;</label>
+ <label><<OLE VERBS GO HERE>></label>
<help>Activate embedded or linked object</help>
</object>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/tmpltdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/tmpltdlg.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/tmpltdlg.xrc (revision 1111)
@@ -11,11 +11,11 @@
</object>
<object class="wxButton" name="IDC_TMPLTDLG_ADD">
<pos>140,20d</pos> <size>50,14d</size>
- <label>&Add --&gt;</label>
+ <label>&Add --></label>
</object>
<object class="wxButton" name="IDC_TMPLTDLG_REMOVE">
<pos>140,38d</pos> <size>50,14d</size>
- <label>&lt;-- &Remove</label>
+ <label><-- &Remove</label>
</object>
<object class="wxButton" name="IDC_TMPLTDLG_REMOVE_ALL">
<pos>140,60d</pos> <size>50,14d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/bevres-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bevres-strings.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/bevres-strings.xrc (revision 1111)
@@ -373,7 +373,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_BEVELSTRING_MANY">
- <label>&lt;Many&gt;</label>
+ <label><Many></label>
</object>
</object>
<object class="sizeritem">
Index: Trunk/XaraLX/wxOil/xrc/EN/plugres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/plugres.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/plugres.xrc (revision 1111)
@@ -24,11 +24,11 @@
</object>
<object class="wxStaticText" name="IDC_PLUGINPATH_PATHNAME">
<pos>34,122d</pos> <size>260,12d</size>
- <label>&lt;Pathname here&gt;</label>
+ <label><Pathname here></label>
</object>
<object class="wxStaticText" name="IDC_PLUGINPATH_ISPLUGIN">
<pos>212,125d</pos> <size>200,12d</size>
- <label>&lt;Does index exist&gt;</label>
+ <label><Does index exist></label>
</object>
<object class="wxStaticText" name="-1">
<pos>7,3d</pos> <size>260,8d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/webprvw-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webprvw-strings.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/webprvw-strings.xrc (revision 1111)
@@ -25,19 +25,19 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_AN_PALINFO">
- <label>Using an #1%d bit, #2%d colour #3%s palette&lt;BR&gt;
</label>
+ <label>Using an #1%d bit, #2%d colour #3%s palette<BR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_BANNER_BOX">
- <label>&lt;TR&gt;&lt;TD BGCOLOR="#eddc8b"&gt;
&lt;CENTER&gt;Best Possible Download Times&lt;/CENTER&gt;
&lt;/TD&gt;&lt;/TR&gt;
&lt;TR&gt;&lt;TD&gt;
</label>
+ <label><TR><TD BGCOLOR="#eddc8b">
<CENTER>Best Possible Download Times</CENTER>
</TD></TR>
<TR><TD>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_BITMAPED_BACKGROUND">
- <label>&lt;BODY BACKGROUND="#1%s" BGPROPERTIES=FIXED TEXT="BLACK"&gt;
</label>
+ <label><BODY BACKGROUND="#1%s" BGPROPERTIES=FIXED TEXT="BLACK">
</label>
</object>
</object>
<object class="sizeritem">
@@ -61,49 +61,49 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_CHECK_BACK">
- <label>&lt;BODY BACKGROUND="#1%s" TEXT="BLACK"&gt;
</label>
+ <label><BODY BACKGROUND="#1%s" TEXT="BLACK">
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_CLOSE_CENTER">
- <label>&lt;/CENTER&gt;</label>
+ <label></CENTER></label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_CLOSE_TR">
- <label>&lt;/TR&gt;
</label>
+ <label></TR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_DETAILS_BUILD">
- <label>&lt;TABLE BORDER="0" ALIGN="CENTER" WIDTH="50%" CELLSPACING="4"&gt;
&lt;TR&gt;&lt;TD BGCOLOR="#ffffff"&gt;
&lt;CENTER&gt;
</label>
+ <label><TABLE BORDER="0" ALIGN="CENTER" WIDTH="50%" CELLSPACING="4">
<TR><TD BGCOLOR="#ffffff">
<CENTER>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_DISPLAY_BMP">
- <label>&lt;IMG BORDER="0" SRC="#1%s" ALT="This is an exported BMP picture" USEMAP="#PreviewBitmapImagemap" ISMAP="ISMAP"&gt;
</label>
+ <label><IMG BORDER="0" SRC="#1%s" ALT="This is an exported BMP picture" USEMAP="#PreviewBitmapImagemap" ISMAP="ISMAP">
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_DISPLAY_PIC">
- <label>&lt;IMG BORDER="0" SRC="#1%s" ALT="This is an exported picture" USEMAP="#PreviewBitmapImagemap" ISMAP="ISMAP"&gt;
</label>
+ <label><IMG BORDER="0" SRC="#1%s" ALT="This is an exported picture" USEMAP="#PreviewBitmapImagemap" ISMAP="ISMAP">
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_DISPLAY_PNG">
- <label>&lt;IMG BORDER="0" SRC="#1%s" ALT="This is an exported PNG picture" USEMAP="#PreviewBitmapImagemap" ISMAP="ISMAP"&gt;
</label>
+ <label><IMG BORDER="0" SRC="#1%s" ALT="This is an exported PNG picture" USEMAP="#PreviewBitmapImagemap" ISMAP="ISMAP">
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_DITHERING">
- <label>Dithered using #1%s&lt;BR&gt;
</label>
+ <label>Dithered using #1%s<BR>
</label>
</object>
</object>
<object class="sizeritem">
@@ -121,25 +121,25 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_EMPTY_BOX">
- <label>&lt;BR&gt;
&lt;TABLE BORDER="0" height="250"&gt;&lt;TR&gt;&lt;TD&gt;&lt;/TD&gt;&lt;/TR&gt;&lt;/TABLE&gt;
&lt;BR&gt;&lt;BR&gt;
</label>
+ <label><BR>
<TABLE BORDER="0" height="250"><TR><TD></TD></TR></TABLE>
<BR><BR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_END_HTML">
- <label>&lt;/BODY&gt;
&lt;/HTML&gt;
</label>
+ <label></BODY>
</HTML>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_END_TABLE">
- <label>&lt;/TABLE&gt;</label>
+ <label></TABLE></label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_ES_TR">
- <label>&lt;/TR&gt;
&lt;TR&gt;
</label>
+ <label></TR>
<TR>
</label>
</object>
</object>
<object class="sizeritem">
@@ -157,19 +157,19 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTML_BGCOLOUR">
- <label>&lt;BODY BGCOLOR="#1%s"&gt;
</label>
+ <label><BODY BGCOLOR="#1%s">
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTML_BGIMAGE">
- <label>&lt;BODY BACKGROUND="#1%s"&gt;
</label>
+ <label><BODY BACKGROUND="#1%s">
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTML_BITMAP">
- <label>&lt;P ALIGN="center"&gt;
&lt;IMG BORDER="0" SRC="#1%s" ALT="The previewed image" USEMAP="#PreviewBitmapImagemap" ISMAP="ISMAP"&gt;&lt;/P&gt;
&lt;P&gt;&nbsp;&lt;/P&gt;
</label>
+ <label><P ALIGN="center">
<IMG BORDER="0" SRC="#1%s" ALT="The previewed image" USEMAP="#PreviewBitmapImagemap" ISMAP="ISMAP"></P>
<P>&nbsp;</P>
</label>
</object>
</object>
<object class="sizeritem">
@@ -181,37 +181,37 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTML_END">
- <label>&lt;/BODY&gt;&lt;/HTML&gt;
</label>
+ <label></BODY></HTML>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTML_EXPORTED">
- <label>&lt;P ALIGN="center"&gt;&lt;HR&gt;Exported from #1%s&lt;/P&gt;&lt;P&gt;&nbsp;&lt;/P&gt;
</label>
+ <label><P ALIGN="center"><HR>Exported from #1%s</P><P>&nbsp;</P>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTML_HEAD">
- <label>&lt;HTML&gt;
&lt;HEAD&gt;&lt;TITLE&gt;Bitmap Preview&lt;/TITLE&gt;&lt;/HEAD&gt;
</label>
+ <label><HTML>
<HEAD><TITLE>Bitmap Preview</TITLE></HEAD>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTML_INFO1">
- <label>#1%s&lt;BR&gt;
</label>
+ <label>#1%s<BR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTML_INFO2">
- <label>#1%s&lt;BR&gt;
</label>
+ <label>#1%s<BR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTML_PROGRAM">
- <label>&lt;TD ALIGN="LEFT" VALIGN="TOP"&gt;&lt;P ALIGN="right"&gt;&lt;A HREF="#1%s"&gt;&lt;IMG BORDER="0" SRC="#2%s" ALT="Visit the Xara Xtreme homepages"&gt;&lt;/A&gt;&lt;/P&gt;&lt;/TD&gt;&lt;/TR&gt;&lt;/TABLE&gt;
</label>
+ <label><TD ALIGN="LEFT" VALIGN="TOP"><P ALIGN="right"><A HREF="#1%s"><IMG BORDER="0" SRC="#2%s" ALT="Visit the Xara Xtreme homepages"></A></P></TD></TR></TABLE>
</label>
</object>
</object>
<object class="sizeritem">
@@ -241,7 +241,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_HTML_XARA">
- <label>&lt;TABLE BORDER="0" ALIGN="CENTER" WIDTH="100%"&gt;&lt;TR&gt;&lt;TD ALIGN="LEFT" VALIGN="TOP"&gt;&lt;P ALIGN="left"&gt;&lt;A HREF="#1%s"&gt;&lt;IMG BORDER="0" SRC="#2%s" ALT="Visit the Xara Website"&gt;&lt;/A&gt;&lt;/P&gt;&lt;/TD&gt;
</label>
+ <label><TABLE BORDER="0" ALIGN="CENTER" WIDTH="100%"><TR><TD ALIGN="LEFT" VALIGN="TOP"><P ALIGN="left"><A HREF="#1%s"><IMG BORDER="0" SRC="#2%s" ALT="Visit the Xara Website"></A></P></TD>
</label>
</object>
</object>
<object class="sizeritem">
@@ -265,7 +265,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_JCOMPRESSION">
- <label>Compressed, retaining #1%d% of image quality&lt;BR&gt;
</label>
+ <label>Compressed, retaining #1%d% of image quality<BR>
</label>
</object>
</object>
<object class="sizeritem">
@@ -283,19 +283,19 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_LINK_BOX">
- <label>&lt;TR&gt;&lt;TD BGCOLOR="#eddc8b"&gt;
&lt;CENTER&gt;&lt;A HREF="#1%s"&gt;#2%s&lt;/A&gt;&lt;/CENTER&gt;
&lt;/TD&gt;&lt;/TR&gt;
</label>
+ <label><TR><TD BGCOLOR="#eddc8b">
<CENTER><A HREF="#1%s">#2%s</A></CENTER>
</TD></TR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_MONO">
- <label>Using a #1%d bit, monochrome palette&lt;BR&gt;
</label>
+ <label>Using a #1%d bit, monochrome palette<BR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_NODITHER">
- <label>Not dithered&lt;BR&gt;
</label>
+ <label>Not dithered<BR>
</label>
</object>
</object>
<object class="sizeritem">
@@ -307,19 +307,19 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_PAGE_TITLE">
- <label>&lt;CENTER&gt;
&lt;TABLE BORDER="0" ALIGN="CENTER" WIDTH="50%"&gt;
&lt;TR VALIGN="middle"&gt;&lt;TD BGCOLOR="#eddc8b" VALIGN="middle"&gt;
&lt;CENTER&gt;&lt;B&gt;Xara Xtreme Browser Preview&lt;/B&gt;&lt;/CENTER&gt;
&lt;/TD&gt;&lt;/TR&gt;&lt;/TABLE&gt;
&lt;BR&gt;
</label>
+ <label><CENTER>
<TABLE BORDER="0" ALIGN="CENTER" WIDTH="50%">
<TR VALIGN="middle"><TD BGCOLOR="#eddc8b" VALIGN="middle">
<CENTER><B>Xara Xtreme Browser Preview</B></CENTER>
</TD></TR></TABLE>
<BR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_PALETTEINFO">
- <label>Using a #1%d bit, #2%d colour #3%s palette&lt;BR&gt;
</label>
+ <label>Using a #1%d bit, #2%d colour #3%s palette<BR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_PLAIN_BACKGROUND">
- <label>&lt;BODY BGCOLOR="#ffffff" TEXT="#000000"&gt;
</label>
+ <label><BODY BGCOLOR="#ffffff" TEXT="#000000">
</label>
</object>
</object>
<object class="sizeritem">
@@ -355,43 +355,43 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_SPEED_BUILD">
- <label>&lt;TABLE BORDER="1" ALIGN="CENTER" WIDTH="100%" BGCOLOR="#70A0FF"&gt;
&lt;TR&gt;
&lt;TD BGCOLOR="#70A0FF" WIDTH="50%" ALIGN="CENTER"&gt;Speed&lt;/TD&gt;
&lt;TD BGCOLOR="#70A0FF" WIDTH="50%" ALIGN="CENTER"&gt;Time&lt;/TD&gt;
</label>
+ <label><TABLE BORDER="1" ALIGN="CENTER" WIDTH="100%" BGCOLOR="#70A0FF">
<TR>
<TD BGCOLOR="#70A0FF" WIDTH="50%" ALIGN="CENTER">Speed</TD>
<TD BGCOLOR="#70A0FF" WIDTH="50%" ALIGN="CENTER">Time</TD>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_SPEED_BUILD2">
- <label>&lt;TD BGCOLOR="#70A0FF" WIDTH="25%" ALIGN="CENTER"&gt;Speed&lt;/TD&gt;
&lt;TD BGCOLOR="#70A0FF" WIDTH="25%" ALIGN="CENTER"&gt;Time&lt;/TD&gt;
</label>
+ <label><TD BGCOLOR="#70A0FF" WIDTH="25%" ALIGN="CENTER">Speed</TD>
<TD BGCOLOR="#70A0FF" WIDTH="25%" ALIGN="CENTER">Time</TD>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_SPEED_END">
- <label>&lt;/TR&gt;
&lt;/TABLE&gt;
&lt;/TD&gt;&lt;/TR&gt;
</label>
+ <label></TR>
</TABLE>
</TD></TR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_TDTR_CLOSE">
- <label>&lt;/TD&gt;&lt;/TR&gt;
</label>
+ <label></TD></TR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_TEXTLINE_BR">
- <label>#1%s&lt;BR&gt;</label>
+ <label>#1%s<BR></label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_TIME_ENTRY">
- <label>&lt;TD BGCOLOR="#E0E0F0" WIDTH="50%" ALIGN="CENTER"&gt;#1%s&lt;/TD&gt;
</label>
+ <label><TD BGCOLOR="#E0E0F0" WIDTH="50%" ALIGN="CENTER">#1%s</TD>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_TR">
- <label>&lt;TR&gt;
</label>
+ <label><TR>
</label>
</object>
</object>
<object class="sizeritem">
@@ -403,19 +403,19 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_TRTD_OPEN">
- <label>&lt;TR&gt;&lt;TD&gt;
</label>
+ <label><TR><TD>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_TRUECOLOUR">
- <label>Using a #1%d bit, true colour palette&lt;BR&gt;
</label>
+ <label>Using a #1%d bit, true colour palette<BR>
</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_WARNING_BOX">
- <label>&lt;TABLE BORDER="0" ALIGN="CENTER" WIDTH="50%" CELLSPACING=4&gt;
&lt;TR&gt;&lt;TD BGCOLOR="#eddc8b"&gt;
&lt;CENTER&gt;#1%s&lt;/CENTER&gt;
&lt;/TD&gt;&lt;/TR&gt;
&lt;/TABLE&gt;
</label>
+ <label><TABLE BORDER="0" ALIGN="CENTER" WIDTH="50%" CELLSPACING=4>
<TR><TD BGCOLOR="#eddc8b">
<CENTER>#1%s</CENTER>
</TD></TR>
</TABLE>
</label>
</object>
</object>
<object class="sizeritem">
Index: Trunk/XaraLX/wxOil/xrc/EN/textres-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/textres-strings.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/textres-strings.xrc (revision 1111)
@@ -157,7 +157,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_MULTIPLEFONTS">
- <label>&lt;Multiple&gt;</label>
+ <label><Multiple></label>
</object>
</object>
<object class="sizeritem">
Index: Trunk/XaraLX/wxOil/xrc/EN/hotlink-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/hotlink-strings.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/hotlink-strings.xrc (revision 1111)
@@ -145,7 +145,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_WEBADDRESSDLG_MANY">
- <label>&lt;Many&gt;</label>
+ <label><Many></label>
</object>
</object>
<object class="sizeritem">
Index: Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc (revision 1111)
@@ -721,7 +721,7 @@
</object>
<object class="wxButton" name="IDC_BUTTON_LE_ADD">
<pos>55,80d</pos> <size>25,14d</size>
- <label>New &gt;</label>
+ <label>New ></label>
</object>
<object class="wxButton" name="IDC_BUTTON_LE_INSERT">
<pos>55,100d</pos> <size>40,14d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/liveeffectres-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/liveeffectres-strings.xrc (revision 1110)
+++ Trunk/XaraLX/wxOil/xrc/EN/liveeffectres-strings.xrc (revision 1111)
@@ -97,7 +97,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_LE_1NONE">
- <label>1. &lt;None&gt;</label>
+ <label>1. <None></label>
</object>
</object>
<object class="sizeritem">
@@ -151,13 +151,13 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_LE_MANY">
- <label>&lt;Many&gt;</label>
+ <label><Many></label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_LE_NONE">
- <label>&lt;None&gt;</label>
+ <label><None></label>
</object>
</object>
<object class="sizeritem">
@@ -187,7 +187,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_LE_ORDER_FORMAT_NONE">
- <label>%d. &lt;None&gt;</label>
+ <label>%d. <None></label>
</object>
</object>
<object class="sizeritem">
Xara