Index: main/trunk/greenstone2/macros/about.dm
===================================================================
--- main/trunk/greenstone2/macros/about.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/about.dm	(revision 28888)
@@ -71,5 +71,5 @@
  
 	 <param name="gwcgi" value="_gwcgi_">
-         <param name="collection" value="_cgiargc_"> 
+         <param name="collection" value="_cgiargcAttrsafe_"> 
      	 <param name="classifier" value="CL_classifier_.1">
 	   
Index: main/trunk/greenstone2/macros/amharic.dm
===================================================================
--- main/trunk/greenstone2/macros/amharic.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/amharic.dm	(revision 28888)
@@ -84,5 +84,5 @@
 _textdescrpref_ [l=am] {ášáá­á« ááœ}  
 _textdescrlogin_ [l=am] {ášááá¢á« ááœ}  
-_textdescrlogout_ [l=am] {á¥áá° _cgiargun_ áá£}  
+_textdescrlogout_ [l=am] {á¥áá° _cgiargunHtmlsafe_ áá£}  
 
 _textdescrgreenstone_ [l=am] {ááªááµá¶á á²áá³á áá­á¥ášáª á¶ááµáá­}  
@@ -236,5 +236,5 @@
 _linktextPREFERENCES_ [l=am] {áá­á«ááœ}  
 _linktextLOGIN_ [l=am] {áá£}  
-_linktextLOGGEDIN_ [l=am] {(ášáá£ážá á¥áá° _cgiargun_ áá)}  
+_linktextLOGGEDIN_ [l=am] {(ášáá£ážá á¥áá° _cgiargunHtmlsafe_ áá)}  
 _linktextLOGOUT_ [l=am] {áá£}  
 
@@ -395,6 +395,6 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=am] {_If_(_thislast_á£áá€áµ _thisfirst_ - _thislast_ áá€ _cgiargq_ áá á­á
-á£ áá€ _cgiargq_ áá á­á
+_textquerytitle_ [l=am] {_If_(_thislast_á£áá€áµ _thisfirst_ - _thislast_ áá€ _cgiargqHtmlsafe_ áá á­á
+á£ áá€ _cgiargqHtmlsafe_ áá á­á
  ášááµáá ášáá)}  
 _textnoquerytitle_ [l=am] {ášááá ááœ}  
Index: main/trunk/greenstone2/macros/amharic2.dm
===================================================================
--- main/trunk/greenstone2/macros/amharic2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/amharic2.dm	(revision 28888)
@@ -130,5 +130,5 @@
 _foundintcontent_ [l=am] {<h3>áá° "_2_" á­ááœáµ</h3><p> ášáášá¥ášá á ááá áš "_collectionname_" á­ááœáµ (áá°"_2_" á­ááœáµ á­ááµáµáá) áá­ ááá¢    á­á
 áá á ááá á  "_2_" á­ááœáµ ááµá¥ áášáµ ášáááá
-      <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">áá°ááµ áá°á
+      <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">áá°ááµ áá°á
 </a> á°ááášá°áá€      á áá ááá« ášáááá
 á ášáá°áá "back" á áá«á­ á áá áá áá° ááµáá á°ááµá
@@ -153,5 +153,5 @@
 _textmustbelongtogroup_ [l=am] {á áµá³ááµá£ á­á
 áá áá
- ááá áá áš "_cgiargug_" á¡áµá á á£á ááá á«áµááááá¢}  
+ ááá áá áš "_cgiargugHtmlsafe_" á¡áµá á á£á ááá á«áµááááá¢}  
 
 _textmessageinvalid_ [l=am] {ášá ášášá áá
@@ -463,5 +463,5 @@
 _textretcoll_ [l=am] {áá° á°á¥á³á¢á á°áááµ}  
 
-_textdelperm_ [l=am] {ášá°áá°ááµ áá­á ááá áš _cgiargbc1dirname_ á­ááœáµ áá°ášá á áá»ááá¢ áá­áá«áµ ááá ášááœááµá€ <ul> <li>ááªááµá¶á _gsdlhome_/collect/_cgiargbc1dirname_ áá
+_textdelperm_ [l=am] {ášá°áá°ááµ áá­á ááá áš _cgiargbc1dirnameHtmlsafe_ á­ááœáµ áá°ášá á áá»ááá¢ áá­áá«áµ ááá ášááœááµá€ <ul> <li>ááªááµá¶á _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ áá
 á°á­ ááá°ášá áááµ ášáááá¢<br> ášá
 áá áá
@@ -469,13 +469,13 @@
 á
  ááµáááµ áá«áµáááá
- á­áœáá áš_cgiargbc1dirname_ á­ááœáµá ášáá
+ á­áœáá áš_cgiargbc1dirnameHtmlsafe_ á­ááœáµá ášáá
  á®áááá°á­ áá­ á áµááá¶ ááášášáµá¢</li> <li>ááªáá°á¶á áš _gsdlhome_/bin/script/delcol.pl áá®áá«áá áá«áµá¬á°á á áá»ááá¢ á­á
  áá­á ášááá á¥á ášáá°á« áááá á ášááá¥á¢</li> </ul }  
 
-_textdelinv_ [l=am] {áš _cgiargbc1dirname_ ášááœáµ ášá°ášáášá áá­á ášáá«áááá ááá¢ ášáá¥áá± áá°áµ á°á°á­ááá¢}  
-
-_textdelsuc_ [l=am] {áš _cgiargbc1dirname_ á­ááœáµ á á°á³á« ááá³ á°á°á­ááá¢}  
-
-_textclonefail_ [l=am] {áš _cgiargclonecol_ á­ááœáµ áá«á£ á áá»ááá¢ áá­áá«áµ ááá ášááœááµá€ <ul> <li> áš _cgiargclonecol_ á­ááœáµ á áá°áá ášá <li> áš _cgiargclonecol_ á­ááœáµ collect.cfg ášáá£á áá
+_textdelinv_ [l=am] {áš _cgiargbc1dirnameHtmlsafe_ ášááœáµ ášá°ášáášá áá­á ášáá«áááá ááá¢ ášáá¥áá± áá°áµ á°á°á­ááá¢}  
+
+_textdelsuc_ [l=am] {áš _cgiargbc1dirnameHtmlsafe_ á­ááœáµ á á°á³á« ááá³ á°á°á­ááá¢}  
+
+_textclonefail_ [l=am] {áš _cgiargclonecolHtmlsafe_ á­ááœáµ áá«á£ á áá»ááá¢ áá­áá«áµ ááá ášááœááµá€ <ul> <li> áš _cgiargclonecolHtmlsafe_ á­ááœáµ á áá°áá ášá <li> áš _cgiargclonecolHtmlsafe_ á­ááœáµ collect.cfg ášáá£á áá
 ášáµ áá­á ášááá <li> ááªáá°á¶á áš collect.cfg áá
 ášáµ áá­áá ášááá á¥ áááµ ášááá </ul>}  
@@ -507,8 +507,8 @@
 á á áá«á®áœ á áµá áá)á¢  á°á¥á³á¢áá á¥áá°áá ášááááªá« á¥áá²áá³ á áµá­ááá¢ }  
 
-_textexptsuc_ [l=am] {áš _cgiargbc1dirname_ á­ááœáµ áá° _gsdlhome_/tmp/exported\__cgiargbc1dirname_ áá
+_textexptsuc_ [l=am] {áš _cgiargbc1dirnameHtmlsafe_ á­ááœáµ áá° _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ áá
 á°á­ á á°á³á« ááá³ á°áá³áá¢}  
 
-_textexptfail_ [l=am] {<p>_cgiargbc1dirname_ á­ááœáµá áá° ááª ááá­ á áá»ááá¢  <p>á­á
+_textexptfail_ [l=am] {<p>_cgiargbc1dirnameHtmlsafe_ á­ááœáµá áá° ááª ááá­ á áá»ááá¢  <p>á­á
  ááá ášááœáá áµ áá­áá«áµ ááªááµá¶á á²á«á áá° ááª ášááášá á áµááá á á«á á á¥á®áµ á áá°á«ááá¢<ul>   <li>ááªáá°á¶áá áš á°áá£á¢ á²á² áá­ ášá«áá­ á­á
  á á«á á á¥á®áµ á á­á«áá á áá°á á¥á«áµá
@@ -696,5 +696,5 @@
 
 _textdeleteuser_ [l=am] {á°áááá­á á áµáááµ}  
-_textremwarn_ [l=am] {á°áááá­ <b>_cgiargumun_</b> á áµášáá²á«áá ááµáááµ áááááá?}  
+_textremwarn_ [l=am] {á°áááá­ <b>_cgiargumunHtmlsafe_</b> á áµášáá²á«áá ááµáááµ áááááá?}  
 
 
Index: main/trunk/greenstone2/macros/arabic.dm
===================================================================
--- main/trunk/greenstone2/macros/arabic.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/arabic.dm	(revision 28888)
@@ -547,6 +547,6 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ar] {_If_(_thislast_ ÙØªØ§ØŠØ¬ _thisfirst_ _thislast_ Ø§ÙØšØ­Ø« :  _cgiargq_, ÙØ§ ÙÙØ¬Ø¯ Ù
-Ø·Ø§ØšÙØ© ÙÙØšØ­Ø«  _cgiargq_)}
+_textquerytitle_ [l=ar] {_If_(_thislast_ ÙØªØ§ØŠØ¬ _thisfirst_ _thislast_ Ø§ÙØšØ­Ø« :  _cgiargqHtmlsafe_, ÙØ§ ÙÙØ¬Ø¯ Ù
+Ø·Ø§ØšÙØ© ÙÙØšØ­Ø«  _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=ar] {ØµÙØ­Ø© Ø§ÙØšØ­Ø«}
 
Index: main/trunk/greenstone2/macros/arabic2.dm
===================================================================
--- main/trunk/greenstone2/macros/arabic2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/arabic2.dm	(revision 28888)
@@ -320,5 +320,5 @@
 ÙØ¹Ø© "_2_" ÙÙ
 ÙÙÙ
-    <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">Ø§ÙØªÙØ¯Ù
+    <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">Ø§ÙØªÙØ¯Ù
 </a> Ø¥ÙÙ ÙØ°Ù Ø§ÙØµÙØ­Ø©; 
     Ø£Ù Ø§Ø³ØªØ®Ø¯Ù
@@ -353,5 +353,5 @@
 Ù Ù
 Ø¬Ù
-ÙØ¹Ø© "_cgiargug_" ÙÙ ØªØ¯Ø®Ù ÙÙØ°Ù Ø§ÙØµÙØ­Ø©}
+ÙØ¹Ø© "_cgiargugHtmlsafe_" ÙÙ ØªØ¯Ø®Ù ÙÙØ°Ù Ø§ÙØµÙØ­Ø©}
 
 _textmessageinvalid_ [l=ar] {Ø§ÙØµÙØ­Ø© Ø§ÙØªÙ Ø·ÙØšØª Ø¹Ø±Ø¶ÙØ§ ØªØªØ·ÙØš Ù
@@ -1065,5 +1065,5 @@
 _textdelperm_ [l=ar] {ØšØ¹Ø¶ Ø£Ù ÙÙ Ù
 Ø¬Ù
-ÙØ¹Ø© _cgiargbc1dirname_ ÙØ§ ÙÙ
+ÙØ¹Ø© _cgiargbc1dirnameHtmlsafe_ ÙØ§ ÙÙ
 ÙÙ Ù
 Ø­ÙÙØ§Ø Ø±ØšÙ
@@ -1072,5 +1072,5 @@
 <li>Ø£Ù ØšØ±ÙØ§Ù
 Ø¬ Greenstone ÙØ§ ÙØ³Ù
-Ø­ ØšØ¥Ø²Ø§ÙØ© _gsdlhome_/collect/_cgiargbc1dirname_
+Ø­ ØšØ¥Ø²Ø§ÙØ© _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_
 <br>ÙØ§Ù
 ÙØ³.
@@ -1079,5 +1079,5 @@
 ÙØ³ ÙØ¯ÙÙØ§Ù ÙÙÙ ØªÙÙ
 Ù Ø¹Ù
-ÙÙØ© Ø¥Ø²Ø§ÙØ© _cgiargbc1dirname_
+ÙÙØ© Ø¥Ø²Ø§ÙØ© _cgiargbc1dirnameHtmlsafe_
 Ù
 Ø¬Ù
@@ -1096,5 +1096,5 @@
 _textdelinv_ [l=ar] {Ø§ÙÙ
 Ø¬Ù
-ÙØ¹Ø© _cgiargbc1dirname_ Ù
+ÙØ¹Ø© _cgiargbc1dirnameHtmlsafe_ Ù
 Ø­Ù
 ÙØ© Ù
@@ -1105,18 +1105,18 @@
  Ø­Ø°Ù Ù
 Ø¬Ù
-ÙØ¹Ø© _cgiargbc1dirname_ ØšÙØ¬Ø§Ø­.}
+ÙØ¹Ø© _cgiargbc1dirnameHtmlsafe_ ØšÙØ¬Ø§Ø­.}
 
 _textclonefail_ [l=ar] {Ø§ÙÙ
 Ø¬Ù
-ÙØ¹Ø© _cgiargclonecol_ ÙØ§ ÙÙ
+ÙØ¹Ø© _cgiargclonecolHtmlsafe_ ÙØ§ ÙÙ
 ÙÙ Ø§Ø³ØªÙØ³Ø§Ø®ÙØ§. ÙØ£Ø³ØšØ§Øš Ø°ÙÙ ÙØ¯ ØªÙÙÙ: 
 <ul>
 <li> Ø§ÙÙ
 Ø¬Ù
-ÙØ¹Ø© _cgiargclonecol_ ØºÙØ± Ù
+ÙØ¹Ø© _cgiargclonecolHtmlsafe_ ØºÙØ± Ù
 ÙØ¬ÙØ¯Ø©
 <li> Ø§ÙÙ
 Ø¬Ù
-ÙØ¹Ø© _cgiargclonecol_ ÙÙØ³ ÙÙØ§ Ù
+ÙØ¹Ø© _cgiargclonecolHtmlsafe_ ÙÙØ³ ÙÙØ§ Ù
 ÙÙ Ø§ÙØ®ØµØ§ØŠØµ collect.cfg 
 <li> ØšØ±ÙØ§Ù
@@ -1200,10 +1200,10 @@
  ØªØµØ¯ÙØ± Ø§ÙÙ
 Ø¬Ù
-ÙØ¹Ø© _cgiargbc1dirname_ ØšÙØ¬Ø§Ø­ Ø¥ÙÙ Ø¯ÙÙÙ
-_gsdlhome_/tmp/exported\__cgiargbc1dirname_ .}
+ÙØ¹Ø© _cgiargbc1dirnameHtmlsafe_ ØšÙØ¬Ø§Ø­ Ø¥ÙÙ Ø¯ÙÙÙ
+_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ .}
 
 _textexptfail_ [l=ar] {<p>ÙØŽÙ ÙÙ ØªØµØ¯ÙØ± Ù
 Ø¬Ù
-ÙØ¹Ø© _cgiargbc1dirname_ 
+ÙØ¹Ø© _cgiargbc1dirnameHtmlsafe_ 
  
  <p>Ø±ØšÙ
@@ -1761,5 +1761,5 @@
 _textremwarn_ [l=ar] {ÙÙ ØªØ±ÙØ¯ Ø­Ø°Ù ÙØ°Ø§ Ø§ÙÙ
 Ø³ØªØ®Ø¯Ù
- ÙÙØ§ØŠÙØ§Ù <b>_cgiargumun_</b>?}
+ ÙÙØ§ØŠÙØ§Ù <b>_cgiargumunHtmlsafe_</b>?}
 
 
Index: main/trunk/greenstone2/macros/armenian.dm
===================================================================
--- main/trunk/greenstone2/macros/armenian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/armenian.dm	(revision 28888)
@@ -55,5 +55,5 @@
 _textdescrpref_ [l=hy] {ÕÕ¡Õ­ÕšÕ¶Õ¿ÖÕžÖÕ©ÕµÕžÖÕ¶Õ¶Õ¥ÖÕ« Õ§Õ»}
 _textdescrlogin_ [l=hy] {ÕÕžÖÕ¿ÖÕ« Õ§Õ»}  
-_textdescrlogout_ [l=hy] {ÔŽÕžÖÖÕœ Õ¥Õ¯ ÕžÖÕºÕ¥Õœ _cgiargun_}  
+_textdescrlogout_ [l=hy] {ÔŽÕžÖÖÕœ Õ¥Õ¯ ÕžÖÕºÕ¥Õœ _cgiargunHtmlsafe_}  
 
 _textdescrgreenstone_ [l=hy] {Ô³ÖÕ«Õ¶ÕœÕ©ÕžÕžÖÕ¶ Õ©ÕŸÕ¡ÕµÕ«Õ¶ Õ£ÖÕ¡Õ€Õ¡ÖÕ¡Õ¶Õ« Õ®ÖÕ¡Õ£ÖÕ¡Õ·Õ¡Ö}
@@ -196,5 +196,5 @@
 ÕÕÕÕÔµÕ}
 _linktextLOGIN_ [l=hy] {ÕÕÕÕÕ}  
-_linktextLOGGEDIN_ [l=hy] {(ÕŽÕžÖÕ¿Ö Õ§ Õ£ÖÕžÖÕ®Õ¥Õ¬ ÕžÖÕºÕ¥Õœ _cgiargun_)}  
+_linktextLOGGEDIN_ [l=hy] {(ÕŽÕžÖÕ¿Ö Õ§ Õ£ÖÕžÖÕ®Õ¥Õ¬ ÕžÖÕºÕ¥Õœ _cgiargunHtmlsafe_)}  
 _linktextLOGOUT_ [l=hy] {ÔŽÕÕÕÕ Ô³Ô±ÔŒ}  
 
@@ -352,5 +352,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=hy] {_If_(_thislast_,results _thisfirst_ - _thislast_ Õ°Õ¡ÖÖÕŽÕ¡Õ¶ Õ°Õ¡ÕŽÕ¡Ö: _cgiargq_,ÕÕ¯Õ¡Õ¶ Õ°Õ¡ÕŽÕšÕ¶Õ¯Õ¶ÕžÖÕŽÕ¶Õ¥Ö Õ°Õ¡ÖÖÕŽÕ¡Õ¶Õš: _cgiargq_)}
+_textquerytitle_ [l=hy] {_If_(_thislast_,results _thisfirst_ - _thislast_ Õ°Õ¡ÖÖÕŽÕ¡Õ¶ Õ°Õ¡ÕŽÕ¡Ö: _cgiargqHtmlsafe_,ÕÕ¯Õ¡Õ¶ Õ°Õ¡ÕŽÕšÕ¶Õ¯Õ¶ÕžÖÕŽÕ¶Õ¥Ö Õ°Õ¡ÖÖÕŽÕ¡Õ¶Õš: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=hy] {ÕÕ¶Õ¿ÖÕŽÕ¡Õ¶ Õ§Õ»}
 
Index: main/trunk/greenstone2/macros/armenian2.dm
===================================================================
--- main/trunk/greenstone2/macros/armenian2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/armenian2.dm	(revision 28888)
@@ -132,5 +132,5 @@
 
 <p>ÕÕ¥Ö ÕšÕ¶Õ¿ÖÕ¡Õ® Õ¯Õ¡ÕºÕš Õ¡ÖÕ¿Õ¡ÖÕ«Õ¶ Õ§  "_collectionname_" Õ°Õ¥Õ¿ ( Õ¡ÕµÕ¶ Õ¯Õ¡ÕºÕŸÕ¡Õ® Õ§  "_2_" Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ« Õ°Õ¥Õ¿)
-ÔµÕ©Õ¥ ÖÕ¡Õ¶Õ¯Õ¡Õ¶ÕžÖÕŽ Õ¥Ö Õ¿Õ¥ÕœÕ¶Õ¥Õ¬  Õ¯Õ¡ÕºÕš "_2_" Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ«  ÕŽÕ¥Õ»  Õ€ÕžÖÖ Õ¯Õ¡ÖÕžÕ² Õ¥Ö <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_"> Õ£Õ¶Õ¡Õ¬ Õ¡ÕŒÕ¡Õ» Õ€Õ¥ÕºÕ« Õ¡ÕµÕœ Õ§Õ»Õš, Õ¯Õ¡ÕŽ Ö
+ÔµÕ©Õ¥ ÖÕ¡Õ¶Õ¯Õ¡Õ¶ÕžÖÕŽ Õ¥Ö Õ¿Õ¥ÕœÕ¶Õ¥Õ¬  Õ¯Õ¡ÕºÕš "_2_" Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ«  ÕŽÕ¥Õ»  Õ€ÕžÖÖ Õ¯Õ¡ÖÕžÕ² Õ¥Ö <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_"> Õ£Õ¶Õ¡Õ¬ Õ¡ÕŒÕ¡Õ» Õ€Õ¥ÕºÕ« Õ¡ÕµÕœ Õ§Õ»Õš, Õ¯Õ¡ÕŽ Ö
 Õ£Õ¿Õ¡Õ£ÕžÖÕ®Õ¥Ö Õ€Õ«Õ¿Õ¡Õ¯Õ« Â«Õ°Õ¥Õ¿Â» Õ¯ÕžÕ³Õ¡Õ¯Õš ÕŸÕ¥ÖÕ¡Õ€Õ¡ÕŒÕ¶Õ¡Õ¬ÕžÖ Õ°Õ¡ÕŽÕ¡Ö Õ¶Õ¡Õ­ÕžÖÕ€ ÖÕ¡ÕœÕ¿Õ¡Õ©Õ²Õ©Õ«Õ¶Ö}  
 
@@ -152,5 +152,5 @@
 _textpassword_ [l=hy] {Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡ÕŒ}  
 
-_textmustbelongtogroup_ [l=hy] {ÕÕ¯Õ¡Õ¿Õ« Õ¡ÕŒÕ¥Ö ÕžÖ Õ€ÕžÖÖ ÕºÕ¥Õ¿Ö Õ§ ÕºÕ¡Õ¿Õ¯Õ¡Õ¶Õ¥Ö  "_cgiargug_" Õ­ÕŽÕ¢Õ«Õ¶ Õ¡ÕµÕœ Õ§Õ» ÕŽÕžÖÕ¿Ö ÕžÖÕ¶Õ¥Õ¶Õ¡Õ¬ÕžÖ Õ°Õ¡ÕŽÕ¡Ö}  
+_textmustbelongtogroup_ [l=hy] {ÕÕ¯Õ¡Õ¿Õ« Õ¡ÕŒÕ¥Ö ÕžÖ Õ€ÕžÖÖ ÕºÕ¥Õ¿Ö Õ§ ÕºÕ¡Õ¿Õ¯Õ¡Õ¶Õ¥Ö  "_cgiargugHtmlsafe_" Õ­ÕŽÕ¢Õ«Õ¶ Õ¡ÕµÕœ Õ§Õ» ÕŽÕžÖÕ¿Ö ÕžÖÕ¶Õ¥Õ¶Õ¡Õ¬ÕžÖ Õ°Õ¡ÕŽÕ¡Ö}  
 
 _textmessageinvalid_ [l=hy] {ÕÕ¥Ö Õ¯ÕžÕ²ÕŽÕ«Ö Õ¡ÕŒÕ¡Õ»Õ¡ÖÕ¯ÕŸÕžÕ² Õ§Õ»Õš ÕºÕ¡Õ°Õ¡Õ¶Õ»ÕžÖÕŽ Õ§ Õ£ÖÕ¡Õ¶ÖÕžÖÕŽÖ<br>
@@ -380,15 +380,15 @@
 _textretcoll_ [l=hy] {ÕÕ¥ÖÕ¡Õ€Õ¡ÕŒÕ¶Õ¡Õ¬ Õ°Õ¡ÕŸÕ¡ÖÕ«Õ¹Õ«Õ¶}  
 
-_textdelperm_ [l=hy] {_cgiargbc1dirname_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ«Ö ÕŽÕ« ÖÕ¡Õ¶Õ«ÕœÕš Õ¯Õ¡ÕŽ Õ¢ÕžÕ¬ÕžÖÕš  Õ¹Õ¥Õ¶ Õ¯Õ¡ÖÕžÕ² Õ»Õ¶Õ»ÕŸÕ¥Õ¬ Ö ÕÕ¶Õ¡ÖÕ¡ÕŸÕžÖ ÕºÕ¡Õ¿Õ³Õ¡ÕŒÕ¶Õ¥ÖÕ¶ Õ¥Õ¶Ö  <ul>  <li>Greenstone-Õš Õ©ÕžÖÕµÕ¬Õ¿ÕŸÕžÖÕ©ÕµÕžÖÕ¶ Õ¹ÕžÖÕ¶Õ«  Õ»Õ¶Õ»Õ¥Õ¬ÕžÖ  __gsdlhome_/collect/_cgiargbc1dirname_ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯ÕšÖ<br> ÔŽÕžÖÖ Õ¯Õ¡ÖÕžÕ² Õ§ Õ¯Õ¡ÖÕ«Ö ÕžÖÕ¶Õ¥Õ¶Õ¡Ö Õ±Õ¥ÕŒÖÕžÕŸ Õ°Õ¥ÕŒÕ¡ÖÕ¶Õ¥Õ¬ÕžÖ Õ¡ÕµÕœ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õš Õ¡ÕŸÕ¡ÖÕ¿Õ¥Õ¬ÕžÖ _cgiargbc1dirname_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ« Õ°Õ¥ÕŒÕ¡ÖÕžÖÕŽÕš Õ°Õ¡ÕŽÕ¡Õ¯Õ¡ÖÕ£Õ¹Õ«ÖÖ </li> <li>Greenstone-Õš Õ¹Õ« Õ¯Õ¡ÖÕžÕ² Õ£ÕžÖÕ®Õ¡ÖÕ¯Õ¥Õ¬ _gsdlhome_/bin/script/delcol.pl  Õ®ÖÕ¡Õ£Õ«ÖÕšÖ  ÕÕ¡ÕŽÕžÕŠÕŸÕ¥Ö, ÕžÖ Õ¡ÕµÕœ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õš ÕšÕ¶Õ©Õ¥ÖÖÕŸÕžÕ² Ö Õ¯Õ¡Õ¿Õ¡ÖÕŸÕžÕ² Õ§Ö</li>
+_textdelperm_ [l=hy] {_cgiargbc1dirnameHtmlsafe_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ«Ö ÕŽÕ« ÖÕ¡Õ¶Õ«ÕœÕš Õ¯Õ¡ÕŽ Õ¢ÕžÕ¬ÕžÖÕš  Õ¹Õ¥Õ¶ Õ¯Õ¡ÖÕžÕ² Õ»Õ¶Õ»ÕŸÕ¥Õ¬ Ö ÕÕ¶Õ¡ÖÕ¡ÕŸÕžÖ ÕºÕ¡Õ¿Õ³Õ¡ÕŒÕ¶Õ¥ÖÕ¶ Õ¥Õ¶Ö  <ul>  <li>Greenstone-Õš Õ©ÕžÖÕµÕ¬Õ¿ÕŸÕžÖÕ©ÕµÕžÖÕ¶ Õ¹ÕžÖÕ¶Õ«  Õ»Õ¶Õ»Õ¥Õ¬ÕžÖ  __gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯ÕšÖ<br> ÔŽÕžÖÖ Õ¯Õ¡ÖÕžÕ² Õ§ Õ¯Õ¡ÖÕ«Ö ÕžÖÕ¶Õ¥Õ¶Õ¡Ö Õ±Õ¥ÕŒÖÕžÕŸ Õ°Õ¥ÕŒÕ¡ÖÕ¶Õ¥Õ¬ÕžÖ Õ¡ÕµÕœ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õš Õ¡ÕŸÕ¡ÖÕ¿Õ¥Õ¬ÕžÖ _cgiargbc1dirnameHtmlsafe_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ« Õ°Õ¥ÕŒÕ¡ÖÕžÖÕŽÕš Õ°Õ¡ÕŽÕ¡Õ¯Õ¡ÖÕ£Õ¹Õ«ÖÖ </li> <li>Greenstone-Õš Õ¹Õ« Õ¯Õ¡ÖÕžÕ² Õ£ÕžÖÕ®Õ¡ÖÕ¯Õ¥Õ¬ _gsdlhome_/bin/script/delcol.pl  Õ®ÖÕ¡Õ£Õ«ÖÕšÖ  ÕÕ¡ÕŽÕžÕŠÕŸÕ¥Ö, ÕžÖ Õ¡ÕµÕœ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õš ÕšÕ¶Õ©Õ¥ÖÖÕŸÕžÕ² Ö Õ¯Õ¡Õ¿Õ¡ÖÕŸÕžÕ² Õ§Ö</li>
 </ul>}  
 
-_textdelinv_ [l=hy] {_cgiargbc1dirname_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶ÕŸÕ¡Õ® Õ§ Õ¯Õ¡ÕŽ ÕœÕ­Õ¡Õ¬ Õ§Ö ÕÕ¶Õ»Õ¥Õ¬Õš Õ¹Õ¥Õ²Õ¡ÖÕ¯ÕŸÕ¡Õ® Õ§Ö}  
-
-_textdelsuc_ [l=hy] {_cgiargbc1dirname_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ Õ°Õ¡Õ»ÕžÕ²ÕžÖÕ©ÕµÕ¡ÕŽÕ¢ Õ»Õ¶Õ»ÕŸÕ¥Õ¬ Õ§Ö}  
-
-_textclonefail_ [l=hy] {_cgiargclonecol_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ Õ°Õ¶Õ¡ÖÕ¡ÕŸÕžÖ Õ¹Õ§ Õ¯Õ¬ÕžÕ¶Õ¡ÕŸÕžÖÕ¥Õ¬Ö ÕÕ¶Õ¡ÖÕ¡ÕŸÕžÖ ÕºÕ¡Õ¿Õ³Õ¡ÕŒÕ¶Õ¥Ö Õ¯Õ¡ÖÕžÕ² Õ¥Õ¶ Õ¬Õ«Õ¶Õ¥Õ¬Õ
+_textdelinv_ [l=hy] {_cgiargbc1dirnameHtmlsafe_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶ÕŸÕ¡Õ® Õ§ Õ¯Õ¡ÕŽ ÕœÕ­Õ¡Õ¬ Õ§Ö ÕÕ¶Õ»Õ¥Õ¬Õš Õ¹Õ¥Õ²Õ¡ÖÕ¯ÕŸÕ¡Õ® Õ§Ö}  
+
+_textdelsuc_ [l=hy] {_cgiargbc1dirnameHtmlsafe_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ Õ°Õ¡Õ»ÕžÕ²ÕžÖÕ©ÕµÕ¡ÕŽÕ¢ Õ»Õ¶Õ»ÕŸÕ¥Õ¬ Õ§Ö}  
+
+_textclonefail_ [l=hy] {_cgiargclonecolHtmlsafe_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ Õ°Õ¶Õ¡ÖÕ¡ÕŸÕžÖ Õ¹Õ§ Õ¯Õ¬ÕžÕ¶Õ¡ÕŸÕžÖÕ¥Õ¬Ö ÕÕ¶Õ¡ÖÕ¡ÕŸÕžÖ ÕºÕ¡Õ¿Õ³Õ¡ÕŒÕ¶Õ¥Ö Õ¯Õ¡ÖÕžÕ² Õ¥Õ¶ Õ¬Õ«Õ¶Õ¥Õ¬Õ
 <ul>
-<li> _cgiargclonecol_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ Õ£ÕžÕµÕžÖÕ©ÕµÕžÖÕ¶ Õ¹ÕžÖÕ¶Õ«
-<li> _cgiargclonecol_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ Õ¹ÕžÖÕ¶Õ« collect.cfg Õ¯Õ¡ÕŒÕžÖÖÕŸÕ¡Õ®ÖÕ¡ÕµÕ«Õ¶ ÖÕ¡ÕµÕ¬Õš
+<li> _cgiargclonecolHtmlsafe_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ Õ£ÕžÕµÕžÖÕ©ÕµÕžÖÕ¶ Õ¹ÕžÖÕ¶Õ«
+<li> _cgiargclonecolHtmlsafe_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ Õ¹ÕžÖÕ¶Õ« collect.cfg Õ¯Õ¡ÕŒÕžÖÖÕŸÕ¡Õ®ÖÕ¡ÕµÕ«Õ¶ ÖÕ¡ÕµÕ¬Õš
 <li> Ô³ÖÕ«Õ¶ÕœÕ©ÕžÕžÖÕ¶Õš Õ¹ÕžÖÕ¶Õ« Õ©ÕžÖÕµÕ¬Õ¡Õ¿ÕŸÕžÖÕ©ÕµÕžÖÕ¶ Õ¯Õ¡ÖÕ€Õ¡Õ¬ÕžÖ collect.cfg Õ¯Õ¡ÕŒÕžÖÖÕŸÕ¡Õ®ÖÕ¡ÕµÕ«Õ¶ ÖÕ¡ÕµÕ¬Õš
 </ul>
@@ -418,8 +418,8 @@
 Õ£Õ¿Õ¡Õ£ÕžÖÕ®Õ¥Õ¬ÕžÖÖ)Ö ÔœÕžÖÕ°ÕžÖÖÕ€ Õ¥Õ¶Ö Õ¿Õ¡Õ¬Õ«Õœ Õ¡Õ·Õ­Õ¡Õ¿Õ¥ÖÕ¶Õ¥Ö ÕÕ¡ÕŸÕ¡ÖÕ«Õ¹Õš Õ¶ÕžÖÕ«ÖÖ}  
 
-_textexptsuc_ [l=hy] {_cgiargbc1dirname_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ Õ°Õ¡Õ»ÕžÕ²ÕžÖÕ©ÕµÕ¡ÕŽÕ¢ Õ¡ÖÕ¿Õ¡Õ°Õ¡Õ¶ÕŸÕ¥Õ¬ Õ§ _gsdlhome_/tmp/exported\__cgiargbc1dirname_ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯ÕžÖÕŽÖ
+_textexptsuc_ [l=hy] {_cgiargbc1dirnameHtmlsafe_ Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶ Õ°Õ¡Õ»ÕžÕ²ÕžÖÕ©ÕµÕ¡ÕŽÕ¢ Õ¡ÖÕ¿Õ¡Õ°Õ¡Õ¶ÕŸÕ¥Õ¬ Õ§ _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯ÕžÖÕŽÖ
 }  
 
-_textexptfail_ [l=hy] {<p>ÕÕ« Õ°Õ¡Õ»ÕžÕ²ÕŸÕžÖÕŽ Õ¡ÖÕ¿Õ¡Õ°Õ¡Õ¶Õ¥Õ¬  _cgiargbc1dirname_  Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶Ö ÕÕ¡ Õ°Õ¡ÕŸÕ¡Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§ ,ÕžÖ Õ¬Õ«Õ¶Õ« Õ¡ÕµÕ¶ ÕºÕ¡Õ¿Õ³Õ¡ÕŒÕžÕŸ ,ÕžÖ Greenstone-Õš Õ¿Õ¥Õ²Õ¡Õ€ÖÕŸÕ¡Õ® Õ§ Õ¡ÕŒÕ¡Õ¶Ö "Ô±ÖÕ¿Õ¡Õ°Õ¡Õ¶Õ¥Õ¬ Õ€Õ¥ÕºÕ«  CD-ROM" Õ£ÕžÖÕ®Õ¡ÕŒÕžÖÕµÕ©Õ«Ö  .
+_textexptfail_ [l=hy] {<p>ÕÕ« Õ°Õ¡Õ»ÕžÕ²ÕŸÕžÖÕŽ Õ¡ÖÕ¿Õ¡Õ°Õ¡Õ¶Õ¥Õ¬  _cgiargbc1dirnameHtmlsafe_  Õ°Õ¡ÕŸÕ¡ÖÕ¡Õ®ÕžÖÕ¶Ö ÕÕ¡ Õ°Õ¡ÕŸÕ¡Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§ ,ÕžÖ Õ¬Õ«Õ¶Õ« Õ¡ÕµÕ¶ ÕºÕ¡Õ¿Õ³Õ¡ÕŒÕžÕŸ ,ÕžÖ Greenstone-Õš Õ¿Õ¥Õ²Õ¡Õ€ÖÕŸÕ¡Õ® Õ§ Õ¡ÕŒÕ¡Õ¶Ö "Ô±ÖÕ¿Õ¡Õ°Õ¡Õ¶Õ¥Õ¬ Õ€Õ¥ÕºÕ«  CD-ROM" Õ£ÕžÖÕ®Õ¡ÕŒÕžÖÕµÕ©Õ«Ö  .
 <ul>  
 <li> ÔµÕ©Õ¥ Õ€ÕžÖÖ Õ¿Õ¥Õ²Õ¡Õ€ÖÕ¥Õ¬ Õ¥Ö  Greenstone-Õ«  2.70w Õ¡ÕŸÕ¥Õ¬Õ« ÕŸÕ¡Õ² Õ¿Õ¡ÖÕ¢Õ¥ÖÕ¡Õ¯Õš CD-ROM-Õ«Ö Õ¡ÕµÕœ Õ¢Õ¡Õ²Õ¡Õ€ÖÕ«Õ¹Õ¶Õ¥ÖÕš Õ¹Õ¥Õ¶ Õ¿Õ¥Õ²Õ¡Õ€ÖÕŸÕ« Õ¥Õ©Õ¥ "ÕÕ¡Õ¿ÕŸÕ«ÖÕŸÕ¡Õ®" Õ¯Õ¡ÖÕ£Õ¡Õ¢Õ¥ÖÕŽÕ¡Õ¶ ÕªÕ¡ÕŽÕ¡Õ¶Õ¡Õ¯ Õ¹Õ¥Ö ÕšÕ¶Õ¿ÖÕ¥Õ¬ Õ€ÖÕ¡Õ¶ÖÖ Ô¿Õ¡ÖÕžÕ² Õ¥Ö Õ¡ÕŸÕ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ€ÖÕ¡Õ¶Ö ÕŸÕ¥ÖÕ¡Õ¡Õ·Õ­Õ¡Õ¿Õ¥ÖÕ¶Õ¥Õ¬ÕžÕŸ Õ¯Õ¡ÖÕ£Õ¡Õ¢Õ¥ÖÕžÖÕŽÕšÖ
@@ -600,5 +600,5 @@
 Õ£Õ¿ÕŸÕžÕ²Õ«Õ¶}  
 _textremwarn_ [l=hy] {ÔŽÕžÖÖ Õ«ÖÕžÕÖ ÖÕ¡Õ¶Õ¯Õ¡Õ¶ÕžÖÕŽ Õ¥Ö ÕŽÕ·Õ¡Õ¿Õ¡Õ¯Õ¡Õ¶ Õ°Õ¥ÕŒÕ¡ÖÕ¶Õ¥Õ¬ Õ¡ÕµÕœ Ö
-Õ£Õ¿ÕŸÕžÕ²Õ«Õ¶  <b>_cgiargumun_</b>}  
+Õ£Õ¿ÕŸÕžÕ²Õ«Õ¶  <b>_cgiargumunHtmlsafe_</b>}  
 
 
Index: main/trunk/greenstone2/macros/authen.dm
===================================================================
--- main/trunk/greenstone2/macros/authen.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/authen.dm	(revision 28888)
@@ -16,5 +16,5 @@
   <form name="login" method="post" action="_gwcgi_">
 )
-<input type=hidden name="e" value="_If_(_cgiarger_,_cgiarger_,_decodedcompressedoptions_)">
+<input type=hidden name="e" value="_If_(_cgiarger_,_cgiargerAttrsafe_,_decodedcompressedoptions_)">
 _hiddenargs_
 <center><table width="_pagewidth_">
@@ -25,5 +25,5 @@
 <tr><td>
 <table><tr><td>_textusername_</td>
-<td><input type="text" name="un" value="_cgiargun_" size=10></td>
+<td><input type="text" name="un" value="_cgiargunAttrsafe_" size=10></td>
 <td></td></tr>
 <tr><td>_textpassword_</td>
Index: main/trunk/greenstone2/macros/base.dm
===================================================================
--- main/trunk/greenstone2/macros/base.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/base.dm	(revision 28888)
@@ -73,4 +73,5 @@
 _cgiargd_ {}
 _cgiargcl_ {}
+
 
 # set from within the query action
@@ -142,5 +143,5 @@
 _httpcollimg_  {_httpcollection_/index/assoc}
 
-_httpcollection_ {_httpprefix_/collect/_cgiargc_}
+_httpcollection_ {_httpprefix_/collect/_cgiargcUrlsafe_}
 
 _httppagex_ {_gwcgi_?e=_compressedoptions_&amp;a=p&amp;p=_1_}
@@ -153,5 +154,5 @@
 #_httppagehome_ {_httppagex_(home)}
 ###_httppagehome_ {http://www.nzdl.org/cgi-bin/dblibrary?a=p&amp;p=home}
-_httppagehome_ {_gwcgi_?a=p&amp;p=home&amp;l=_cgiargl_&amp;w=_cgiargw_}
+_httppagehome_ {_gwcgi_?a=p&amp;p=home&amp;l=_cgiarglUrlsafe_&amp;w=_cgiargwUrlsafe_}
 _httppagehelp_ {_httppagex_(help)}
 _httppagepref_ {_httppagex_(preferences)}
@@ -163,5 +164,5 @@
 _httppublications_ {_httpdownload_/greenstone/publications}
 
-_httpcurrentdocument_ {_gwcgi_?e=_compressedoptions_&amp;cl=_cgiargcl_&amp;d=_cgiargd_}
+_httpcurrentdocument_ {_gwcgi_?e=_compressedoptions_&amp;cl=_cgiargclUrlsafe_&amp;d=_cgiargdUrlsafe_}
 _httpquery_    {_gwcgi_?e=_compressedoptions_&amp;a=_If_("_cgiargqt_" eq "2",sqlq,q)}
 _httpsqlquery_ {_gwcgi_?e=_compressedoptions_&amp;a=sqlq&amp;qt=2}
Index: main/trunk/greenstone2/macros/bengali.dm
===================================================================
--- main/trunk/greenstone2/macros/bengali.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/bengali.dm	(revision 28888)
@@ -53,5 +53,5 @@
 _textdescrpref_ [l=bn] {àŠªàŠàŠšà§àŠŠà§àŠ° àŠªà§àŠ·à§àŠ àŠŸ}  
 _textdescrlogin_ [l=bn] {àŠ²àŠàŠàŠš àŠªà§àŠ·à§àŠ àŠŸ}  
-_textdescrlogout_ [l=bn] {_cgiargun_ àŠ¹àŠ¿àŠžà§àŠ¬à§ àŠ²àŠàŠàŠàŠ àŠ¹à§à§àŠà§}  
+_textdescrlogout_ [l=bn] {_cgiargunHtmlsafe_ àŠ¹àŠ¿àŠžà§àŠ¬à§ àŠ²àŠàŠàŠàŠ àŠ¹à§à§àŠà§}  
 
 _textdescrgreenstone_ [l=bn] {àŠšàŠ¿àŠàŠàŠ¿àŠ²à§àŠ¯àŠŸàŠšà§àŠ¡ àŠ¡àŠ¿àŠàŠ¿àŠàŠŸàŠ² àŠ²àŠŸàŠàŠ¬à§àŠ°à§àŠ°à§ àŠžàŠ«àŠà§àŠà§à§àŠ¯àŠŸàŠ°}  
@@ -210,5 +210,5 @@
 _linktextPREFERENCES_ [l=bn] {àŠªàŠàŠšà§àŠŠ}
 _linktextLOGIN_ [l=bn] {àŠ²àŠàŠàŠš}  
-_linktextLOGGEDIN_ [l=bn] {(_cgiargun_ àŠ¹àŠ¿àŠžà§àŠ¬à§ àŠ²àŠàŠàŠš àŠ¹à§à§àŠà§)}  
+_linktextLOGGEDIN_ [l=bn] {(_cgiargunHtmlsafe_ àŠ¹àŠ¿àŠžà§àŠ¬à§ àŠ²àŠàŠàŠš àŠ¹à§à§àŠà§)}  
 _linktextLOGOUT_ [l=bn] {àŠ²àŠàŠàŠàŠ}  
 
@@ -369,5 +369,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=bn] {_If_(_thislast_àŠ«àŠ²àŠŸàŠ«àŠ² _thisfirst_ - _thislast_ àŠªà§àŠ°àŠ¶à§àŠšà§àŠ° àŠàŠšà§àŠ¯ _cgiargq_,àŠªà§àŠ°àŠ¶à§àŠšà§àŠ° àŠžàŠŸàŠ¥à§ àŠà§àŠš àŠàŠ¿àŠà§ àŠ®àŠ¿àŠ²à§àŠà§ àŠšàŠŸàŠ _cgiargq_)}
+_textquerytitle_ [l=bn] {_If_(_thislast_àŠ«àŠ²àŠŸàŠ«àŠ² _thisfirst_ - _thislast_ àŠªà§àŠ°àŠ¶à§àŠšà§àŠ° àŠàŠšà§àŠ¯ _cgiargqHtmlsafe_,àŠªà§àŠ°àŠ¶à§àŠšà§àŠ° àŠžàŠŸàŠ¥à§ àŠà§àŠš àŠàŠ¿àŠà§ àŠ®àŠ¿àŠ²à§àŠà§ àŠšàŠŸàŠ _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=bn] {àŠªà§àŠ·à§àŠ àŠŸ àŠ
 àŠšà§àŠžàŠšà§àŠ§àŠŸàŠš àŠàŠ°à§àŠš}  
Index: main/trunk/greenstone2/macros/bengali2.dm
===================================================================
--- main/trunk/greenstone2/macros/bengali2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/bengali2.dm	(revision 28888)
@@ -85,5 +85,5 @@
 
 # should have arguments of collection, collectionname and link
-_foundintcontent_ [l=bn] {<h3> "_à§š_"àŠžàŠàŠà§àŠ°àŠ¹à§àŠ° àŠžàŠŸàŠ¥à§ àŠ¯à§àŠà§àŠ€ àŠàŠ°à§àŠš</h3> <p> àŠ¯à§ àŠžàŠàŠ¯à§àŠŸàŠàŠàŠ¿ àŠàŠªàŠšàŠ¿ àŠšàŠ¿àŠ¬àŠŸàŠ°à§àŠàŠš àŠàŠ°à§àŠà§àŠš àŠ€àŠŸ àŠ¬àŠŸàŠàŠ°à§ àŠ¥à§àŠà§ _collectionname_" àŠžàŠàŠà§àŠ°àŠ¹à§ àŠàŠ°àŠŸ àŠ¹à§à§àŠà§ (àŠàŠ¹àŠŸ àŠ¯à§àŠà§àŠ€ àŠ¹à§à§àŠà§"_à§š_" àŠžàŠàŠà§àŠ°àŠ¹à§àŠ° àŠžàŠŸàŠ¥à§) àŠàŠªàŠšàŠ¿ àŠ¯àŠŠàŠ¿ "_2_" àŠžàŠàŠ¯à§àŠŸàŠ àŠàŠ¿ àŠŠà§àŠàŠ€à§ àŠàŠà§àŠàŠŸ àŠàŠ°à§àŠš àŠ€àŠ¬à§ <a href="_httpdoc_&c=_1_&cI=_cgiargcI_&d=_3_"> àŠ àŠ¿àŠàŠŸàŠšàŠŸ àŠ
+_foundintcontent_ [l=bn] {<h3> "_à§š_"àŠžàŠàŠà§àŠ°àŠ¹à§àŠ° àŠžàŠŸàŠ¥à§ àŠ¯à§àŠà§àŠ€ àŠàŠ°à§àŠš</h3> <p> àŠ¯à§ àŠžàŠàŠ¯à§àŠŸàŠàŠàŠ¿ àŠàŠªàŠšàŠ¿ àŠšàŠ¿àŠ¬àŠŸàŠ°à§àŠàŠš àŠàŠ°à§àŠà§àŠš àŠ€àŠŸ àŠ¬àŠŸàŠàŠ°à§ àŠ¥à§àŠà§ _collectionname_" àŠžàŠàŠà§àŠ°àŠ¹à§ àŠàŠ°àŠŸ àŠ¹à§à§àŠà§ (àŠàŠ¹àŠŸ àŠ¯à§àŠà§àŠ€ àŠ¹à§à§àŠà§"_à§š_" àŠžàŠàŠà§àŠ°àŠ¹à§àŠ° àŠžàŠŸàŠ¥à§) àŠàŠªàŠšàŠ¿ àŠ¯àŠŠàŠ¿ "_2_" àŠžàŠàŠ¯à§àŠŸàŠ àŠàŠ¿ àŠŠà§àŠàŠ€à§ àŠàŠà§àŠàŠŸ àŠàŠ°à§àŠš àŠ€àŠ¬à§ <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_"> àŠ àŠ¿àŠàŠŸàŠšàŠŸ àŠ
 àŠšà§àŠžàŠ°àŠš àŠàŠ°à§àŠš àŠžàŠŸàŠ®àŠšà§ àŠ¯àŠŸàŠš </a> à¥€ àŠ
 àŠšà§àŠ¯àŠ¥àŠŸà§ àŠàŠªàŠšàŠŸàŠ° àŠ¬à§àŠ¯àŠ¬àŠ¹à§àŠ€ àŠ¬à§àŠ²àŠŸàŠàŠàŠŸàŠ°à§àŠ° àŠªàŠ¿àŠàŠšà§ àŠ¬àŠŸàŠàŠš àŠŠàŠ¿à§à§ àŠàŠà§àŠ° àŠ¡àŠà§àŠ®à§àŠšà§àŠà§ àŠ«à§àŠ°àŠ€ àŠ¯àŠŸàŠšà¥€}  
@@ -105,5 +105,5 @@
 _textpassword_ [l=bn] {àŠªàŠŸàŠžàŠà§àŠŸàŠ°à§àŠ¡}  
 
-_textmustbelongtogroup_ [l=bn] {àŠ®àŠšà§ àŠ°àŠŸàŠàŠ¬à§àŠš àŠàŠ àŠªà§àŠ·à§àŠ àŠŸà§ àŠªà§àŠ°àŠ¬à§àŠ¶ àŠàŠ°àŠ€à§ àŠàŠªàŠšàŠŸàŠà§  "_cgiargug_" àŠàŠ àŠà§àŠ°à§àŠªà§àŠ° àŠ
+_textmustbelongtogroup_ [l=bn] {àŠ®àŠšà§ àŠ°àŠŸàŠàŠ¬à§àŠš àŠàŠ àŠªà§àŠ·à§àŠ àŠŸà§ àŠªà§àŠ°àŠ¬à§àŠ¶ àŠàŠ°àŠ€à§ àŠàŠªàŠšàŠŸàŠà§  "_cgiargugHtmlsafe_" àŠàŠ àŠà§àŠ°à§àŠªà§àŠ° àŠ
 àŠšà§àŠ€àŠ°à§àŠ­à§àŠà§àŠ€ àŠ¹àŠ€à§ àŠ¹àŠ¬à§}  
 
@@ -322,17 +322,17 @@
 _textretcoll_ [l=bn] {àŠàŠŸàŠ²à§àŠà§àŠàŠ°à§ àŠ«àŠ¿àŠ°à§ àŠàŠžà§àŠš}  
 
-_textdelperm_ [l=bn] {_cgiargbc1dirname_ àŠžàŠàŠà§àŠ°àŠ¹à§àŠ° àŠžàŠ®à§àŠªà§àŠ°à§àŠš àŠ
+_textdelperm_ [l=bn] {_cgiargbc1dirnameHtmlsafe_ àŠžàŠàŠà§àŠ°àŠ¹à§àŠ° àŠžàŠ®à§àŠªà§àŠ°à§àŠš àŠ
 àŠàŠ¶ àŠ
 àŠ¥àŠ¬àŠŸ àŠ
-àŠàŠ¶ àŠ¬àŠ¿àŠ¶à§àŠ· àŠ®à§àŠà§ àŠ«à§àŠ²àŠŸ àŠžàŠ®à§àŠ­àŠ¬ àŠ¹à§àŠšàŠ¿ à¥€ àŠžàŠ®à§àŠ­àŠŸàŠ¬à§àŠ¯ àŠàŠŸàŠ°àŠ£ àŠà§àŠ²àŠ¿ àŠ¹àŠ²àŠ <u> <li> Greenstone àŠ _gsdlhome_/collect/_cgiargbc1dirname_ directory.<br>àŠàŠ àŠ«à§àŠ²à§àŠ¡àŠŸàŠ°àŠàŠ¿ àŠ®à§àŠà§ àŠ«à§àŠ²àŠŸàŠ° àŠ
-àŠšà§àŠ®àŠ€àŠ¿ àŠšà§àŠ à¥€ _cgiargbc1dirname_  àŠžàŠàŠà§àŠ°àŠ¹àŠà§ àŠžàŠ®à§àŠªà§àŠ£ àŠ­àŠŸàŠ¬à§ àŠàŠ àŠàŠ®à§àŠªàŠ¿àŠàŠàŠ° àŠ¥à§àŠà§ àŠžàŠ°àŠ¿à§à§ àŠ«à§àŠ²àŠ€à§, àŠàŠªàŠšàŠŸàŠà§ àŠàŠ àŠ®à§àŠ¯àŠŸàŠšà§à§àŠŸàŠ²àŠ¿ àŠžàŠ°àŠ¿à§à§ àŠ«à§àŠ²àŠŸàŠ° àŠªà§àŠ°à§à§àŠàŠš àŠªà§àŠ€à§ àŠªàŠŸàŠ°à§ à¥€ <li> Greenstone, _gsdlhome_/bin/script/delcol.pl. àŠàŠ àŠªà§àŠ°à§àŠà§àŠ°àŠŸàŠ®àŠàŠ¿àŠà§ àŠªàŠ°àŠ¿àŠàŠŸàŠ²àŠšàŠŸ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°àŠà§ àŠšàŠŸà¥€ àŠàŠ àŠ«àŠŸàŠàŠ²àŠàŠŸ àŠªàŠ àŠ£àŠ¯à§àŠà§àŠ¯ àŠ¬àŠŸ àŠžàŠ®à§àŠªà§àŠ°à§àŠ£ àŠ¬àŠŸ àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ°àŠ¯à§àŠà§àŠ¯ àŠàŠ¿àŠšàŠŸ àŠšàŠ¿àŠ¶à§àŠàŠ¿àŠ€ àŠ¹à§à§ àŠšàŠ¿àŠš à¥€}  
-
-_textdelinv_ [l=bn] {_cgiargbc1dirname_ àŠžàŠàŠà§àŠ°àŠ¹àŠàŠ¿ àŠžàŠ àŠ¿àŠ àŠšà§ àŠ
+àŠàŠ¶ àŠ¬àŠ¿àŠ¶à§àŠ· àŠ®à§àŠà§ àŠ«à§àŠ²àŠŸ àŠžàŠ®à§àŠ­àŠ¬ àŠ¹à§àŠšàŠ¿ à¥€ àŠžàŠ®à§àŠ­àŠŸàŠ¬à§àŠ¯ àŠàŠŸàŠ°àŠ£ àŠà§àŠ²àŠ¿ àŠ¹àŠ²àŠ <u> <li> Greenstone àŠ _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ directory.<br>àŠàŠ àŠ«à§àŠ²à§àŠ¡àŠŸàŠ°àŠàŠ¿ àŠ®à§àŠà§ àŠ«à§àŠ²àŠŸàŠ° àŠ
+àŠšà§àŠ®àŠ€àŠ¿ àŠšà§àŠ à¥€ _cgiargbc1dirnameHtmlsafe_  àŠžàŠàŠà§àŠ°àŠ¹àŠà§ àŠžàŠ®à§àŠªà§àŠ£ àŠ­àŠŸàŠ¬à§ àŠàŠ àŠàŠ®à§àŠªàŠ¿àŠàŠàŠ° àŠ¥à§àŠà§ àŠžàŠ°àŠ¿à§à§ àŠ«à§àŠ²àŠ€à§, àŠàŠªàŠšàŠŸàŠà§ àŠàŠ àŠ®à§àŠ¯àŠŸàŠšà§à§àŠŸàŠ²àŠ¿ àŠžàŠ°àŠ¿à§à§ àŠ«à§àŠ²àŠŸàŠ° àŠªà§àŠ°à§à§àŠàŠš àŠªà§àŠ€à§ àŠªàŠŸàŠ°à§ à¥€ <li> Greenstone, _gsdlhome_/bin/script/delcol.pl. àŠàŠ àŠªà§àŠ°à§àŠà§àŠ°àŠŸàŠ®àŠàŠ¿àŠà§ àŠªàŠ°àŠ¿àŠàŠŸàŠ²àŠšàŠŸ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°àŠà§ àŠšàŠŸà¥€ àŠàŠ àŠ«àŠŸàŠàŠ²àŠàŠŸ àŠªàŠ àŠ£àŠ¯à§àŠà§àŠ¯ àŠ¬àŠŸ àŠžàŠ®à§àŠªà§àŠ°à§àŠ£ àŠ¬àŠŸ àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ°àŠ¯à§àŠà§àŠ¯ àŠàŠ¿àŠšàŠŸ àŠšàŠ¿àŠ¶à§àŠàŠ¿àŠ€ àŠ¹à§à§ àŠšàŠ¿àŠš à¥€}  
+
+_textdelinv_ [l=bn] {_cgiargbc1dirnameHtmlsafe_ àŠžàŠàŠà§àŠ°àŠ¹àŠàŠ¿ àŠžàŠ àŠ¿àŠ àŠšà§ àŠ
 àŠ¥àŠ¬àŠŸ àŠžàŠàŠ°àŠà§àŠ·àŠ¿àŠ€, àŠàŠàŠŸàŠà§ àŠ®à§àŠà§ àŠ«à§àŠ²àŠŸ àŠ¯àŠŸàŠ¬à§àŠšàŠŸ à¥€}  
 
-_textdelsuc_ [l=bn] {_cgiargbc1dirname_ àŠžàŠàŠà§àŠ°àŠ¹àŠà§ àŠžàŠ«àŠ² àŠ­àŠŸàŠ¬à§ àŠ®à§àŠà§ àŠ«à§àŠ²àŠŸ àŠ¹à§à§àŠà§ à¥€}  
-
-_textclonefail_ [l=bn] {The _cgiargclonecol_ àŠžàŠàŠà§àŠ°àŠ¹ àŠàŠàŠšàŠ àŠàŠàŠ àŠ¬àŠŸ àŠ¡à§àŠªà§àŠ²àŠ¿àŠà§àŠ àŠ¹àŠ€à§ àŠªàŠŸàŠ°à§àŠšàŠŸà¥€ àŠžàŠŸàŠ®à§àŠ­àŠŸàŠ¬à§àŠ¯ àŠàŠŸàŠ°àŠ£ àŠà§àŠ²àŠŸ àŠ¹àŠ²àŠ <ul> <li>_cgiargclonecol_ àŠžàŠàŠà§àŠ°àŠ¹àŠàŠ¿àŠ° àŠ
-àŠžà§àŠ€àŠ¿àŠ€à§àŠ¬ àŠšà§àŠ <li> The _cgiargclonecol_ àŠžàŠàŠà§àŠ°àŠ¹àŠàŠ¿àŠ° collect.cfg àŠ«àŠŸàŠàŠ² àŠšà§àŠ <li> Greenstone àŠàŠ° collect.cfg àŠ«àŠŸàŠàŠ²àŠàŠ¿ àŠªà§àŠŸàŠ° àŠ
+_textdelsuc_ [l=bn] {_cgiargbc1dirnameHtmlsafe_ àŠžàŠàŠà§àŠ°àŠ¹àŠà§ àŠžàŠ«àŠ² àŠ­àŠŸàŠ¬à§ àŠ®à§àŠà§ àŠ«à§àŠ²àŠŸ àŠ¹à§à§àŠà§ à¥€}  
+
+_textclonefail_ [l=bn] {The _cgiargclonecolHtmlsafe_ àŠžàŠàŠà§àŠ°àŠ¹ àŠàŠàŠšàŠ àŠàŠàŠ àŠ¬àŠŸ àŠ¡à§àŠªà§àŠ²àŠ¿àŠà§àŠ àŠ¹àŠ€à§ àŠªàŠŸàŠ°à§àŠšàŠŸà¥€ àŠžàŠŸàŠ®à§àŠ­àŠŸàŠ¬à§àŠ¯ àŠàŠŸàŠ°àŠ£ àŠà§àŠ²àŠŸ àŠ¹àŠ²àŠ <ul> <li>_cgiargclonecolHtmlsafe_ àŠžàŠàŠà§àŠ°àŠ¹àŠàŠ¿àŠ° àŠ
+àŠžà§àŠ€àŠ¿àŠ€à§àŠ¬ àŠšà§àŠ <li> The _cgiargclonecolHtmlsafe_ àŠžàŠàŠà§àŠ°àŠ¹àŠàŠ¿àŠ° collect.cfg àŠ«àŠŸàŠàŠ² àŠšà§àŠ <li> Greenstone àŠàŠ° collect.cfg àŠ«àŠŸàŠàŠ²àŠàŠ¿ àŠªà§àŠŸàŠ° àŠ
 àŠšà§àŠ®àŠ€àŠ¿ àŠšà§àŠ </ul>}  
 
@@ -357,7 +357,7 @@
 àŠšà§àŠ°à§àŠ§ àŠàŠ°àŠŸ àŠ¹àŠà§àŠà§ à¥€}  
 
-_textexptsuc_ [l=bn] {_cgiargbc1dirname_ àŠžàŠàŠà§àŠ°àŠ¹àŠàŠ¿àŠà§ àŠžàŠ«àŠ²àŠ­àŠŸàŠ¬à§ _gsdlhome_/tmp/exported\__cgiargbc1dirname_ directoryàŠ«à§àŠ²à§àŠ¡àŠŸàŠ°à§ àŠªàŠŸàŠ àŠŸàŠšà§ àŠ¹à§à§àŠà§ à¥€ }  
-
-_textexptfail_ [l=bn] {<p> _cgiargbc1dirname_ àŠžàŠàŠà§àŠ°àŠ¹àŠà§ àŠàŠà§àŠžàŠªà§àŠ°à§àŠ àŠàŠ°àŠŸ àŠžàŠ®à§àŠ­àŠ¬ àŠ¹à§àŠšàŠ¿à¥€ <p> àŠàŠàŠŸ àŠàŠ®àŠš àŠ¹àŠ€à§ àŠªàŠŸàŠ°à§ àŠ¯à§, àŠà§àŠ°àŠ¿àŠšàŠžà§àŠà§àŠš àŠàŠšàŠžà§àŠàŠ²à§àŠ¶àŠš àŠàŠ°àŠŸàŠ° àŠžàŠ®à§ àŠ¹à§àŠ€ àŠžàŠ¿àŠ¡àŠ¿àŠ°àŠ®à§ àŠàŠà§àŠžàŠªà§àŠ°à§àŠàŠ¯à§àŠà§àŠ¯ àŠàŠ°àŠŸ àŠ¹à§àŠšàŠ¿à¥€ <li> àŠ¯àŠŠàŠ¿ àŠàŠªàŠšàŠ¿ àŠà§àŠš àŠžàŠ¿àŠ¡àŠ¿àŠ°àŠ® àŠ¥à§àŠà§ à§š.à§­à§Š àŠàŠ° àŠàŠà§àŠ° àŠà§àŠ°àŠ¿àŠšàŠžà§àŠà§àŠš àŠàŠšàŠžà§àŠàŠ²à§àŠ¶ àŠàŠ°à§ àŠ¥àŠŸàŠà§àŠš,àŠ€àŠŸàŠ¹àŠ²à§ àŠàŠ àŠàŠªàŠŸàŠŠàŠŸàŠš àŠà§àŠ²àŠŸ àŠàŠšàŠžà§àŠàŠ² àŠ¹àŠ¬à§àŠšàŠŸ àŠ¯àŠŠàŠ¿àŠšàŠŸ àŠàŠªàŠšàŠ¿ àŠàŠŸàŠžà§àŠàŠ® àŠàŠšàŠžà§àŠàŠ²à§àŠ° àŠžàŠ®à§ àŠžà§àŠà§àŠ²àŠŸ àŠšàŠ¿àŠ°à§àŠ¬àŠŸàŠàŠš àŠšàŠŸ àŠàŠ°à§àŠšà¥€àŠªà§àŠšàŠ°àŠŸà§ àŠàŠšàŠžà§àŠàŠ²à§àŠ¶àŠš àŠ¶à§àŠ°à§ àŠàŠ°àŠŸàŠ° àŠžàŠ®à§ àŠàŠªàŠšàŠ¿ àŠžà§àŠà§àŠ²àŠŸàŠà§ àŠ¯à§àŠ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§àŠšà¥€ <li> àŠ¯àŠŠàŠ¿ àŠàŠªàŠšàŠ¿ àŠà§à§àŠ¬ àŠ¬àŠšà§àŠàŠ£ àŠ¥à§àŠà§ àŠà§àŠ°à§àŠ£àŠžà§àŠà§àŠš àŠàŠšàŠžà§àŠàŠ² àŠàŠ°àŠ€à§ àŠàŠŸàŠš àŠ€àŠŸàŠ¹àŠ²à§ àŠàŠªàŠšàŠŸàŠà§ àŠàŠ àŠàŠŸàŠ°à§àŠ¯àŠà§àŠ°àŠ® àŠžàŠà§àŠ°àŠ¿à§ àŠàŠ°àŠ€à§àŠàŠàŠàŠŸ àŠ
+_textexptsuc_ [l=bn] {_cgiargbc1dirnameHtmlsafe_ àŠžàŠàŠà§àŠ°àŠ¹àŠàŠ¿àŠà§ àŠžàŠ«àŠ²àŠ­àŠŸàŠ¬à§ _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ directoryàŠ«à§àŠ²à§àŠ¡àŠŸàŠ°à§ àŠªàŠŸàŠ àŠŸàŠšà§ àŠ¹à§à§àŠà§ à¥€ }  
+
+_textexptfail_ [l=bn] {<p> _cgiargbc1dirnameHtmlsafe_ àŠžàŠàŠà§àŠ°àŠ¹àŠà§ àŠàŠà§àŠžàŠªà§àŠ°à§àŠ àŠàŠ°àŠŸ àŠžàŠ®à§àŠ­àŠ¬ àŠ¹à§àŠšàŠ¿à¥€ <p> àŠàŠàŠŸ àŠàŠ®àŠš àŠ¹àŠ€à§ àŠªàŠŸàŠ°à§ àŠ¯à§, àŠà§àŠ°àŠ¿àŠšàŠžà§àŠà§àŠš àŠàŠšàŠžà§àŠàŠ²à§àŠ¶àŠš àŠàŠ°àŠŸàŠ° àŠžàŠ®à§ àŠ¹à§àŠ€ àŠžàŠ¿àŠ¡àŠ¿àŠ°àŠ®à§ àŠàŠà§àŠžàŠªà§àŠ°à§àŠàŠ¯à§àŠà§àŠ¯ àŠàŠ°àŠŸ àŠ¹à§àŠšàŠ¿à¥€ <li> àŠ¯àŠŠàŠ¿ àŠàŠªàŠšàŠ¿ àŠà§àŠš àŠžàŠ¿àŠ¡àŠ¿àŠ°àŠ® àŠ¥à§àŠà§ à§š.à§­à§Š àŠàŠ° àŠàŠà§àŠ° àŠà§àŠ°àŠ¿àŠšàŠžà§àŠà§àŠš àŠàŠšàŠžà§àŠàŠ²à§àŠ¶ àŠàŠ°à§ àŠ¥àŠŸàŠà§àŠš,àŠ€àŠŸàŠ¹àŠ²à§ àŠàŠ àŠàŠªàŠŸàŠŠàŠŸàŠš àŠà§àŠ²àŠŸ àŠàŠšàŠžà§àŠàŠ² àŠ¹àŠ¬à§àŠšàŠŸ àŠ¯àŠŠàŠ¿àŠšàŠŸ àŠàŠªàŠšàŠ¿ àŠàŠŸàŠžà§àŠàŠ® àŠàŠšàŠžà§àŠàŠ²à§àŠ° àŠžàŠ®à§ àŠžà§àŠà§àŠ²àŠŸ àŠšàŠ¿àŠ°à§àŠ¬àŠŸàŠàŠš àŠšàŠŸ àŠàŠ°à§àŠšà¥€àŠªà§àŠšàŠ°àŠŸà§ àŠàŠšàŠžà§àŠàŠ²à§àŠ¶àŠš àŠ¶à§àŠ°à§ àŠàŠ°àŠŸàŠ° àŠžàŠ®à§ àŠàŠªàŠšàŠ¿ àŠžà§àŠà§àŠ²àŠŸàŠà§ àŠ¯à§àŠ àŠàŠ°àŠ€à§ àŠªàŠŸàŠ°à§àŠšà¥€ <li> àŠ¯àŠŠàŠ¿ àŠàŠªàŠšàŠ¿ àŠà§à§àŠ¬ àŠ¬àŠšà§àŠàŠ£ àŠ¥à§àŠà§ àŠà§àŠ°à§àŠ£àŠžà§àŠà§àŠš àŠàŠšàŠžà§àŠàŠ² àŠàŠ°àŠ€à§ àŠàŠŸàŠš àŠ€àŠŸàŠ¹àŠ²à§ àŠàŠªàŠšàŠŸàŠà§ àŠàŠ àŠàŠŸàŠ°à§àŠ¯àŠà§àŠ°àŠ® àŠžàŠà§àŠ°àŠ¿à§ àŠàŠ°àŠ€à§àŠàŠàŠàŠŸ àŠ
 àŠ€àŠ¿àŠ°àŠ¿àŠà§àŠ€ àŠªà§àŠ¯àŠŸàŠà§àŠ àŠ¡àŠŸàŠàŠšàŠ²à§àŠ¡ àŠ¬àŠŸ àŠàŠšàŠžà§àŠàŠ² àŠàŠ°àŠ€à§ àŠ¹àŠ¬à§à¥€ àŠŠà§àŠŸàŠàŠ°à§ <ahref="http://www.greenstone.org">http://www.greenstone.org</a> or <a àŠàŠàŠŸàŠšà§ àŠªà§àŠ°àŠ¬à§àŠ¶ àŠàŠ°à§àŠšà¥€ àŠàŠ°àŠ àŠ€àŠ¥à§àŠ¯à§àŠ° àŠàŠšà§àŠ¯ href="https://list.scms.waikato.ac.nz/mailman/listinfo/greenstone-users">the mailing list</a>àŠàŠ àŠ àŠ¿àŠàŠŸàŠšàŠŸà§ àŠ¯à§àŠàŠŸàŠ¯à§àŠ àŠàŠ°à§àŠšà¥€ </ul>}  
 
@@ -519,5 +519,5 @@
 
 _textdeleteuser_ [l=bn] {àŠàŠàŠàŠš àŠàŠàŠàŠŸàŠ° àŠ¬àŠŸàŠŠ àŠŠàŠ¿àŠš}  
-_textremwarn_ [l=bn] {àŠàŠªàŠšàŠ¿ àŠàŠ¿ <b>_cgiargumun_</b> àŠàŠàŠàŠŸàŠ°àŠà§ àŠžà§àŠ¥àŠŸà§à§àŠ­àŠŸàŠ¬à§ àŠ¬àŠŸàŠŠ àŠŠàŠ¿àŠ€à§ àŠàŠŸàŠš?}  
+_textremwarn_ [l=bn] {àŠàŠªàŠšàŠ¿ àŠàŠ¿ <b>_cgiargumunHtmlsafe_</b> àŠàŠàŠàŠŸàŠ°àŠà§ àŠžà§àŠ¥àŠŸà§à§àŠ­àŠŸàŠ¬à§ àŠ¬àŠŸàŠŠ àŠŠàŠ¿àŠ€à§ àŠàŠŸàŠš?}  
 
 
Index: main/trunk/greenstone2/macros/browse.dm
===================================================================
--- main/trunk/greenstone2/macros/browse.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/browse.dm	(revision 28888)
@@ -68,5 +68,5 @@
 }
 
-_filterbox_{<input type=text name="bft" value="_cgiargbft_" size=60>}
+_filterbox_{<input type=text name="bft" value="_cgiargbftAttrsafe_" size=60>}
 
 
Index: main/trunk/greenstone2/macros/bulgarian.dm
===================================================================
--- main/trunk/greenstone2/macros/bulgarian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/bulgarian.dm	(revision 28888)
@@ -285,5 +285,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=bg] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,ÐÑÐŒÐ° ÑÑÐŸÑÐ²ÐµÑÑÑÐ²ÐžÑ Ð·Ð°: _cgiargq_)}  
+_textquerytitle_ [l=bg] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,ÐÑÐŒÐ° ÑÑÐŸÑÐ²ÐµÑÑÑÐ²ÐžÑ Ð·Ð°: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=bg] {Ð¢ÑÑÑÐµÐœÐµ}  
 
Index: main/trunk/greenstone2/macros/catalan2.dm
===================================================================
--- main/trunk/greenstone2/macros/catalan2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/catalan2.dm	(revision 28888)
@@ -119,5 +119,5 @@
 
 # should have arguments of collection, collectionname and link
-_foundintcontent_ [l=ca] {<h3>EnllaÃ§ amb la colÂ·lecciÃ³ "_2_" </h3>  <p> L'enllaÃ§ que heu seleccionat Ã©s extern a la colÂ·lecciÃ³ "_collectionname_"     (connecta amb la colÂ·lecciÃ³ "_2_").     Si voleu visualitar aquest enllaÃ§ a la colÂ·lecciÃ³ "_2_" podeu       <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">avanÃ§ar</a> fins a aquesta pÃ gina;      en cas contrari, pitgeu el botÃ³ "retrocÃ©s" del vostre navegador per tornar al document anterior. }  
+_foundintcontent_ [l=ca] {<h3>EnllaÃ§ amb la colÂ·lecciÃ³ "_2_" </h3>  <p> L'enllaÃ§ que heu seleccionat Ã©s extern a la colÂ·lecciÃ³ "_collectionname_"     (connecta amb la colÂ·lecciÃ³ "_2_").     Si voleu visualitar aquest enllaÃ§ a la colÂ·lecciÃ³ "_2_" podeu       <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">avanÃ§ar</a> fins a aquesta pÃ gina;      en cas contrari, pitgeu el botÃ³ "retrocÃ©s" del vostre navegador per tornar al document anterior. }  
 
 
@@ -137,5 +137,5 @@
 _textpassword_ [l=ca] {contrasenya}
 
-_textmustbelongtogroup_ [l=ca] {AvÃ­s: heu de pertÃ nyer al grup "_cgiargug_" per entrar a aquesta pÃ gina}
+_textmustbelongtogroup_ [l=ca] {AvÃ­s: heu de pertÃ nyer al grup "_cgiargugHtmlsafe_" per entrar a aquesta pÃ gina}
 
 _textmessageinvalid_ [l=ca] {La pÃ gina que heu demanat exigeix que us identifiqueu.<br>
@@ -352,21 +352,21 @@
 _textretcoll_ [l=ca] {Torna al colÂ·leccionista}
 
-_textdelperm_ [l=ca] {No s'ha pogut suprimir tota o una part de la colÂ·lecciÃ³ _cgiargbc1dirname_ . AixÃ² pot ser perquÃš:
+_textdelperm_ [l=ca] {No s'ha pogut suprimir tota o una part de la colÂ·lecciÃ³ _cgiargbc1dirnameHtmlsafe_ . AixÃ² pot ser perquÃš:
 <ul>
-<li> Greenstone no tÃ© permÃ­s per suprimir el directori _gsdlhome_/collect/_cgiargbc1dirname_.<br>
-Potser haureu d'eliminar aquest directori manualment per completar la supressiÃ³ de la colÂ·lecciÃ³ _cgiargbc1dirname_ d'aquest ordinador.</li>
+<li> Greenstone no tÃ© permÃ­s per suprimir el directori _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_.<br>
+Potser haureu d'eliminar aquest directori manualment per completar la supressiÃ³ de la colÂ·lecciÃ³ _cgiargbc1dirnameHtmlsafe_ d'aquest ordinador.</li>
 <li>Greenstone no pot executar el programa _gsdlhome_/bin/script/delcol.pl. Comproveu que aquest fitxer es pugui llegir i executar.</li>
 </ul>
 }
 
-_textdelinv_ [l=ca] {La colÂ·lecciÃ³  _cgiargbc1dirname_ estÃ  protegida o no Ã©s vÃ lida. S'ha cancelÂ·lat la supressiÃ³. 
-}
-
-_textdelsuc_ [l=ca] {La colÂ·lecciÃ³  _cgiargbc1dirname_ s'ha suprimit satisfactÃ²riament.}
-
-_textclonefail_ [l=ca] {La colÂ·lecciÃ³  _cgiargclonecol_ no s'ha pogut clonar. AixÃ² pot ser perquÃš: 
+_textdelinv_ [l=ca] {La colÂ·lecciÃ³  _cgiargbc1dirnameHtmlsafe_ estÃ  protegida o no Ã©s vÃ lida. S'ha cancelÂ·lat la supressiÃ³. 
+}
+
+_textdelsuc_ [l=ca] {La colÂ·lecciÃ³  _cgiargbc1dirnameHtmlsafe_ s'ha suprimit satisfactÃ²riament.}
+
+_textclonefail_ [l=ca] {La colÂ·lecciÃ³  _cgiargclonecolHtmlsafe_ no s'ha pogut clonar. AixÃ² pot ser perquÃš: 
 <ul>
-<li> La colÂ·lecciÃ³ _cgiargclonecol_ no existeix
-<li> La colÂ·lecciÃ³  _cgiargclonecol_ no tÃ© el fitxer de configuraciÃ³ collect.cfg 
+<li> La colÂ·lecciÃ³ _cgiargclonecolHtmlsafe_ no existeix
+<li> La colÂ·lecciÃ³  _cgiargclonecolHtmlsafe_ no tÃ© el fitxer de configuraciÃ³ collect.cfg 
 <li> Greenstone no tÃ© permÃ­s per llegir el fitxer de configuraciÃ³ collect.cfg 
 </ul>
@@ -392,7 +392,7 @@
 _textreloaderror_ [l=ca] {S'ha produÃ¯t un error durant la creaciÃ³ de la nova colÂ·lecciÃ³. Podria ser que Greenstone s'haguÃ©s confÃ³s pel vostre Ãºs dels botons "tornar a carregar" o "retrocÃ©s" del vostre navegador (procureu no fer servir aquests botons durant la creaciÃ³ d'una colÂ·lecciÃ³ amb el colÂ·leccionista). Ãs recomanable tornar a fer arrencar el colÂ·leccionista des del principi. }
 
-_textexptsuc_ [l=ca] {La colÂ·lecciÃ³  _cgiargbc1dirname_ s'ha exportat satisfactÃ²riament al directori _gsdlhome_/tmp/exported\__cgiargbc1dirname_. }
-
-_textexptfail_ [l=ca] {<p>No s'ha pogut exportar la colÂ·lecciÃ³ _cgiargbc1dirname_ .  <p>Ãs probable que sigui perquÃš Greenstone es va instalÂ·lar sense els components necessaris per a la funciÃ³ "Exportar colÂ·lecciÃ³".   <ul>   <li>Si vÃ reu instalÂ·lar una versiÃ³ de Greenstone anterior a 2.70w des d'un cd-rom, aquests components no s'hauran instalÂ·lat llevat que els haguÃ©ssiu seleccionat durant una instalÂ·laciÃ³ "personalitzada". Els podeu afegir a la instalÂ·laciÃ³ tornant a executar el procediment d'instalÂ·laciÃ³.   <li>Si vÃ reu instalÂ·lar Greenstone des d'una distribuciÃ³ a Internet, haureu de baixar i instalÂ·lar un paquet addicional per poder habilitar aquesta funciÃ³. Podeu obtenir mÃ©s informaciÃ³ a <a href="http://www.greenstone.org">http://www.greenstone.org</a> o  <a  href="https://list.scms.waikato.ac.nz/mailman/listinfo/greenstone-users">a la llista de correu</a>.  </ul> }  
+_textexptsuc_ [l=ca] {La colÂ·lecciÃ³  _cgiargbc1dirnameHtmlsafe_ s'ha exportat satisfactÃ²riament al directori _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_. }
+
+_textexptfail_ [l=ca] {<p>No s'ha pogut exportar la colÂ·lecciÃ³ _cgiargbc1dirnameHtmlsafe_ .  <p>Ãs probable que sigui perquÃš Greenstone es va instalÂ·lar sense els components necessaris per a la funciÃ³ "Exportar colÂ·lecciÃ³".   <ul>   <li>Si vÃ reu instalÂ·lar una versiÃ³ de Greenstone anterior a 2.70w des d'un cd-rom, aquests components no s'hauran instalÂ·lat llevat que els haguÃ©ssiu seleccionat durant una instalÂ·laciÃ³ "personalitzada". Els podeu afegir a la instalÂ·laciÃ³ tornant a executar el procediment d'instalÂ·laciÃ³.   <li>Si vÃ reu instalÂ·lar Greenstone des d'una distribuciÃ³ a Internet, haureu de baixar i instalÂ·lar un paquet addicional per poder habilitar aquesta funciÃ³. Podeu obtenir mÃ©s informaciÃ³ a <a href="http://www.greenstone.org">http://www.greenstone.org</a> o  <a  href="https://list.scms.waikato.ac.nz/mailman/listinfo/greenstone-users">a la llista de correu</a>.  </ul> }  
 
 ######################################################################
@@ -536,5 +536,5 @@
 
 _textdeleteuser_ [l=ca] {Suprimeix un usuari}
-_textremwarn_ [l=ca] {Segur que voleu suprimir permanentment l'usuari <b>_cgiargumun_</b>?}
+_textremwarn_ [l=ca] {Segur que voleu suprimir permanentment l'usuari <b>_cgiargumunHtmlsafe_</b>?}
 
 
Index: main/trunk/greenstone2/macros/chinese-trad.dm
===================================================================
--- main/trunk/greenstone2/macros/chinese-trad.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/chinese-trad.dm	(revision 28888)
@@ -57,5 +57,5 @@
 _textdescrlogin_ [l=zh-tr] {ç»å
 ¥é é¢}  
-_textdescrlogout_ [l=zh-tr] {ä»¥ _cgiargun_ ç»åº}  
+_textdescrlogout_ [l=zh-tr] {ä»¥ _cgiargunHtmlsafe_ ç»åº}  
 
 _textdescrgreenstone_ [l=zh-tr] {Greenstone æžäœåæžé€šè»é«}
@@ -212,5 +212,5 @@
 _linktextLOGIN_ [l=zh-tr] {ç»å
 ¥}  
-_linktextLOGGEDIN_ [l=zh-tr] {(ä»¥ _cgiargun_ èº«ä»œç»å
+_linktextLOGGEDIN_ [l=zh-tr] {(ä»¥ _cgiargunHtmlsafe_ èº«ä»œç»å
 ¥)}  
 _linktextLOGOUT_ [l=zh-tr] {ç»åº}  
@@ -373,5 +373,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=zh-tr] {_If_(_thislast_,results _thisfirst_ - _thislast_ éå°æ¥è©¢: _cgiargq_ïŒæå°äžå°ç¬Šåçæ¢ä»¶: _cgiargq_)}
+_textquerytitle_ [l=zh-tr] {_If_(_thislast_,results _thisfirst_ - _thislast_ éå°æ¥è©¢: _cgiargqHtmlsafe_ïŒæå°äžå°ç¬Šåçæ¢ä»¶: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=zh-tr] {æå°é é¢}
 
Index: main/trunk/greenstone2/macros/chinese-trad2.dm
===================================================================
--- main/trunk/greenstone2/macros/chinese-trad2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/chinese-trad2.dm	(revision 28888)
@@ -193,5 +193,5 @@
 Ÿæª¢èŠæŒ "_2_" å
 žèè³æåº«å
-§çé£çµïŒæšå¯ä»¥æäžäž<a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_"> éè£çé£çµ</a>ïŒä»¥ååŸè©²é ïŒæè
+§çé£çµïŒæšå¯ä»¥æäžäž<a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_"> éè£çé£çµ</a>ïŒä»¥ååŸè©²é ïŒæè
 ïŒæäžäžçèŠœåšçãåå°äžäžé ãéµïŒä»¥åå°åäžé ã}  
 
@@ -214,5 +214,5 @@
 
 _textmustbelongtogroup_ [l=zh-tr] {æ³šæïŒäœ å¿
-é å±¬æŒ "_cgiargug_" éåçŸ€çµæèœçå°æ­€é }
+é å±¬æŒ "_cgiargugHtmlsafe_" éåçŸ€çµæèœçå°æ­€é }
 
 _textmessageinvalid_ [l=zh-tr] {äœ æè«æ±é²å
@@ -220,5 +220,5 @@
 ¥ïŒ<br>
 _If_(_cgiargug_,[è«æ³šæäœ å¿
-é å±¬æŒ "_cgiargug_" çŸ€çµæèœé²å
+é å±¬æŒ "_cgiargugHtmlsafe_" çŸ€çµæèœé²å
 ¥æ­€ç¶²é ] <br>)
 è«èŒžå
@@ -611,9 +611,9 @@
 
 _textdelperm_ [l=zh-tr] {éšåæå
-šéš _cgiargbc1dirname_ å
+šéš _cgiargbc1dirnameHtmlsafe_ å
 žèè³æåº«ç¡æ³åªé€ïŒå¯èœåå çºïŒ
 <ul> 
-<li>â¢	Greenstone ç¡åªé€_gsdlhome_/collect/_cgiargbc1dirname_ ç®éçèš±å¯ã 
-äœ éèŠäººå·¥ç§»é€_cgiargbc1dirname_å
+<li>â¢	Greenstone ç¡åªé€_gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ ç®éçèš±å¯ã 
+äœ éèŠäººå·¥ç§»é€_cgiargbc1dirnameHtmlsafe_å
 žèè³æåº«ã</li>
 <li>â¢	Greenstone ç¡æ³å·è¡_gsdlhome_/bin/script/delcol.plçšåŒïŒè«ç¢ºå®æ­€æªæ¡å¯
@@ -622,16 +622,16 @@
 }
 
-_textdelinv_ [l=zh-tr] {_cgiargbc1dirname_ å
+_textdelinv_ [l=zh-tr] {_cgiargbc1dirnameHtmlsafe_ å
 žèè³æåº«è¢«ä¿è­·æç¡æïŒåæ¶åªé€ã 
 }
 
-_textdelsuc_ [l=zh-tr] {æååªé€_cgiargbc1dirname_å
+_textdelsuc_ [l=zh-tr] {æååªé€_cgiargbc1dirnameHtmlsafe_å
 žèè³æåº«ã}
 
-_textclonefail_ [l=zh-tr] {ç¡æ³è€è£œ _cgiargclonecol_ å
+_textclonefail_ [l=zh-tr] {ç¡æ³è€è£œ _cgiargclonecolHtmlsafe_ å
 žèè³æåº«ïŒå¯èœåå çºïŒ
 <ul>
-<li>â¢	_cgiargclonecol_ collection äžå­åšã 
-<li>â¢	_cgiargclonecol_ collection æ²æ collect.cfg è®æžæªã 
+<li>â¢	_cgiargclonecolHtmlsafe_ collection äžå­åšã 
+<li>â¢	_cgiargclonecolHtmlsafe_ collection æ²æ collect.cfg è®æžæªã 
 <li>â¢	Greenstone æ²æè®åcollect.cfg è®æžæªçèš±å¯ã 
 </ul>
@@ -675,9 +675,9 @@
 }
 
-_textexptsuc_ [l=zh-tr] {æåèŒžåº _cgiargbc1dirname_å
-žèè³æåº« è³ _gsdlhome_/tmp/exported\__cgiargbc1dirname_ ç®éã 
-}
-
-_textexptfail_ [l=zh-tr] {<p>ç¡æ³èŒžåº _cgiargbc1dirname_ çå
+_textexptsuc_ [l=zh-tr] {æåèŒžåº _cgiargbc1dirnameHtmlsafe_å
+žèè³æåº« è³ _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ ç®éã 
+}
+
+_textexptfail_ [l=zh-tr] {<p>ç¡æ³èŒžåº _cgiargbc1dirnameHtmlsafe_ çå
 žèè³æåº«ã
 
@@ -942,5 +942,5 @@
 _textremwarn_ [l=zh-tr] {äœ ç¢ºå®èŠæ°žä¹
 åªé€äœ¿çšè
-_cgiargumun_?}
+_cgiargumunHtmlsafe_?}
 
 
Index: main/trunk/greenstone2/macros/chinese.dm
===================================================================
--- main/trunk/greenstone2/macros/chinese.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/chinese.dm	(revision 28888)
@@ -54,5 +54,5 @@
 _textdescrpref_ [l=zh] {éé¡¹é¡µ}
 _textdescrlogin_ [l=zh] {ç»åœé¡µ}  
-_textdescrlogout_ [l=zh] {ä»¥ _cgiargun_ éåº}  
+_textdescrlogout_ [l=zh] {ä»¥ _cgiargunHtmlsafe_ éåº}  
 
 _textdescrgreenstone_ [l=zh] {ç»¿å®ç³æ°å­åŸä¹ŠéŠèœ¯ä»¶}
@@ -213,5 +213,5 @@
 _linktextPREFERENCES_ [l=zh] {éé¡¹}
 _linktextLOGIN_ [l=zh] {ç»åœ}  
-_linktextLOGGEDIN_ [l=zh] {(ä»¥ _cgiargun_ ç»åœ)}  
+_linktextLOGGEDIN_ [l=zh] {(ä»¥ _cgiargunHtmlsafe_ ç»åœ)}  
 _linktextLOGOUT_ [l=zh] {éåº}  
 
@@ -383,5 +383,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=zh] {_If_(_thislast_,results _thisfirst_ - _thislast_ æ¥è¯¢: _cgiargq_,æªåç°: _cgiargq_)}
+_textquerytitle_ [l=zh] {_If_(_thislast_,results _thisfirst_ - _thislast_ æ¥è¯¢: _cgiargqHtmlsafe_,æªåç°: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=zh] {æ¥æŸé¡µ}
 
Index: main/trunk/greenstone2/macros/chinese2.dm
===================================================================
--- main/trunk/greenstone2/macros/chinese2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/chinese2.dm	(revision 28888)
@@ -152,5 +152,5 @@
 _foundintcontent_ [l=zh] {<h3>è¿æ¥å°æ¶èâ_2_â</h3>
 
-<p>æšéæ©çéŸæ¥æ¯å°æ¶èâ_collectionname_âçäžäžªå€éšéŸæ¥ïŒå®æ¯è¿æ¥å°æ¶èâ_2_âïŒãåŠææšæ³æ¥çåšæ¶èâ_2_âçè¿äžªéŸæ¥ïŒæšå¯ä»¥<a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">åè¿</a> å°è¿äžªé¡µé¢ïŒåŠåçšæšçæµè§åšçâè¿åâæé®éåå°ä¹åçæä»¶ã}  
+<p>æšéæ©çéŸæ¥æ¯å°æ¶èâ_collectionname_âçäžäžªå€éšéŸæ¥ïŒå®æ¯è¿æ¥å°æ¶èâ_2_âïŒãåŠææšæ³æ¥çåšæ¶èâ_2_âçè¿äžªéŸæ¥ïŒæšå¯ä»¥<a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">åè¿</a> å°è¿äžªé¡µé¢ïŒåŠåçšæšçæµè§åšçâè¿åâæé®éåå°ä¹åçæä»¶ã}  
 
 
@@ -171,5 +171,5 @@
 
 _textmustbelongtogroup_ [l=zh] {æ³šææšå¿
-é¡»æ¯å±äºâ_cgiargug_âç»æèœè®¿é®æ­€é¡µé¢}  
+é¡»æ¯å±äºâ_cgiargugHtmlsafe_âç»æèœè®¿é®æ­€é¡µé¢}  
 
 _textmessageinvalid_ [l=zh] {<br>)
@@ -479,22 +479,22 @@
 }  
 
-_textdelperm_ [l=zh] {æ¶è_cgiargbc1dirname_çéšä»œæè
+_textdelperm_ [l=zh] {æ¶è_cgiargbc1dirnameHtmlsafe_çéšä»œæè
 å
 šéšäžèœè¢«å é€ãåå å¯èœæïŒ
 <ul>
-<li>ç»¿å®ç³ç³»ç»æ²¡ææéæ¥å é€_gsdlhome_/collect/_cgiargbc1dirname_ç®åœã<br>
-æšå¯èœéèŠæåšç§»é€è¿äžªç®åœæ¥å®ææ¶è_cgiargbc1dirname_ä»è¿éšçµèäž­çç§»é€ã</li>
+<li>ç»¿å®ç³ç³»ç»æ²¡ææéæ¥å é€_gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ç®åœã<br>
+æšå¯èœéèŠæåšç§»é€è¿äžªç®åœæ¥å®ææ¶è_cgiargbc1dirnameHtmlsafe_ä»è¿éšçµèäž­çç§»é€ã</li>
 <li>ç»¿å®ç³ç³»ç»äžèœè¿è¡çšåº_gsdlhome_/bin/script/delcol.plãè¯·ç¡®å®è¿äžªæ¡£æ¡æ¯å¯è¯»ååå¯æ§è¡çã</li>
 </ul>}  
 
-_textdelinv_ [l=zh] {æ¶è_cgiargbc1dirname_æ¯è¢«ä¿æ€çæè
+_textdelinv_ [l=zh] {æ¶è_cgiargbc1dirnameHtmlsafe_æ¯è¢«ä¿æ€çæè
 æ æçãå é€å·²è¢«åæ¶ã}  
 
-_textdelsuc_ [l=zh] {_cgiargbc1dirname_ æ¶èå·²ç»è¢«æåå°å é€ã}  
-
-_textclonefail_ [l=zh] {æ¶è_cgiargclonecol_äžèœè¢«å€å¶çãåå å¯èœæïŒ
+_textdelsuc_ [l=zh] {_cgiargbc1dirnameHtmlsafe_ æ¶èå·²ç»è¢«æåå°å é€ã}  
+
+_textclonefail_ [l=zh] {æ¶è_cgiargclonecolHtmlsafe_äžèœè¢«å€å¶çãåå å¯èœæïŒ
 <ul>
-<li>æ­€æ¶è_cgiargclonecol_äžå­åš
-<li>æ­€æ¶è_cgiargclonecol_æ²¡æé
+<li>æ­€æ¶è_cgiargclonecolHtmlsafe_äžå­åš
+<li>æ­€æ¶è_cgiargclonecolHtmlsafe_æ²¡æé
 çœ®æ¡£æ¡collect.cfg
 <li>ç»¿å®ç³ç³»ç»æ²¡ææéæ¥è¯»åé
@@ -531,7 +531,7 @@
 ã}  
 
-_textexptsuc_ [l=zh] {æ¶è_cgiargbc1dirname_å·²è¢«æåå°å¯Œåºå°_gsdlhome_/tmp/exported\__cgiargbc1dirname_ç®åœäžã}  
-
-_textexptfail_ [l=zh] {<p>å¯ŒåºéŠè_cgiargbc1dirname_å€±èŽ¥ã
+_textexptsuc_ [l=zh] {æ¶è_cgiargbc1dirnameHtmlsafe_å·²è¢«æåå°å¯Œåºå°_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ç®åœäžã}  
+
+_textexptfail_ [l=zh] {<p>å¯ŒåºéŠè_cgiargbc1dirnameHtmlsafe_å€±èŽ¥ã
 
 <p>è¿åŸå¯èœæ¯å äžºç»¿å®ç³åšå®è£
@@ -752,5 +752,5 @@
 _textdeleteuser_ [l=zh] {å é€äžäžªçšæ·}  
 _textremwarn_ [l=zh] {æšççæ³æ°žä¹
-å°ç§»é€çšæ·<b>_cgiargumun_</b>åïŒ}  
+å°ç§»é€çšæ·<b>_cgiargumunHtmlsafe_</b>åïŒ}  
 
 
Index: main/trunk/greenstone2/macros/collect.dm
===================================================================
--- main/trunk/greenstone2/macros/collect.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/collect.dm	(revision 28888)
@@ -41,5 +41,5 @@
 
 _httpinfo_ {_gwcgi_?e=_compressedoptions_&p=info}
-_httpview_ {_gwcgi_?a=p&p=about&c=_cgiargbc1dirname_}
+_httpview_ {_gwcgi_?a=p&p=about&c=_cgiargbc1dirnameUrlsafe_}
 
 
@@ -144,5 +144,5 @@
 <form name="collectorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 <input type=hidden name="bc1dodelete" value="0">
 <input type=hidden name="bc1esrce" value="0">
@@ -247,5 +247,5 @@
 <form name="collectorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 <input type=hidden name="bc1infochanged" value="0">
 
@@ -261,9 +261,9 @@
 <p>_textwcanc_
 <h4>_texttfc_</h4>
-<input type="text" name="bc1fullname" value="_cgiargbc1fullname_"
+<input type="text" name="bc1fullname" value="_cgiargbc1fullnameAttrsafe_"
 onChange="document.collectorform.bc1infochanged.value=1;") size=72>
 <br>_texttctiasp_
 <h4>_textcea_</h4>
-<input type="text" name="bc1contactemail" value="_cgiargbc1contactemail_"
+<input type="text" name="bc1contactemail" value="_cgiargbc1contactemailAttrsafe_"
 onChange="document.collectorform.bc1infochanged.value=1;" size=72>
 <br>
@@ -273,5 +273,5 @@
 <textarea name="bc1aboutdesc"  cols=72 rows=6 wrap=physical
 onChange="document.collectorform.bc1infochanged.value=1;">
-_cgiargbc1aboutdesc_
+_cgiargbc1aboutdescHtmlsafe_
 </textarea>
 <br>_texttiasd_
@@ -371,9 +371,9 @@
 <form name="collectorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 <input type=hidden name="bc1fromsrce" value="0">
 <input type=hidden name="bc1clonechanged" value="0">
-<input type=hidden name="bc1clone" value="_cgiargbc1clone_">
-<input type=hidden name="bc1inputnum" value="_cgiargbc1inputnum_">
+<input type=hidden name="bc1clone" value="_cgiargbc1cloneAttrsafe_">
+<input type=hidden name="bc1inputnum" value="_cgiargbc1inputnumAttrsafe_">
 
 <center>
@@ -424,6 +424,6 @@
 <form name="collectorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
-<input type=hidden name="bc1cfgchanged" value="_cgiargbc1cfgchanged_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
+<input type=hidden name="bc1cfgchanged" value="_cgiargbc1cfgchangedAttrsafe_">
 
 <center>
@@ -476,5 +476,5 @@
 <form name="collectorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 
 <frameset rows="*,160" border=0>
@@ -495,5 +495,5 @@
   </noframes>
   <frame src="_gwcgi_?e=_compressedoptions_&p=bildframe1">
-  <frame src="_gwcgi_?e=_compressedoptions_&p=bildstatus&c=_cgiargbc1dirname_">
+  <frame src="_gwcgi_?e=_compressedoptions_&p=bildstatus&c=_cgiargbc1dirnameUrlsafe_">
 </frameset>
 </html>
@@ -572,5 +572,5 @@
 <form name="collectorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 
 </form>
@@ -683,5 +683,5 @@
 <form name="collectorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 
 </form>
Index: main/trunk/greenstone2/macros/croatian.dm
===================================================================
--- main/trunk/greenstone2/macros/croatian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/croatian.dm	(revision 28888)
@@ -236,5 +236,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=hr] {_If_(_thislast_,results _thisfirst_ - _thislast_ za upit: _cgiargq_, Ne zadovoljava upit: _cgiargq_)}
+_textquerytitle_ [l=hr] {_If_(_thislast_,results _thisfirst_ - _thislast_ za upit: _cgiargqHtmlsafe_, Ne zadovoljava upit: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=hr] {PretraÅŸivanje}
 
Index: main/trunk/greenstone2/macros/czech.dm
===================================================================
--- main/trunk/greenstone2/macros/czech.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/czech.dm	(revision 28888)
@@ -289,5 +289,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=cs] {_If_(_thislast_,vÃœsledky _thisfirst_ - _thislast_ na dotaz: _cgiargq_,ÅœÃ¡dnÃ© vÃœsledky na dotaz: _cgiargq_)}
+_textquerytitle_ [l=cs] {_If_(_thislast_,vÃœsledky _thisfirst_ - _thislast_ na dotaz: _cgiargqHtmlsafe_,ÅœÃ¡dnÃ© vÃœsledky na dotaz: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=cs] {VyhledÃ¡vacÃ­ strana}
 
Index: main/trunk/greenstone2/macros/czech2.dm
===================================================================
--- main/trunk/greenstone2/macros/czech2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/czech2.dm	(revision 28888)
@@ -139,5 +139,5 @@
 
 <p>
-Odkaz, kterÃœ jste zvolili je externÃ­. Odkazuje na kolekci "_2_". PÅejete-li si zobrazit dokument z kolece "_2_" mÅ¯ÅŸete pouÅŸÃ­t <a href"_httpdoc_&c_1_&cl_cgiargcl_&d_3_">tento odkaz</a>; v opaÄnÃ©m pÅÃ­padÄ pouÅŸijte tlaÄÃ­tka "zpÄt" ve vaÅ¡em prohlÃ­ÅŸeÄi.}
+Odkaz, kterÃœ jste zvolili je externÃ­. Odkazuje na kolekci "_2_". PÅejete-li si zobrazit dokument z kolece "_2_" mÅ¯ÅŸete pouÅŸÃ­t <a href"_httpdoc_&c_1_&cl_cgiargclUrlsafe_&d_3_">tento odkaz</a>; v opaÄnÃ©m pÅÃ­padÄ pouÅŸijte tlaÄÃ­tka "zpÄt" ve vaÅ¡em prohlÃ­ÅŸeÄi.}
 
 
@@ -157,5 +157,5 @@
 _textpassword_ [l=cs] {heslo}
 
-_textmustbelongtogroup_ [l=cs] {Pozn. MusÃ­te patÅit do skupiny "_cgiargug_"}
+_textmustbelongtogroup_ [l=cs] {Pozn. MusÃ­te patÅit do skupiny "_cgiargugHtmlsafe_"}
 
 _textmessageinvalid_ [l=cs] {PoÅŸadovanÃ¡ strÃ¡nka vyÅŸaduje autentifikaci.<br> 
@@ -369,5 +369,5 @@
 _textbildsuc_ [l=cs] {Kolekce byla ÃºspÄÅ¡nÄ vytvoÅena.}
 
-_textviewbildsummary_ [l=cs] {MÅ¯ÅŸete zobrazit<a href"_httppagex_(bsummary)&c_cgiargbc1dirname_" target_top>detailnÃ­ zprÃ¡vu</a> o tvorbÄ kolekce.}
+_textviewbildsummary_ [l=cs] {MÅ¯ÅŸete zobrazit<a href"_httppagex_(bsummary)&c_cgiargbc1dirnameHtmlsafe_" target_top>detailnÃ­ zprÃ¡vu</a> o tvorbÄ kolekce.}
 
 _textfailmsg11_ [l=cs] {Kolekce nemohla bÃœt vytvoÅena, protoÅŸe neobsahuje ÅŸÃ¡dnÃ¡ data. UjistÄte se, ÅŸe alespoÅ
@@ -385,18 +385,18 @@
 _textretcoll_ [l=cs] {VrÃ¡tit se do Collector}
 
-_textdelperm_ [l=cs] {NÄkterÃ© z _cgiargbc1dirname_ kolekcÃ­ nemohly bÃœt smazÃ¡ny. MoÅŸnÃ© pÅÃ­Äiny jsou:<ul>
-<li>Greenstone nemÃ¡ oprÃ¡vnÄnÃ­ mazat adresÃ¡Å _gsdlhome_/collect/_cgiargbc1dirname_.<br>
+_textdelperm_ [l=cs] {NÄkterÃ© z _cgiargbc1dirnameHtmlsafe_ kolekcÃ­ nemohly bÃœt smazÃ¡ny. MoÅŸnÃ© pÅÃ­Äiny jsou:<ul>
+<li>Greenstone nemÃ¡ oprÃ¡vnÄnÃ­ mazat adresÃ¡Å _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_.<br>
 Budete muset odstranit tuto kolekci ruÄnÄ, aby zmizela ÃºplnÄ z tohoto poÄÃ­taÄe.</li>
 <li>Greenstone nemÅ¯ÅŸe spustit program _gsdlhome_/bin/script/delcol.pl UjistÄte se,
 ÅŸe soubor mÃ¡ nastaveny atributy "ke ÄtenÃ­" a "spustitelnÃœ".</li></ul>}
 
-_textdelinv_ [l=cs] {Kolekce _cgiargbc1dirname_ je uzamÄena, a nebo je naplatnÃ¡. SmazÃ¡nÃ­ bylo zruÅ¡eno.}
-
-_textdelsuc_ [l=cs] {Kolekce _cgiargbc1dirname_ byla ÃºspÄÅ¡nÄ smazÃ¡na.}
-
-_textclonefail_ [l=cs] {_cgiargclonecol_ kolekce nemohla bÃœt zkopÃ­rovÃ¡na. MoÅŸnÃ© pÅÃ­Äiny jsou:
+_textdelinv_ [l=cs] {Kolekce _cgiargbc1dirnameHtmlsafe_ je uzamÄena, a nebo je naplatnÃ¡. SmazÃ¡nÃ­ bylo zruÅ¡eno.}
+
+_textdelsuc_ [l=cs] {Kolekce _cgiargbc1dirnameHtmlsafe_ byla ÃºspÄÅ¡nÄ smazÃ¡na.}
+
+_textclonefail_ [l=cs] {_cgiargclonecolHtmlsafe_ kolekce nemohla bÃœt zkopÃ­rovÃ¡na. MoÅŸnÃ© pÅÃ­Äiny jsou:
 <ul>
-<li>Kolekce _cgiargclonecol_ neexistuje</li>
-<li>Kolekce _cgiargclonecol_ postrÃ¡dÃ¡ konfiguraÄnÃ­ soubor (collect.cfg)</li>
+<li>Kolekce _cgiargclonecolHtmlsafe_ neexistuje</li>
+<li>Kolekce _cgiargclonecolHtmlsafe_ postrÃ¡dÃ¡ konfiguraÄnÃ­ soubor (collect.cfg)</li>
 <li>Greenstone nemÃ¡ oprÃ¡vnÄnÃ­ ÄÃ­st z collect.cfg</li>
 </ul>}
@@ -427,8 +427,8 @@
 restartovat Collector od zaÄÃ¡tku.}
 
-_textexptsuc_ [l=cs] {Kolekce _cgiargbc1dirname_ byla ÃºspÄÅ¡nÄ exportovÃ¡na do adresÃ¡Åe _gsdlhome_/tmp/exported\__cgiargbc1dirname_ }
+_textexptsuc_ [l=cs] {Kolekce _cgiargbc1dirnameHtmlsafe_ byla ÃºspÄÅ¡nÄ exportovÃ¡na do adresÃ¡Åe _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ }
 
 _textexptfail_ [l=cs] {<p>
-Chyba pÅi exportu kolekce _cgiargbc1dirname_ .<p>
+Chyba pÅi exportu kolekce _cgiargbc1dirnameHtmlsafe_ .<p>
 Tato chyba je pravdÄpodobnÄ zpÅ¯sobena tÃ­m, ÅŸe Greenstone byl nainstalovÃ¡n bez komponent nezbytnÃœch
 pro fungovÃ¡nÃ­ funkce exportovÃ¡nÃ­ kolekce.
@@ -587,5 +587,5 @@
 
 _textdeleteuser_ [l=cs] {smazat uÅŸivatele}
-_textremwarn_ [l=cs] {SkuteÄnÄ chcete zcela odstranit uÅŸivatele <b>_cgiargumun_</b>?}
+_textremwarn_ [l=cs] {SkuteÄnÄ chcete zcela odstranit uÅŸivatele <b>_cgiargumunHtmlsafe_</b>?}
 
 
Index: main/trunk/greenstone2/macros/dari.dm
===================================================================
--- main/trunk/greenstone2/macros/dari.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/dari.dm	(revision 28888)
@@ -492,5 +492,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=prs] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,ØªØ·Ø§ØšÙÛ ÛØ§ÙØª ÙØŽØ¯: _cgiargq_)}  
+_textquerytitle_ [l=prs] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,ØªØ·Ø§ØšÙÛ ÛØ§ÙØª ÙØŽØ¯: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=prs] {ØµÙØ¬Ù Ø¬Ø³ØªØ¬Ù}  
 
Index: main/trunk/greenstone2/macros/dateqry.dm
===================================================================
--- main/trunk/greenstone2/macros/dateqry.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/dateqry.dm	(revision 28888)
@@ -80,5 +80,5 @@
 <nobr>
 	<center>
-	<input type="text" name="q" value="_cgiargq_" size="50">
+	<input type="text" name="q" value="_cgiargqAttrsafe_" size="50">
 	<input type="submit" value="_textbeginsearch_">
 	</center>
@@ -91,11 +91,11 @@
 	<center>
 _textstartdate_
-<input type="text" name="ds" value = "_cgiargds_"size="4" maxlength="4">
-<select name="dsbc" value="_cgiargdsbc_" size="1">
+<input type="text" name="ds" value = "_cgiargdsAttrsafe_"size="4" maxlength="4">
+<select name="dsbc" value="_cgiargdsbcAttrsafe_" size="1">
 	<option value = "0"_If_(_cgiargdsbc_,, selected)>_textad_
 	<option value = "1"_If_(_cgiargdsbc_, selected)>_textbc_
 </select> 
 _textenddate_
-<input type="text" name="de" value = "_cgiargde_" size="4" maxlength="4"> 
+<input type="text" name="de" value = "_cgiargdeAttrsafe_" size="4" maxlength="4"> 
 <select name="debc" size="1">
 	<option value = "0" _If_(_cgiargdebc_,, selected)>_textad_
Index: main/trunk/greenstone2/macros/deposit.dm
===================================================================
--- main/trunk/greenstone2/macros/deposit.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/deposit.dm	(revision 28888)
@@ -67,5 +67,5 @@
 _httpconf_ {_gwcgi_?e=_compressedoptions_&p=conf}
 _httpbild_ {_gwcgi_?e=_compressedoptions_&p=bild}
-_httpview_ {_gwcgi_?a=p&p=about&c=_cgiargdi1dirname_}
+_httpview_ {_gwcgi_?a=p&p=about&c=_cgiargdi1dirnameUrlsafe_}
 _httpdel_  {javascript:do\_delete();}
 _httpexpt_ {_gwcgi_?e=_compressedoptions_&p=expt}
@@ -156,5 +156,5 @@
 #_di1md.Creator_ {_If_("_:cgiargdi1md.Creator_" eq  "_cgiargdi1md.Creator_",_cgiargdi1md.Creator_,)}
 #_di1md.Description_ {_If_("_:cgiargdi1md.Description_" eq  "_cgiargdi1md.Description_",_cgiargdi1md.Description_,)}
-#_di1md.Subject_ {_If_("_:cgiargdi1md.Subject_" eq "_cgiargdi1md.Subject_",_cgiargdi1md.Subject,)}
+#_di1md.Subject_ {_If_("_:cgiargdi1md.Subject_" eq "_cgiargdi1md.Subject_",_cgiargdi1md.Subject_,)}
 
 _step1scriptextra_ {
@@ -230,5 +230,5 @@
 
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 
 
@@ -261,5 +261,5 @@
 #######################################################################
 
-_userfile_ {_If_("_:cgiargdi1userfile_" eq  "_cgiargdi1userfile_",_cgiargdi1userfile_,)}
+_userfile_ {_If_("_:cgiargdi1userfile_" eq  "_cgiargdi1userfile_",_cgiargdi1userfileAttrsafe_,)}
 
 _step2scriptextra_ {
@@ -275,5 +275,5 @@
 <form name="depositorform" method=post action="_gwcgi_" enctype="multipart/form-data">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 <center>
 <table width=_pagewidth_>
@@ -311,5 +311,5 @@
 <form name="depositorform" method=post action="_gwcgi_" enctype="multipart/form-data">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 <center>
 <table width=_pagewidth_>
@@ -348,5 +348,5 @@
 <form name="depositorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 
 <frameset rows="*,160" border=0>
@@ -450,5 +450,5 @@
 <form name="depositorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 
 </form>
@@ -573,5 +573,5 @@
 <form name="depositorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 
 </form>
Index: main/trunk/greenstone2/macros/depositdspace.dm
===================================================================
--- main/trunk/greenstone2/macros/depositdspace.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/depositdspace.dm	(revision 28888)
@@ -97,5 +97,4 @@
 
 }
-
 
 
@@ -580,5 +579,5 @@
 _httpconf_ {_gwcgi_?e=_compressedoptions_&p=conf}
 _httpbild_ {_gwcgi_?e=_compressedoptions_&p=bild}
-_httpview_ {_gwcgi_?a=p&p=about&c=_cgiargdi1dirname_}
+_httpview_ {_gwcgi_?a=p&p=about&c=_cgiargdi1dirnameUrlsafe_}
 _httpdel_  {javascript:do\_delete();}
 _httpexpt_ {_gwcgi_?e=_compressedoptions_&p=expt}
@@ -1241,5 +1240,5 @@
             <tr>
               <td class="evenRowOddCol"><a
- href="_httptmp_/_cgiargdi1tmp_/_cgiargdi1timestamp_/_di1userfile_"
+ href="_httptmp_/_cgiargdi1tmpUrlsafe_/_cgiargdi1timestampUrlsafe_/_di1userfile_"
  target="_blank">_di1userfile_</a></td>
               <td class="evenRowEvenCol">_di1userfilesize_ bytes</td>
@@ -1257,5 +1256,5 @@
  
 
-                  <a href="javascript:add\_checksum('tmp/_cgiargdi1tmp_/_cgiargdi1timestamp_/_di1userfile_')">calculate ...</a>
+                  <a href="javascript:add\_checksum('tmp/_cgiargdi1tmpJssafe_/_cgiargdi1timestampJssafe_/_di1userfile_')">calculate ...</a>
 	        </span>
 	      </td>
@@ -1283,5 +1282,5 @@
 you can verify.
     <input name="submit_show_checksums" value="Show checksums" 
-         type="button" onClick="javascript:add\_checksum('tmp/_cgiargdi1tmp_/_cgiargdi1timestamp_/_di1userfile_')"></li>
+         type="button" onClick="javascript:add\_checksum('tmp/_cgiargdi1tmpJssafe_/_cgiargdi1timestampJssafe_/_di1userfile_')"></li>
 
 
@@ -1495,5 +1494,5 @@
                           <td class="metadataFieldLabel">Uploaded&nbsp;File:</td>
                           <td class="metadataFieldValue"><a
-   href="_httptmp_/_cgiargdi1tmp_/_cgiargdi1timestamp_/_cgiargdi1userfile_"
+   href="_httptmp_/_cgiargdi1tmpUrlsafe_/_cgiargdi1timestampUrlsafe_/_cgiargdi1userfileUrlsafe_"
    target="_blank">_di1userfile_</a> - HTML
 (Known) <br>
@@ -1702,5 +1701,5 @@
 <form name="depositorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 
 <frameset rows="*,160" border=0>
@@ -1804,5 +1803,5 @@
 <form name="depositorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 
 </form>
@@ -1927,5 +1926,5 @@
 <form name="depositorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="p" value="_cgiargp_">
+<input type=hidden name="p" value="_cgiargpAttrsafe_">
 
 </form>
Index: main/trunk/greenstone2/macros/dhivehi.dm
===================================================================
--- main/trunk/greenstone2/macros/dhivehi.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/dhivehi.dm	(revision 28888)
@@ -71,5 +71,5 @@
 _textdescrpref_ [l=dv] {ÞÞšÞÞ°ÞÞšÞÞ§ÞÞ© ÞÞŠÞÞªÞÞŠ	}  
 _textdescrlogin_ [l=dv] {ÞÞ®ÞÞ°ÞÞšÞÞ° ÞÞ­ÞÞ°	}  
-_textdescrlogout_ [l=dv] {_cgiargun_ ÞÞ®ÞÞ°ÞÞŠÞÞªÞÞ° ÞÞªÞÞ­	}  
+_textdescrlogout_ [l=dv] {_cgiargunHtmlsafe_ ÞÞ®ÞÞ°ÞÞŠÞÞªÞÞ° ÞÞªÞÞ­	}  
 
 _textdescrgreenstone_ [l=dv] {ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ° ÞÞšÞÞšÞÞŠÞÞ° ÞÞŠÞÞšÞÞªÞÞŠÞÞ© ÞÞ®ÞÞ°ÞÞ°ÞÞ¬ÞÞŠÞ	}  
@@ -210,5 +210,5 @@
 _linktextPREFERENCES_ [l=dv] {ÞÞŠÞÞ§ÞÞ§ÞÞŠÞÞ°	}  
 _linktextLOGIN_ [l=dv] {ÞÞ®ÞÞ°ÞÞšÞÞ°	}  
-_linktextLOGGEDIN_ [l=dv] {(ÞÞ®ÞÞ°ÞÞšÞÞ° ÞÞ¬ÞÞŠÞÞšÞÞŠÞÞ© _cgiargun_)	}  
+_linktextLOGGEDIN_ [l=dv] {(ÞÞ®ÞÞ°ÞÞšÞÞ° ÞÞ¬ÞÞŠÞÞšÞÞŠÞÞ© _cgiargunHtmlsafe_)	}  
 _linktextLOGOUT_ [l=dv] {ÞÞ®ÞÞ°ÞÞŠÞÞªÞÞ°	}  
 
@@ -361,5 +361,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=dv] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,No matches for query: _cgiargq_)	}  
+_textquerytitle_ [l=dv] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,No matches for query: _cgiargqHtmlsafe_)	}  
 _textnoquerytitle_ [l=dv] {ÞÞ¯ÞÞ§ ÞÞŠÞÞªÞÞ§	}  
 
Index: main/trunk/greenstone2/macros/dhivehi2.dm
===================================================================
--- main/trunk/greenstone2/macros/dhivehi2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/dhivehi2.dm	(revision 28888)
@@ -82,5 +82,5 @@
 # should have arguments of collection, collectionname and link
 _foundintcontent_ [l=dv] {<h3>ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ° "_2_" ÞÞ¬ ÞÞšÞÞ°ÞÞª</h3>  <p>ÞÞšÞÞŠ ÞÞšÞÞ°ÞÞšÞÞ§ÞÞªÞÞªÞÞš ÞÞšÞÞ°ÞÞŠÞÞ© ÞÞš ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞŠÞÞ° "_collectionname_" ÞÞ­ÞÞªÞÞ° ÞÞŠÞÞš ÞÞšÞÞ°ÞÞ¬ÞÞ¬ÞÞ¬. ÞÞšÞÞšÞÞ°ÞÞª ÞÞ®ÞÞ°ÞÞ¬ÞÞ© "_2_" ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞŠÞÞ° ÞÞš ÞÞšÞÞ°ÞÞª ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ° "_2_"ÞÞ¬ ÞÞ¬ÞÞ¬ÞÞšÞÞ° ÞÞ¬ÞÞªÞÞŠÞÞ° ÞÞ­ÞÞªÞÞ°ÞÞªÞ
-ÞªÞÞŠÞÞŠ <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">go forward</a> ÞÞŠÞÞªÞÞ§ÞÞŠÞÞ° ÞÞšÞÞ§ÞÞŠÞÞ°ÞÞªÞÞªÞÞ° ÞÞ¬ÞÞ¬ÞÞ°Ø ÞÞ«ÞÞ°ÞÞŠÞÞŠ ÞÞ°ÞÞŠÞÞªÞÞŠÞÞÞ¬ "ÞÞ¬ÞÞ°" ÞÞšÞÞ° ÞÞ­ÞÞªÞÞ°ÞÞ®ÞÞ°ÞÞ¬ÞÞ° ÞÞªÞÞ©ÞÞ¬ ÞÞšÞÞªÞÞŠÞÞ° ÞÞªÞÞ«ÞÞŠÞÞ­.}  
+ÞªÞÞŠÞÞŠ <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">go forward</a> ÞÞŠÞÞªÞÞ§ÞÞŠÞÞ° ÞÞšÞÞ§ÞÞŠÞÞ°ÞÞªÞÞªÞÞ° ÞÞ¬ÞÞ¬ÞÞ°Ø ÞÞ«ÞÞ°ÞÞŠÞÞŠ ÞÞ°ÞÞŠÞÞªÞÞŠÞÞÞ¬ "ÞÞ¬ÞÞ°" ÞÞšÞÞ° ÞÞ­ÞÞªÞÞ°ÞÞ®ÞÞ°ÞÞ¬ÞÞ° ÞÞªÞÞ©ÞÞ¬ ÞÞšÞÞªÞÞŠÞÞ° ÞÞªÞÞ«ÞÞŠÞÞ­.}  
 
 
@@ -100,5 +100,5 @@
 _textpassword_ [l=dv] {ÞÞ§ÞÞ°ÞÞ¯ÞÞ°}  
 
-_textmustbelongtogroup_ [l=dv] {ÞÞš ÞÞŠÞÞªÞÞ§ ÞÞ­ÞÞªÞÞ°ÞÞªÞÞªÞÞŠÞÞ° ÞÞšÞÞŠÞÞŠÞÞ§ÞÞªÞÞ° "_cgiargug_" ÞÞ°ÞÞ«ÞÞ§ÞÞš ÞÞŠÞÞšÞÞ¬ÞÞšÞÞ§ÞÞ° ÞÞ¬ÞÞ­ÞÞ°ÞÞŠÞÞ° ÞÞŠÞ¢ÞªÞÞ«ÞÞ§ÞÞŠÞÞ°ÞÞŠÞÞŠÞÞš ÞÞ¬ÞÞ°ÞÞ¬ÞÞšÞÞ°}  
+_textmustbelongtogroup_ [l=dv] {ÞÞš ÞÞŠÞÞªÞÞ§ ÞÞ­ÞÞªÞÞ°ÞÞªÞÞªÞÞŠÞÞ° ÞÞšÞÞŠÞÞŠÞÞ§ÞÞªÞÞ° "_cgiargugHtmlsafe_" ÞÞ°ÞÞ«ÞÞ§ÞÞš ÞÞŠÞÞšÞÞ¬ÞÞšÞÞ§ÞÞ° ÞÞ¬ÞÞ­ÞÞ°ÞÞŠÞÞ° ÞÞŠÞ¢ÞªÞÞ«ÞÞ§ÞÞŠÞÞ°ÞÞŠÞÞŠÞÞš ÞÞ¬ÞÞ°ÞÞ¬ÞÞšÞÞ°}  
 
 _textmessageinvalid_ [l=dv] {<br>) ÞÞšÞÞŠÞÞŠÞÞ§ÞÞªÞÞ¬ ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ° ÞÞ«ÞÞŠÞ ÞÞ­ÞÞ° ÞÞŠÞÞš}
@@ -293,11 +293,11 @@
 _textretcoll_ [l=dv] {ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞ ÞÞŠÞÞ° ÞÞŠÞÞÞªÞÞ§ ÞÞšÞÞ§ÞÞŠÞÞ­}  
 
-_textdelperm_ [l=dv] {ÞÞŠÞÞ¬ÞÞ° ÞÞªÞÞŠÞÞŠ ÞÞªÞÞšÞÞ§ _cgiargbc1dirname_ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ° ÞÞªÞÞ¬ÞÞªÞÞ¬ÞÞ§. ÞÞ©ÞÞ¬ ÞÞŠÞÞŠÞÞªÞÞŠÞÞŠÞÞ©: <ul><li>ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ° ÞÞŠÞÞ° _gsdlhome_/collect/_cgiargbc1dirname_ ÞÞš ÞÞŠÞÞšÞÞ° ÞÞªÞÞ¬ÞÞªÞÞªÞÞ¬ ÞÞªÞÞ°ÞÞŠ ÞÞ¬ÞÞªÞÞ°.<br> ÞÞš ÞÞŠÞÞšÞÞ¬ÞÞ°ÞÞŠÞÞ© ÞÞ¬ÞÞªÞÞŠÞÞ° ÞÞ®ÞÞ° ÞÞªÞÞ¬ÞÞŠÞÞšÞÞ®ÞÞ° _cgiargbc1dirname_ ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ° ÞÞš ÞÞ®ÞÞÞšÞÞªÞÞŠÞÞªÞÞ° ÞÞªÞÞšÞÞªÞÞ¬ÞÞšÞÞ§ÞÞ¬. <li/>                                                            }  
-
-_textdelinv_ [l=dv] {_cgiargbc1dirname_ ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ°ÞÞŠÞÞ© ÞÞŠÞÞ°ÞÞŠÞÞª ÞÞªÞÞ¬ÞÞšÞÞŠ. ÞÞªÞÞ¬ÞÞªÞÞ° ÞÞ¬ÞÞ°ÞÞŠÞÞ°ÞÞªÞÞ¬ÞÞšÞÞŠ[}  
-
-_textdelsuc_ [l=dv] {_cgiargbc1dirname_ ÞÞŠÞÞ°ÞÞ°ÞÞŠÞÞ° ÞÞ®ÞÞ¬ÞÞ¬ÞÞšÞÞ°ÞÞ¬  }  
-
-_textclonefail_ [l=dv] {ÞÞ¬ _cgiargclonecol_ ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ° ÞÞ°ÞÞ¯ÞÞ°ÞÞ¬ÞÞ° ÞÞªÞÞªÞÞ¬ÞÞªÞÞª. ÞÞšÞÞ¬ÞÞ° ÞÞšÞÞ§ÞÞš ÞÞšÞÞ©ÞÞŠÞÞšÞÞšÞÞ§ ÞÞŠÞÞŠÞÞŠÞÞ§ ÞÞªÞÞ¬ ÞÞŠÞÞŠÞÞ° ÞÞ¬ÞÞ§ÞÞ¬: <ul> <li>ÞÞ¬_cgiargclonecol_ÞÞ¬ÞÞ© ÞÞ¬ÞÞ° ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ¬ÞÞ° <li>ÞÞ¬ _cgiargclonecol_ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ°ÞÞŠÞÞš.collect.cfg ÞÞ®ÞÞ°ÞÞšÞÞŠÞÞ­ÞÞŠÞÞ° ÞÞŠÞÞšÞÞ° ÞÞ¬ÞÞªÞÞ° <li>ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞŠÞÞ°  collect.cfg ÞÞ®ÞÞ°ÞÞšÞÞŠÞÞ­ÞÞŠÞÞ° ÞÞŠÞÞšÞÞ° ÞÞšÞÞªÞÞªÞÞ¬ ÞÞªÞÞ°ÞÞŠ ÞÞ¬ÞÞªÞÞ° </ul>}  
+_textdelperm_ [l=dv] {ÞÞŠÞÞ¬ÞÞ° ÞÞªÞÞŠÞÞŠ ÞÞªÞÞšÞÞ§ _cgiargbc1dirnameHtmlsafe_ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ° ÞÞªÞÞ¬ÞÞªÞÞ¬ÞÞ§. ÞÞ©ÞÞ¬ ÞÞŠÞÞŠÞÞªÞÞŠÞÞŠÞÞ©: <ul><li>ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ° ÞÞŠÞÞ° _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ ÞÞš ÞÞŠÞÞšÞÞ° ÞÞªÞÞ¬ÞÞªÞÞªÞÞ¬ ÞÞªÞÞ°ÞÞŠ ÞÞ¬ÞÞªÞÞ°.<br> ÞÞš ÞÞŠÞÞšÞÞ¬ÞÞ°ÞÞŠÞÞ© ÞÞ¬ÞÞªÞÞŠÞÞ° ÞÞ®ÞÞ° ÞÞªÞÞ¬ÞÞŠÞÞšÞÞ®ÞÞ° _cgiargbc1dirnameHtmlsafe_ ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ° ÞÞš ÞÞ®ÞÞÞšÞÞªÞÞŠÞÞªÞÞ° ÞÞªÞÞšÞÞªÞÞ¬ÞÞšÞÞ§ÞÞ¬. <li/>                                                            }  
+
+_textdelinv_ [l=dv] {_cgiargbc1dirnameHtmlsafe_ ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ°ÞÞŠÞÞ© ÞÞŠÞÞ°ÞÞŠÞÞª ÞÞªÞÞ¬ÞÞšÞÞŠ. ÞÞªÞÞ¬ÞÞªÞÞ° ÞÞ¬ÞÞ°ÞÞŠÞÞ°ÞÞªÞÞ¬ÞÞšÞÞŠ[}  
+
+_textdelsuc_ [l=dv] {_cgiargbc1dirnameHtmlsafe_ ÞÞŠÞÞ°ÞÞ°ÞÞŠÞÞ° ÞÞ®ÞÞ¬ÞÞ¬ÞÞšÞÞ°ÞÞ¬  }  
+
+_textclonefail_ [l=dv] {ÞÞ¬ _cgiargclonecolHtmlsafe_ ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ° ÞÞ°ÞÞ¯ÞÞ°ÞÞ¬ÞÞ° ÞÞªÞÞªÞÞ¬ÞÞªÞÞª. ÞÞšÞÞ¬ÞÞ° ÞÞšÞÞ§ÞÞš ÞÞšÞÞ©ÞÞŠÞÞšÞÞšÞÞ§ ÞÞŠÞÞŠÞÞŠÞÞ§ ÞÞªÞÞ¬ ÞÞŠÞÞŠÞÞ° ÞÞ¬ÞÞ§ÞÞ¬: <ul> <li>ÞÞ¬_cgiargclonecolHtmlsafe_ÞÞ¬ÞÞ© ÞÞ¬ÞÞ° ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ¬ÞÞ° <li>ÞÞ¬ _cgiargclonecolHtmlsafe_ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ°ÞÞŠÞÞš.collect.cfg ÞÞ®ÞÞ°ÞÞšÞÞŠÞÞ­ÞÞŠÞÞ° ÞÞŠÞÞšÞÞ° ÞÞ¬ÞÞªÞÞ° <li>ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞŠÞÞ°  collect.cfg ÞÞ®ÞÞ°ÞÞšÞÞŠÞÞ­ÞÞŠÞÞ° ÞÞŠÞÞšÞÞ° ÞÞšÞÞªÞÞªÞÞ¬ ÞÞªÞÞ°ÞÞŠ ÞÞ¬ÞÞªÞÞ° </ul>}  
 
 _textcolerr_ [l=dv] {ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞ ÞÞŠÞÞ°ÞÞŠÞÞŠÞÞ¬ÞÞ°}  
@@ -314,7 +314,7 @@
 ÞªÞÞ°ÞÞ¬ÞÞ©ÞÞŠÞÞŠÞÞ°ÞÞªÞÞ° ÞÞ¬ÞÞŠÞÞ©ÞÞ¬ÞÞ°ÞÞ­ (ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞ ÞÞ­ÞÞªÞÞ°ÞÞ®ÞÞ°ÞÞ¬ÞÞ° ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ¬ÞÞ° ÞÞŠÞÞ°ÞÞ§ÞÞªÞÞªÞÞ§ÞÞšÞÞª ÞÞ¬ ÞÞ®ÞÞ°ÞÞŠÞÞ° ÞÞ­ÞÞªÞÞ°ÞÞªÞÞªÞÞªÞÞ° ÞÞªÞÞªÞÞ¬ÞÞšÞÞªÞÞ° ÞÞ¬ÞÞ¬ÞÞ°).ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞ ÞÞŠÞÞªÞÞ° ÞÞŠÞÞŠÞÞ°ÞÞ¬ÞÞ­}  
 
-_textexptsuc_ [l=dv] {_cgiargbc1dirname_ ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ°  _gsdlhome_/tmp/exported\__cgiargbc1dirname_ ÞÞŠÞÞšÞÞ¬ÞÞ°ÞÞŠÞÞ©ÞÞŠÞÞ° ÞÞ¬ÞÞ°ÞÞ°ÞÞ¯ÞÞ° ÞÞªÞÞ¬ÞÞšÞÞ°ÞÞ¬}  
-
-_textexptfail_ [l=dv] {<p> _cgiargbc1dirname_ ÞÞ¬ÞÞ°ÞÞ°ÞÞ¯ÞÞ¬ÞÞ° ÞÞªÞÞªÞÞ¬ÞÞªÞÞª. <p>ÞÞšÞÞ¬ÞÞ° ÞÞšÞÞ§ÞÞš ÞÞŠÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞªÞÞŠÞÞš ÞÞŠÞÞ§ÞÞªÞÞ¬ÞÞ¬ÞÞ© ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ° ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞªÞÞªÞÞŠÞÞš "ÞÞ©ÞÞ©ÞÞŠÞÞ° ÞÞ¬ÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞªÞÞªÞÞ¬ ÞÞŠÞÞ°ÞÞ°ÞÞŠÞÞ° ÞÞªÞÞŠÞÞš ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞªÞÞ¬ÞÞ¬. <ul> <li>ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞ© ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞ¬ 2.70ÞÞŠÞÞ°ÞÞªÞÞ¬ ÞÞªÞÞ©ÞÞ¬ ÞÞŠÞÞÞŠÞÞ¬ÞÞ° ÞÞŠÞÞŠ ÞÞš ÞÞ®ÞÞ°ÞÞ¯ÞÞŠÞÞ°ÞÞ°ÞÞŠÞÞ° ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞ§ÞÞ© ÞÞŠÞÞŠÞÞ¬ÞÞŠÞÞš "ÞÞŠÞÞ°ÞÞŠÞÞ°" ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ¬ÞÞ°ÞÞ¬ ÞÞ¬ÞÞ¬ÞÞšÞÞ°. ÞÞŠÞÞªÞÞ° ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞªÞÞŠÞÞ° ÞÞ¬ÞÞ°ÞÞªÞÞªÞÞ° ÞÞ¬ÞÞŠÞÞšÞÞŠÞÞ° ÞÞšÞÞªÞÞªÞÞªÞÞ¬ÞÞšÞÞ§ÞÞ¬. <li>ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ° ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞ© ÞÞ¬ÞÞ° ÞÞŠÞÞÞŠÞÞŠÞÞªÞÞ°ÞÞŠÞÞŠ ÞÞšÞÞªÞÞª ÞÞ¬ÞÞ­ÞÞ¬ÞÞ° ÞÞŠÞÞªÞÞ°ÞÞ¯ÞÞ°ÞÞ®ÞÞ° ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞŠÞÞ° ÞÞ¬ÞÞ­.  <a href="http://www.greenstone.org">http://www.greenstone.org</a> ÞÞŠÞÞ° ÞÞšÞÞ§ÞÞŠÞÞ°ÞÞ®ÞÞ°ÞÞŠÞÞ°ÞÞ§. ÞÞšÞÞªÞÞª ÞÞŠÞ¢ÞªÞÞ«ÞÞ§ÞÞª ÞÞ­ÞÞªÞÞ°ÞÞŠÞÞŠ ÞÞ¬ÞÞšÞÞšÞÞ°ÞÞ° ÞÞšÞÞ°ÞÞŠÞÞ©   <a </ul> }  
+_textexptsuc_ [l=dv] {_cgiargbc1dirnameHtmlsafe_ ÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞ°  _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ ÞÞŠÞÞšÞÞ¬ÞÞ°ÞÞŠÞÞ©ÞÞŠÞÞ° ÞÞ¬ÞÞ°ÞÞ°ÞÞ¯ÞÞ° ÞÞªÞÞ¬ÞÞšÞÞ°ÞÞ¬}  
+
+_textexptfail_ [l=dv] {<p> _cgiargbc1dirnameHtmlsafe_ ÞÞ¬ÞÞ°ÞÞ°ÞÞ¯ÞÞ¬ÞÞ° ÞÞªÞÞªÞÞ¬ÞÞªÞÞª. <p>ÞÞšÞÞ¬ÞÞ° ÞÞšÞÞ§ÞÞš ÞÞŠÞÞŠÞÞ¬ÞÞ°ÞÞŠÞÞªÞÞŠÞÞš ÞÞŠÞÞ§ÞÞªÞÞ¬ÞÞ¬ÞÞ© ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ° ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞªÞÞªÞÞŠÞÞš "ÞÞ©ÞÞ©ÞÞŠÞÞ° ÞÞ¬ÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞªÞÞªÞÞ¬ ÞÞŠÞÞ°ÞÞ°ÞÞŠÞÞ° ÞÞªÞÞŠÞÞš ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞªÞÞ¬ÞÞ¬. <ul> <li>ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞ© ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞ¬ 2.70ÞÞŠÞÞ°ÞÞªÞÞ¬ ÞÞªÞÞ©ÞÞ¬ ÞÞŠÞÞÞŠÞÞ¬ÞÞ° ÞÞŠÞÞŠ ÞÞš ÞÞ®ÞÞ°ÞÞ¯ÞÞŠÞÞ°ÞÞ°ÞÞŠÞÞ° ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞ§ÞÞ© ÞÞŠÞÞŠÞÞ¬ÞÞŠÞÞš "ÞÞŠÞÞ°ÞÞŠÞÞ°" ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ¬ÞÞ°ÞÞ¬ ÞÞ¬ÞÞ¬ÞÞšÞÞ°. ÞÞŠÞÞªÞÞ° ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞªÞÞŠÞÞ° ÞÞ¬ÞÞ°ÞÞªÞÞªÞÞ° ÞÞ¬ÞÞŠÞÞšÞÞŠÞÞ° ÞÞšÞÞªÞÞªÞÞªÞÞ¬ÞÞšÞÞ§ÞÞ¬. <li>ÞÞ°ÞÞ©ÞÞ°ÞÞ°ÞÞ¯ÞÞ° ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞ© ÞÞ¬ÞÞ° ÞÞŠÞÞÞŠÞÞŠÞÞªÞÞ°ÞÞŠÞÞŠ ÞÞšÞÞªÞÞª ÞÞ¬ÞÞ­ÞÞ¬ÞÞ° ÞÞŠÞÞªÞÞ°ÞÞ¯ÞÞ°ÞÞ®ÞÞ° ÞÞšÞÞ°ÞÞ°ÞÞ¯ÞÞ°ÞÞªÞÞŠÞÞ° ÞÞ¬ÞÞ­.  <a href="http://www.greenstone.org">http://www.greenstone.org</a> ÞÞŠÞÞ° ÞÞšÞÞ§ÞÞŠÞÞ°ÞÞ®ÞÞ°ÞÞŠÞÞ°ÞÞ§. ÞÞšÞÞªÞÞª ÞÞŠÞ¢ÞªÞÞ«ÞÞ§ÞÞª ÞÞ­ÞÞªÞÞ°ÞÞŠÞÞŠ ÞÞ¬ÞÞšÞÞšÞÞ°ÞÞ° ÞÞšÞÞ°ÞÞŠÞÞ©   <a </ul> }  
 
 ######################################################################
@@ -458,5 +458,5 @@
 
 _textdeleteuser_ [l=dv] {ÞÞ«ÞÞŠÞÞÞ¬ÞÞ° ÞÞ®ÞÞ¬ÞÞ§}  
-_textremwarn_ [l=dv] {ÞÞš ÞÞ«ÞÞŠÞ ÞÞ¬ÞÞ°ÞÞ®ÞÞ° ÞÞ®ÞÞ¬ÞÞŠÞÞ° ÞÞ­ÞÞªÞÞ°ÞÞŠ <b>_cgiargumun_</b>?}  
+_textremwarn_ [l=dv] {ÞÞš ÞÞ«ÞÞŠÞ ÞÞ¬ÞÞ°ÞÞ®ÞÞ° ÞÞ®ÞÞ¬ÞÞŠÞÞ° ÞÞ­ÞÞªÞÞ°ÞÞŠ <b>_cgiargumunHtmlsafe_</b>?}  
 
 
Index: main/trunk/greenstone2/macros/document.dm
===================================================================
--- main/trunk/greenstone2/macros/document.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/document.dm	(revision 28888)
@@ -35,7 +35,7 @@
 _tocclose_ {</div>}
 
-_nextsearchresult_ {_If_("_cgiargsrn_" ne "0",<li id="nextresult"><a href="_httpquery_&amp;ifl=1&amp;ifln=_cgiargsrn_">_textnextsearchresult_</a></li>)}
-
-_prevsearchresult_ {_If_("_cgiargsrp_" ne "0",<li id="prevresult"><a href="_httpquery_&amp;ifl=1&amp;ifln=_cgiargsrp_">_textprevsearchresult_</a></li>)}
+_nextsearchresult_ {_If_("_cgiargsrn_" ne "0",<li id="nextresult"><a href="_httpquery_&amp;ifl=1&amp;ifln=_cgiargsrnUrlsafe_">_textnextsearchresult_</a></li>)}
+
+_prevsearchresult_ {_If_("_cgiargsrp_" ne "0",<li id="prevresult"><a href="_httpquery_&amp;ifl=1&amp;ifln=_cgiargsrpUrlsafe_">_textprevsearchresult_</a></li>)}
 
 _content_ {
@@ -142,8 +142,8 @@
 }
 
-_doc-url_ {_gwcgi_?e=_compressedoptions_&amp;a=_cgiarga_&amp;c=_cgiargc_&amp;cl=_cgiargcl_&amp;d=_cgiargd_}
+_docurl_ {_gwcgi_?e=_compressedoptions_&amp;a=_cgiargaUrlsafe_&amp;c=_cgiargcUrlsafe_&amp;cl=_cgiargclUrlsafe_&amp;d=_cgiargdUrlsafe_}
 
 _loginlink_ {
-<div id="usercommentlink"><a href="_doc-url_&amp;uan=1">_textaddusercomment_</a></div>
+<div id="usercommentlink"><a href="_docurl_&amp;uan=1">_textaddusercomment_</a></div>
 }
 
@@ -155,9 +155,9 @@
 <form name="AddUserCommentForm" id="usercommentform">
 <!--<p>_textcommentusername_ <input type="text" name="username"></p>-->
-<input type=hidden name="username" value="_cgiargun_">
+<input type=hidden name="username" value="_cgiargunAttrsafe_">
 <p>
 _textaddusercomment_
 <textarea name="comment" rows="10" cols="70"></textarea>
-<input type=hidden name="d" value="_cgiargd_">
+<input type=hidden name="d" value="_cgiargdAttrsafe_">
 </p>
 
@@ -165,5 +165,5 @@
 <label id="usercommentfeedback"></label>
 
-<div id="usercommentlogoutlink"><a href="_doc-url_&amp;un=">_textusercommentlogout_</a></div>
+<div id="usercommentlogoutlink"><a href="_docurl_&amp;un=">_textusercommentlogout_</a></div>
 </form>
 
@@ -297,6 +297,6 @@
 <form name="GotoForm" method="get" action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="d" value="_cgiargd_">
-<input type=hidden name="cl" value="_cgiargcl_">
+<input type=hidden name="d" value="_cgiargdAttrsafe_">
+<input type=hidden name="cl" value="_cgiargclAttrsafe_">
 <input type="text" name="gp" size="3" maxlength="4">
 <input type="submit" value="_textgoto_">
@@ -322,5 +322,5 @@
   <PARAM NAME=library      VALUE="_gwcgi_?e=_compressedoptions_">
   <PARAM NAME=phindcgi     VALUE="_gwcgi_?a=phind">
-  <PARAM NAME=collection   VALUE="_cgiargc_">
+  <PARAM NAME=collection   VALUE="_cgiargcAttrsafe_">
   <PARAM NAME=classifier   VALUE="_phindnumber_">
 
@@ -344,8 +344,8 @@
 
         <param name="gwcgi" value="_gwcgi_">
-        <param name="collection" value="_cgiargc_">
-        <param name="classifier" value="_cgiargcl_.1">
-
-        <param name="hrefMustHave" value="cl=_cgiargcl_.1">
+        <param name="collection" value="_cgiargcAttrsafe_">
+        <param name="classifier" value="_cgiargclAttrsafe_.1">
+
+        <param name="hrefMustHave" value="cl=_cgiargclAttrsafe_.1">
         <param name="imageMustNotHave" value="hl=\%x=\%gt=\%gc=\%.pr">
 
@@ -495,7 +495,7 @@
 
 
-_imagehighlight_ {_docbutton_(_httpcurrentdocument_&amp;hl=1&amp;gc=_cgiarggc_&amp;gt=_cgiarggt_,_textHIGHLIGHT_,_texticonhighlight_)}
-
-_imagenohighlight_ {_docbutton_(_httpcurrentdocument_&amp;hl=0&amp;gc=_cgiarggc_&amp;gt=_cgiarggt_,_document:textNOHIGHLIGHT_,_document:texticonnohighlight_)}
+_imagehighlight_ {_docbutton_(_httpcurrentdocument_&amp;hl=1&amp;gc=_cgiarggcUrlsafe_&amp;gt=_cgiarggtUrlsafe_,_textHIGHLIGHT_,_texticonhighlight_)}
+
+_imagenohighlight_ {_docbutton_(_httpcurrentdocument_&amp;hl=0&amp;gc=_cgiarggcUrlsafe_&amp;gt=_cgiarggtUrlsafe_,_document:textNOHIGHLIGHT_,_document:texticonnohighlight_)}
 
 _imagecontracttoc_ {_docbutton_(_httpcurrentdocument_&amp;gc=0,_textCONTRACTCONTENTS_,_texticoncontracttoc_)}
@@ -734,5 +734,9 @@
 	,
 	//if no metadata was passed as link\, then the GS version of the document will be used.
-    a2a_config.linkurl = gsapi.fullDomainURL("_gwcgi_")+ "?c=_cgiargc_&a=d&d=_cgiargd_";
+	// Use jssafe variants of the args in the following and then urlencode it from javascript
+	// http://stackoverflow.com/questions/332872/how-to-encode-a-url-in-javascript
+	// http://stackoverflow.com/questions/75980/best-practice-escape-or-encodeuri-encodeuricomponent
+    //a2a_config.linkurl = gsapi.fullDomainURL("_gwcgi_")+ "?c=cgiargc&a=d&d=cgiargd";
+    a2a_config.linkurl = gsapi.fullDomainURL("_gwcgi_")+ "?c=" + encodeURIComponent(_cgiargcJssafe_) + "&a=d&d=" + encodeURIComponent(_cgiargdJssafe_);
 )
 
Index: main/trunk/greenstone2/macros/dutch.dm
===================================================================
--- main/trunk/greenstone2/macros/dutch.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/dutch.dm	(revision 28888)
@@ -53,5 +53,5 @@
 _textdescrpref_ [l=nl] {Voorkeuren-pagina}  
 _textdescrlogin_ [l=nl] {Login-pagina}  
-_textdescrlogout_ [l=nl] {Log uit als  _cgiargun_}  
+_textdescrlogout_ [l=nl] {Log uit als  _cgiargunHtmlsafe_}  
 
 _textdescrgreenstone_ [l=nl] {Greenstone Digital Library Software}
@@ -192,5 +192,5 @@
 _linktextPREFERENCES_ [l=nl] {VOORKEUREN}  
 _linktextLOGIN_ [l=nl] {INLOGGEN }  
-_linktextLOGGEDIN_ [l=nl] {(ingelogd als  _cgiargun_)}  
+_linktextLOGGEDIN_ [l=nl] {(ingelogd als  _cgiargunHtmlsafe_)}  
 _linktextLOGOUT_ [l=nl] {UITLOGGEN}  
 
@@ -342,5 +342,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=nl] {_If_(_thislast_, _thisfirst_ - _thislast_ resultaten voor de zoekactie: _cgiargq_,geen resultaat voor de zoekactie: _cgiargq_)}
+_textquerytitle_ [l=nl] {_If_(_thislast_, _thisfirst_ - _thislast_ resultaten voor de zoekactie: _cgiargqHtmlsafe_,geen resultaat voor de zoekactie: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=nl] {Zoek pagina}
 
Index: main/trunk/greenstone2/macros/english.dm
===================================================================
--- main/trunk/greenstone2/macros/english.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/english.dm	(revision 28888)
@@ -76,5 +76,5 @@
 _textdescrpref_ {Preferences page}
 _textdescrlogin_ {Login page}
-_textdescrlogout_ {Logout as _cgiargun_}
+_textdescrlogout_ {Logout as _cgiargunHtmlsafe_}
 
 _textdescrgreenstone_ {Greenstone Digital Library Software}
@@ -215,5 +215,5 @@
 _linktextPREFERENCES_ {PREFERENCES}
 _linktextLOGIN_ {LOGIN}
-_linktextLOGGEDIN_ {(logged in as _cgiargun_)}
+_linktextLOGGEDIN_ {(logged in as _cgiargunHtmlsafe_)}
 _linktextLOGOUT_ {LOGOUT}
 
@@ -387,5 +387,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,No matches for query: _cgiargq_)}
+_textquerytitle_ {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,No matches for query: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ {Search page}
 
Index: main/trunk/greenstone2/macros/english2.dm
===================================================================
--- main/trunk/greenstone2/macros/english2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/english2.dm	(revision 28888)
@@ -169,5 +169,5 @@
     collection (it links to the "_2_" collection).
     If you wish to view this link in the "_2_" collection you can 
-    <a href="_httpdoc_&amp;c=_1_&amp;cl=_cgiargcl_&amp;d=_3_">go forward</a> to this page; 
+    <a href="_httpdoc_&amp;c=_1_&amp;cl=_cgiargclUrlsafe_&amp;d=_3_">go forward</a> to this page; 
     otherwise use your browsers "back" button to return to the previous document.
 }
@@ -189,5 +189,5 @@
 _textpassword_ {password}
 
-_textmustbelongtogroup_ {Note that you must belong to the "_cgiargug_" group to access this page}
+_textmustbelongtogroup_ {Note that you must belong to the "_cgiargugHtmlsafe_" group to access this page}
 
 _textmessageinvalid_ {The page you have requested requires you to sign in.<br>
@@ -531,10 +531,10 @@
 
 _textdelperm_ {
-Some or all of the _cgiargbc1dirname_ collection could not be
+Some or all of the _cgiargbc1dirnameHtmlsafe_ collection could not be
 deleted. Possible causes are:
 <ul>
-<li> Greenstone does not have permission to delete the _gsdlhome_/collect/_cgiargbc1dirname_
+<li> Greenstone does not have permission to delete the _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_
 directory.<br>
-You may need to remove this directory manually to complete the removal of the _cgiargbc1dirname_
+You may need to remove this directory manually to complete the removal of the _cgiargbc1dirnameHtmlsafe_
 collection from this computer.</li>
 <li>Greenstone can not run the program _gsdlhome_/bin/script/delcol.pl. Make sure that this file is readable and executable.</li>
@@ -543,14 +543,14 @@
 
 _textdelinv_ {
-The _cgiargbc1dirname_ collection is protected or invalid. Deletion was cancelled.
-}
-
-_textdelsuc_ {The _cgiargbc1dirname_ collection was successfully deleted.}
+The _cgiargbc1dirnameHtmlsafe_ collection is protected or invalid. Deletion was cancelled.
+}
+
+_textdelsuc_ {The _cgiargbc1dirnameHtmlsafe_ collection was successfully deleted.}
 
 _textclonefail_ {
-The _cgiargclonecol_ collection cound not be cloned. Possible causes are:
+The _cgiargclonecolHtmlsafe_ collection cound not be cloned. Possible causes are:
 <ul>
-<li> The _cgiargclonecol_ collection doesn't exist
-<li> The _cgiargclonecol_ collection has no collect.cfg configuration file
+<li> The _cgiargclonecolHtmlsafe_ collection doesn't exist
+<li> The _cgiargclonecolHtmlsafe_ collection has no collect.cfg configuration file
 <li> Greenstone does not have permission to read the collect.cfg configuration file
 </ul>
@@ -594,10 +594,10 @@
 
 _textexptsuc_ {
-The _cgiargbc1dirname_ collection was successfully exported to the
-_gsdlhome_/tmp/exported\__cgiargbc1dirname_ directory.
+The _cgiargbc1dirnameHtmlsafe_ collection was successfully exported to the
+_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ directory.
 }
 
 _textexptfail_ {
-<p>Failed to export the _cgiargbc1dirname_ collection.
+<p>Failed to export the _cgiargbc1dirnameHtmlsafe_ collection.
 
 <p>This is likely to be because Greenstone was installed without the
@@ -850,5 +850,5 @@
 
 _textdeleteuser_ {Delete a user}
-_textremwarn_ {Do you really want to permanently remove user <b>_cgiargumun_</b>?}
+_textremwarn_ {Do you really want to permanently remove user <b>_cgiargumunHtmlsafe_</b>?}
 
 
Index: main/trunk/greenstone2/macros/farsi.dm
===================================================================
--- main/trunk/greenstone2/macros/farsi.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/farsi.dm	(revision 28888)
@@ -77,5 +77,5 @@
 }  
 _textdescrlogout_ [l=fa] {Ø®Ø±ÙØ¬ Ø§Ø² Ø³ÙØ³ØªÙ
- ØšÙ ØµÙØ±Øª  _cgiargun_}  
+ ØšÙ ØµÙØ±Øª  _cgiargunHtmlsafe_}  
 
 _textdescrgreenstone_ [l=fa] {ÙØ±Ù
@@ -277,5 +277,5 @@
 _linktextLOGIN_ [l=fa] {ÙØ±ÙØ¯ ØšÙ Ø³ÙØ³ØªÙ
 }  
-_linktextLOGGEDIN_ [l=fa] {ØšÙ Ø¹ÙÙØ§Ù _cgiargun_ ÙØ§Ø±Ø¯ Ø³ÙØ³ØªÙ
+_linktextLOGGEDIN_ [l=fa] {ØšÙ Ø¹ÙÙØ§Ù _cgiargunHtmlsafe_ ÙØ§Ø±Ø¯ Ø³ÙØ³ØªÙ
  ØŽØ¯Ù Ø§Ø³Øª}  
 _linktextLOGOUT_ [l=fa] {Ø®Ø±ÙØ¬ Ø§Ø² Ø³ÙØ³ØªÙ
@@ -508,5 +508,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=fa] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,ØªØ·Ø§ØšÙÛ ÛØ§ÙØª ÙØŽØ¯: _cgiargq_)}
+_textquerytitle_ [l=fa] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,ØªØ·Ø§ØšÙÛ ÛØ§ÙØª ÙØŽØ¯: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=fa] {ØµÙØ¬Ù Ø¬Ø³ØªØ¬Ù}
 
Index: main/trunk/greenstone2/macros/farsi2.dm
===================================================================
--- main/trunk/greenstone2/macros/farsi2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/farsi2.dm	(revision 28888)
@@ -321,5 +321,5 @@
 ÙØ¹Ù "_2_" ØšØšÛÙÛØ¯ Ù
 Û ØªÙØ§ÙÛØ¯
-<a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">ØšÙ Ø§ÛÙ ØµÙØ­Ù</a> ØšØ±ÙÛØ¯Ø Ø¯Ø± ØºÛØ± 
+<a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">ØšÙ Ø§ÛÙ ØµÙØ­Ù</a> ØšØ±ÙÛØ¯Ø Ø¯Ø± ØºÛØ± 
 Ø§ÛÙØµÙØ±Øª ØšØ§ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² Ø¯Ú©Ù
 Ù Back Ù
@@ -348,5 +348,5 @@
 
 _textmustbelongtogroup_ [l=fa] {ØªÙØ¬Ù Ø¯Ø§ØŽØªÙ ØšØ§ØŽÙØ¯ ÙÙ ØŽÙ
-Ø§ Ø¬ÙØª Ø¯Ø³ØªØ±Ø³Ù ØšÙ Ø§ÙÙ ØµÙØ­Ù ØšØ§ÙØ¯ Ø¬Ø²Ù Ú¯Ø±ÙÙ "cgiargug-"ØšØ§ØŽÙØ¯}  
+Ø§ Ø¬ÙØª Ø¯Ø³ØªØ±Ø³Ù ØšÙ Ø§ÙÙ ØµÙØ­Ù ØšØ§ÙØ¯ Ø¬Ø²Ù Ú¯Ø±ÙÙ "_cgiargugHtmlsafe_"ØšØ§ØŽÙØ¯}  
 
 _textmessageinvalid_ [l=fa] {ØµÙØ­Ù Ø§Ù ÙÙ ØŽÙ
@@ -1066,5 +1066,5 @@
 Ù ÛØ§ ØšØ®ØŽÛ Ø§Ø² Ù
 Ø¬Ù
-ÙØ¹Ù_cgiargbc1dirname_ ÙÙ
+ÙØ¹Ù_cgiargbc1dirnameHtmlsafe_ ÙÙ
 Û ØªÙØ§ÙØ¯ Ø­Ø°Ù ØŽÙØ¯. Ø¯ÙØ§ÛÙ Ø§Ø­ØªÙ
 Ø§ÙÛ Ù
@@ -1072,9 +1072,9 @@
 Ú©Ù Ø§Ø³Øª ÛÚ©Û Ø§Ø² Ù
 ÙØ§Ø±Ø¯ Ø²ÛØ± ØšØ§ØŽØ¯:  <ul>
-<li>Ú¯Ø±ÙÙ Ø§Ø³ØªÙÙ Ø§Ø² Ø§Ø®ØªÙØ§Ø± ÙØ§Ø±ÙÙ Ø¬ÙØª Ø­Ø°Ù Ø¯Ø§ÙØ±ÙØªÙØ±Ù _gsdlhome_/collect/_cgiargbc1dirname_ ØšØ±Ø®ÙØ±Ø¯Ø§Ø± ÙÙØ³Øª.
+<li>Ú¯Ø±ÙÙ Ø§Ø³ØªÙÙ Ø§Ø² Ø§Ø®ØªÙØ§Ø± ÙØ§Ø±ÙÙ Ø¬ÙØª Ø­Ø°Ù Ø¯Ø§ÙØ±ÙØªÙØ±Ù _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ ØšØ±Ø®ÙØ±Ø¯Ø§Ø± ÙÙØ³Øª.
 
 Ø¬ÙØª ØšØ±Ø¯Ø§ØŽØªÙ Ù
 Ø¬Ù
-ÙØ¹Ù _cgiargbc1dirname_ ØŽÙ
+ÙØ¹Ù _cgiargbc1dirnameHtmlsafe_ ØŽÙ
 Ø§ Ù
 Ù
@@ -1089,14 +1089,14 @@
 _textdelinv_ [l=fa] {Ù
 Ø¬Ù
-ÙØ¹Ù_cgiargbc1dirname_ Ø­ÙØ§ØžØª ØŽØ¯Ù ÙØ§ ØšÙ Ø§Ø¹ØªØšØ§Ø± Ø§Ø³Øª. Ø­Ø°Ù ÙØ±Ø¯Ù ÙØºÙ ØŽØ¯.}  
+ÙØ¹Ù_cgiargbc1dirnameHtmlsafe_ Ø­ÙØ§ØžØª ØŽØ¯Ù ÙØ§ ØšÙ Ø§Ø¹ØªØšØ§Ø± Ø§Ø³Øª. Ø­Ø°Ù ÙØ±Ø¯Ù ÙØºÙ ØŽØ¯.}  
 
 _textdelsuc_ [l=fa] {Ù
 Ø¬Ù
-ÙØ¹Ù _cgiargbc1dirname_ ØšØ§ Ù
+ÙØ¹Ù _cgiargbc1dirnameHtmlsafe_ ØšØ§ Ù
 ÙÙÙÙØª Ø­Ø°Ù ØŽØ¯.}  
 
 _textclonefail_ [l=fa] {Ù
 Ø¬Ù
-ÙØ¹Ù _cgiargclonecol_ ÙÙ
+ÙØ¹Ù _cgiargclonecolHtmlsafe_ ÙÙ
 Ù ØªÙØ§ÙØ¯ ØšØ§Ø²ØªÙÙÙØ¯ ØŽÙØ¯. Ø¯ÙØ§ÙÙ Ø§Ø­ØªÙ
 Ø§ÙÙ Ø§ÙÙ ÙØ§ ÙØ³ØªÙØ¯:
@@ -1104,9 +1104,9 @@
 <li>Ù
 Ø¬Ù
-ÙØ¹Ù _cgiargclonecol_ Ù
+ÙØ¹Ù _cgiargclonecolHtmlsafe_ Ù
 ÙØ¬ÙØ¯ ÙÙØ³Øª.
 <li>Ù
 Ø¬Ù
-ÙØ¹Ù _cgiargclonecol_ Ø¯Ø§Ø±Ø§Ù ÙØ§ÙÙ ÙŸÙÙØ±ØšÙØ¯Ù collect.cfg ÙÙØ³Øª.
+ÙØ¹Ù _cgiargclonecolHtmlsafe_ Ø¯Ø§Ø±Ø§Ù ÙØ§ÙÙ ÙŸÙÙØ±ØšÙØ¯Ù collect.cfg ÙÙØ³Øª.
 <li>Ú¯Ø±ÙÙ Ø§Ø³ØªÙÙ Ø§Ø² Ù
 Ø¬ÙØ² ÙØ§ÙÙ Ø¬ÙØª Ø®ÙØ§ÙØ¯Ù collect.cfg ØšØ±Ø®ÙØ±Ø¯Ø§Ø± ÙÙØ³Øª.
@@ -1154,10 +1154,10 @@
 _textexptsuc_ [l=fa] {Ù
 Ø¬Ù
-ÙØ¹Ù _cgiargbc1dirname_ØšØ§ Ù
-ÙÙÙÙØª ØšÙ Ø¯Ø§ÙØ±ÙØªÙØ±Ù _gsdlhome_/tmp/exported\__cgiargbc1dirname_ØµØ§Ø¯Ø± ØŽØ¯.}  
+ÙØ¹Ù _cgiargbc1dirnameHtmlsafe_ØšØ§ Ù
+ÙÙÙÙØª ØšÙ Ø¯Ø§ÙØ±ÙØªÙØ±Ù _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ØµØ§Ø¯Ø± ØŽØ¯.}  
 
 _textexptfail_ [l=fa] {<p>ØšØ±ÙÙØ¯Ø§Ø¯ Ù
 Ø¬Ù
-ÙØ¹Ù _cgiargbc1dirname_ Ø§ÙØ¬Ø§Ù
+ÙØ¹Ù _cgiargbc1dirnameHtmlsafe_ Ø§ÙØ¬Ø§Ù
  ÙÚ¯Ø±ÙØª. <p>Ø§ÙÙ Ù
 Ù
@@ -1539,5 +1539,5 @@
 Ø§ ÙØ§ÙØ¹Ø§ Ù
 Ù Ø®ÙØ§ÙÙØ¯ ØšØ±Ø§Ù ÙÙ
-ÙØŽÙ ÙØ§Ø±ØšØ± Ø±Ø§ Ø­Ø°Ù ÙÙÙØ¯<b>_cgiargumun_</b>Ø}  
+ÙØŽÙ ÙØ§Ø±ØšØ± Ø±Ø§ Ø­Ø°Ù ÙÙÙØ¯<b>_cgiargumunHtmlsafe_</b>Ø}  
 
 
Index: main/trunk/greenstone2/macros/finnish.dm
===================================================================
--- main/trunk/greenstone2/macros/finnish.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/finnish.dm	(revision 28888)
@@ -249,5 +249,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=fi] {_If_(_thislast_,antaa tuloksen _thisfirst_ - _thislast_ kyselylle: _cgiargq_,Kysely ei tÃ€smÃ€Ã€: _cgiargq_)}
+_textquerytitle_ [l=fi] {_If_(_thislast_,antaa tuloksen _thisfirst_ - _thislast_ kyselylle: _cgiargqHtmlsafe_,Kysely ei tÃ€smÃ€Ã€: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=fi] {Hakusivu}
 
Index: main/trunk/greenstone2/macros/french.dm
===================================================================
--- main/trunk/greenstone2/macros/french.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/french.dm	(revision 28888)
@@ -58,5 +58,5 @@
 _textdescrpref_ [l=fr] {Page de prÃ©fÃ©rences}
 _textdescrlogin_ [l=fr] {Page de connexion}
-_textdescrlogout_ [l=fr] {Deconnexion de _cgiargun_}
+_textdescrlogout_ [l=fr] {Deconnexion de _cgiargunHtmlsafe_}
 
 _textdescrgreenstone_ [l=fr] {Logiciel de BibliothÃšque NumÃ©rique Greenstone}
@@ -198,5 +198,5 @@
 _linktextPREFERENCES_ [l=fr] {PRÃFÃRENCES}
 _linktextLOGIN_ [l=fr] {LOGIN}
-_linktextLOGGEDIN_ [l=fr] {(connectÃ© comme _cgiargun_)}
+_linktextLOGGEDIN_ [l=fr] {(connectÃ© comme _cgiargunHtmlsafe_)}
 _linktextLOGOUT_ [l=fr] {DECONNEXION}
 
@@ -363,5 +363,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=fr] {_If_(_thislast_,resultats _thisfirst_ - _thislast_ pour la recherche: _cgiargq_,Pas de documents contenant: _cgiargq_)}
+_textquerytitle_ [l=fr] {_If_(_thislast_,resultats _thisfirst_ - _thislast_ pour la recherche: _cgiargqHtmlsafe_,Pas de documents contenant: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=fr] {Page de recherche}
 
Index: main/trunk/greenstone2/macros/french2.dm
===================================================================
--- main/trunk/greenstone2/macros/french2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/french2.dm	(revision 28888)
@@ -139,5 +139,5 @@
  (il renvoie sur la collection Â«_2_Â»). Si vous souhaitez afficher le
  contenu de ce lien dans la collection Â«_2_Â», vous pouvez
- <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">aller</a> Ã  cette
+ <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">aller</a> Ã  cette
  page; dans le cas contraire, utilisez le bouton Â«PrÃ©cÃ©dentÂ» du
  navigateur pour revenir au document prÃ©cÃ©dent. 
@@ -161,5 +161,5 @@
 _textpassword_ [l=fr] {mot de passe}
 
-_textmustbelongtogroup_ [l=fr] {Remarquez qu'il vous faut appartenir au groupe "_cgiargug_" pour accÃ©der Ã  cette page}
+_textmustbelongtogroup_ [l=fr] {Remarquez qu'il vous faut appartenir au groupe "_cgiargugHtmlsafe_" pour accÃ©der Ã  cette page}
 
 _textmessageinvalid_ [l=fr] {La page que vous avez demandÃ©e nÃ©cessite
@@ -524,13 +524,13 @@
 _textretcoll_ [l=fr] {Retour au Collector}
 
-_textdelperm_ [l=fr] {Certains Ã©lÃ©ments ou toute la collection _cgiargbc1dirname_ n'ont pu
+_textdelperm_ [l=fr] {Certains Ã©lÃ©ments ou toute la collection _cgiargbc1dirnameHtmlsafe_ n'ont pu
 Ãªtre supprimÃ©s. Les causes possibles sont:
 
 <ul>
-<li> Greenstone n'a pas la permission de supprimer le rÃ©pertoire _gsdlhome_/collect/_cgiargbc1dirname_
+<li> Greenstone n'a pas la permission de supprimer le rÃ©pertoire _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_
 .<br>
 
 Vous pouvez avoir Ã  supprimer manuellement le rÃ©pertoire pour achever la
-suppression de la collection _cgiargbc1dirname_ de cet ordinateur.
+suppression de la collection _cgiargbc1dirnameHtmlsafe_ de cet ordinateur.
 <li>Greenstone ne peut pas lancer le programme  _gsdlhome_/bin/script/delcol.pl. Assurez vous que ce fichier est lisible et exÃ©cutable.</li>
 
@@ -539,18 +539,18 @@
 }
 
-_textdelinv_ [l=fr] {La collection _cgiargbc1dirname_ est protÃ©gÃ©e ou invalide. La
+_textdelinv_ [l=fr] {La collection _cgiargbc1dirnameHtmlsafe_ est protÃ©gÃ©e ou invalide. La
 suppression a Ã©tÃ© annulÃ©e.
 
 }
 
-_textdelsuc_ [l=fr] {La collection _cgiargbc1dirname_ a Ã©tÃ© supprimÃ©e.}
-
-_textclonefail_ [l=fr] {La collection _cgiargclonecol_ n'a pu Ãªtre clonÃ©e. Les causes possibles sont:
+_textdelsuc_ [l=fr] {La collection _cgiargbc1dirnameHtmlsafe_ a Ã©tÃ© supprimÃ©e.}
+
+_textclonefail_ [l=fr] {La collection _cgiargclonecolHtmlsafe_ n'a pu Ãªtre clonÃ©e. Les causes possibles sont:
 
 <ul>
 
-<li> La collection _cgiargclonecol_ n'existe pas
-
-<li> La collection _cgiargclonecol_ ne possÃšde pas de fichier de
+<li> La collection _cgiargclonecolHtmlsafe_ n'existe pas
+
+<li> La collection _cgiargclonecolHtmlsafe_ ne possÃšde pas de fichier de
 configuration collect.cfg
 
@@ -606,10 +606,10 @@
 }
 
-_textexptsuc_ [l=fr] {La collection _cgiargbc1dirname_ a Ã©tÃ© exportÃ©e dans le rÃ©pertoire
-_gsdlhome_/tmp/exported\__cgiargbc1dirname_ .
-
-}
-
-_textexptfail_ [l=fr] {<p>L'exportation de la collection _cgiargbc1dirname_ a Ã©chouÃ©.
+_textexptsuc_ [l=fr] {La collection _cgiargbc1dirnameHtmlsafe_ a Ã©tÃ© exportÃ©e dans le rÃ©pertoire
+_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ .
+
+}
+
+_textexptfail_ [l=fr] {<p>L'exportation de la collection _cgiargbc1dirnameHtmlsafe_ a Ã©chouÃ©.
 
 <p>Il est probable que ce problÃšme provient du fait que Greenstone a Ã©tÃ©
@@ -862,5 +862,5 @@
 _textdeleteuser_ [l=fr] {Supprimer un utilisateur}
 _textremwarn_ [l=fr] {Ãtes vous sÃ»r de vouloir supprimer
-l'utilisateur <b>_cgiargumun_</b>?}
+l'utilisateur <b>_cgiargumunHtmlsafe_</b>?}
 
 
Index: main/trunk/greenstone2/macros/gaelic.dm
===================================================================
--- main/trunk/greenstone2/macros/gaelic.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/gaelic.dm	(revision 28888)
@@ -344,5 +344,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=gd] {_If_(_thislast_,builean _thisfirst_ - _thislast_ do cheist: _cgiargq_,Chan eil seisean ann do cheist: _cgiargq_)}  
+_textquerytitle_ [l=gd] {_If_(_thislast_,builean _thisfirst_ - _thislast_ do cheist: _cgiargqHtmlsafe_,Chan eil seisean ann do cheist: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=gd] {Duillleag luirg}  
 
Index: main/trunk/greenstone2/macros/galician.dm
===================================================================
--- main/trunk/greenstone2/macros/galician.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/galician.dm	(revision 28888)
@@ -286,5 +286,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=gl] {_If_(_thislast_,resultados _thisfirst_ - _thislast_ para a consulta:_cgiargq_,Non se atoparon resultados correspondentes Ã¡ consulta: _cgiargq_)}
+_textquerytitle_ [l=gl] {_If_(_thislast_,resultados _thisfirst_ - _thislast_ para a consulta:_cgiargqHtmlsafe_,Non se atoparon resultados correspondentes Ã¡ consulta: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=gl] {PÃ¡xina de busca}
 
Index: main/trunk/greenstone2/macros/galician2.dm
===================================================================
--- main/trunk/greenstone2/macros/galician2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/galician2.dm	(revision 28888)
@@ -187,5 +187,5 @@
 <p>O enlace que vostede seleccionou Ã© externo Ã¡ colecciÃ³n "_collectionname_" (
 remite Ã¡ colecciÃ³n "_2_"). Se desexa ver o documento que corresponde a este
-enlace na colecciÃ³n "_2_",pode <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">
+enlace na colecciÃ³n "_2_",pode <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">
 acceder</a> a esa pÃ¡xina; en caso contrario, prema o botÃ³n "AtrÃ¡s" do seu
 navegador para volver Ã³ documento anterior.
@@ -209,5 +209,5 @@
 _textpassword_ [l=gl] {contrasinal}
 
-_textmustbelongtogroup_ [l=gl] {AdvÃ­rtese que para acceder a esta pÃ¡xina vostede debe pertenecer Ã³ grupo "_cgiargug_"}
+_textmustbelongtogroup_ [l=gl] {AdvÃ­rtese que para acceder a esta pÃ¡xina vostede debe pertenecer Ã³ grupo "_cgiargugHtmlsafe_"}
 
 _textmessageinvalid_ [l=gl] {Para acceder Ã¡ pÃ¡xina que vostede solicitou Ã© necesario conectarse.<br>
@@ -580,5 +580,5 @@
 
 _textviewbildsummary_ [l=gl] {Para obter mais detalles, vostede pode  <a
-href="_httppagex_(bsummary)&c=_cgiargbc1dirname_" target=_top>visualizar o
+href="_httppagex_(bsummary)&c=_cgiargbc1dirnameUrlsafe_" target=_top>visualizar o
 resume da creaciÃ³n </a> desta colecciÃ³n.
 
@@ -615,11 +615,11 @@
 }
 
-_textdelperm_ [l=gl] {<p>Non se puido suprimir parte da colecciÃ³n  _cgiargbc1dirname_ ou toda ela. As
+_textdelperm_ [l=gl] {<p>Non se puido suprimir parte da colecciÃ³n  _cgiargbc1dirnameHtmlsafe_ ou toda ela. As
 causas posibles son:
 
 <ul>
 
-<li>Greenstone non ten permiso para suprimir o directorio _gsdlhome_/collect/_cgiargbc1dirname_. <
-br> Para suprimir definitivamente a colecciÃ³n _cgiargbc1dirname_ neste ordenador,
+<li>Greenstone non ten permiso para suprimir o directorio _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_. <
+br> Para suprimir definitivamente a colecciÃ³n _cgiargbc1dirnameHtmlsafe_ neste ordenador,
  pode ser necesario suprimir manualmente este directorio.
 
@@ -628,20 +628,20 @@
 }
 
-_textdelinv_ [l=gl] {A colecciÃ³n  _cgiargbc1dirname_ estÃ¡ protexida ou non Ã© vÃ¡lida. A supresiÃ³n
+_textdelinv_ [l=gl] {A colecciÃ³n  _cgiargbc1dirnameHtmlsafe_ estÃ¡ protexida ou non Ã© vÃ¡lida. A supresiÃ³n
 cancelouse.
 
 }
 
-_textdelsuc_ [l=gl] {suprimiuse a colecciÃ³n _cgiargbc1dirname_.
-
-}
-
-_textclonefail_ [l=gl] {Non se puido clonar a colecciÃ³n  _cgiargbc1dirname_. As causas posibles son:
+_textdelsuc_ [l=gl] {suprimiuse a colecciÃ³n _cgiargbc1dirnameHtmlsafe_.
+
+}
+
+_textclonefail_ [l=gl] {Non se puido clonar a colecciÃ³n  _cgiargbc1dirnameHtmlsafe_. As causas posibles son:
 
 <ul>
 
-<li>A colecciÃ³n _cgiargclonecol_ non existe
-
-<li>A colecciÃ³n _cgiargclonecol_ non ten ningÃºn ficheiro collect.cfg
+<li>A colecciÃ³n _cgiargclonecolHtmlsafe_ non existe
+
+<li>A colecciÃ³n _cgiargclonecolHtmlsafe_ non ten ningÃºn ficheiro collect.cfg
 
 <li>Greenstone non ten permiso para ler o ficheiro de configuraciÃ³n
@@ -693,9 +693,9 @@
 }
 
-_textexptsuc_ [l=gl] {A colecciÃ³n de _cgiargbc1dirname_ exportouse Ã³ directorio _gsdlhome_/tmp/exported\__cgiargbc1dirname_.
-
-}
-
-_textexptfail_ [l=gl] {<p>Non se puido exportar a colecciÃ³n _cgiargbc1dirname_.
+_textexptsuc_ [l=gl] {A colecciÃ³n de _cgiargbc1dirnameHtmlsafe_ exportouse Ã³ directorio _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_.
+
+}
+
+_textexptfail_ [l=gl] {<p>Non se puido exportar a colecciÃ³n _cgiargbc1dirnameHtmlsafe_.
 
 >p>Ã© probable  que esto se deba a que Greenstone instalouse sen os compoÃ±entes
@@ -879,5 +879,5 @@
 
 _textdeleteuser_ [l=gl] {Suprimir un usuario}
-_textremwarn_ [l=gl] {Â¿Confirma vostede que desexa suprimir definitivamente o usuario <b>_cgiargumun_</b>?}
+_textremwarn_ [l=gl] {Â¿Confirma vostede que desexa suprimir definitivamente o usuario <b>_cgiargumunHtmlsafe_</b>?}
 
 
Index: main/trunk/greenstone2/macros/georgian.dm
===================================================================
--- main/trunk/greenstone2/macros/georgian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/georgian.dm	(revision 28888)
@@ -292,5 +292,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ka] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,No matches for query: _cgiargq_)}
+_textquerytitle_ [l=ka] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,No matches for query: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=ka] {á«ááááá¡ áááá áá}
 
Index: main/trunk/greenstone2/macros/georgian2.dm
===================================================================
--- main/trunk/greenstone2/macros/georgian2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/georgian2.dm	(revision 28888)
@@ -127,5 +127,5 @@
    (áá¡ ááá£áááááá¡ "_2_" ááááá¥áªáááá).
     áá£ ááááá áá¡á£á á áá®áááá ááá£áá "_2_" ááááá¥áªáááá, 
-    <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">áá¥ áááá­áá áá </a>áá áááááá§áááá áá¥áááá áá áá£ááá áá¡ 
+    <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">áá¥ áááá­áá áá </a>áá áááááá§áááá áá¥áááá áá áá£ááá áá¡ 
 <a href=javascript:history.back()> "back" </a> áŠááááá á£ááá ááá¡ááá á£áááááá. }
 
@@ -136,5 +136,5 @@
     ááááá¥ááá¡áááá¡  (áá¡ ááá£áááááá¡ "_2_" ááááá¥áªáááá).
    áá£ áá¡á£á á áá ááá£ááá¡  "_2_" ááááá¥áªááášá ááá®áá 
-    <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">ááááááá</a> áá áááá ááá; 
+    <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">ááááááá</a> áá áááá ááá; 
     áá áááá á£áááá "á£ááá" á¬ááá áááá£áááá¢áá áá¥áááá áá áá£ááá áá¡ "Back" áŠáááááá¡ ááááá§áááááá
 }
@@ -156,5 +156,5 @@
 _textpassword_ [l=ka] {ááá ááá}
 
-_textmustbelongtogroup_ [l=ka] {áá¥ááá á£ááá ááááá£ááááááááá áááá®ááá áááááá "_cgiargug_" á¯áá£á€á¡ áááá ááá¡ á¡áááá®áááá.}
+_textmustbelongtogroup_ [l=ka] {áá¥ááá á£ááá ááááá£ááááááááá áááá®ááá áááááá "_cgiargugHtmlsafe_" á¯áá£á€á¡ áááá ááá¡ á¡áááá®áááá.}
 
 _textmessageinvalid_ [l=ka] {áááá ááá¡ á¡áááá®áááá á£ááá ááááá áá ááá¢áá ááááªáá <br>
@@ -366,5 +366,5 @@
 
 _textviewbildsummary_ [l=ka] {ááááá¥áªááá¡ áááááá¡ ááááá¢ááááá ááá¢ááááá ášáááá«áááá ááá®áá ááááá¥áªááá¡ 
-<a href="_httppagex_(bsummary)&c=_cgiargbc1dirname_" target=_top>ášáá¥áááá¡ á áááá£ááášá 
+<a href="_httppagex_(bsummary)&c=_cgiargbc1dirnameUrlsafe_" target=_top>ášáá¥áááá¡ á áááá£ááášá 
 </a> .
 }
@@ -384,9 +384,9 @@
 _textretcoll_ [l=ka] {ááááá¥á¢áá áá áááá á£áááá }
 
-_textdelperm_ [l=ka] {á§áááá áá á ááááááááá  _cgiargbc1dirname_ ááááá¥áªáá ááá  á¬ááášáááá. . áá¡ ášáá¡áá«ááááááá ášáááááá ááááááááá¡ áááá.:
+_textdelperm_ [l=ka] {á§áááá áá á ááááááááá  _cgiargbc1dirnameHtmlsafe_ ááááá¥áªáá ááá  á¬ááášáááá. . áá¡ ášáá¡áá«ááááááá ášáááááá ááááááááá¡ áááá.:
 <ul>
-<li> áá ááá¡á¢áá£áá¡ áá  áááá©ááá  _gsdlhome_/collect/_cgiargbc1dirname_
+<li> áá ááá¡á¢áá£áá¡ áá  áááá©ááá  _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_
 ááá áá¥á¢áá ááá¡ á¬áášááá¡ á£á€áááá.<br>
-ášáááá«áááá áááááá¢áááá áá ááá áá¥á¢áá ááá¡ ááá¡á¢á á£á¥áªáá áááá¡áááá¡ ,á áá _cgiargbc1dirname_
+ášáááá«áááá áááááá¢áááá áá ááá áá¥á¢áá ááá¡ ááá¡á¢á á£á¥áªáá áááá¡áááá¡ ,á áá _cgiargbc1dirnameHtmlsafe_
 ááááá¥áªáá áááášáá áá áá áááááá£á¢áá áááá .<li>
 <li>áá ááá¡á¢áá£áá¡ áá  ášáá£á«ááá áá ááá áááá¡ ááášáááá _gsdlhome_/bin/script/delcol.pl. ááá á¬áá£áááá áááášá á áá á€áááá ááááá®ááá áá ášáá¡áá«ááááááá ááá¡á ááášáááá.</li>
@@ -394,12 +394,12 @@
 }
 
-_textdelinv_ [l=ka] {ááááá¥áªáá _cgiargbc1dirname_ áááªá£ááá áá áá áá¡á¬áá áá. á¬áášáá á£áá á§áá€áááá.
-}
-
-_textdelsuc_ [l=ka] {ááááá¥áªáá _cgiargbc1dirname_ á¬áá ááá¢ááá£ááá á¬ááášááá.}
-
-_textclonefail_ [l=ka] {ááááá¥áªááá  _cgiargclonecol_ ááá  á£áá á£ááááá§á ááá¡ááá£á¢á£á á  ášááááá¡ááá. <br> áá¡ ášáá¡áá«ááááááá ášáááááá ááááááááá¡ áááá:<ul>
-<li> ááááá¥áªáá _cgiargclonecol_ áá  áá á¡ááááá¡
-<li> ááááá¥áªáá _cgiargclonecol_ áá  áááá©ááá collect.cfg áááá€ááá£á ááªááá¡ á€áááá
+_textdelinv_ [l=ka] {ááááá¥áªáá _cgiargbc1dirnameHtmlsafe_ áááªá£ááá áá áá áá¡á¬áá áá. á¬áášáá á£áá á§áá€áááá.
+}
+
+_textdelsuc_ [l=ka] {ááááá¥áªáá _cgiargbc1dirnameHtmlsafe_ á¬áá ááá¢ááá£ááá á¬ááášááá.}
+
+_textclonefail_ [l=ka] {ááááá¥áªááá  _cgiargclonecolHtmlsafe_ ááá  á£áá á£ááááá§á ááá¡ááá£á¢á£á á  ášááááá¡ááá. <br> áá¡ ášáá¡áá«ááááááá ášáááááá ááááááááá¡ áááá:<ul>
+<li> ááááá¥áªáá _cgiargclonecolHtmlsafe_ áá  áá á¡ááááá¡
+<li> ááááá¥áªáá _cgiargclonecolHtmlsafe_ áá  áááá©ááá collect.cfg áááá€ááá£á ááªááá¡ á€áááá
 <li> áá ááá¡á¢áá£áá¡ áá  áááá©ááá  collect.cfg áááá€ááá£á ááªááá¡ á€ááááá¡ á¬ááááá®ááá¡   á£á€áááá.
 </ul>
@@ -429,9 +429,9 @@
 _textreloaderror_ [l=ka] {áá®ááá ááááá¥áªááá¡ ášáá¥áááá¡ áá áá¡ á¬áá áááášáá ášááªáááá.  áááááá§áááá  áá áá£ááá áá¡ âááááá®ááááâ  áá âá£áááâ (ááªáááá áá  áááááá§áááá áá¡ áŠááááááá á áááá¡ááª á¥áááá ááááá¥áªááá¡ áááá¥á¢áá áá¡ ááááá§áááááá). á áááááááááá£ááá ááááá¢ááá ááá ááááá¥á¢áá á .}
 
-_textexptsuc_ [l=ka] {ááááá¥áªáá_cgiargbc1dirname_ á¬áá ááá¢ááá£ááá ááááááááááá  
-_gsdlhome_/tmp/exported__cgiargbc1dirname_ ááá áá¥á¢áá ááášá.
-}
-
-_textexptfail_ [l=ka] {<p> ááááá¥áªááá¡_cgiargbc1dirname_ áááá á¥á¢áá ááášá áá®á¡ááá á¢áá¡ áá áááááá.
+_textexptsuc_ [l=ka] {ááááá¥áªáá_cgiargbc1dirnameHtmlsafe_ á¬áá ááá¢ááá£ááá ááááááááááá  
+_gsdlhome_/tmp/exported__cgiargbc1dirnameHtmlsafe_ ááá áá¥á¢áá ááášá.
+}
+
+_textexptfail_ [l=ka] {<p> ááááá¥áªááá¡_cgiargbc1dirnameHtmlsafe_ áááá á¥á¢áá ááášá áá®á¡ááá á¢áá¡ áá áááááá.
 
 <p>áá¡ ášáá¡áá«ááááááá ááá®áá áááá¡ áááá, á áá áá ááá¡á¢áá£áá áá§á ááááá¡á¢áááá ááá£áá
@@ -565,5 +565,5 @@
 
 _textdeleteuser_ [l=ka] {áááá®ááá ááááá¡ á¬áášáá}
-_textremwarn_ [l=ka] {ááááááááá áá¡á£á á á¡ááááááá áááá®ááá áááááá¡ á¬áášáá <b>_cgiargumun_</b>?}
+_textremwarn_ [l=ka] {ááááááááá áá¡á£á á á¡ááááááá áááá®ááá áááááá¡ á¬áášáá <b>_cgiargumunHtmlsafe_</b>?}
 
 
Index: main/trunk/greenstone2/macros/german.dm
===================================================================
--- main/trunk/greenstone2/macros/german.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/german.dm	(revision 28888)
@@ -322,5 +322,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=de] {_If_(_thislast_,Treffer _thisfirst_ - _thislast_ zur Anfrage: _cgiargq_,Keine Treffer fÃŒr die Anfrage: _cgiargq_)}
+_textquerytitle_ [l=de] {_If_(_thislast_,Treffer _thisfirst_ - _thislast_ zur Anfrage: _cgiargqHtmlsafe_,Keine Treffer fÃŒr die Anfrage: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=de] {Suchseite}
 
Index: main/trunk/greenstone2/macros/german2.dm
===================================================================
--- main/trunk/greenstone2/macros/german2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/german2.dm	(revision 28888)
@@ -102,5 +102,5 @@
 _textbtco_ [l=de] {Die Sammlung basieren auf}  
 
-_textdelsuc_ [l=de] {Die Sammlung _cgiargbc1dirname_ wurde erfolgreich gelÃ¶scht.}  
+_textdelsuc_ [l=de] {Die Sammlung _cgiargbc1dirnameHtmlsafe_ wurde erfolgreich gelÃ¶scht.}  
 
 ######################################################################
Index: main/trunk/greenstone2/macros/gli.dm
===================================================================
--- main/trunk/greenstone2/macros/gli.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/gli.dm	(revision 28888)
@@ -50,5 +50,5 @@
         <param name="httpprefix" value="_httpprefix_">
         <param name="gwcgi" value="_gwcgi_">
-        <param name="collection" value="_cgiargc_">
+        <param name="collection" value="_cgiargcAttrsafe_">
  </applet>
 
@@ -72,5 +72,5 @@
     <param name="httpprefix" value="_httpprefix_">
     <param name="gwcgi"      value="_gwcgi_">
-    <param name="collection" value="_cgiargc_">
+    <param name="collection" value="_cgiargcAttrsafe_">
 
     <comment>
@@ -89,5 +89,5 @@
         httpprefix = "_httpprefix_"
         gwcgi      = "_gwcgi_"
-        collection = "_cgiargc_"
+        collection = "_cgiargcAttrsafe_"
       >
 
Index: main/trunk/greenstone2/macros/greek.dm
===================================================================
--- main/trunk/greenstone2/macros/greek.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/greek.dm	(revision 28888)
@@ -335,5 +335,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=el] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,No matches for query: _cgiargq_)}
+_textquerytitle_ [l=el] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,No matches for query: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=el] {Î£ÎµÎ»Î¯ÎŽÎ± Î±ÎœÎ±Î¶Î®ÏÎ·ÏÎ·Ï}
 
Index: main/trunk/greenstone2/macros/gti.dm
===================================================================
--- main/trunk/greenstone2/macros/gti.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/gti.dm	(revision 28888)
@@ -103,5 +103,5 @@
 <p>
 <nobr>
-<input type="text" name="q" value="_cgiargq_" size="_gtitextareawidth_"/>
+<input type="text" name="q" value="_cgiargqAttrsafe_" size="_gtitextareawidth_"/>
 <input type="hidden" name="p" value="find"/><input type="submit" value="_textgtifind_"/>
 </nobr>
@@ -218,5 +218,5 @@
   <table dir="_gtitextdirection_">
     <tr><td><strong>_1_</strong></td></tr>
-    <tr><td><textarea name="_cgiargtlc_::_1_" rows="_gtitextareaheight_" cols="_gtitextareawidth_">_2_</textarea></td></tr>
+    <tr><td><textarea name="_cgiargtlcAttrsafe_::_1_" rows="_gtitextareaheight_" cols="_gtitextareawidth_">_2_</textarea></td></tr>
   </table>
 </center>
@@ -243,5 +243,5 @@
   <table dir="_gtitextdirection_">
     <tr><td><strong>_gtitargetlanguagename_</strong></td><td align="right">&nbsp;</td></tr>
-    <tr><td colspan="2"><textarea name="_cgiargtlc_::_1_" rows="_gtitextareaheight_" cols="_gtitextareawidth_"></textarea></td></tr>
+    <tr><td colspan="2"><textarea name="_cgiargtlcAttrsafe_::_1_" rows="_gtitextareaheight_" cols="_gtitextareawidth_"></textarea></td></tr>
   </table>
 </center>
@@ -271,5 +271,5 @@
   <table dir="_gtitextdirection_">
     <tr><td><strong>_gtitargetlanguagename_</strong></td><td align="right"><font size="-1"><i>_textgtilastupdated_ _5_</i></font></td></tr>
-    <tr><td colspan="2"><textarea name="_cgiargtlc_::_1_" rows="_gtitextareaheight_" cols="_gtitextareawidth_">_4_</textarea></td></tr>
+    <tr><td colspan="2"><textarea name="_cgiargtlcAttrsafe_::_1_" rows="_gtitextareaheight_" cols="_gtitextareawidth_">_4_</textarea></td></tr>
   </table>
 </center>
@@ -277,6 +277,6 @@
 
 # Links to see the translation files in action
-_gtiviewcoredminaction_ {<a href="_gwcgi_?a=p&amp;p=about&amp;c=demo&amp;l=_cgiargtlc_&amp;e=_compressedoptions_">_textgtiviewtargetfileinaction_</a>}
-_gtiviewauxdminaction_ {<a href="_gwcgi_?a=p&amp;p=about&amp;c=demo&amp;l=_cgiargtlc_&amp;e=_compressedoptions_">_textgtiviewtargetfileinaction_</a>}
+_gtiviewcoredminaction_ {<a href="_gwcgi_?a=p&amp;p=about&amp;c=demo&amp;l=_cgiargtlcUrlsafe_&amp;e=_compressedoptions_">_textgtiviewtargetfileinaction_</a>}
+_gtiviewauxdminaction_ {<a href="_gwcgi_?a=p&amp;p=about&amp;c=demo&amp;l=_cgiargtlcUrlsafe_&amp;e=_compressedoptions_">_textgtiviewtargetfileinaction_</a>}
 
 _gtiviewperlmodulesinaction_ {}
Index: main/trunk/greenstone2/macros/gujarati.dm
===================================================================
--- main/trunk/greenstone2/macros/gujarati.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/gujarati.dm	(revision 28888)
@@ -76,5 +76,5 @@
 _textdescrpref_ [l=gu] {àªªàªžàªàªŠàªà«àª àªªàªŸàªšà«}
 _textdescrlogin_ [l=gu] {àª²à«àªà«àªš àªªàªŸàªšà«àª }
-_textdescrlogout_ [l=gu] {_cgiargun_ àª€àª°à«àªà« àª²à«àªàªàªàª àªàª°à« }
+_textdescrlogout_ [l=gu] {_cgiargunHtmlsafe_ àª€àª°à«àªà« àª²à«àªàªàªàª àªàª°à« }
 
 _textdescrgreenstone_ [l=gu] {àªà«àª°à«àªšàªžà«àªà«àªš àª¡àª¿àªàª¿àªàª² àª²àªŸàª¯àª¬à«àª°à«àª°à« àªžà«àª«à«àªàªµà«àª°}
@@ -212,5 +212,5 @@
 _linktextPREFERENCES_ [l=gu] {àªªàªžàªàªŠàªà«àª}
 _linktextLOGIN_ [l=gu] {àª²à«àªà«àªš}
-_linktextLOGGEDIN_ [l=gu] {(_cgiargun_ àª€àª°à«àªà« àª²à«àªà«àªš àªàª°à«àª¯à«àª) }
+_linktextLOGGEDIN_ [l=gu] {(_cgiargunHtmlsafe_ àª€àª°à«àªà« àª²à«àªà«àªš àªàª°à«àª¯à«àª) }
 _linktextLOGOUT_ [l=gu] {àª²à«àªàªàªàª}
 
@@ -373,5 +373,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=gu] {_If_(_thislast_,results _thisfirst_ - _thislast_ àªà«àªµà«àª°à« àª®àªŸàªà«: _cgiargq_,àªà«àªµà«àª°à« àª®àªŸàªà« àª®à«àª àª¥àª€à« àªšàª¥à«.: _cgiargq_)}
+_textquerytitle_ [l=gu] {_If_(_thislast_,results _thisfirst_ - _thislast_ àªà«àªµà«àª°à« àª®àªŸàªà«: _cgiargqHtmlsafe_,àªà«àªµà«àª°à« àª®àªŸàªà« àª®à«àª àª¥àª€à« àªšàª¥à«.: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=gu] {àªªàªŸàªšà« àª¶à«àª§à«}
 
Index: main/trunk/greenstone2/macros/gujarati2.dm
===================================================================
--- main/trunk/greenstone2/macros/gujarati2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/gujarati2.dm	(revision 28888)
@@ -116,5 +116,5 @@
 
 # should have arguments of collection, collectionname and link
-_foundintcontent_ [l=gu] {<h3>"_2_" àªžàªàªà«àª°àª¹àª®àªŸàª àªàªµàªŸ àª®àªŸàªà«àªšà«  àª²àª¿àªàª</h3><p> àª€àª®à« àªà« àª²àª¿àªàª àªªàªžàªàªŠ àªàª°à« àªà« àª€à« "_collectionname_" àªžàªàªà«àª°àª¹àªšà« àª¬àªŸàª¹à«àª¯ àª²àª¿àªàª àªà«.(àª€à«  "_2_" àªžàªàªà«àª°àª¹ àªžà«àª§à« àª²àª àªàªŸàª¯ àªà«). àªà« àª€àª®à« "_2_" àªžàªàªà«àª°àª¹àªšà« àª²àª¿àªàª àªà«àªµàªŸ àªàªà«àªàª€àªŸ àª¹à«àª¯ àª€à« àª€àª®à« <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_"> àª àªªàªŸàªšàªŸ àªªàª° àªàªàª³ àªàªŸàªµ; </a> àª
+_foundintcontent_ [l=gu] {<h3>"_2_" àªžàªàªà«àª°àª¹àª®àªŸàª àªàªµàªŸ àª®àªŸàªà«àªšà«  àª²àª¿àªàª</h3><p> àª€àª®à« àªà« àª²àª¿àªàª àªªàªžàªàªŠ àªàª°à« àªà« àª€à« "_collectionname_" àªžàªàªà«àª°àª¹àªšà« àª¬àªŸàª¹à«àª¯ àª²àª¿àªàª àªà«.(àª€à«  "_2_" àªžàªàªà«àª°àª¹ àªžà«àª§à« àª²àª àªàªŸàª¯ àªà«). àªà« àª€àª®à« "_2_" àªžàªàªà«àª°àª¹àªšà« àª²àª¿àªàª àªà«àªµàªŸ àªàªà«àªàª€àªŸ àª¹à«àª¯ àª€à« àª€àª®à« <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_"> àª àªªàªŸàªšàªŸ àªªàª° àªàªàª³ àªàªŸàªµ; </a> àª
 àª¥àªµàªŸ àª
 àªàªŸàªàªšàªŸ àªªà«àª°àª²à«àª àªªàª°àª€ àªàªµàªµàªŸ àª®àªŸàªà« àª€àª®àªŸàª°àªŸ àª¬à«àª°àªŸàªàªàª°àªšà«àª "àªªàªŸàªàª³" àª¬àªàªšàªšà« àªàªªàª¯à«àª àªàª°à«. }  
@@ -136,5 +136,5 @@
 _textpassword_ [l=gu] {àªªàªŸàªžàªµàª°à«àª¡}  
 
-_textmustbelongtogroup_ [l=gu] {àª¯àªŸàªŠ àª°àªŸàªà« àªà« àª àªªàªŸàªšàªŸ àª®àªŸàª  àªªà«àª°àªµà«àª¶ àªàª°àªµàªŸ àª®àªŸàªà« àª€àª®à« "_cgiargug_" àªžàª®à«àª¹àªšàªŸàª àªžàª­à«àª¯ àª¹à«àªµàªŸ àªà«àªàª.}  
+_textmustbelongtogroup_ [l=gu] {àª¯àªŸàªŠ àª°àªŸàªà« àªà« àª àªªàªŸàªšàªŸ àª®àªŸàª  àªªà«àª°àªµà«àª¶ àªàª°àªµàªŸ àª®àªŸàªà« àª€àª®à« "_cgiargugHtmlsafe_" àªžàª®à«àª¹àªšàªŸàª àªžàª­à«àª¯ àª¹à«àªµàªŸ àªà«àªàª.}  
 
 _textmessageinvalid_ [l=gu] {àªà« àªªàªŸàªšàªŸ àª®àªŸàªà« àª€àª®à« àªµàª¿àªšàªàª€à« àªàª°à«àª² àª€à« àªªàªŸàªšà«àª àª
@@ -384,19 +384,19 @@
 _textretcoll_ [l=gu] {àªžàªàªà«àª°àªŸàª¹àª àªªàª° àªªàªŸàªàªŸ àªàªŸàªµ}  
 
-_textdelperm_ [l=gu] {_cgiargbc1dirname_ àªžàªàªà«àª°àª¹àªšà« àª
+_textdelperm_ [l=gu] {_cgiargbc1dirnameHtmlsafe_ àªžàªàªà«àª°àª¹àªšà« àª
 àª®à«àª àª­àªŸàª àª
-àª¥àªµàªŸ àªàªà« àªžàªàªà«àª°àª¹ àª­à«àªžà«àª àª¶àªà«àª¯àªŸ àªšàª¥à«. àªžàªàª­àªµàª¿àª€ àªàªŸàª°àª£à« àª àªªà«àª°àª®àªŸàª£à« àªà«àª  <ul> <li>àªà«àª°à«àªšàªžà«àªà«àªšàªšà«  _gsdlhome_/collect/_cgiargbc1dirname_ àª¡àª¿àª°à«àªàªàª°à« àª­à«àªžàªàªµàªŸàªšà« àªªàª°àªµàªŸàªšàªà« àªšàª¥à«.<br>àª àªàª®à«àªªà«àª¯à«àªàª° àª®àªŸàª¥à« _cgiargbc1dirname_ àªžàªàªà«àª°àª¹àªšà« àªžàªàªªà«àª°à«àª£ àª­à«àªàªžàªµàªŸ àª€àª®àªŸàª°à« àª àª¡àª¿àª°à«àªàªàª°à« àª®à«àªšà«àª¯à«àª
+àª¥àªµàªŸ àªàªà« àªžàªàªà«àª°àª¹ àª­à«àªžà«àª àª¶àªà«àª¯àªŸ àªšàª¥à«. àªžàªàª­àªµàª¿àª€ àªàªŸàª°àª£à« àª àªªà«àª°àª®àªŸàª£à« àªà«àª  <ul> <li>àªà«àª°à«àªšàªžà«àªà«àªšàªšà«  _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ àª¡àª¿àª°à«àªàªàª°à« àª­à«àªžàªàªµàªŸàªšà« àªªàª°àªµàªŸàªšàªà« àªšàª¥à«.<br>àª àªàª®à«àªªà«àª¯à«àªàª° àª®àªŸàª¥à« _cgiargbc1dirnameHtmlsafe_ àªžàªàªà«àª°àª¹àªšà« àªžàªàªªà«àª°à«àª£ àª­à«àªàªžàªµàªŸ àª€àª®àªŸàª°à« àª àª¡àª¿àª°à«àªàªàª°à« àª®à«àªšà«àª¯à«àª
 àª²à« àª­à«àªàªžàªµà« àªªàª¡àª¶à«.</li><li>àªà«àª°à«àªšàªžà«àªà«àªš _gsdlhome_/bin/script/delcol.pl àªªà«àª°à«àªà«àª°àªŸàª®àªšà«àª àªžàªàªàªŸàª²àªš àªàª°à« àª¶àªà«àª€à« àªšàª¥à«. àªàªŸàª€àª°à« àªàª°à« àªà« àª àª«àªŸàªàª² àªµàªŸàªà«àª¯ (àª°à«àª¡à«àª¬àª²) àª
 àªšà« àª
 àª®àª²àª¿àªà«àª€ (àªàªà«àªžàª¿àªà«àª¯à«àªà«àª¬àª²) àªà«.</li></ul>}  
 
-_textdelinv_ [l=gu] {_cgiargbc1dirname_ àªžàªàªà«àª°àª¹ àªžà«àª°àªà«àª·àª¿àª€ àª
+_textdelinv_ [l=gu] {_cgiargbc1dirnameHtmlsafe_ àªžàªàªà«àª°àª¹ àªžà«àª°àªà«àª·àª¿àª€ àª
 àª¥àªµàªŸ àª
 àª®àªŸàªšà«àª¯ àªà«. àªžàªàªà«àª°àª¹ àª­à«àªžà«àª àªšàªŸàªàªµàªŸàªšà«  àªªà«àª°àªà«àª°àª¿àª¯àªŸ àª°àªŠ àªàª°àªµàªŸàª®àªŸàª àªàªµà« àª¹àª€à«.}  
 
-_textdelsuc_ [l=gu] {_cgiargbc1dirname_ àªžàªàªà«àª°àª¹àªšà« àªžàª«àª³àªªà«àª°à«àªµàª àª­à«àªžà«àª àªšàªŸàªà«àª¯à«àª àªà«.}  
-
-_textclonefail_ [l=gu] {_cgiargclonecol_ àªžàªàªà«àª°àª¹ àªàª€à«àªªàªšà«àªš (Cloned) àª¥àª àª¶àªà«àª¯à« àªšàª¥à«. àªžàªàª­àªµàª¿àª€ àªàªŸàª°àª£à« àªà«àªµàªŸ àªà« :  <ul><li>_cgiargclonecol_ àªžàªàªà«àª°àª¹ àª
-àªžà«àª€àª¿àª€à«àªµàª®àªŸàª àªšàª¥à«<li>_cgiargclonecol_ àªžàªàªà«àª°àª¹àª®àªŸàª collect.cfg àªàªšà«àª«àª¿àªà«àª¯à«àª°à«àª¶àªš àª«àªŸàªàª² àªšàª¥à«<li>àªà«àª°à«àªšàªžà«àªà«àªšàªšà« collect.cfg àªàªšà«àª«àª¿àªà«àª¯à«àª°à«àª¶àªš àª«àªŸàªàª² àªµàªŸàªàªàªµàªŸàªšà«àª
+_textdelsuc_ [l=gu] {_cgiargbc1dirnameHtmlsafe_ àªžàªàªà«àª°àª¹àªšà« àªžàª«àª³àªªà«àª°à«àªµàª àª­à«àªžà«àª àªšàªŸàªà«àª¯à«àª àªà«.}  
+
+_textclonefail_ [l=gu] {_cgiargclonecolHtmlsafe_ àªžàªàªà«àª°àª¹ àªàª€à«àªªàªšà«àªš (Cloned) àª¥àª àª¶àªà«àª¯à« àªšàª¥à«. àªžàªàª­àªµàª¿àª€ àªàªŸàª°àª£à« àªà«àªµàªŸ àªà« :  <ul><li>_cgiargclonecolHtmlsafe_ àªžàªàªà«àª°àª¹ àª
+àªžà«àª€àª¿àª€à«àªµàª®àªŸàª àªšàª¥à«<li>_cgiargclonecolHtmlsafe_ àªžàªàªà«àª°àª¹àª®àªŸàª collect.cfg àªàªšà«àª«àª¿àªà«àª¯à«àª°à«àª¶àªš àª«àªŸàªàª² àªšàª¥à«<li>àªà«àª°à«àªšàªžà«àªà«àªšàªšà« collect.cfg àªàªšà«àª«àª¿àªà«àª¯à«àª°à«àª¶àªš àª«àªŸàªàª² àªµàªŸàªàªàªµàªŸàªšà«àª
 àªšà«àª®àª€àª¿ àªšàª¥à«</ul>}  
 
@@ -418,7 +418,7 @@
 àª¥àªµàªŸ  "àªªàªŸàªàª³" àª¬àªàªšà« àªšà« àªàªªàª¯à«àª àªàª°àªµàªŸàª¥à« àªà«àª°à«àªšàªžà«àªà«àªš àªà«àªàªàªµàªŸàª àªàª¯à« àª¹àª€à« ( àªžàªàªà«àª°àªŸàª¹àª àªžàªŸàª¥à« àªžàªàªà«àª°àª¹ àª€à«àª¯àªŸàª° àªàª°àª€à« àªµàªàª€à« àª àª¬àªàªšà«àªšà« àªàªªàª¯à«àª àªàª°àªµàªŸàªšà« àªàªŸàª³à«). àª¶àª°à«àªàª€àª¥à« àª àªžàªàªà«àª°àªŸàª¹àªàªšà« àªªà«àªšàªàªàªŸàª²à« (àª°àª¿àªžà«àªàªŸàª°à«àª) àªàª°àªµàªŸàªšà« àª€àª®àªšà« àª­àª²àªŸàª®àª£ àªàª°àªµàªŸàª®àªŸàª àªàªµà« àªà«.}  
 
-_textexptsuc_ [l=gu] {_cgiargbc1dirname_ àªžàªàªà«àª°àª¹ àªžàª«àª³àªªà«àª°à«àªµàª  _gsdlhome_/tmp/exported\__cgiargbc1dirname_ àª¡àª¿àª°à«àªàªàª°à«àª®àªŸàª àªàªà«àªžàªªà«àª°à«àª àª¥àª àªàª¯à«.}  
-
-_textexptfail_ [l=gu] {<p> _cgiargbc1dirname_ àªžàªàªà«àª°àª¹ àªàªàªžà«àªªà«àª°à«àª àª¥àªµàªŸàª®àªŸàª àªšàª¿àª·à«àª«àª³ àªàª¯à«àª. <p> àªàªµà«àª àª¥àªµàªŸàªšà« àªžàªàª­àªŸàªµàªšàªŸ àªà« àªàªŸàª°àª£ àªà« "Export to CD-ROM" àªàªŸàª°à«àª¯ àªšà« àª€àª°àª«à«àª£ àªàª°àª€àªŸ àªàª°à«àª°à« àªàªàªà« àªµàª¿àªšàªŸ àªà«àª°à«àªšàªžà«àªà«àªš àªàªšà«àªžà«àªà«àª² àªàª°à«àª¯à« àª¹àª€à«àª.<ul><li>àªà« àª€àª®à« CD-ROM àª®àªŸàªàª¥à« àªà«àª°à«àªšàªžà«àªà«àªšàªšà«àª 2.70w àªªàª¹à«àª²àªŸàªšà«àª àªžàªàªžà«àªàª°àª£ àªàªšà«àªžà«àªà«àª² àªàª°à«àª¯à« àª¹à«àª¯ àª€à« "Custom" àªàªšà«àªžà«àªà«àª² àªŠàª°àª®à«àª¯àªŸàªš àªà« àª àªàªàªà« àªªàªžàªàªŠ àªš àªàª°à«àª¯àªŸ àª¹à«àª¯ àª€à«àª¯àªŸàª àªžà«àª§à« àªàªµàªŸ àªàªàªà«àªšà« àªàªšà«àªžà«àªà«àª² àªàª°àªµàªŸàªšà« àªàª°à«àª° àªš àª¹àª€à«.<li>àªà« àª€àª®à« àªµà«àª¬ àªµàª¿àª€àª°àª£ (àªµà«àª¬ àª¡àª¿àªžà«àªà«àª°àª¿àª¬à«àª¯à«àª¶àªš) àª®àªŸàªàª¥à« àªà«àª°à«àªšàªžà«àªà«àªš àªàªšà«àªžà«àªà«àª² àªàª°à«àª¯à« àª¹à«àª¯ àª€à« àª€à«àªšà« àªàªŸàª°à«àª¯àª°àª€ àªàª°àªµàªŸ àª®àªŸàªà« àª€àª®àªŸàª°à« àªµàª§àªŸàª°àªŸàªšà«àª àªªà«àªà«àª àª¡àªŸàªàªšàª²à«àª¡ àª
+_textexptsuc_ [l=gu] {_cgiargbc1dirnameHtmlsafe_ àªžàªàªà«àª°àª¹ àªžàª«àª³àªªà«àª°à«àªµàª  _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ àª¡àª¿àª°à«àªàªàª°à«àª®àªŸàª àªàªà«àªžàªªà«àª°à«àª àª¥àª àªàª¯à«.}  
+
+_textexptfail_ [l=gu] {<p> _cgiargbc1dirnameHtmlsafe_ àªžàªàªà«àª°àª¹ àªàªàªžà«àªªà«àª°à«àª àª¥àªµàªŸàª®àªŸàª àªšàª¿àª·à«àª«àª³ àªàª¯à«àª. <p> àªàªµà«àª àª¥àªµàªŸàªšà« àªžàªàª­àªŸàªµàªšàªŸ àªà« àªàªŸàª°àª£ àªà« "Export to CD-ROM" àªàªŸàª°à«àª¯ àªšà« àª€àª°àª«à«àª£ àªàª°àª€àªŸ àªàª°à«àª°à« àªàªàªà« àªµàª¿àªšàªŸ àªà«àª°à«àªšàªžà«àªà«àªš àªàªšà«àªžà«àªà«àª² àªàª°à«àª¯à« àª¹àª€à«àª.<ul><li>àªà« àª€àª®à« CD-ROM àª®àªŸàªàª¥à« àªà«àª°à«àªšàªžà«àªà«àªšàªšà«àª 2.70w àªªàª¹à«àª²àªŸàªšà«àª àªžàªàªžà«àªàª°àª£ àªàªšà«àªžà«àªà«àª² àªàª°à«àª¯à« àª¹à«àª¯ àª€à« "Custom" àªàªšà«àªžà«àªà«àª² àªŠàª°àª®à«àª¯àªŸàªš àªà« àª àªàªàªà« àªªàªžàªàªŠ àªš àªàª°à«àª¯àªŸ àª¹à«àª¯ àª€à«àª¯àªŸàª àªžà«àª§à« àªàªµàªŸ àªàªàªà«àªšà« àªàªšà«àªžà«àªà«àª² àªàª°àªµàªŸàªšà« àªàª°à«àª° àªš àª¹àª€à«.<li>àªà« àª€àª®à« àªµà«àª¬ àªµàª¿àª€àª°àª£ (àªµà«àª¬ àª¡àª¿àªžà«àªà«àª°àª¿àª¬à«àª¯à«àª¶àªš) àª®àªŸàªàª¥à« àªà«àª°à«àªšàªžà«àªà«àªš àªàªšà«àªžà«àªà«àª² àªàª°à«àª¯à« àª¹à«àª¯ àª€à« àª€à«àªšà« àªàªŸàª°à«àª¯àª°àª€ àªàª°àªµàªŸ àª®àªŸàªà« àª€àª®àªŸàª°à« àªµàª§àªŸàª°àªŸàªšà«àª àªªà«àªà«àª àª¡àªŸàªàªšàª²à«àª¡ àª
 àªšà« àªàªšà«àªžà«àªà«àª² àªàª°àªµà«àª àªªàª¡àª¶à«. àªà«àªªàªŸ àªàª°à« àªµàª§àªŸàª°àªŸàªšà« àª®àªŸàª¹àª¿àª€à« àª®àªŸàªà« <a href="http://www.greenstone.org">http://www.greenstone.org</a> àª
 àª¥àªµàªŸ <a href="https://list.scms.waikato.ac.nz/mailman/listinfo/greenstone-users">the mailing list</a>àªšà« àª®à«àª²àªŸàªàªŸàª€ àª²à« </ul>}  
@@ -627,5 +627,5 @@
 
 _textdeleteuser_ [l=gu] {àªàªªàª­à«àªà«àª€àªŸ àª°àªŠ àªàª°à«.}  
-_textremwarn_ [l=gu] {àª€àª®à« àªàª°à«àªàª° <b>_cgiargumun_</b> àªàªªàª­à«àªà«àª€àªŸàªšà« àªàªŸàª¯àª® àª®àªŸàªà« àªŠà«àª° àªàª°àªµàªŸ àª®àªŸàªàªà« àªà« ?}  
+_textremwarn_ [l=gu] {àª€àª®à« àªàª°à«àªàª° <b>_cgiargumunHtmlsafe_</b> àªàªªàª­à«àªà«àª€àªŸàªšà« àªàªŸàª¯àª® àª®àªŸàªà« àªŠà«àª° àªàª°àªµàªŸ àª®àªŸàªàªà« àªà« ?}  
 
 
Index: main/trunk/greenstone2/macros/hebrew.dm
===================================================================
--- main/trunk/greenstone2/macros/hebrew.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/hebrew.dm	(revision 28888)
@@ -223,5 +223,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=he] {_If_(thislast_,×ª××Š×××ª _thisfirst_ - _thislast_ ××©××××ª× : _cgiargq_, ×××  ××¡×××× ×××× ××©××××ª×: _cgiargq_)}
+_textquerytitle_ [l=he] {_If_(thislast_,×ª××Š×××ª _thisfirst_ - _thislast_ ××©××××ª× : _cgiargqHtmlsafe_, ×××  ××¡×××× ×××× ××©××××ª×: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=he] {×××€××© ××£}
 
Index: main/trunk/greenstone2/macros/hindi.dm
===================================================================
--- main/trunk/greenstone2/macros/hindi.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/hindi.dm	(revision 28888)
@@ -223,6 +223,6 @@
 # any matches
 _textquerytitle_ [l=hi] {_If_(_thislast_,à€ªà€°à€¿à€£à€Ÿà€® _thisfirst_ - _thislast_ à€à€ž
-à€ªà¥à€°à€¶à¥à€š à€à¥: _cgiargq_,à€à€ž à€ªà¥à€°à€¶à¥à€š
-à€à€Ÿ à€à¥à€ à€®à¥à€² à€šà€¹à¥à€ à€¹à¥: _cgiargq_)}
+à€ªà¥à€°à€¶à¥à€š à€à¥: _cgiargqHtmlsafe_,à€à€ž à€ªà¥à€°à€¶à¥à€š
+à€à€Ÿ à€à¥à€ à€®à¥à€² à€šà€¹à¥à€ à€¹à¥: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=hi] {à€à¥à€ à€à€Ÿ à€ªà¥à€·à¥à€  à¥€}
 
Index: main/trunk/greenstone2/macros/html.dm
===================================================================
--- main/trunk/greenstone2/macros/html.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/html.dm	(revision 28888)
@@ -15,5 +15,5 @@
 <frameset rows="90,*" noresize frameborder=0>
   <frame frameborder=0 src="_gwcgi_?e=_compressedoptions_&a=p&p=nav">
-  <frame frameborder=0 src="_cgiarghp_">
+  <frame frameborder=0 src="_cgiarghpAttrsafe_">
   <noframes>
   <p>_textframebrowser_</p>
Index: main/trunk/greenstone2/macros/hungarian.dm
===================================================================
--- main/trunk/greenstone2/macros/hungarian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/hungarian.dm	(revision 28888)
@@ -322,5 +322,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=hu] {_If_(_thislast_,results _thisfirst_ - _thislast_ a lekerdezesre: _cgiargq_,nincs talalat a lekerdezesre: _cgiargq_)}  
+_textquerytitle_ [l=hu] {_If_(_thislast_,results _thisfirst_ - _thislast_ a lekerdezesre: _cgiargqHtmlsafe_,nincs talalat a lekerdezesre: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=hu] {KeresÅ oldal}  
 
Index: main/trunk/greenstone2/macros/indo.dm
===================================================================
--- main/trunk/greenstone2/macros/indo.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/indo.dm	(revision 28888)
@@ -291,5 +291,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=id] {_If_(_thislast_,hasil _thisfirst_ - _thislast_ untuk pertanyaan: _cgiargq_,Tidak ada yang memenuhi syarat: _cgiargq_)}
+_textquerytitle_ [l=id] {_If_(_thislast_,hasil _thisfirst_ - _thislast_ untuk pertanyaan: _cgiargqHtmlsafe_,Tidak ada yang memenuhi syarat: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=id] {Halaman Pencarian}
 
Index: main/trunk/greenstone2/macros/italian.dm
===================================================================
--- main/trunk/greenstone2/macros/italian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/italian.dm	(revision 28888)
@@ -54,5 +54,5 @@
 _textdescrpref_ [l=it] {Impostazioni}
 _textdescrlogin_ [l=it] {Pagina login}  
-_textdescrlogout_ [l=it] {Uscire come_cgiargun_}  
+_textdescrlogout_ [l=it] {Uscire come _cgiargunHtmlsafe_}  
 
 _textdescrgreenstone_ [l=it] {Greenstone Digital Library Software}
@@ -193,5 +193,5 @@
 _linktextPREFERENCES_ [l=it] {IMPOSTAZIONI}
 _linktextLOGIN_ [l=it] {LOGIN}  
-_linktextLOGGEDIN_ [l=it] {(connesso come_cgiargun)}  
+_linktextLOGGEDIN_ [l=it] {(connesso come _cgiargunHtmlsafe_)}  
 _linktextLOGOUT_ [l=it] {USCIRE}  
 
@@ -341,5 +341,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=it] {_If_(_thislast_,risultati _thisfirst_ - _thislast_ della ricerca: _cgiargq_,Nessun risultato della ricerca: _cgiargq_)}
+_textquerytitle_ [l=it] {_If_(_thislast_,risultati _thisfirst_ - _thislast_ della ricerca: _cgiargqHtmlsafe_,Nessun risultato della ricerca: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=it] {Pagina di ricerca}
 
Index: main/trunk/greenstone2/macros/italian2.dm
===================================================================
--- main/trunk/greenstone2/macros/italian2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/italian2.dm	(revision 28888)
@@ -121,5 +121,5 @@
 
 # should have arguments of collection, collectionname and link
-_foundintcontent_ [l=it] {<h3>Collegamento alla raccolta "_2_"</h3>  <p> Il collegamento che hai selezionato Ãš esterno alla raccolta "_collectionname_" (esso porta alla raccolta "_2_"). Se desideri seguire questo collegamento verso la raccolta "_2_" puoi <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">proseguire</a> verso questa pagina; altrimenti usa il pulsante "indietro" del browser per tornare al documento precedente. }  
+_foundintcontent_ [l=it] {<h3>Collegamento alla raccolta "_2_"</h3>  <p> Il collegamento che hai selezionato Ãš esterno alla raccolta "_collectionname_" (esso porta alla raccolta "_2_"). Se desideri seguire questo collegamento verso la raccolta "_2_" puoi <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">proseguire</a> verso questa pagina; altrimenti usa il pulsante "indietro" del browser per tornare al documento precedente. }  
 
 
@@ -139,5 +139,5 @@
 _textpassword_ [l=it] {password}
 
-_textmustbelongtogroup_ [l=it] {Nota che devi appartenere al gruppo "_cgiargug_" per accedere a questa pagina}
+_textmustbelongtogroup_ [l=it] {Nota che devi appartenere al gruppo "_cgiargugHtmlsafe_" per accedere a questa pagina}
 
 _textmessageinvalid_ [l=it] {La pagina che hai richiesto necessita di autenticazione.<br>
@@ -343,12 +343,12 @@
 _textretcoll_ [l=it] {Ritorna al Collector}
 
-_textdelperm_ [l=it] {Alcune o tutte le collezioni _cgiargbc1dirname_non possono essere cancellate. La cause possibili sono: <ul> <li> Greenstone non ha il permesso di cancellare la directory _gsdlhome_/collect/_cgiargbc1dirname_
-<br> Potrebbe essere necessario rimuovere manualmente questa directory per completare la cancellazione della collezione _gsdlhome_/collect/_cgiargbc1dirname_ da questo computer.</li> <li>Greenstone non puÃ² eseguire il programma _gsdlhome_/bin/script/delcol.pl. Assicurati che questo file sia leggibile ed eseguibile.</li></ul>}
-
-_textdelinv_ [l=it] {La collezione _cgiargbc1dirname_ Ãš protetta o invalida. La cancellazione Ãš stata annullata.}
-
-_textdelsuc_ [l=it] {La collezione _cgiargbc1dirname_ Ãš stata cancellata con successo.}
-
-_textclonefail_ [l=it] {La collezione _cgiargclonecol_ non puÃ² essere clonata.}
+_textdelperm_ [l=it] {Alcune o tutte le collezioni _cgiargbc1dirnameHtmlsafe_non possono essere cancellate. La cause possibili sono: <ul> <li> Greenstone non ha il permesso di cancellare la directory _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_
+<br> Potrebbe essere necessario rimuovere manualmente questa directory per completare la cancellazione della collezione _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ da questo computer.</li> <li>Greenstone non puÃ² eseguire il programma _gsdlhome_/bin/script/delcol.pl. Assicurati che questo file sia leggibile ed eseguibile.</li></ul>}
+
+_textdelinv_ [l=it] {La collezione _cgiargbc1dirnameHtmlsafe_ Ãš protetta o invalida. La cancellazione Ãš stata annullata.}
+
+_textdelsuc_ [l=it] {La collezione _cgiargbc1dirnameHtmlsafe_ Ãš stata cancellata con successo.}
+
+_textclonefail_ [l=it] {La collezione _cgiargclonecolHtmlsafe_ non puÃ² essere clonata.}
 
 _textcolerr_ [l=it] {Errore del Collector.}
@@ -380,9 +380,9 @@
 }
 
-_textexptsuc_ [l=it] {La collezione _cgiargbc1dirname_ Ãš stata esportata con successo 
-nella direcoty _gsdlhome_/tmp/exported\__cgiargbc1dirname_ 
-}
-
-_textexptfail_ [l=it] {<p>L'esportazione della collezione _cgiargbc1dirname_ Ãš fallita.  <p>Probabilmente questo dipende dal fatto che Greenstone Ãš stato installato senza le componenti necessarie a supportare la funzione "Esporta collezione". <ul>   <li>Se hai installato Greenstone da un CD-ROM, queste componenti non sono state installate a meno che   non le abbia selezionate durante l'installazione "Personalizzata".  Puoi aggiungerle alla tua installazione ripetendo la procedura di installazione.   <li>Se hai installato Greenstone da una distribuzion web, devi scaricare ed installare i pacchetti addizionali   necessari ad abilitare questa funzione. Consulta <a href="http://www.greenstone.org">http://www.greenstone.org</a>   oppure spedisci un'e-mail a <a  href="mailto:greenstone@cs.waikato.ac.nz">greenstone@cs.waikato.ac.nz</a>  per ulteriori informazioni.  </ul>  }  
+_textexptsuc_ [l=it] {La collezione _cgiargbc1dirnameHtmlsafe_ Ãš stata esportata con successo 
+nella direcoty _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ 
+}
+
+_textexptfail_ [l=it] {<p>L'esportazione della collezione _cgiargbc1dirnameHtmlsafe_ Ãš fallita.  <p>Probabilmente questo dipende dal fatto che Greenstone Ãš stato installato senza le componenti necessarie a supportare la funzione "Esporta collezione". <ul>   <li>Se hai installato Greenstone da un CD-ROM, queste componenti non sono state installate a meno che   non le abbia selezionate durante l'installazione "Personalizzata".  Puoi aggiungerle alla tua installazione ripetendo la procedura di installazione.   <li>Se hai installato Greenstone da una distribuzion web, devi scaricare ed installare i pacchetti addizionali   necessari ad abilitare questa funzione. Consulta <a href="http://www.greenstone.org">http://www.greenstone.org</a>   oppure spedisci un'e-mail a <a  href="mailto:greenstone@cs.waikato.ac.nz">greenstone@cs.waikato.ac.nz</a>  per ulteriori informazioni.  </ul>  }  
 
 ######################################################################
@@ -525,5 +525,5 @@
 
 _textdeleteuser_ [l=it] {Cancella un utente}
-_textremwarn_ [l=it] {Vuoi davvero rimuovere definitivamente l'utente <b>_cgiargumun_</b>?}
+_textremwarn_ [l=it] {Vuoi davvero rimuovere definitivamente l'utente <b>_cgiargumunHtmlsafe_</b>?}
 
 
Index: main/trunk/greenstone2/macros/japanese.dm
===================================================================
--- main/trunk/greenstone2/macros/japanese.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/japanese.dm	(revision 28888)
@@ -50,5 +50,5 @@
 _textdescrpref_ [l=ja] {ããªãã¡ã¬ã³ã¹ããŒãž}
 _textdescrlogin_ [l=ja] {ã­ã°ã€ã³ããŒãž}  
-_textdescrlogout_ [l=ja] {_cgiargun_ãšããŠã­ã°ã€ã³ãã}  
+_textdescrlogout_ [l=ja] {_cgiargunHtmlsafe_ãšããŠã­ã°ã€ã³ãã}  
 
 _textdescrgreenstone_ [l=ja] {ã°ãªãŒã³ã¹ããŒã³é»å­å³æžé€šãœãããŠãšã¢}
@@ -196,5 +196,5 @@
 _linktextPREFERENCES_ [l=ja] {ããªãã¡ã¬ã³ã¹}
 _linktextLOGIN_ [l=ja] {ã­ã°ã€ã³}  
-_linktextLOGGEDIN_ [l=ja] {(_cgiargun_ãšããŠã­ã°ã€ã³ãã)}  
+_linktextLOGGEDIN_ [l=ja] {(_cgiargunHtmlsafe_ãšããŠã­ã°ã€ã³ãã)}  
 _linktextLOGOUT_ [l=ja] {ã­ã°ã¢ãŠã}  
 
@@ -345,5 +345,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ja] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,No matches for query: _cgiargq_)}
+_textquerytitle_ [l=ja] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,No matches for query: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=ja] {æ€çŽ¢ããŒãž}
 
Index: main/trunk/greenstone2/macros/japanese2.dm
===================================================================
--- main/trunk/greenstone2/macros/japanese2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/japanese2.dm	(revision 28888)
@@ -76,5 +76,5 @@
 
 # should have arguments of collection, collectionname and link
-_foundintcontent_ [l=ja] {<h3>Link to "_2_" collection</h3> <p> éžæããããªã³ã¯ã¯_collectionname_ã³ã¬ã¯ã·ã§ã³ã®å€éšã«ãããŸããïŒ"_2_" ã³ã¬ã¯ã·ã§ã³ã«ãªã³ã¯ããŠããŸãïŒ      ãã"_2_" ã³ã¬ã¯ã·ã§ã³ã®ãªã³ã¯ãèŠãããã°<a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">é²ã</a>ãã®ããŒãžã«;      ãããã¯ãã©ãŠã¶-ã®ãããã¯ããã¿ã³ãäœ¿çšããŠä»¥åã®ãã­ã¥ã¡ã³ããžæ»ã£ãŠãã ããã}  
+_foundintcontent_ [l=ja] {<h3>Link to "_2_" collection</h3> <p> éžæããããªã³ã¯ã¯_collectionname_ã³ã¬ã¯ã·ã§ã³ã®å€éšã«ãããŸããïŒ"_2_" ã³ã¬ã¯ã·ã§ã³ã«ãªã³ã¯ããŠããŸãïŒ      ãã"_2_" ã³ã¬ã¯ã·ã§ã³ã®ãªã³ã¯ãèŠãããã°<a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">é²ã</a>ãã®ããŒãžã«;      ãããã¯ãã©ãŠã¶-ã®ãããã¯ããã¿ã³ãäœ¿çšããŠä»¥åã®ãã­ã¥ã¡ã³ããžæ»ã£ãŠãã ããã}  
 
 
@@ -94,5 +94,5 @@
 _textpassword_ [l=ja] {ãã¹ã¯ãŒã}  
 
-_textmustbelongtogroup_ [l=ja] {ãã®ããŒãžã«ã¢ã¯ã»ã¹ããã«ã¯ã "_cgiargug_" ã°ã«ãŒãã«å±ããŠããªããã°ãªããŸããã}  
+_textmustbelongtogroup_ [l=ja] {ãã®ããŒãžã«ã¢ã¯ã»ã¹ããã«ã¯ã "_cgiargugHtmlsafe_" ã°ã«ãŒãã«å±ããŠããªããã°ãªããŸããã}  
 
 _textmessageinvalid_ [l=ja] {ããªããèŠæ±ããŠããããŒãžã¯ãµã€ã³ã€ã³ãå¿
@@ -309,12 +309,12 @@
 
 _textdelperm_ [l=ja] {ã³ã¬ã¯ã·ã§ã³ã®ããã€ããããã¯å
-šéšãåé€ã§ããŸãããèããããåå ãšããŠã¯ <ul> <li>ã°ãªãŒã³ã¹ããŒã³ã¯ _gsdlhome_/collect/_cgiargbc1dirname_ãåé€ããèš±å¯æš©éãæã£ãŠããŸããã directory.<br> You may need to remove this directory manually to complete the removal of the _cgiargbc1dirname_ collection from this computer.ãã®ã³ã³ãã¥ãŒã¿ãŒãã_cgiargbc1dirname_ã®ç§»åãå®æããããã«ãã®ãã£ã¬ã¯ããªãŒãããã¥ã¢ã«ã§ç§»åããå¿
+šéšãåé€ã§ããŸãããèããããåå ãšããŠã¯ <ul> <li>ã°ãªãŒã³ã¹ããŒã³ã¯ _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ãåé€ããèš±å¯æš©éãæã£ãŠããŸããã directory.<br> You may need to remove this directory manually to complete the removal of the _cgiargbc1dirnameHtmlsafe_ collection from this computer.ãã®ã³ã³ãã¥ãŒã¿ãŒãã_cgiargbc1dirnameHtmlsafe_ã®ç§»åãå®æããããã«ãã®ãã£ã¬ã¯ããªãŒãããã¥ã¢ã«ã§ç§»åããå¿
 èŠããããŸãã</li> <li>ã°ãªãŒã³ã¹ããŒã³ã¯_gsdlhome_/bin/script/delcol.plãã­ã°ã©ã ãèµ·åã§ããŸããããã®ãã¡ã€ã«ãèª­ã¿åãå¯èœã§ãã€å®è¡å¯èœã§ããããšãç¢ºèªããŠãã ããã</li> </ul>}  
 
 _textdelinv_ [l=ja] {ã³ã¬ã¯ã¿ãŒ}  
 
-_textdelsuc_ [l=ja] {_cgiargbc1dirname_ ã³ã¬ã¯ã·ã§ã³ã¯åé€ãããŸããã}  
-
-_textclonefail_ [l=ja] {_cgiargclonecol_  ã³ã¬ã¯ã·ã§ã³ã¯è€è£œã§ããŸãããèããããåå ãšããŠã¯ïŒ <ul> <li> The _cgiargclonecol_ collection ãå­åšããªãã <li> The _cgiargclonecol_ collection ã collect.cfg configuration fileãæããªãã <li> ã°ãªãŒã³ã¹ããŒã³ãcollect.cfg configuration fileãèª­ãæš©éããªãã </ul>}  
+_textdelsuc_ [l=ja] {_cgiargbc1dirnameHtmlsafe_ ã³ã¬ã¯ã·ã§ã³ã¯åé€ãããŸããã}  
+
+_textclonefail_ [l=ja] {_cgiargclonecolHtmlsafe_  ã³ã¬ã¯ã·ã§ã³ã¯è€è£œã§ããŸãããèããããåå ãšããŠã¯ïŒ <ul> <li> The _cgiargclonecolHtmlsafe_ collection ãå­åšããªãã <li> The _cgiargclonecolHtmlsafe_ collection ã collect.cfg configuration fileãæããªãã <li> ã°ãªãŒã³ã¹ããŒã³ãcollect.cfg configuration fileãèª­ãæš©éããªãã </ul>}  
 
 _textcolerr_ [l=ja] {ã³ã¬ã¯ã¿ãŒãšã©ãŒ}  
@@ -331,7 +331,7 @@
 _textreloaderror_ [l=ja] {æ°èŠã³ã¬ã¯ã·ã§ã³ãæ§ç¯äž­ã«ãšã©ãŒãçºçããŸãããããã¯ã°ãªãŒã³ã¹ããŒã³ãããã©ãŠã¶ãŒã®ããªã­ãŒããããããã¯ããã¿ã³ãäœ¿çšããããã«æ··ä¹±ããããã§ããïŒã³ã¬ã¯ã¿ãŒã§ã³ã¬ã¯ã·ã§ã³ãæ§ç¯äž­ã¯ãããã®ãã¿ã³ãäœ¿çšããªãã§ãã ãããïŒã³ã¬ã¯ã¿ãŒãæåããåèµ·åããŠãã ããã }  
 
-_textexptsuc_ [l=ja] {_cgiargbc1dirname_ ã³ã¬ã¯ã·ã§ã³ã¯ _gsdlhome_/tmp/exported\__cgiargbc1dirname_ãã£ã¬ã¯ããªãŒã«ãšã¯ã¹ããŒããããŸããã. }  
-
-_textexptfail_ [l=ja] {<p>_cgiargbc1dirname_ã³ã¬ã¯ã·ã§ã³ã®ãšã¯ã¹ããŒãã«å€±æããã  <p>ããã¯ã°ãªãŒã³ã¹ããŒã³ããCD-ROMã«ãšã¯ã¹ããŒããããæ©èœããµããŒãããå¿
+_textexptsuc_ [l=ja] {_cgiargbc1dirnameHtmlsafe_ ã³ã¬ã¯ã·ã§ã³ã¯ _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ãã£ã¬ã¯ããªãŒã«ãšã¯ã¹ããŒããããŸããã. }  
+
+_textexptfail_ [l=ja] {<p>_cgiargbc1dirnameHtmlsafe_ã³ã¬ã¯ã·ã§ã³ã®ãšã¯ã¹ããŒãã«å€±æããã  <p>ããã¯ã°ãªãŒã³ã¹ããŒã³ããCD-ROMã«ãšã¯ã¹ããŒããããæ©èœããµããŒãããå¿
 èŠãªã³ã³ããŒãã³ããã€ã³ã¹ããŒã«ããŠããªãããã§ãã  <ul>   <li>ããã°ãªãŒã³ã¹ããŒã³ã®2.70w ä»¥åã®ããŒãžã§ã³ãCD-ROMããã€ã³ã¹ããŒã«ãããŠããã°ãã«ã¹ã¿ã ã€ã³ã¹ããŒã«ã§éžæããªãéããããã®ã³ã³ããŒãã³ãã¯ã€ã³ã¹ããŒã«ãããŸãããã€ã³ã¹ããŒã«ã®æé ãåå®è¡ããããšã§ãã³ã³ããŒãã³ããè¿œå ã§ããŸãã     <li>If you installed Greenstone from a web distribution you will need toããã°ãªãŒã³ã¹ããŒã³ããŠãšãããå
 ¥æãããªããããã®æ©èœãå®è¡ããã«ã¯è¿œå ã®ããã±ãŒãžãã€ã³ã¹ããŒã«ããªããã°ãªããŸããã<a href="http://www.greenstone.org">http://www.greenstone.org</a> ã<ahref="https://list.scms.waikato.ac.nz/mailman/listinfo/greenstone-users">ã«ã¢ã¯ã»ã¹ããŠãã ãããã¡ãŒãªã³ã°ãªã¹ã</a>  è©³çŽ°ã¯  </ul>}  
@@ -485,5 +485,5 @@
 _textdeleteuser_ [l=ja] {ãŠãŒã¶ãŒãåé€ããã}  
 _textremwarn_ [l=ja] {ãŠãŒã¶ãŒãæ°žä¹
-ã«åé€ããŸãã <b>_cgiargumun_</b>?}  
+ã«åé€ããŸãã <b>_cgiargumunHtmlsafe_</b>?}  
 
 
Index: main/trunk/greenstone2/macros/kannada.dm
===================================================================
--- main/trunk/greenstone2/macros/kannada.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/kannada.dm	(revision 28888)
@@ -56,5 +56,5 @@
 _textdescrpref_ [l=kn] {à²ªà³à²°à²Ÿà²§à²Ÿà²šà³à²¯à²€à³à²à²³ à²ªà³à²}  
 _textdescrlogin_ [l=kn] {à²ªà³à²°à²µà³à²¶ à²ªà³à²}  
-_textdescrlogout_ [l=kn] {_cgiargun_ à²à²à²¬ à²¹à³à²žà²°à²¿à²šà²²à³à²²à²¿ à²¹à³à²°à²à³ à²¬à²šà³à²šà²¿}  
+_textdescrlogout_ [l=kn] {_cgiargunHtmlsafe_ à²à²à²¬ à²¹à³à²žà²°à²¿à²šà²²à³à²²à²¿ à²¹à³à²°à²à³ à²¬à²šà³à²šà²¿}  
 
 _textdescrgreenstone_ [l=kn] {à²à³à²°à³à²šà³à²žà³à²à³à²šà³ à²¡à²¿à²à²¿à²à²²à³ à²à³à²°à²à²¥à²Ÿà²²à²¯ à²€à²à²€à³à²°à²Ÿà²à²¶}  
@@ -197,5 +197,5 @@
 _linktextPREFERENCES_ [l=kn] {à²ªà³à²°à²Ÿà²§à²Ÿà²šà³à²¯à²€à³à²à²³à³}  
 _linktextLOGIN_ [l=kn] {à²ªà³à²°à²µà³à²¶à²¿à²žà³}  
-_linktextLOGGEDIN_ [l=kn] {( _cgiargun_ à²à²à²¬ à²¹à³à²žà²°à²¿à²šà²²à³à²²à²¿ à²ªà³à²°à²µà³à²¶à²¿à²žà²¿à²Šà³à²Šà²Ÿà²à²¿à²Šà³)}  
+_linktextLOGGEDIN_ [l=kn] {( _cgiargunHtmlsafe_ à²à²à²¬ à²¹à³à²žà²°à²¿à²šà²²à³à²²à²¿ à²ªà³à²°à²µà³à²¶à²¿à²žà²¿à²Šà³à²Šà²Ÿà²à²¿à²Šà³)}  
 _linktextLOGOUT_ [l=kn] {à²¹à³à²°à²à³ à²¬à²šà³à²šà²¿}  
 
@@ -343,5 +343,5 @@
 # any matches
 _textquerytitle_ [l=kn] {_If_(_thislast_,à²«à²²à²¿à²€à²Ÿà²à²¶à²à²³à³ _thisfirst_ - _thislast_ 
-à² à²ªà³à²°à²¶à³à²šà³à²à³: _cgiargq_,à² à²ªà³à²°à²¶à³à²šà³à²à³ à²žà²°à²¿à²¯à²Ÿà²Š à²¹à³à²à²Šà²Ÿà²£à²¿à²à³à²à²³à²¿à²²à³à²²: _cgiargq_)}  
+à² à²ªà³à²°à²¶à³à²šà³à²à³: _cgiargqHtmlsafe_,à² à²ªà³à²°à²¶à³à²šà³à²à³ à²žà²°à²¿à²¯à²Ÿà²Š à²¹à³à²à²Šà²Ÿà²£à²¿à²à³à²à²³à²¿à²²à³à²²: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=kn] {à²¶à³à²§à²šà³à²¯ à²ªà³à²}  
 
Index: main/trunk/greenstone2/macros/kannada2.dm
===================================================================
--- main/trunk/greenstone2/macros/kannada2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/kannada2.dm	(revision 28888)
@@ -116,5 +116,5 @@
 à²Šà³ "_2_" à²žà²à²à³à²°à²¹à²à³à²à³ à²à²à²à²¿à²žà³à²€à³à²€à²Šà³).
 à²šà³à²µà³ à² à²à³à²à²¡à²¿à²¯à²šà³à²šà³ "_2_" à²žà²à²à³à²°à²¹à²Šà²²à³à²²à²¿ à²šà³à²¡à²¬à²¯à²žà²¿à²Šà²°à³ à² à²ªà³à²à²à³à²à³ 
-<a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">go forward</a> à²®à²Ÿà²¡à²¿; 
+<a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">go forward</a> à²®à²Ÿà²¡à²¿; 
 à²
 à²¥à²µà²Ÿ à²šà²¿à²®à³à²® à²¬à³à²°à³à²žà²°à³ à²šà³ "back" à²à³à²à²¡à²¿à²¯à²šà³à²šà³ à²à²€à³à²€à²¿ à² à²¹à²¿à²à²Šà²¿à²š à²Šà²žà³à²€à²Ÿà²µà³à²à²¿à²à³ à²¹à²¿à²à²Šà²¿à²°à³à²à²¿.}  
@@ -136,5 +136,5 @@
 _textpassword_ [l=kn] {à²žà²à²à³à²€ à²ªà²Š}  
 
-_textmustbelongtogroup_ [l=kn] {à² à²ªà³à²à²µà²šà³à²šà³ à²šà³à²¡à²²à³ à²šà³à²µà³ "_cgiargug_" à²à³à²à²ªà²¿à²à³ à²žà³à²°à²¿à²Šà²µà²°à²Ÿà²à²¿à²°à²¬à³à²à³}  
+_textmustbelongtogroup_ [l=kn] {à² à²ªà³à²à²µà²šà³à²šà³ à²šà³à²¡à²²à³ à²šà³à²µà³ "_cgiargugHtmlsafe_" à²à³à²à²ªà²¿à²à³ à²žà³à²°à²¿à²Šà²µà²°à²Ÿà²à²¿à²°à²¬à³à²à³}  
 
 _textmessageinvalid_ [l=kn] {<br>)à²Šà²¯à²µà²¿à²à³à²à³ à²šà²¿à²®à³à²® à²¬à²³à²à³à²Šà²Ÿà²°à²° à²¹à³à²žà²°à³ à²®à²€à³à²€à³ à²žà²à²à³à²€à²ªà²Šà²µà²šà³à²šà³ à²¬à²°à³à²¯à²¿à²°à²¿}  
@@ -428,25 +428,25 @@
 _textretcoll_ [l=kn] {"à²žà²à²à³à²°à²Ÿà²¹à²" à²à³à²à³ à²¹à²¿à²à²€à²¿à²°à³à²à²¿}  
 
-_textdelperm_ [l=kn] {_cgiargbc1dirname_ à²š à²¹à²²à²µà³ à²
+_textdelperm_ [l=kn] {_cgiargbc1dirnameHtmlsafe_ à²š à²¹à²²à²µà³ à²
 à²¥à²µà²Ÿ à²à²²à³à²²à²Ÿ à²žà²à²à³à²°à²¹à²à²³à²šà³à²šà³ à²€à³à²à³à²¯à²²à²Ÿà²à²²à²¿à²²à³à²². à²à²Šà²à³à²à³ à²à²Ÿà²°à²£à²à²³à³ à²¹à³à²à²¿à²°à²¬à²¹à³à²Šà³:
 <ul> 
-<li> à²à³à²°à³à²šà³âà²žà³à²à³à²šà³âà²à³  _gsdlhome_/collect/_cgiargbc1dirname_  à²¡à³à²°à²à³à²à²°à²¿à²¯à²šà³à²šà³ à²€à³à²à³à²¯à²²à³ à²
+<li> à²à³à²°à³à²šà³âà²žà³à²à³à²šà³âà²à³  _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_  à²¡à³à²°à²à³à²à²°à²¿à²¯à²šà³à²šà³ à²€à³à²à³à²¯à²²à³ à²
 à²šà³à²®à²€à²¿à²¯à²¿à²²à³à²²<br>
-à²šà³à²µà³ à²šà³à²°à²µà²Ÿà²à²¿ à² à²¡à³à²°à²à³à²à²°à²¿à²¯à²šà³à²šà³ à²€à³à²à³à²Šà³,  _cgiargbc1dirname_ à²žà²à²à³à²°à²¹à²µà²šà³à²šà³ à²€à³à²à³à²¯à³à²µà²à²Ÿà²°à³à²¯à²µà²šà³à²šà³ à²ªà³à²°à³à²£à²à³à²³à²¿à²žà²¿. </li>
+à²šà³à²µà³ à²šà³à²°à²µà²Ÿà²à²¿ à² à²¡à³à²°à²à³à²à²°à²¿à²¯à²šà³à²šà³ à²€à³à²à³à²Šà³,  _cgiargbc1dirnameHtmlsafe_ à²žà²à²à³à²°à²¹à²µà²šà³à²šà³ à²€à³à²à³à²¯à³à²µà²à²Ÿà²°à³à²¯à²µà²šà³à²šà³ à²ªà³à²°à³à²£à²à³à²³à²¿à²žà²¿. </li>
 <li>à²à³à²°à³à²šà³âà²žà³à²à³à²šà³âà²à³ _gsdlhome_/bin/script/delcol à²ªà³à²°à³à²à³à²°à²Ÿà²à²šà³à²šà³ à²à²Ÿà²°à³à²¯à²à²€à²à³à²³à²¿à²žà²²à³ à²žà²Ÿà²§à³à²¯à²µà²¿à²²à³à²². à²à²Šà³ à²à²Šà²¬à²¹à³à²Šà²Ÿà²Š à²®à²€à³à²€à³ à²à²Ÿà²°à³à²¯à²Ÿà²à²°à²£à³à²¯à²Ÿà²à²¬à²²à³à²² à²ªà³à²°à³à²à³à²°à²Ÿà² à²à²à²Šà³ à²à²à²¿à²€ à²ªà²¡à²¿à²žà²¿à²à³à²³à³à²³à²¿</li>
 </ul>}  
 
-_textdelinv_ [l=kn] {_cgiargbc1dirname_ à²žà²à²à³à²°à²¹ à²°à²à³à²·à²¿à²žà²²à³à²ªà²à³à²à²¿à²Šà³ à²
+_textdelinv_ [l=kn] {_cgiargbc1dirnameHtmlsafe_ à²žà²à²à³à²°à²¹ à²°à²à³à²·à²¿à²žà²²à³à²ªà²à³à²à²¿à²Šà³ à²
 à²¥à²µà²Ÿ à²
 à²Šà³ à²žà²°à²¿à²¯à²¿à²²à³à²².  à²¹à³à²à²Ÿà²à²¿ à²žà²à²à³à²°à²¹ à²€à³à²à³à²¯à³à²µ à²à²Ÿà²°à³à²¯ à²°à²Šà³à²Šà²Ÿà²à²¿à²Šà³.}  
 
-_textdelsuc_ [l=kn] {_cgiargbc1dirname_ à²žà²à²à³à²°à²¹à²µà³ à²žà²«à²²à²µà²Ÿà²à²¿ à²€à³à²à³à²¯à²²à³à²ªà²à³à²à²¿à²€à³}  
+_textdelsuc_ [l=kn] {_cgiargbc1dirnameHtmlsafe_ à²žà²à²à³à²°à²¹à²µà³ à²žà²«à²²à²µà²Ÿà²à²¿ à²€à³à²à³à²¯à²²à³à²ªà²à³à²à²¿à²€à³}  
 
 _textclonefail_ [l=kn] {à² à²ªà³à² à²ªà³à²°à²µà³à²¶à²¿à²žà²²à³ à²¡à²¯à²²à³
-_cgiargclonecol_ à²žà²à²à³à²°à²¹à²µà²šà³à²šà³ à²à³à²²à³à²šà³ à²®à²Ÿà²¡à²²à²Ÿà²à²²à²¿à²²à³à²². à² à²à³à²³à²à²à²¡ à²à²Ÿà²°à²£à²à²³à²¿à²°à²¬à²¹à³à²Šà³:
+_cgiargclonecolHtmlsafe_ à²žà²à²à³à²°à²¹à²µà²šà³à²šà³ à²à³à²²à³à²šà³ à²®à²Ÿà²¡à²²à²Ÿà²à²²à²¿à²²à³à²². à² à²à³à²³à²à²à²¡ à²à²Ÿà²°à²£à²à²³à²¿à²°à²¬à²¹à³à²Šà³:
 <ul>
-<li>  _cgiargclonecol_ à²žà²à²à³à²°à²¹ à²
+<li>  _cgiargclonecolHtmlsafe_ à²žà²à²à³à²°à²¹ à²
 à²žà³à²€à²¿à²€à³à²µà²Šà²²à³à²²à²¿à²²à³à²² 
-<li> _cgiargclonecol_ à²žà²à²à³à²°à²¹à²à³à²à³ à²¬à³à²à²Ÿà²Š collect.cfg à²žà²®à²à³à²°à²Ÿà²à³à²€à²¿ à²à²¡à²€à²µà²¿à²²à³à²²
+<li> _cgiargclonecolHtmlsafe_ à²žà²à²à³à²°à²¹à²à³à²à³ à²¬à³à²à²Ÿà²Š collect.cfg à²žà²®à²à³à²°à²Ÿà²à³à²€à²¿ à²à²¡à²€à²µà²¿à²²à³à²²
 <li> à²à³à²°à³à²šà³âà²žà³à²à³à²šà³âà²à³ collect.cfg à²žà²®à²à³à²°à²Ÿà²à³à²€à²¿ à²à²¡à²€à²µà²šà³à²šà³ à²à²Šà²²à³ à²
 à²šà³à²®à²€à²¿à²¯à²¿à²²à³à²² 
@@ -479,7 +479,7 @@
 "à²žà²à²à³à²°à²Ÿà²¹à²" à²µà²šà³à²šà³ à²®à²€à³à²€à³ à²®à³à²Šà²²à²¿à²à²Š à²ªà³à²°à²Ÿà²°à²à²­à²¿à²žà²¿.}  
 
-_textexptsuc_ [l=kn] {_cgiargbc1dirname_ à²žà²à²à³à²°à²¹à²µà³ à²žà²«à²²à²µà²Ÿà²à²¿  _gsdlhome_/tmp/exported\__cgiargbc1dirname_ à²¡à³à²°à²à³à²à²°à²¿à²à³ à²°à²«à³à²€à²Ÿà²¯à²¿à²€à³}
-
-_textexptfail_ [l=kn] {<p>_cgiargbc1dirname_ à²žà²à²à³à²°à²¹à²Š à²°à²«à³à²€à³ à²à²Ÿà²°à³à²¯ à²µà²¿à²«à²²à²µà²Ÿà²¯à²¿à²€à³.
+_textexptsuc_ [l=kn] {_cgiargbc1dirnameHtmlsafe_ à²žà²à²à³à²°à²¹à²µà³ à²žà²«à²²à²µà²Ÿà²à²¿  _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ à²¡à³à²°à²à³à²à²°à²¿à²à³ à²°à²«à³à²€à²Ÿà²¯à²¿à²€à³}
+
+_textexptfail_ [l=kn] {<p>_cgiargbc1dirnameHtmlsafe_ à²žà²à²à³à²°à²¹à²Š à²°à²«à³à²€à³ à²à²Ÿà²°à³à²¯ à²µà²¿à²«à²²à²µà²Ÿà²¯à²¿à²€à³.
 
 <p> à²ªà³à²°à²Ÿà²¯à²·à² à²°à²«à³à²€à³à²®à²Ÿà²¡à²²à³ à²
@@ -714,5 +714,5 @@
 
 _textdeleteuser_ [l=kn] {à² à²à²ªà²¯à³à²à²¿à²žà³à²µà²µà²°à²šà³à²šà³ à²€à³à²à³}  
-_textremwarn_ [l=kn] {<b>_cgiargumun_</b> à²¬à²³à²à³à²Šà²Ÿà²°à²°à²šà³à²šà³ à²šà³à²µà³ à²šà²¿à²à²µà²Ÿà²à²¿ à²¶à²Ÿà²¶à³à²µà²€à²µà²Ÿà²à²¿ à²€à³à²à³à²¯à²²à³ à²à²à³à²à²¿à²žà³à²€à³à²€à³à²°à²Ÿ?}  
+_textremwarn_ [l=kn] {<b>_cgiargumunHtmlsafe_</b> à²¬à²³à²à³à²Šà²Ÿà²°à²°à²šà³à²šà³ à²šà³à²µà³ à²šà²¿à²à²µà²Ÿà²à²¿ à²¶à²Ÿà²¶à³à²µà²€à²µà²Ÿà²à²¿ à²€à³à²à³à²¯à²²à³ à²à²à³à²à²¿à²žà³à²€à³à²€à³à²°à²Ÿ?}  
 
 
Index: main/trunk/greenstone2/macros/kazakh.dm
===================================================================
--- main/trunk/greenstone2/macros/kazakh.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/kazakh.dm	(revision 28888)
@@ -52,5 +52,5 @@
 _textdescrpref_ [l=kk] {ÐÐºÐµÐŒÐŽÐµÑ}
 _textdescrlogin_ [l=kk] {ÐÑÑÑ Ð¿Ð°ÑÐ°ÒÑ}
-_textdescrlogout_ [l=kk] {ÐÒ¯Ð¹ÐµÐŽÐµÐœ ÒÐ°Ð»Ð°Ð¹ ÑÑÒÑ  _cgiargun_}
+_textdescrlogout_ [l=kk] {ÐÒ¯Ð¹ÐµÐŽÐµÐœ ÒÐ°Ð»Ð°Ð¹ ÑÑÒÑ  _cgiargunHtmlsafe_}
 
 _textdescrgreenstone_ [l=kk] {Greenstone ÑÐ»ÐµÐºÑÑÐŸÐœÐŽÑÒ ÐºÑÑÐ°Ð¿Ñ
@@ -192,5 +192,5 @@
 _linktextPREFERENCES_ [l=kk] {ÐÐÐÐÐÐÐ£}
 _linktextLOGIN_ [l=kk] {ÐºÑÑÑ}
-_linktextLOGGEDIN_ [l=kk] {(Ð¶Ò¯Ð¹ÐµÐ³Ðµ ÒÐ°Ð»Ð°Ð¹ ÐºÑÑÑ _cgiargun_)}
+_linktextLOGGEDIN_ [l=kk] {(Ð¶Ò¯Ð¹ÐµÐ³Ðµ ÒÐ°Ð»Ð°Ð¹ ÐºÑÑÑ _cgiargunHtmlsafe_)}
 _linktextLOGOUT_ [l=kk] {ÑÑÒÑ}
 
@@ -351,5 +351,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=kk] {_If_(_thislast_, _cgiargq_ ÑÒ±ÑÐ°ÐœÑÐŒ Ð±ÐŸÐ¹ÑÐœÑÐ° ÑÐ·ÐŽÐµÑÐŽÑÒ£ ÐœÓÑÐžÐ¶ÐµÐ»ÐµÑÑ: _thisfirst_ - _thislast_ , ÑÒ±ÑÐ°ÐœÑÐŒ Ð±ÐŸÐ¹ÑÐœÑÐ°: _cgiargq_ ÐµÑÑÐµÒ£Ðµ ÑÐ°Ð±ÑÐ»ÒÐ°Ðœ Ð¶ÐŸÒ)}
+_textquerytitle_ [l=kk] {_If_(_thislast_, _cgiargqHtmlsafe_ ÑÒ±ÑÐ°ÐœÑÐŒ Ð±ÐŸÐ¹ÑÐœÑÐ° ÑÐ·ÐŽÐµÑÐŽÑÒ£ ÐœÓÑÐžÐ¶ÐµÐ»ÐµÑÑ: _thisfirst_ - _thislast_ , ÑÒ±ÑÐ°ÐœÑÐŒ Ð±ÐŸÐ¹ÑÐœÑÐ°: _cgiargqHtmlsafe_ ÐµÑÑÐµÒ£Ðµ ÑÐ°Ð±ÑÐ»ÒÐ°Ðœ Ð¶ÐŸÒ)}
 _textnoquerytitle_ [l=kk] {ÐÐ·ÐŽÐµÑ Ð¿Ð°ÑÐ°ÒÑ}
 
Index: main/trunk/greenstone2/macros/kazakh2.dm
===================================================================
--- main/trunk/greenstone2/macros/kazakh2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/kazakh2.dm	(revision 28888)
@@ -132,5 +132,5 @@
 # should have arguments of collection, collectionname and link
 _foundintcontent_ [l=kk] {" _2 _ " Ð¶ÐžÐœÐ°ÒÑÐœÐ° ÑÑÐ»ÑÐµÐŒÐµ
-Ð¡ÑÐ· ÑÐ°Ò£ÐŽÐ°ÒÐ°Ðœ ÑÑÐ»ÑÐµÐŒÐµ " _collectionname _ " Ð¶ÐžÐœÐ°ÒÒÐ° ÑÑÑÑÒÑ Ð±ÐŸÐ»ÑÐ¿ ÑÐ°Ð±ÑÐ»Ð°ÐŽÑ (ÐŸÐ» " _2 _ " Ð¶ÐžÐœÐ°ÒÑÐŒÐµÐœ Ð±Ð°Ð¹Ð»Ð°ÐœÑÑÑÑ). ÐÐ³ÐµÑ ÑÑÐ· ÐŸÑÑ ÑÑÐ»ÑÐµÐŒÐµ Ð°ÑÒÑÐ»Ñ  " _2 _ " Ð¶ÐžÐœÐ°ÒÑÐœÐ° Ó©ÑÐºÑÒ£ÑÐ· ÐºÐµÐ»ÑÐµ, ÐŸÐœÐŽÐ° ÑÑÐ· <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_"> Ð°ÑÑ ÒÐ°ÑÐ°Ð¹ ÐŒÑÐœÐ° Ð±ÐµÑÐºÐµ Ó©ÑÑÑÒ£ÑÐ·Ð³Ðµ Ð±ÐŸÐ»Ð°ÐŽÑ </a>; Ð±Ð°ÑÒÐ°ÑÐ° Ð°Ð»ÐŽÑÐœÒÑ ÒÒ±Ð¶Ð°ÑÒÐ° ÐŸÑÐ°Ð»Ñ Ò¯ÑÑÐœ ÑÑÐ·ÐŽÑÒ£ Ð±ÑÐ°ÑÐ·ÐµÑÑÒ£ÑÐ·ÐŽÐµÐ³Ñ "back/Ð°ÑÑÒÐ°" Ð±Ð°ÑÑÑÐŒÐ°ÑÑÐœ ÒÐŸÐ»ÐŽÐ°ÐœÑÒ£ÑÐ·. }
+Ð¡ÑÐ· ÑÐ°Ò£ÐŽÐ°ÒÐ°Ðœ ÑÑÐ»ÑÐµÐŒÐµ " _collectionname _ " Ð¶ÐžÐœÐ°ÒÒÐ° ÑÑÑÑÒÑ Ð±ÐŸÐ»ÑÐ¿ ÑÐ°Ð±ÑÐ»Ð°ÐŽÑ (ÐŸÐ» " _2 _ " Ð¶ÐžÐœÐ°ÒÑÐŒÐµÐœ Ð±Ð°Ð¹Ð»Ð°ÐœÑÑÑÑ). ÐÐ³ÐµÑ ÑÑÐ· ÐŸÑÑ ÑÑÐ»ÑÐµÐŒÐµ Ð°ÑÒÑÐ»Ñ  " _2 _ " Ð¶ÐžÐœÐ°ÒÑÐœÐ° Ó©ÑÐºÑÒ£ÑÐ· ÐºÐµÐ»ÑÐµ, ÐŸÐœÐŽÐ° ÑÑÐ· <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_"> Ð°ÑÑ ÒÐ°ÑÐ°Ð¹ ÐŒÑÐœÐ° Ð±ÐµÑÐºÐµ Ó©ÑÑÑÒ£ÑÐ·Ð³Ðµ Ð±ÐŸÐ»Ð°ÐŽÑ </a>; Ð±Ð°ÑÒÐ°ÑÐ° Ð°Ð»ÐŽÑÐœÒÑ ÒÒ±Ð¶Ð°ÑÒÐ° ÐŸÑÐ°Ð»Ñ Ò¯ÑÑÐœ ÑÑÐ·ÐŽÑÒ£ Ð±ÑÐ°ÑÐ·ÐµÑÑÒ£ÑÐ·ÐŽÐµÐ³Ñ "back/Ð°ÑÑÒÐ°" Ð±Ð°ÑÑÑÐŒÐ°ÑÑÐœ ÒÐŸÐ»ÐŽÐ°ÐœÑÒ£ÑÐ·. }
 
 
@@ -151,5 +151,5 @@
 _textpassword_ [l=kk] {ÐÐ°ÑÐŸÐ»Ñ}
 
-_textmustbelongtogroup_ [l=kk] {ÐÐ°Ð·Ð°Ñ Ð°ÑÐŽÐ°ÑÑÒ£ÑÐ·, Ð±Ò±Ð» Ð¿Ð°ÑÐ°ÒÒÐ° ÐºÑÑÑ Ò¯ÑÑÐœ Ð¡ÑÐ· "_cgiargug_" ÑÐŸÐ±ÑÐœÐ° Ð¶Ð°ÑÑÑÒ£ÑÐ· ÒÐ°Ð¶ÐµÑ.}
+_textmustbelongtogroup_ [l=kk] {ÐÐ°Ð·Ð°Ñ Ð°ÑÐŽÐ°ÑÑÒ£ÑÐ·, Ð±Ò±Ð» Ð¿Ð°ÑÐ°ÒÒÐ° ÐºÑÑÑ Ò¯ÑÑÐœ Ð¡ÑÐ· "_cgiargugHtmlsafe_" ÑÐŸÐ±ÑÐœÐ° Ð¶Ð°ÑÑÑÒ£ÑÐ· ÒÐ°Ð¶ÐµÑ.}
 
 _textmessageinvalid_ [l=kk] {Ð¡ÑÐ· ÑÒ±ÑÐ°ÒÐ°Ðœ Ð¿Ð°ÑÐ°Ò Ð°Ð²ÑÐŸÑÐžÐ·Ð°ÑÐžÑÐ»Ð°ÑÐŽÑ ÑÐ°Ð»Ð°Ð¿ ÐµÑÐµÐŽÑ.
@@ -368,17 +368,17 @@
 _textretcoll_ [l=kk] {ÐÐŸÐ»Ð»ÐµÐºÑÐŸÑÒÐ° ÐŸÑÐ°Ð»Ñ}
 
-_textdelperm_ [l=kk] {<p> ÐÐµÐ¹Ð±ÑÑ Ð±Ó©Ð»ÑÐºÑÐµÑ ÐœÐµÐŒÐµÑÐµ Ð±Ð°ÑÐ»ÑÒ _cgiargbc1dirname_ ÐÐžÐœÐ°ÒÑ Ð¶ÐŸÐ¹ÑÐ»Ð° Ð°Ð»ÐŒÐ°ÐŽÑ. ÐÒ¯ÐŒÐºÑÐœ ÑÐµÐ±ÐµÐ¿ÑÐµÑÑ:
+_textdelperm_ [l=kk] {<p> ÐÐµÐ¹Ð±ÑÑ Ð±Ó©Ð»ÑÐºÑÐµÑ ÐœÐµÐŒÐµÑÐµ Ð±Ð°ÑÐ»ÑÒ _cgiargbc1dirnameHtmlsafe_ ÐÐžÐœÐ°ÒÑ Ð¶ÐŸÐ¹ÑÐ»Ð° Ð°Ð»ÐŒÐ°ÐŽÑ. ÐÒ¯ÐŒÐºÑÐœ ÑÐµÐ±ÐµÐ¿ÑÐµÑÑ:
 <ul>
-<li> Greenstone-ÐœÑÒ£ gsdlhome_/collect/_cgiargbc1dirname_ ÐŽÐžÑÐµÐºÑÐŸÑÐžÐ¹ÑÐœ Ð¶ÐŸÑÒÐ° ÑÒ±ÒÑÐ°Ñ Ð¶ÐŸÒ.
+<li> Greenstone-ÐœÑÒ£ gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ ÐŽÐžÑÐµÐºÑÐŸÑÐžÐ¹ÑÐœ Ð¶ÐŸÑÒÐ° ÑÒ±ÒÑÐ°Ñ Ð¶ÐŸÒ.
 <br> ÐÒ±Ð» ÐºÐ°ÑÐ°Ð»ÐŸÐ³ÑÑ Ó©Ð·ÑÒ£ÑÐ·ÐŽÑÒ£ ÐºÐŸÐŒÐ¿ÑÑÑÐµÑÑÒ£ÑÐ·ÐŽÐµÐœ ÒÐŸÐ»ÐŒÐµÐœ Ð¶Ð°ÑÐ°Ñ ÑÐµÐ¶ÐžÐŒÑÐœÐŽÐµ Ð¶ÐŸÐ¹ÑÐ¿ ÐºÓ©ÑÑÒ£ÑÐ·. }
 
-_textdelinv_ [l=kk] {_cgiargbc1dirname_  ÐÐžÐœÐ°ÒÑ ÒÐŸÑÒÐ°Ð»ÒÐ°Ðœ ÐœÐµÐŒÐµÑÐµ Ð·Ð°ÒÑÐŒÐŽÐ°ÐœÒÐ°Ðœ. ÐÐŸÑ Ò¯ÑÐŽÑÑÑÐœÐµÐœ Ð±Ð°Ñ ÑÐ°ÑÑÑÐ»ÐŽÑ.}
-
-_textdelsuc_ [l=kk] {_cgiargbc1dirname_  ÐÐžÐœÐ°ÒÑ ÑÓÑÑÑ Ð¶ÐŸÐ¹ÑÐ»ÐŽÑ.}
-
-_textclonefail_ [l=kk] {_cgiargclonecol_  ÐÐžÐœÐ°Ò ÐŽÑÐ±Ð»ÐžÐºÐ°ÑÑÐœ Ð¶Ð°ÑÐ°Ñ ÐŒÒ¯ÐŒÐºÑÐœ ÐµÐŒÐµÑ. ÐÒ±ÐœÑÒ£ ÐŒÒ¯ÐŒÐºÑÐœ ÑÐµÐ±ÐµÐ¿ÑÐµÑÑ:
+_textdelinv_ [l=kk] {_cgiargbc1dirnameHtmlsafe_  ÐÐžÐœÐ°ÒÑ ÒÐŸÑÒÐ°Ð»ÒÐ°Ðœ ÐœÐµÐŒÐµÑÐµ Ð·Ð°ÒÑÐŒÐŽÐ°ÐœÒÐ°Ðœ. ÐÐŸÑ Ò¯ÑÐŽÑÑÑÐœÐµÐœ Ð±Ð°Ñ ÑÐ°ÑÑÑÐ»ÐŽÑ.}
+
+_textdelsuc_ [l=kk] {_cgiargbc1dirnameHtmlsafe_  ÐÐžÐœÐ°ÒÑ ÑÓÑÑÑ Ð¶ÐŸÐ¹ÑÐ»ÐŽÑ.}
+
+_textclonefail_ [l=kk] {_cgiargclonecolHtmlsafe_  ÐÐžÐœÐ°Ò ÐŽÑÐ±Ð»ÐžÐºÐ°ÑÑÐœ Ð¶Ð°ÑÐ°Ñ ÐŒÒ¯ÐŒÐºÑÐœ ÐµÐŒÐµÑ. ÐÒ±ÐœÑÒ£ ÐŒÒ¯ÐŒÐºÑÐœ ÑÐµÐ±ÐµÐ¿ÑÐµÑÑ:
 <ul>
-<li> _cgiargclonecol_  Ð¶ÐžÐœÐ°ÒÑÑÒ£ Ð¶ÐŸÒÑÑÒÑ
-<li> _cgiargclonecol_ Ð¶ÐžÐœÐ°ÒÑÑÒ£ collect.cfg ÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÑÐ»ÑÒ ÑÐ°Ð¹Ð»ÐŽÑÒ£ Ð¶ÐŸÒÑÑÒÑ
+<li> _cgiargclonecolHtmlsafe_  Ð¶ÐžÐœÐ°ÒÑÑÒ£ Ð¶ÐŸÒÑÑÒÑ
+<li> _cgiargclonecolHtmlsafe_ Ð¶ÐžÐœÐ°ÒÑÑÒ£ collect.cfg ÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÑÐ»ÑÒ ÑÐ°Ð¹Ð»ÐŽÑÒ£ Ð¶ÐŸÒÑÑÒÑ
 <li> Greenstone-ÐœÑÒ£ collect.cfg ÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÑÐ»ÑÒ ÑÐ°Ð¹Ð»ÐŽÑ ÐŸÒÑ ÑÒ±ÒÑÐ°ÑÑÐœÑÒ£ Ð¶ÐŸÒÑÑÒÑ</ul>}
 
@@ -401,7 +401,7 @@
 _textreloaderror_ [l=kk] {ÐÐ°Ò£Ð° ÐÐžÐœÐ°ÒÑÑ Ð¶Ð°ÑÐ°Ñ Ð±Ð°ÑÑÑÑÐœÐŽÐ° ÒÐ°ÑÐµ Ð¿Ð°Ð¹ÐŽÐ° Ð±ÐŸÐ»ÐŽÑ. ÐÒ±Ð» Ð±ÑÐ°ÑÐ·ÐµÑÑÒ£ÑÐ·ÐŽÑÒ£ "reload/ÒÐ°Ð¹ÑÐ°Ð¶Ò¯ÐºÑÐµÑ" Ð¶ÓÐœÐµ "back/Ð°ÑÑÒÐ°" Ð±Ð°ÑÑÑÐŒÐ°Ð»Ð°ÑÑÐœ ÒÐ°ÑÐµ Ð±Ð°ÑÑÐŽÐ°Ðœ Ð±ÐŸÐ»ÑÑ ÐŒÒ¯ÐŒÐºÑÐœ (ÐÑÑ Ð±Ð°ÑÑÑÐŒÐ°Ð»Ð°ÑÐŽÑ ÐºÐŸÐ»Ð»ÐµÐºÑÐŸÑ ÐºÓ©ÐŒÐµÐ³ÑÐŒÐµÐœ ÐÐžÐœÐ°ÒÑÐ°Ñ Ð¶Ð°ÑÐ°ÒÐ°ÐœÐŽÐ° Ð¿Ð°Ð¹ÐŽÐ°Ð»Ð°ÐœÐ±Ð°ÑÒÐ° ÑÑÑÑÑÑÒ£ÑÐ·). ÐÐŸÐ»Ð»ÐµÐºÑÐŸÑ ÒÐ°Ð¹ÑÐ° Ð¶ÑÐ±ÐµÑÑÐ»ÑÑ Ð¶Ó©Ðœ.}
 
-_textexptsuc_ [l=kk] {_cgiargbc1dirname_ ÐÐžÐœÐ°ÒÑ _gsdlhome_/tmp/exported\__cgiargbc1dirname_ ÐŽÐžÑÐµÐºÑÐŸÑÐžÑÑÑÐœÐ° ÑÓÑÑÑ ÐµÐœÐ³ÑÐ·ÑÐ»ÐŽÑ.}
-
-_textexptfail_ [l=kk] {ÐÐžÐœÐ°ÒÑÑ ÑÐºÑÐ¿ÐŸÑÑÑÐ°ÑÐŽÐ° Ð¶Ð°Ò£ÑÐ»Ñ_cgiargbc1dirname_. 
+_textexptsuc_ [l=kk] {_cgiargbc1dirnameHtmlsafe_ ÐÐžÐœÐ°ÒÑ _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ ÐŽÐžÑÐµÐºÑÐŸÑÐžÑÑÑÐœÐ° ÑÓÑÑÑ ÐµÐœÐ³ÑÐ·ÑÐ»ÐŽÑ.}
+
+_textexptfail_ [l=kk] {ÐÐžÐœÐ°ÒÑÑ ÑÐºÑÐ¿ÐŸÑÑÑÐ°ÑÐŽÐ° Ð¶Ð°Ò£ÑÐ»Ñ_cgiargbc1dirnameHtmlsafe_. 
 ÐÒ±Ð»  "ÐÐžÐœÐ°ÒÑÑ ÑÐºÑÐ¿ÐŸÑÑÑÐ°Ñ" ÑÑÐœÐºÑÐžÑÑÑÐœ ÒÐŸÐ»ÐŽÐ°ÑÐŽÑÒ£ ÒÐ°Ð¶ÐµÑÑÑ ÐºÐŸÐŒÐ¿ÐŸÐœÐµÐœÑÑÐµÑÑÑÑÐ· Greenstone ÐŸÑÐœÐ°ÑÑÐ»ÒÐ°ÐœÐŽÑÒÑÐ°Ðœ Ð±ÐŸÐ»ÑÑ ÐŒÒ¯ÐŒÐºÑÐœ. 
 <ul>
@@ -568,5 +568,5 @@
 
 _textdeleteuser_ [l=kk] {ÒÐŸÐ»ÐŽÐ°ÐœÑÑÑÐœÑ Ð°Ð»ÑÐ¿ ÑÐ°ÑÑÐ°Ñ}
-_textremwarn_ [l=kk] {Ð¡ÑÐ· ÑÑÐœÑÐŒÐµÐœÐµÐœ ÒÐŸÐ»ÐŽÐ°ÐœÑÑÑ _cgiargumun_ ÐŽÑ ÑÒ¯Ð¿ÐºÑÐ»ÑÐºÑÑ Ð°Ð»ÑÐ¿ ÑÐ°ÑÑÐ°Ð¹ÑÑÐ· Ð±Ð°?}
+_textremwarn_ [l=kk] {Ð¡ÑÐ· ÑÑÐœÑÐŒÐµÐœÐµÐœ ÒÐŸÐ»ÐŽÐ°ÐœÑÑÑ _cgiargumunHtmlsafe_ ÐŽÑ ÑÒ¯Ð¿ÐºÑÐ»ÑÐºÑÑ Ð°Ð»ÑÐ¿ ÑÐ°ÑÑÐ°Ð¹ÑÑÐ· Ð±Ð°?}
 
 
Index: main/trunk/greenstone2/macros/kirghiz.dm
===================================================================
--- main/trunk/greenstone2/macros/kirghiz.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/kirghiz.dm	(revision 28888)
@@ -268,5 +268,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ky] {_If_(_thislast_, ÐœÐ°ÑÑÐ¹Ð¶Ð°Ð»Ð°ÑÑ _thisfirst_ - _thislast_ ÑÑÑÐŸÐŸ Ð±ÐŸÑÐœÑÐ° ÐžÐ·ÐŽÓ©Ó©: _cgiargq_,ÑÑÑÐŸÐŸ Ð±ÐŸÑÐœÑÐ° ÑÐ»Ð³ÐŸÐŸÐ»ÐŸÑ Ð¶ÐŸÐº _cgiargq_)}
+_textquerytitle_ [l=ky] {_If_(_thislast_, ÐœÐ°ÑÑÐ¹Ð¶Ð°Ð»Ð°ÑÑ _thisfirst_ - _thislast_ ÑÑÑÐŸÐŸ Ð±ÐŸÑÐœÑÐ° ÐžÐ·ÐŽÓ©Ó©: _cgiargqHtmlsafe_,ÑÑÑÐŸÐŸ Ð±ÐŸÑÐœÑÐ° ÑÐ»Ð³ÐŸÐŸÐ»ÐŸÑ Ð¶ÐŸÐº _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=ky] {ÐÐµÑÑÐž ÐžÐ·ÐŽÓ©Ó©}
 
Index: main/trunk/greenstone2/macros/laotian.dm
===================================================================
--- main/trunk/greenstone2/macros/laotian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/laotian.dm	(revision 28888)
@@ -346,5 +346,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=lo] {"_If_(_thislast_,results _thisfirst_ - _thislast_àºªàº³àº«àº¥àº±àºàºàº³àºàº»à»àº: _cgiargq_,àºà»à»àºàº»àºàºàº±àºàºàº³àºàºµà»àºà»àº²àºàºàº»à»àºàº«àº² : _cgiargq_)"}  
+_textquerytitle_ [l=lo] {"_If_(_thislast_,results _thisfirst_ - _thislast_àºªàº³àº«àº¥àº±àºàºàº³àºàº»à»àº: _cgiargqHtmlsafe_,àºà»à»àºàº»àºàºàº±àºàºàº³àºàºµà»àºà»àº²àºàºàº»à»àºàº«àº² : _cgiargqHtmlsafe_)"}  
 _textnoquerytitle_ [l=lo] {àº«àºà»àº²àºàºµà»àºàº»à»àºàº«àº² 	}  
 
Index: main/trunk/greenstone2/macros/latvian.dm
===================================================================
--- main/trunk/greenstone2/macros/latvian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/latvian.dm	(revision 28888)
@@ -323,5 +323,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=lv] {_If_(_thislast_,rezultÄti _thisfirst_ - _thislast_ priekÅ¡ pieprasÄ«juma: _cgiargq_,Nav rezultÄtu priekÅ¡ pieprasÄ«juma: _cgiargq_)}
+_textquerytitle_ [l=lv] {_If_(_thislast_,rezultÄti _thisfirst_ - _thislast_ priekÅ¡ pieprasÄ«juma: _cgiargqHtmlsafe_,Nav rezultÄtu priekÅ¡ pieprasÄ«juma: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=lv] {MeklÄÅ¡anas lapa}
 
Index: main/trunk/greenstone2/macros/latvian2.dm
===================================================================
--- main/trunk/greenstone2/macros/latvian2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/latvian2.dm	(revision 28888)
@@ -158,5 +158,5 @@
     kolekciju (tÄ saista uz "_2_" kolekciju).
     Ja jÅ«s vÄlÄties skatÄ«t Å¡o saiti  "_2_" kolekcijÄ, jÅ«s varat 
-    <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">tikt tÄlÄk</a> uz Å¡o lapu; 
+    <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">tikt tÄlÄk</a> uz Å¡o lapu; 
     pretÄjÄ gadÄ«jumÄ izmantojiet jÅ«su pÄrlÅ«ka "atpakaÄŒ" pogu, lai atgrieztos uz iepriekÅ¡Äjo dokumentu.
 }
@@ -178,5 +178,5 @@
 _textpassword_ [l=lv] {parole}
 
-_textmustbelongtogroup_ [l=lv] {IevÄrojiet, ka jums jÄpieder "_cgiargug_" grupai, lai piekÄŒÅ«tu Å¡ai lapai}
+_textmustbelongtogroup_ [l=lv] {IevÄrojiet, ka jums jÄpieder "_cgiargugHtmlsafe_" grupai, lai piekÄŒÅ«tu Å¡ai lapai}
 
 _textmessageinvalid_ [l=lv] {JÅ«su prasÄ«tÄ lapa pieprasa jÅ«su pierakstÄ«Å¡anos.<br>
@@ -460,5 +460,5 @@
 _textbildsuc_ [l=lv] {Kolekcija izveidota sekmÄ«gi.}
 
-_textviewbildsummary_ [l=lv] {JÅ«s varat <a href="_httppagex_(bsummary)&c=_cgiargbc1dirname_" target=_top>skatÄ«t kolekcijas veidoÅ¡anas
+_textviewbildsummary_ [l=lv] {JÅ«s varat <a href="_httppagex_(bsummary)&c=_cgiargbc1dirnameUrlsafe_" target=_top>skatÄ«t kolekcijas veidoÅ¡anas
 pÄrskatu</a> papildus informÄcijai.
 }
@@ -481,10 +481,10 @@
 _textretcoll_ [l=lv] {Atgriezties uz kolektoru}
 
-_textdelperm_ [l=lv] {DaÄŒa vai visa _cgiargbc1dirname_ kolekcija nevar tikt izdzÄsta.
+_textdelperm_ [l=lv] {DaÄŒa vai visa _cgiargbc1dirnameHtmlsafe_ kolekcija nevar tikt izdzÄsta.
 IespÄjami cÄloÅi ir:
 <ul>
-<li> Greenstone nav atÄŒaujas izdzÄst _gsdlhome_/collect/_cgiargbc1dirname_
+<li> Greenstone nav atÄŒaujas izdzÄst _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_
 direktoriju.<br>
-JÅ«s varat mÄÄ£inÄt izdzÄst Å¡o direktoriju manuÄli, lai pabeigtu kolekcijas _cgiargbc1dirname_
+JÅ«s varat mÄÄ£inÄt izdzÄst Å¡o direktoriju manuÄli, lai pabeigtu kolekcijas _cgiargbc1dirnameHtmlsafe_
 izdzÄÅ¡anu no jÅ«su datora.</li>
 <li>Greenstone nevar palaist programmu _gsdlhome_/bin/script/delcol.pl . PÄrliecinieties,
@@ -493,13 +493,13 @@
 }
 
-_textdelinv_ [l=lv] {_cgiargbc1dirname_ kolekcija ir aizsargÄta vai bojÄta. IzdzÄÅ¡ana bija atcelta.
-}
-
-_textdelsuc_ [l=lv] {_cgiargbc1dirname_ kolekcija bija sekmÄ«gi izdzÄsta.}
-
-_textclonefail_ [l=lv] {_cgiargclonecol_ kolekcija nevar tikt klonÄta. IespÄjamie cÄloÅi:
+_textdelinv_ [l=lv] {_cgiargbc1dirnameHtmlsafe_ kolekcija ir aizsargÄta vai bojÄta. IzdzÄÅ¡ana bija atcelta.
+}
+
+_textdelsuc_ [l=lv] {_cgiargbc1dirnameHtmlsafe_ kolekcija bija sekmÄ«gi izdzÄsta.}
+
+_textclonefail_ [l=lv] {_cgiargclonecolHtmlsafe_ kolekcija nevar tikt klonÄta. IespÄjamie cÄloÅi:
 <ul>
-<li> _cgiargclonecol_ kolekcija neeksistÄ
-<li> _cgiargclonecol_ kolekcijai nav collect.cfg konfigurÄcijas datnes
+<li> _cgiargclonecolHtmlsafe_ kolekcija neeksistÄ
+<li> _cgiargclonecolHtmlsafe_ kolekcijai nav collect.cfg konfigurÄcijas datnes
 <li> Greenstone nav atÄŒaujas lasÄ«t collect.cnf konfigurÄcijas datni.
 </ul>
@@ -536,9 +536,9 @@
 }
 
-_textexptsuc_ [l=lv] {_cgiargbc1dirname_ kolekcija tika sekmÄ«gi eksportÄta uz
-_gsdlhome_/tmp/exported\__cgiargbc1dirname_ direktoriju.
-}
-
-_textexptfail_ [l=lv] {<p>Neizdodas eksportÄt _cgiargbc1dirname_ kolekciju.
+_textexptsuc_ [l=lv] {_cgiargbc1dirnameHtmlsafe_ kolekcija tika sekmÄ«gi eksportÄta uz
+_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ direktoriju.
+}
+
+_textexptfail_ [l=lv] {<p>Neizdodas eksportÄt _cgiargbc1dirnameHtmlsafe_ kolekciju.
 
 <p>Tas varÄtu bÅ«t, ja Greenstone bija uzstÄdÄ«ts bez nepiecieÅ¡amiem
@@ -734,5 +734,5 @@
 
 _textdeleteuser_ [l=lv] {IzdzÄst lietotÄju}
-_textremwarn_ [l=lv] {Vai jÅ«s patiesi vÄlaties pavisam izdzÄst lietotÄju <b>_cgiargumun_</b>?}
+_textremwarn_ [l=lv] {Vai jÅ«s patiesi vÄlaties pavisam izdzÄst lietotÄju <b>_cgiargumunHtmlsafe_</b>?}
 
 
Index: main/trunk/greenstone2/macros/malayalam.dm
===================================================================
--- main/trunk/greenstone2/macros/malayalam.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/malayalam.dm	(revision 28888)
@@ -345,5 +345,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ml] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,No matches for query: _cgiargq_)}  
+_textquerytitle_ [l=ml] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,No matches for query: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=ml] {àŽ€àµàŽ°àŽ¯àµàŽ }
 
Index: main/trunk/greenstone2/macros/malayalam2.dm
===================================================================
--- main/trunk/greenstone2/macros/malayalam2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/malayalam2.dm	(revision 28888)
@@ -119,5 +119,5 @@
      collection (it links to the "_2_" collection). 
     àŽàŽ€àµ àŽàŽŸàŽ£àŽ£àŽ®àµàŽàµàŽàŽ¿ e "_2_" collection àŽàŽªàŽ¯àµàŽàŽ¿àŽàµàŽàµ  
-     <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">àŽ®àµàŽšàµàŽšàµàŽàµàŽàµ àŽªàµàŽµàµàŽàµ</a>   
+     <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">àŽ®àµàŽšàµàŽšàµàŽàµàŽàµ àŽªàµàŽµàµàŽàµ</a>   
      àŽ
 àŽ²àµàŽ²àµàŽàµàŽàŽ¿  "back" àŽ¬àŽàµàŽ àŽàŽªàŽ¯àµàŽàŽ¿àŽàµàŽàµ àŽªàŽŽàŽ¯àŽ€àŽ¿àŽ²àµàŽàµàŽàµ àŽ®àŽàŽàµàŽàµàŽàµ}  
@@ -140,5 +140,5 @@
 àŽàŽ¯àŽŸàŽ³àŽªàŽŠàŽ}  
 
-_textmustbelongtogroup_ [l=ml] {àŽ àŽªàµàŽàŽ¿àŽ²àµàŽàµàŽàµàŽ³àµàŽ³ àŽžàŽšàµàŽŠàŽ°àµàŽ¶àŽŸàŽšàµàŽ®àŽ€àŽ¿ '-cgiargug-' àŽàµàŽàµàŽàŽ€àµàŽ€àŽ¿àŽ²àµ àŽªàµàŽàµàŽàŽµàŽ°àµàŽàµàŽàµàŽ®àŽŸàŽ€àµàŽ°àŽ}  
+_textmustbelongtogroup_ [l=ml] {àŽ àŽªàµàŽàŽ¿àŽ²àµàŽàµàŽàµàŽ³àµàŽ³ àŽžàŽšàµàŽŠàŽ°àµàŽ¶àŽŸàŽšàµàŽ®àŽ€àŽ¿ '_cgiargugHtmlsafe_' àŽàµàŽàµàŽàŽ€àµàŽ€àŽ¿àŽ²àµ àŽªàµàŽàµàŽàŽµàŽ°àµàŽàµàŽàµàŽ®àŽŸàŽ€àµàŽ°àŽ}  
 
 _textmessageinvalid_ [l=ml] {àŽ€àŽŸàŽàµàŽàŽ³àµ  àŽàŽµàŽ¶àµàŽ¯àŽªàµàŽªàµàŽàµàŽ àŽªàµàŽàµàŽ²àŽ­àŽ¿àŽàµàŽàµàŽµàŽŸàŽšàµ àŽžàµàŽšàµ àŽàŽ£àµ àŽàµàŽ¯àµàŽ¯àµàŽ 
@@ -402,20 +402,20 @@
 _textretcoll_ [l=ml] {àŽàŽ³àŽàµàŽàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ®àŽàŽàµàŽàŽ¿àŽµàŽ°àŽ¿àŽ}  
 
-_textdelperm_ [l=ml] {_cgiargbc1dirname_ àŽ¶àµàŽàŽ°àŽàµàŽàŽ³àŽ¿àŽ²àµ àŽàŽ¿àŽ²àŽ€àµ àŽàŽ²àµàŽ²àŽŸàŽ®àµ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàŽŽàŽ¿àŽ¯àµàŽšàµàŽšàŽ¿àŽ²àµàŽ². àŽžàŽŸàŽŠàµàŽ§àµàŽ¯àŽ®àŽŸàŽ¯ àŽàŽŸàŽ°àŽ£àŽàµàŽàŽ³àµ <ul> 
-<li> _gsdlhome_/collect/_cgiargbc1dirname_àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàµàŽ°àµàŽšàµàŽžàµàŽ±àµàŽ±àµàŽ£àŽ¿àŽšàµ àŽ
+_textdelperm_ [l=ml] {_cgiargbc1dirnameHtmlsafe_ àŽ¶àµàŽàŽ°àŽàµàŽàŽ³àŽ¿àŽ²àµ àŽàŽ¿àŽ²àŽ€àµ àŽàŽ²àµàŽ²àŽŸàŽ®àµ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàŽŽàŽ¿àŽ¯àµàŽšàµàŽšàŽ¿àŽ²àµàŽ². àŽžàŽŸàŽŠàµàŽ§àµàŽ¯àŽ®àŽŸàŽ¯ àŽàŽŸàŽ°àŽ£àŽàµàŽàŽ³àµ <ul> 
+<li> _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàµàŽ°àµàŽšàµàŽžàµàŽ±àµàŽ±àµàŽ£àŽ¿àŽšàµ àŽ
 àŽšàµàŽ®àŽ€àŽ¿àŽ¯àŽ¿àŽ²àµàŽ²<br> 
-àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽàŽšàµàŽšàµàŽšàµàŽšàŽŸàŽ¯àŽ¿ àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ€àŽŸàŽ²àµ àŽ®àŽŸàŽ€àµàŽ°àŽ®àµ àŽžàŽ®àµàŽªàµàŽ°àµàŽ£àŽ®àŽŸàŽ¯ _cgiargbc1dirname_àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ¯àŽ²àµ àŽµàŽ¿àŽàŽ¯àŽ¿àŽàµàŽàµàŽàŽ¯àµàŽ³àµàŽ³àµ 
+àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽàŽšàµàŽšàµàŽšàµàŽšàŽŸàŽ¯àŽ¿ àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ€àŽŸàŽ²àµ àŽ®àŽŸàŽ€àµàŽ°àŽ®àµ àŽžàŽ®àµàŽªàµàŽ°àµàŽ£àŽ®àŽŸàŽ¯ _cgiargbc1dirnameHtmlsafe_àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ¯àŽ²àµ àŽµàŽ¿àŽàŽ¯àŽ¿àŽàµàŽàµàŽàŽ¯àµàŽ³àµàŽ³àµ 
 àŽàµàŽ°àµàŽšàµàŽžàµàŽ±àµàŽ±àµàŽ£àŽ¿àŽšàµ _gsdlhome_/bin/script/delcol.pl.àŽªàµàŽ°àµàŽŸàŽàµàŽ°àŽŸàŽ àŽªàµàŽ°àŽµàŽ°àµàŽ€àµàŽ€àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàŽŸàŽšàµ àŽàŽŽàŽ¿àŽ¯àµàŽàŽ¯àŽ¿àŽ²àµàŽ². àŽ àŽ«àŽ¯àŽ²àµ àŽµàŽŸàŽ¯àŽ¿àŽàµàŽàŽŸàŽµàµàŽšàµàŽšàŽ€àµàŽ àŽªàµàŽ°àŽµàŽ°àµàŽ€àµàŽ€àŽšàŽ¯àµàŽàµàŽ¯àŽ®àŽŸàŽàµàŽàŽŸàŽµàµàŽšàµàŽšàŽ€àŽŸàŽ£àµ àŽàŽšàµàŽšàµàŽ àŽªàŽ°àŽ¿àŽ¶àµàŽ§àŽ¿àŽàµàŽàµàŽ</li> 
 </ul>}  
 
-_textdelinv_ [l=ml] {_cgiargbc1dirname_àŽ¶àµàŽàŽ°àŽ àŽžàŽàŽ°àŽàµàŽ·àŽ¿àŽàµàŽàŽªàµàŽªàµàŽàµàŽàŽ€àµ àŽŠàµàŽ°àµàŽ¬àŽ²àŽ®àŽŸàŽàµàŽàŽªàµàŽªàµàŽàµàŽàŽ€àµ àŽàŽ£àµ. àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ¯àŽ²àµ àŽ±àŽŠàµàŽŠàµàŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàµ}  
-
-_textdelsuc_ [l=ml] {_cgiargbc1dirname_àŽ¶àµàŽàŽ°àŽ àŽµàŽ¿àŽàŽ¯àŽàŽ°àŽ®àŽŸàŽ¯àŽ¿ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµâàŽ€àµ}  
-
-_textclonefail_ [l=ml] {àŽªàµàŽ€àŽ¿àŽ¯ _cgiargclonecol_ àŽ¶àµàŽàŽ°àŽ àŽàµàŽ²àµàŽ£àµ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàŽŽàŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ².  
+_textdelinv_ [l=ml] {_cgiargbc1dirnameHtmlsafe_àŽ¶àµàŽàŽ°àŽ àŽžàŽàŽ°àŽàµàŽ·àŽ¿àŽàµàŽàŽªàµàŽªàµàŽàµàŽàŽ€àµ àŽŠàµàŽ°àµàŽ¬àŽ²àŽ®àŽŸàŽàµàŽàŽªàµàŽªàµàŽàµàŽàŽ€àµ àŽàŽ£àµ. àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ¯àŽ²àµ àŽ±àŽŠàµàŽŠàµàŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàµ}  
+
+_textdelsuc_ [l=ml] {_cgiargbc1dirnameHtmlsafe_àŽ¶àµàŽàŽ°àŽ àŽµàŽ¿àŽàŽ¯àŽàŽ°àŽ®àŽŸàŽ¯àŽ¿ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµâàŽ€àµ}  
+
+_textclonefail_ [l=ml] {àŽªàµàŽ€àŽ¿àŽ¯ _cgiargclonecolHtmlsafe_ àŽ¶àµàŽàŽ°àŽ àŽàµàŽ²àµàŽ£àµ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàŽŽàŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ².  
 àŽ
 àŽ€àŽ¿àŽšàµàŽ³àµàŽ³ àŽàŽŸàŽ°àŽ£àŽàµàŽàŽ³àµ  <ul> 
-<li> _cgiargclonecol_àŽ¶àµàŽàŽ°àŽ àŽšàŽ¿àŽ²àŽµàŽ¿àŽ²àŽ¿àŽ²àµàŽ² 
-<li>_cgiargclonecol_ àŽ¶àµàŽàŽ°àŽ€àµàŽ€àŽ¿àŽšàµ collect.cfg àŽàŽ²àŽàµàŽ·àµàŽšàµ àŽàµàŽ£àµàŽ«àŽ¿àŽàŽ±àµàŽ·àŽšàµ àŽ«àŽ¯àŽ²àµ àŽàŽ£àµàŽàŽŸàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ² 
+<li> _cgiargclonecolHtmlsafe_àŽ¶àµàŽàŽ°àŽ àŽšàŽ¿àŽ²àŽµàŽ¿àŽ²àŽ¿àŽ²àµàŽ² 
+<li>_cgiargclonecolHtmlsafe_ àŽ¶àµàŽàŽ°àŽ€àµàŽ€àŽ¿àŽšàµ collect.cfg àŽàŽ²àŽàµàŽ·àµàŽšàµ àŽàµàŽ£àµàŽ«àŽ¿àŽàŽ±àµàŽ·àŽšàµ àŽ«àŽ¯àŽ²àµ àŽàŽ£àµàŽàŽŸàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ² 
 <li> àŽªàµàŽ°àŽžàµàŽ€àµàŽ€ collect.cfg àŽ«àŽ¯àŽ²àµ àŽµàŽŸàŽ¯àŽ¿àŽàµàŽàŽŸ àŽàµàŽ°àµàŽžàµàŽ±àµàŽ±àµàŽ£àŽ¿àŽšàµ àŽ
 àŽšàµàŽ®àŽ€àŽ¿àŽ¯àµàŽ£àµàŽàŽŸàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ²</ul>}  
@@ -439,5 +439,5 @@
 _textreloaderror_ [l=ml] {àŽªàµàŽ€àŽ¿àŽ¯ àŽ¶àµàŽàŽ°àŽšàŽ¿àŽ°àµâàŽ®àµàŽ®àŽŸàŽ£àŽ€àµàŽ€àŽ¿àŽšàŽ¿àŽàŽ¯àŽ¿àŽ²àµâ àŽàŽ°àµ àŽªàŽ¿àŽŽàŽµàµ àŽªàŽ±àµàŽ±àŽ¿. àŽ€àŽŸàŽàµàŽàŽ³àµàŽàµ àŽ¬àµàŽ°àµàŽžàŽ±àŽ¿àŽ²àµ "reload", "back" àŽ¬àŽàµàŽàŽ£àµàŽàŽ³àµàŽàµ àŽàŽªàŽ¯àµàŽàŽ€àµàŽ€àµàŽªàµàŽªàŽ±àµàŽ±àŽ¿ àŽàµàŽ°àµàŽžàµàŽ±àµàŽ±àµàŽ£àŽ¿àŽšàµ àŽžàŽàŽ­àŽµàŽ¿àŽàµàŽ àŽ§àŽŸàŽ°àŽ£àŽŸàŽªàŽ¿àŽ¶àŽàµ àŽ®àµàŽ²àŽ®àŽŸàŽµàŽŸàŽ àŽàŽ€àµâ. (àŽ¶àµàŽàŽ°àŽšàŽ¿àŽ°àµâàŽ®àµàŽ®àŽŸàŽ£ àŽµàµàŽ³àŽ¯àŽ¿àŽ²àµâ àŽ àŽ¬àŽàµàŽàŽ£àµàŽàŽ³àµàŽàµ àŽàŽªàŽ¯àµàŽàŽ àŽàŽŽàŽ¿àŽµàŽŸàŽàµàŽàŽŸàŽšàµâ àŽ¶àµàŽ°àŽŠàµàŽ§àŽ¿àŽàµàŽàµàŽ). àŽàŽ²àŽàµàŽàŽ°àµâ àŽàŽŠàµàŽ¯àŽ®àµ àŽàŽ°àŽàŽ­àŽ¿àŽàµàŽàµàŽµàŽŸàŽšàµâ àŽ¶àµàŽªàŽŸàŽ°àµâàŽ¶àŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàµ. }  
 
-_textexptsuc_ [l=ml] {_cgiargbc1dirname_ àŽ¶àµàŽàŽ°àŽ àŽµàŽ¿àŽàŽ¯àŽàŽ°àŽ®àŽŸàŽ¯àŽ¿  _gsdlhome_/tmp/exported\__cgiargbc1dirname_  àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽàŽàµàŽžàµàŽªàµàŽ°àµàŽàµàŽàµàŽàµàŽ¯àµàŽ€àµ.}  
+_textexptsuc_ [l=ml] {_cgiargbc1dirnameHtmlsafe_ àŽ¶àµàŽàŽ°àŽ àŽµàŽ¿àŽàŽ¯àŽàŽ°àŽ®àŽŸàŽ¯àŽ¿  _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_  àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽàŽàµàŽžàµàŽªàµàŽ°àµàŽàµàŽàµàŽàµàŽ¯àµàŽ€àµ.}  
 
 _textexptfail_ [l=ml] {<p>àŽ¶àµàŽàŽ°àŽ àŽàŽàµàŽžàµàŽªàµàŽ°àµàŽàµàŽàµàŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàŽ€àŽ¿àŽ²àµ àŽªàŽ°àŽŸàŽàŽ¯àŽ 
Index: main/trunk/greenstone2/macros/maori.dm
===================================================================
--- main/trunk/greenstone2/macros/maori.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/maori.dm	(revision 28888)
@@ -256,5 +256,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=mi] {_If_(_thislast_,kitenga _thisfirst_ - _thislast_ mÅ te rapu: _cgiargq_,kÄore he kitenga mÅ: _cgiargq_)}
+_textquerytitle_ [l=mi] {_If_(_thislast_,kitenga _thisfirst_ - _thislast_ mÅ te rapu: _cgiargqHtmlsafe_,kÄore he kitenga mÅ: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=mi] {WhÄrangi rapu}
 
Index: main/trunk/greenstone2/macros/marathi.dm
===================================================================
--- main/trunk/greenstone2/macros/marathi.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/marathi.dm	(revision 28888)
@@ -73,5 +73,5 @@
 _textdescrpref_ [l=mr] {à€ªà¥à€°à€Ÿà€§à€Ÿà€šà¥à€¯ à€ªà€Ÿà€š}  
 _textdescrlogin_ [l=mr] {à€²à¥à€ à€à€š à€ªà€Ÿà€š }  
-_textdescrlogout_ [l=mr] {à€¬à€Ÿà€¹à¥à€° à€ªà€¡à€Ÿ _cgiargun_}  
+_textdescrlogout_ [l=mr] {à€¬à€Ÿà€¹à¥à€° à€ªà€¡à€Ÿ _cgiargunHtmlsafe_}  
 
 _textdescrgreenstone_ [l=mr] {à€à¥à€°à¥à€šà€žà¥à€à¥à€š à€¡à€¿à€à¥à€à€² à€²à€Ÿà€¯à€¬à¥à€°à€°à¥  à€žà¥à€«à¥à€à€µà¥à€
@@ -216,5 +216,5 @@
 _linktextPREFERENCES_ [l=mr] {à€ªà¥à€°à€Ÿà€§à€Ÿà€šà¥à€¯}  
 _linktextLOGIN_ [l=mr] {à€²à¥à€ à€à€š }  
-_linktextLOGGEDIN_ [l=mr] {(à€à€ªà€­à¥à€à¥à€€à€Ÿ _cgiargun_)}  
+_linktextLOGGEDIN_ [l=mr] {(à€à€ªà€­à¥à€à¥à€€à€Ÿ _cgiargunHtmlsafe_)}  
 _linktextLOGOUT_ [l=mr] {à€²à¥à€ à€à€à€}  
 
Index: main/trunk/greenstone2/macros/marathi2.dm
===================================================================
--- main/trunk/greenstone2/macros/marathi2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/marathi2.dm	(revision 28888)
@@ -91,5 +91,5 @@
 # should have arguments of collection, collectionname and link
 _foundintcontent_ [l=mr] {<h3>à€²à€¿à€à€ "_2_" à€žà€à€à¥à€°à€¹</h3>  <p> à€€à¥à€®à¥à€¹à¥ à€šà€¿à€µà€¡à€²à¥à€²à¥ à€²à€¿à€à€ à€¹à¥  "_collectionname_" à€¬à€Ÿà€¹à¥à€°à¥à€² à€à€¹à¥     à€žà€à€à¥à€°à€¹ (à€¹à¥ à€²à€¿à€à€ "_2_"  à€žà€à€à¥à€°à€¹).    à€à€° à€€à¥à€®à¥à€¹à€Ÿà€à€²à€Ÿ à€¹à¥ à€²à€¿à€à€  à€žà€à€à¥à€°à€¹ "_2_" à€®à€§à¥à€¯à¥ à€Šà€Ÿà€à€µà€Ÿà€¯à€à¥ à€
-à€žà¥à€²      <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">à€¯à€Ÿ à€ªà€Ÿà€šà€Ÿà€µà€°à¥à€š</a> à€ªà¥à€¢à¥ à€à€Ÿ ;     à€à€¿à€à€µà€Ÿ à€€à¥à€®à€à¥à€¯à€Ÿ à€¬à¥à€°à€Ÿà€à€à€°à€µà€°à¥à€² à€®à€Ÿà€à¥ à€¹à€¯à€Ÿ à€¬à€à€šà€Ÿà€µà¥à€Šà€Ÿà€°à¥ à€à€§à¥à€à¥à€¯à€Ÿ à€ªà€Ÿà€šà€Ÿà€µà€° à€¯à€Ÿ }  
+à€žà¥à€²      <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">à€¯à€Ÿ à€ªà€Ÿà€šà€Ÿà€µà€°à¥à€š</a> à€ªà¥à€¢à¥ à€à€Ÿ ;     à€à€¿à€à€µà€Ÿ à€€à¥à€®à€à¥à€¯à€Ÿ à€¬à¥à€°à€Ÿà€à€à€°à€µà€°à¥à€² à€®à€Ÿà€à¥ à€¹à€¯à€Ÿ à€¬à€à€šà€Ÿà€µà¥à€Šà€Ÿà€°à¥ à€à€§à¥à€à¥à€¯à€Ÿ à€ªà€Ÿà€šà€Ÿà€µà€° à€¯à€Ÿ }  
 
 
@@ -109,5 +109,5 @@
 _textpassword_ [l=mr] {à€à¥à€£à¥à€à€Ÿ à€¶à€¬à¥à€Š}  
 
-_textmustbelongtogroup_ [l=mr] {à€žà¥à€à€šà€Ÿ  "_cgiargug_" à€€à¥à€®à¥à€¹à¥ à€¯à€Ÿ à€à€à€Ÿà€à¥ à€
+_textmustbelongtogroup_ [l=mr] {à€žà¥à€à€šà€Ÿ  "_cgiargugHtmlsafe_" à€€à¥à€®à¥à€¹à¥ à€¯à€Ÿ à€à€à€Ÿà€à¥ à€
 à€žà€²à¥à€¯à€Ÿà€žà€ à€¹à¥ à€ªà€Ÿà€š à€ªà€Ÿà€¹à¥ à€¶à€à€€à€Ÿ}  
 
@@ -326,5 +326,5 @@
 _textretcoll_ [l=mr] {à€žà€à€à¥à€°à€¹à€à€Ÿà€à€¡à¥ à€ªà€°à€€ à€¯à€Ÿ}  
 
-_textdelperm_ [l=mr] {à€žà€à€³à¥ à€à€¿à€à€µà€Ÿ à€à€Ÿà€¹à¥   _cgiargbc1dirname_ à€žà€à€à¥à€°à€¹à€à¥à€¡à€²à€Ÿ à€à¥à€²à€Ÿ à€šà€Ÿà€¹à¥   à€à€Ÿà€°à€£: <ul> <li>à€à¥à€°à¥à€šà€žà¥à€à¥à€šà€²à€Ÿ à€¹à¥ à€à€°à€£à¥à€¯à€Ÿà€à¥ à€ªà€°à€µà€Ÿà€šà€à¥ à€šà€Ÿà€¹à¥ _gsdlhome_/collect/_cgiargbc1dirname_ directory.<br>à€€à¥à€®à¥à€¹à¥ à€žà€à€à€£à€à€Ÿà€µà€°à¥à€š à€¹à¥ à€«à€Ÿà€à€² à€à€Ÿà€¢à¥à€š à€à€Ÿà€à€Ÿ, _cgiargbc1dirname_ collection from this computer.</li> <li>à€à¥à€°à¥à€šà€žà¥à€à¥à€š à€¹à€Ÿ à€à€Ÿà€°à¥à€¯à€à¥à€°à€® à€à€Ÿà€²à€µà¥ à€¶à€à€€ à€šà€Ÿà€¹à¥ _gsdlhome_/bin/script/delcol.pl. à€à€Ÿà€€à¥à€°à¥ à€à€°à€Ÿ à€à¥ à€¹à€¿ à€«à€Ÿà€à€² à€µà€Ÿà€à€šà€¿à€¯ à€µ à€¯à¥à€à¥à€¯ à€à€¹à¥.</li> </ul> }  
+_textdelperm_ [l=mr] {à€žà€à€³à¥ à€à€¿à€à€µà€Ÿ à€à€Ÿà€¹à¥   _cgiargbc1dirnameHtmlsafe_ à€žà€à€à¥à€°à€¹à€à¥à€¡à€²à€Ÿ à€à¥à€²à€Ÿ à€šà€Ÿà€¹à¥   à€à€Ÿà€°à€£: <ul> <li>à€à¥à€°à¥à€šà€žà¥à€à¥à€šà€²à€Ÿ à€¹à¥ à€à€°à€£à¥à€¯à€Ÿà€à¥ à€ªà€°à€µà€Ÿà€šà€à¥ à€šà€Ÿà€¹à¥ _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ directory.<br>à€€à¥à€®à¥à€¹à¥ à€žà€à€à€£à€à€Ÿà€µà€°à¥à€š à€¹à¥ à€«à€Ÿà€à€² à€à€Ÿà€¢à¥à€š à€à€Ÿà€à€Ÿ, _cgiargbc1dirnameHtmlsafe_ collection from this computer.</li> <li>à€à¥à€°à¥à€šà€žà¥à€à¥à€š à€¹à€Ÿ à€à€Ÿà€°à¥à€¯à€à¥à€°à€® à€à€Ÿà€²à€µà¥ à€¶à€à€€ à€šà€Ÿà€¹à¥ _gsdlhome_/bin/script/delcol.pl. à€à€Ÿà€€à¥à€°à¥ à€à€°à€Ÿ à€à¥ à€¹à€¿ à€«à€Ÿà€à€² à€µà€Ÿà€à€šà€¿à€¯ à€µ à€¯à¥à€à¥à€¯ à€à€¹à¥.</li> </ul> }  
 
 _textdelinv_ [l=mr] {à€žà€à€à¥à€°à€¹ à€¹à€Ÿ à€žà€à€°à€à¥à€·à€¿à€€ à€à¥à€²à€Ÿ à€à€¹à¥ à€à€¿à€à€µà€Ÿ à€€à¥ à€šà€¿à€°à¥à€ªà€¯à¥à€à¥ à€à€¹à¥.à€à¥à€¡à€²à¥à€²à¥ à€°à€Šà¥à€Š à€à€Ÿà€²à¥}  
@@ -332,6 +332,6 @@
 _textdelsuc_ [l=mr] {à€žà€à€à¥à€°à€¹  à€¯à€¶à€žà¥à€µà¥à€ªà€£à¥ à€à¥à€¡à€²à€Ÿ à€à¥à€²à€Ÿ à€à€¹à¥.}  
 
-_textclonefail_ [l=mr] {à€žà€à€à¥à€°à€¹ à€ªà¥à€°à¥à€£ à€šà€žà€£à¥à€¯à€Ÿà€à¥ à€à€Ÿà€°à€£à¥                                        The _cgiargclonecol_à€žà€à€à¥à€°à€¹ à€Šà€¿à€žà€€ à€šà€Ÿà€¹à¥ à€à€Ÿà€°à€£ : <ul> <li> The _cgiargclonecol_à€žà€ à€à¥à€°à€¹ à€
-à€žà¥à€€à€¿à€€à¥à€µà€Ÿà€€ à€šà€Ÿà€¹à¥  <li> The _cgiargclonecol_ à€žà€à€à¥à€°à€¹à€Ÿà€²à€Ÿ à€žà¥à€«à€à¥ à€à¥à€šà¥à€«à€¿à€à€°à¥à€¶à€š à€«à€Ÿà€à€² à€šà€Ÿà€¹à¥ <li> à€à¥à€°à¥à€šà€žà¥à€à¥à€šà€²à€Ÿ à€¹à€¿ à€žà€¿ à€à€« à€à¥ à€µà€Ÿà€à€£à¥à€¯à€Ÿà€à¥ à€ªà€°à€µà€Ÿà€šà€à¥ à€šà€Ÿà€¹à¥. </ul> }  
+_textclonefail_ [l=mr] {à€žà€à€à¥à€°à€¹ à€ªà¥à€°à¥à€£ à€šà€žà€£à¥à€¯à€Ÿà€à¥ à€à€Ÿà€°à€£à¥                                        The _cgiargclonecolHtmlsafe_à€žà€à€à¥à€°à€¹ à€Šà€¿à€žà€€ à€šà€Ÿà€¹à¥ à€à€Ÿà€°à€£ : <ul> <li> The _cgiargclonecolHtmlsafe_à€žà€ à€à¥à€°à€¹ à€
+à€žà¥à€€à€¿à€€à¥à€µà€Ÿà€€ à€šà€Ÿà€¹à¥  <li> The _cgiargclonecolHtmlsafe_ à€žà€à€à¥à€°à€¹à€Ÿà€²à€Ÿ à€žà¥à€«à€à¥ à€à¥à€šà¥à€«à€¿à€à€°à¥à€¶à€š à€«à€Ÿà€à€² à€šà€Ÿà€¹à¥ <li> à€à¥à€°à¥à€šà€žà¥à€à¥à€šà€²à€Ÿ à€¹à€¿ à€žà€¿ à€à€« à€à¥ à€µà€Ÿà€à€£à¥à€¯à€Ÿà€à¥ à€ªà€°à€µà€Ÿà€šà€à¥ à€šà€Ÿà€¹à¥. </ul> }  
 
 _textcolerr_ [l=mr] {à€žà€à€à¥à€°à€¹à€ à€à¥à€}  
@@ -351,7 +351,7 @@
 à€žà€€à€Ÿà€šà€Ÿ à€¯à€Ÿ à€¬à€à€šà€Ÿà€à€à€Ÿ à€à€ªà€¯à¥à€ à€à€°à¥ à€šà€à€Ÿ).  à€¯à€Ÿà€®à¥à€³à¥ à€€à¥à€®à¥à€¹à€Ÿà€²à€Ÿ à€žà€à€³à€Ÿ  à€žà€à€à¥à€°à€Ÿà€¹à€ à€ªà¥à€šà¥à€¹à€Ÿ à€žà¥à€°à¥à€µà€Ÿà€€à¥à€ªà€Ÿà€žà¥à€š à€€à€¯à€Ÿà€° à€à€°à€µà€Ÿ à€²à€Ÿà€à¥à€². }  
 
-_textexptsuc_ [l=mr] {The _cgiargbc1dirname_ à€žà€à€à¥à€° à€¯à€¶à€žà¥à€µà¥à€°à€¿à€€à¥à€¯à€Ÿ à€ªà€Ÿà€ à€µà€¿à€²à€Ÿ à€à€¹à¥ _gsdlhome_/tmp/exported\__cgiargbc1dirname_ à€Šà€°à¥à€¶à€¿à€à€Ÿà€à¥ à€šà€Ÿà€µ. }  
-
-_textexptfail_ [l=mr] {<p>à€ªà€Ÿà€ à€µà€¿à€²à€Ÿ à€à¥à€²à€Ÿ à€šà€Ÿà€¹à¥ _cgiargbc1dirname_ à€žà€à€à¥à€°à€¹.         <p>à€žà€à€à¥à€°à€¹  à€ªà€Ÿà€ à€µà€¿à€²à€Ÿ à€à¥à€²à€Ÿ à€šà€Ÿà€¹à¥  à€à€Ÿà€°à€£ à€à¥à€°à¥à€šà€žà¥à€à¥à€š à€à€šà¥à€à¥à€² à€à€°à€€à€Ÿà€š à€žà€à€à¥à€°à€¹  à€ªà€Ÿà€ à€µà€¿à€£à¥à€¯à€Ÿà€à€°à¥à€€ à€à€µà€¶à¥à€¯à€ à€
+_textexptsuc_ [l=mr] {The _cgiargbc1dirnameHtmlsafe_ à€žà€à€à¥à€° à€¯à€¶à€žà¥à€µà¥à€°à€¿à€€à¥à€¯à€Ÿ à€ªà€Ÿà€ à€µà€¿à€²à€Ÿ à€à€¹à¥ _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ à€Šà€°à¥à€¶à€¿à€à€Ÿà€à¥ à€šà€Ÿà€µ. }  
+
+_textexptfail_ [l=mr] {<p>à€ªà€Ÿà€ à€µà€¿à€²à€Ÿ à€à¥à€²à€Ÿ à€šà€Ÿà€¹à¥ _cgiargbc1dirnameHtmlsafe_ à€žà€à€à¥à€°à€¹.         <p>à€žà€à€à¥à€°à€¹  à€ªà€Ÿà€ à€µà€¿à€²à€Ÿ à€à¥à€²à€Ÿ à€šà€Ÿà€¹à¥  à€à€Ÿà€°à€£ à€à¥à€°à¥à€šà€žà¥à€à¥à€š à€à€šà¥à€à¥à€² à€à€°à€€à€Ÿà€š à€žà€à€à¥à€°à€¹  à€ªà€Ÿà€ à€µà€¿à€£à¥à€¯à€Ÿà€à€°à¥à€€ à€à€µà€¶à¥à€¯à€ à€
 à€žà€£à€Ÿà€°à¥à€¯à€Ÿ à€ªà¥à€°à€à¥à€°à€¿à€¯à¥à€à¥ à€à€à€ à€šà€Ÿà€¹à¥à€€        <ul>          <li>à€à€° à€€à¥à€®à¥à€¹à¥ à€žà¥à€¡à¥à€µà¥à€Šà€Ÿà€°à¥ à€à€šà¥à€žà¥à€à¥à€²à¥à€¶à€š à€à€°à€£à€Ÿà€° à€
 à€žà€Ÿà€² à€€à€° "à€à€žà¥à€à€® à€à€šà¥à€žà¥à€à¥à€²à¥à€¶à€š" à€¯à€Ÿ à€à€à€à€Ÿà€à¥ à€šà€¿à€µà€¡ à€à€°à¥à€š "à€à€šà¥à€žà¥à€à¥à€²à¥à€¶à€š" à€à¥ à€ªà¥à€°à€à¥à€°à€¿à€¯à€Ÿ à€ªà¥à€šà¥à€¹à€Ÿ à€à€°à€Ÿ          <li>à€à€° à€€à¥à€®à¥à€¹à¥ à€µà¥à€¬ à€µà€¿à€€à€°à€à€Ÿà€à€¡à¥à€š à€à¥à€°à¥à€šà€žà¥à€à¥à€š à€¡à€Ÿà€à€šà€²à¥à€¡ à€à€°à€£à€Ÿà€° à€
@@ -530,5 +530,5 @@
 
 _textdeleteuser_ [l=mr] {à€à€ªà€¯à¥à€à€ à€à€Ÿà€¢à¥à€š à€à€Ÿà€à€Ÿ.}  
-_textremwarn_ [l=mr] {à€€à¥à€®à¥à€¹à€Ÿà€²à€Ÿ à€à€°à¥à€ à€à€ªà€¯à¥à€à€ à€à€Ÿà€¢à€Ÿà€µà€¯à€Ÿà€à€Ÿ à€à€¹à¥<b>_cgiargumun_</b>?}  
+_textremwarn_ [l=mr] {à€€à¥à€®à¥à€¹à€Ÿà€²à€Ÿ à€à€°à¥à€ à€à€ªà€¯à¥à€à€ à€à€Ÿà€¢à€Ÿà€µà€¯à€Ÿà€à€Ÿ à€à€¹à¥<b>_cgiargumunHtmlsafe_</b>?}  
 
 
Index: main/trunk/greenstone2/macros/mongolian.dm
===================================================================
--- main/trunk/greenstone2/macros/mongolian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/mongolian.dm	(revision 28888)
@@ -514,8 +514,8 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=mn] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,Ð¥Ð°Ð¹Ð»ÑÐ°ÐœÐŽ ÑÐŸÑ
+_textquerytitle_ [l=mn] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,Ð¥Ð°Ð¹Ð»ÑÐ°ÐœÐŽ ÑÐŸÑ
 ÐžÑÐŸÑ
  Ñ
-Ð°ÑÐžÑ ÐŸÐ»ÐŽÑÐŸÐœÐ³Ò¯Ð¹: _cgiargq_)}
+Ð°ÑÐžÑ ÐŸÐ»ÐŽÑÐŸÐœÐ³Ò¯Ð¹: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=mn] {Ð¥Ð°Ð¹Ð»ÑÑÐœ Ñ
 ÑÑÐŽÐ°Ñ}
Index: main/trunk/greenstone2/macros/mongolian2.dm
===================================================================
--- main/trunk/greenstone2/macros/mongolian2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/mongolian2.dm	(revision 28888)
@@ -295,5 +295,5 @@
 ÑÐ³ Ñ
 Ò¯ÑÐ²ÑÐ» ÑÐ° 
-<a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">ÑÐ³ Ñ
+<a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">ÑÐ³ Ñ
 ÑÑÐŽÐ°Ñ</a> ÑÑÑ ÐŸÑÐœÐŸ ÑÑ; 
 ÑÑÐ²ÑÐ» Ð±ÑÐ°ÑÐ·ÐµÑ ÐŽÑÑÑÑ
@@ -322,5 +322,5 @@
 _textmustbelongtogroup_ [l=mn] {Ð­ÐœÑ Ñ
 ÑÑÐŽÑÐ°ÐœÐŽ ÐœÑÐ²ÑÑÑÑ
-ÐžÐ¹Ðœ ÑÑÐ»ÐŽ ÑÐ° "_cgiargug_" Ð±Ò¯Ð»Ð³ÐžÐ¹ÐœÑ
+ÐžÐ¹Ðœ ÑÑÐ»ÐŽ ÑÐ° "_cgiargugHtmlsafe_" Ð±Ò¯Ð»Ð³ÐžÐ¹ÐœÑ
  Ð±Ð°Ð¹Ñ
  ÑÑÑÐŸÐ¹ Ð³ÑÐŽÐ³ÐžÐ¹Ð³ Ð°ÐœÑ
@@ -408,5 +408,5 @@
 _textviewbildsummary_ [l=mn] {Ð¢Ð° ÑÐœÑÑ
 Ò¯Ò¯ ÑÑÐ³Ð»ÑÑÐ»Ð³ÑÐ³ Ò¯Ò¯ÑÐ³ÑÑÑÐœ ÑÐ°Ð»Ð°Ð°ÑÑ
- ÐŒÑÐŽÑÑÐ»Ð»ÐžÐ¹Ð³<a href="_httppagex_(bsummary)&c=_cgiargbc1dirname_" target=_top>Ò¯Ð·ÑÐ¶ Ð±ÐŸÐ»ÐœÐŸ</a>}  
+ ÐŒÑÐŽÑÑÐ»Ð»ÐžÐ¹Ð³<a href="_httppagex_(bsummary)&c=_cgiargbc1dirnameUrlsafe_" target=_top>Ò¯Ð·ÑÐ¶ Ð±ÐŸÐ»ÐœÐŸ</a>}  
 _textview_ [l=mn] {ÐŠÑÐ³Ð»ÑÑÐ»Ð³Ð° Ò¯Ð·ÑÑ
 }  
@@ -960,13 +960,13 @@
 
 _textdelperm_ [l=mn] {ÐÐ°ÑÐžÐŒ Ð±ÑÑÑ Ð±Ò¯Ñ
- _cgiargbc1dirname_ ÑÑÐ³Ð»ÑÑÐ»Ð³ÑÐ³ Ð°ÑÐžÐ»Ð³Ð°Ñ
+ _cgiargbc1dirnameHtmlsafe_ ÑÑÐ³Ð»ÑÑÐ»Ð³ÑÐ³ Ð°ÑÐžÐ»Ð³Ð°Ñ
  
 Ð±ÐŸÐ»ÐŸÐŒÐ¶Ð³Ò¯Ð¹ Ð±Ð°Ð¹ÐœÐ°. ÐšÐ°Ð»ÑÐ³Ð°Ð°Ðœ ÐœÑ:
 <ul>                                                                                                                                                                                                                                       <li> Greenstone ÐœÑ <li>Greenstone ÑÑÑ
-Ð°Ð¹Ðœ _gsdlhome_/collect/_cgiargbc1dirname_
+Ð°Ð¹Ðœ _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_
 ÐŽÐžÑÐµÐºÑÐŸÑÑÐ³ ÑÑÑÐ³Ð°Ñ
  ÑÑÑ
 Ð³Ð³Ò¯Ð¹ Ð±Ð°Ð¹ÐœÐ°.<br>
-_cgiargbc1dirname_ ÑÑÐ³Ð»ÑÑÐ»Ð³ÑÐ³ ÑÐœÑ ÐºÐŸÐŒÐ¿ÑÑÑÐµÑÑÑÑ Ð°ÑÐžÐ»Ð³Ð°Ñ
+_cgiargbc1dirnameHtmlsafe_ ÑÑÐ³Ð»ÑÑÐ»Ð³ÑÐ³ ÑÐœÑ ÐºÐŸÐŒÐ¿ÑÑÑÐµÑÑÑÑ Ð°ÑÐžÐ»Ð³Ð°Ñ
  Ò¯Ð¹Ð»ÐŽÐ»ÐžÐ¹Ð³ Ð±Ò¯ÑÑÐœ Ñ
 ÐžÐ¹Ñ
@@ -982,16 +982,16 @@
 </ul>}
 
-_textdelinv_ [l=mn] {_cgiargbc1dirname_ ÑÑÐ³Ð»ÑÑÐ»Ð³Ð° ÐœÑ Ñ
+_textdelinv_ [l=mn] {_cgiargbc1dirnameHtmlsafe_ ÑÑÐ³Ð»ÑÑÐ»Ð³Ð° ÐœÑ Ñ
 Ð°ÐŒÐ³Ð°Ð°Ð»Ð°Ð³ÐŽÑÐ°Ðœ, ÑÑÐ²ÑÐ» Ñ
 Ò¯ÑÐžÐœÐ³Ò¯Ð¹ Ð±Ð°Ð¹ÐœÐ°. Ð£ÑÑÐ³Ð°ÑÐ°ÐœÐ³Ò¯Ð¹.}
 
-_textdelsuc_ [l=mn] {_cgiargbc1dirname_ ÑÑÐ³Ð»ÑÑÐ»Ð³ÑÐ³ Ð°ÐŒÐ¶ÐžÐ»ÑÑÐ°Ð¹ ÑÑÑÐ³Ð°Ð»Ð°Ð°.}
-
-_textclonefail_ [l=mn] {_cgiargclonecol_ ÑÑÐ³Ð»ÑÑÐ»Ð³Ð° Ñ
+_textdelsuc_ [l=mn] {_cgiargbc1dirnameHtmlsafe_ ÑÑÐ³Ð»ÑÑÐ»Ð³ÑÐ³ Ð°ÐŒÐ¶ÐžÐ»ÑÑÐ°Ð¹ ÑÑÑÐ³Ð°Ð»Ð°Ð°.}
+
+_textclonefail_ [l=mn] {_cgiargclonecolHtmlsafe_ ÑÑÐ³Ð»ÑÑÐ»Ð³Ð° Ñ
 ÑÐ²ÐžÐ»Ð°Ð³ÐŽÑÐ°ÐœÐ³Ò¯Ð¹. ÐšÐ°Ð»ÑÐ³Ð°Ð°Ðœ ÐœÑ:
 <ul>
-<li>_cgiargclonecol_ ÑÑÐ³Ð»ÑÑÐ»Ð³Ð° Ð±Ð°Ð¹Ñ
+<li>_cgiargclonecolHtmlsafe_ ÑÑÐ³Ð»ÑÑÐ»Ð³Ð° Ð±Ð°Ð¹Ñ
 Ð³Ò¯Ð¹ Ð±Ð°Ð¹ÐœÐ°.
-<li>_cgiargclonecol_ ÑÑÐ³Ð»ÑÑÐ»Ð³Ð°ÐœÐŽ collect.cfg Ð³ÑÐŽÑÐ³ Ó©Ó©ÑÑÐ»Ó©Ð»Ñ Ñ
+<li>_cgiargclonecolHtmlsafe_ ÑÑÐ³Ð»ÑÑÐ»Ð³Ð°ÐœÐŽ collect.cfg Ð³ÑÐŽÑÐ³ Ó©Ó©ÑÑÐ»Ó©Ð»Ñ Ñ
 ÐžÐ¹Ñ
  ÑÐ°Ð¹Ð» Ð°Ð»Ð³Ð° Ð±Ð°Ð¹ÐœÐ°.
@@ -1056,8 +1056,8 @@
 ÐžÐ¹Ð³ ÑÐ°ÐœÐŽ Ð·Ó©Ð²Ð»Ó©Ð¶ Ð±Ð°Ð¹ÐœÐ°.}
 
-_textexptsuc_ [l=mn] {_cgiargbc1dirname_ ÑÑÐ³Ð»ÑÑÐ»Ð³ÑÐ³ _gsdlhome_/tmp/exported\__cgiargbc1dirname_ ÐŽÐžÑÐµÐºÑÐŸÑ Ð»ÑÑ 
+_textexptsuc_ [l=mn] {_cgiargbc1dirnameHtmlsafe_ ÑÑÐ³Ð»ÑÑÐ»Ð³ÑÐ³ _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ ÐŽÐžÑÐµÐºÑÐŸÑ Ð»ÑÑ 
 Ð°ÐŒÐ¶ÐžÐ»ÑÑÐ°Ð¹ ÐŸÑÑÑÐ»Ð»Ð°Ð°.}
 
-_textexptfail_ [l=mn] {<p>_cgiargbc1dirname_ ÑÑÐ³Ð»ÑÑÐ»Ð³ÑÐ³ Ð±ÐžÑÐžÑ
+_textexptfail_ [l=mn] {<p>_cgiargbc1dirnameHtmlsafe_ ÑÑÐ³Ð»ÑÑÐ»Ð³ÑÐ³ Ð±ÐžÑÐžÑ
 ÑÑÑ Ð±ÑÐ»ÐŽÑÑ
  Ò¯Ð¹Ð» ÑÐ²Ñ Ð°ÐŒÐ¶ÐžÐ»ÑÐ³Ò¯Ð¹ Ð±ÐŸÐ»Ð»ÐŸÐŸ.
@@ -1489,5 +1489,5 @@
 _textdeleteuser_ [l=mn] {Ð¥ÑÑÑÐ³Ð»ÑÐ³ÑÐžÐ¹Ð³ ÑÑÑÐ³Ð°Ñ
 }
-_textremwarn_ [l=mn] {Ð¢Ð° <b>_cgiargumun_</b> Ñ
+_textremwarn_ [l=mn] {Ð¢Ð° <b>_cgiargumunHtmlsafe_</b> Ñ
 ÑÑÑÐ³Ð»ÑÐ³ÑÐžÐ¹Ð³ Ð°ÑÐžÐ»Ð³Ð°Ñ
 ÑÐ³ Ñ
Index: main/trunk/greenstone2/macros/nav_css.dm
===================================================================
--- main/trunk/greenstone2/macros/nav_css.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/nav_css.dm	(revision 28888)
@@ -54,5 +54,5 @@
 _rssicon_ {<img class="icon" src="_httpimages_/rssicon.png" alt="_collectionname_ RSS feed" title="_collectionname_ RSS feed" onLoad="addDomainToRSSAnchor(this)">}
 
-_rsslink_ {<a id="rss" href="_gwcgi_?site=localhost&amp;a=rss&amp;c=_cgiargc_&amp;l=_cgiargl_&amp;w=_cgiargw_">_rssicon_</a>
+_rsslink_ {<a id="rss" href="_gwcgi_?site=localhost&amp;a=rss&amp;c=_cgiargcUrlsafe_&amp;l=_cgiarglUrlsafe_&amp;w=_cgiargwUrlsafe_">_rssicon_</a>
 <script type="text/javascript">
 function addDomainToRSSAnchor (imgtag) 
Index: main/trunk/greenstone2/macros/nepali.dm
===================================================================
--- main/trunk/greenstone2/macros/nepali.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/nepali.dm	(revision 28888)
@@ -376,5 +376,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ne] {_If_(_thislast_, à€ªà€°à€¿à€£à€Ÿà€®_thisfirst_ - _thislast_ à€¯à€ž à€ªà¥à€°à€¶à¥à€šà€²à€Ÿà€: _cgiargq_, à€¯à¥ à€ªà¥à€°à€¶à¥à€š à€à€žà¥à€žà€à€ à€®à¥à€² à€à€Ÿà€à€Šà¥à€š: _cgiargq_)}
+_textquerytitle_ [l=ne] {_If_(_thislast_, à€ªà€°à€¿à€£à€Ÿà€®_thisfirst_ - _thislast_ à€¯à€ž à€ªà¥à€°à€¶à¥à€šà€²à€Ÿà€: _cgiargqHtmlsafe_, à€¯à¥ à€ªà¥à€°à€¶à¥à€š à€à€žà¥à€žà€à€ à€®à¥à€² à€à€Ÿà€à€Šà¥à€š: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=ne] {à€à¥à€à€à¥ à€ªà¥à€·à¥à€ }
 
Index: main/trunk/greenstone2/macros/nepali2.dm
===================================================================
--- main/trunk/greenstone2/macros/nepali2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/nepali2.dm	(revision 28888)
@@ -118,5 +118,5 @@
 _foundintcontent_ [l=ne] {<h3>Link to "_2_" à€žà€à€à¥à€°à€¹à€à¥ à€žà€®à¥à€ªà€°à¥à€ à€¶à¥à€€à¥à€° </h3>
 <p> à€€à€ªà€Ÿà€à€²à¥ à€°à€Ÿà€à¥à€šà¥à€­à€à€à¥ à€žà€®à¥à€ªà€°à¥à€ à€¶à¥à€€à¥à€° "_collectionname_" à€žà€à€à¥à€°à€¹ à€­à€šà¥à€Šà€Ÿ à€¬à€Ÿà€¹à€¿à€°à€à¥ à€¹à¥ à¥€ ( à€¯à€žà€²à¥ "_2_" à€žà€à€à¥à€°à€¹à€®à€Ÿ à€žà€®à¥à€ªà€°à¥à€ à€à€°à¥à€ ) à¥€ 
-à€¯à€Šà€¿ à€€à€ªà€Ÿà€à€²à€Ÿà€ à€¯à¥ à€žà€®à¥à€ªà€°à¥à€ à€¶à¥à€€à¥à€° "_2_" à€žà€à€à¥à€°à€¹à€®à€Ÿ à€¹à¥à€°à¥à€š à€à€Ÿà€¹à€šà¥à€¹à¥à€šà¥à€ à€­à€šà¥   <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_"> à€
+à€¯à€Šà€¿ à€€à€ªà€Ÿà€à€²à€Ÿà€ à€¯à¥ à€žà€®à¥à€ªà€°à¥à€ à€¶à¥à€€à¥à€° "_2_" à€žà€à€à¥à€°à€¹à€®à€Ÿ à€¹à¥à€°à¥à€š à€à€Ÿà€¹à€šà¥à€¹à¥à€šà¥à€ à€­à€šà¥   <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_"> à€
 à€à€Ÿà€¡à¥ à€¬à€¢à¥à€šà¥à€¹à¥à€ž</a> à€
 à€šà¥à€¯à€¥à€Ÿ , " back " à€¬à€à€š à€¥à€¿à€à€¿ à€ªà€à€¿à€²à¥ à€
@@ -139,5 +139,5 @@
 _textpassword_ [l=ne] {à€à¥à€ªà¥à€¯ à€žà€à€à¥à€€ ( à€ªà€Ÿà€žà€µà€°à¥à€¡ )                                                                                                                                                                                                                                                           }  
 
-_textmustbelongtogroup_ [l=ne] {à€¯à¥ à€ªà¥à€·à¥à€ à€à¥à€²à¥à€šà€à€Ÿ à€šà€¿à€®à¥à€€à€¿ à€€à€ªà€Ÿà€ " _ cgiargug_" à€žà€®à¥à€¹à€žà€à€ à€à€¬à€Šà¥à€§ à€¹à¥à€šà¥à€ªà€°à¥à€ à¥€}  
+_textmustbelongtogroup_ [l=ne] {à€¯à¥ à€ªà¥à€·à¥à€ à€à¥à€²à¥à€šà€à€Ÿ à€šà€¿à€®à¥à€€à€¿ à€€à€ªà€Ÿà€ "_cgiargugHtmlsafe_" à€žà€®à¥à€¹à€žà€à€ à€à€¬à€Šà¥à€§ à€¹à¥à€šà¥à€ªà€°à¥à€ à¥€}  
 
 _textmessageinvalid_ [l=ne] {à€€à€ªà€Ÿà€à€²à¥ à€
@@ -375,22 +375,22 @@
 _textretcoll_ [l=ne] {à€žà€à€à€²à€ à€ªà¥à€š à€«à€°à¥à€à€šà¥à€ž}  
 
-_textdelperm_ [l=ne] {à€à¥à€¹à€¿ à€µà€Ÿ à€žà€®à¥à€ªà¥à€°à¥à€£ _cgiargbc1dirname_ à€žà€à€à¥à€°à€¹ à€¹à€à€Ÿà€à€š à€žà€à€¿à€à€š à¥€ à€¹à¥à€šà€žà€à¥à€šà€šà¥ à€à€Ÿà€°à€£à€¹à€°à¥ : 
+_textdelperm_ [l=ne] {à€à¥à€¹à€¿ à€µà€Ÿ à€žà€®à¥à€ªà¥à€°à¥à€£ _cgiargbc1dirnameHtmlsafe_ à€žà€à€à¥à€°à€¹ à€¹à€à€Ÿà€à€š à€žà€à€¿à€à€š à¥€ à€¹à¥à€šà€žà€à¥à€šà€šà¥ à€à€Ÿà€°à€£à€¹à€°à¥ : 
 <ul> 
-<li> à€à¥à€°à€¿à€šà€žà¥à€à¥à€š _gsdlhome_/collect/_cgiargbc1dirname_ à€šà€¿à€°à¥à€Šà¥à€¶à€¿à€à€Ÿà€®à€Ÿ à€¹à€à€Ÿà€à€šà¥ à€
+<li> à€à¥à€°à€¿à€šà€žà¥à€à¥à€š _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ à€šà€¿à€°à¥à€Šà¥à€¶à€¿à€à€Ÿà€®à€Ÿ à€¹à€à€Ÿà€à€šà¥ à€
 à€šà¥à€®à€€à€¿ à€à¥à€šà¥ à¥€ <br>
-à€€à€ªà€Ÿà€ à€žà¥à€µà€à€¯à€²à¥ _cgiargbc1dirname_ à€žà€à€à¥à€°à€¹ à€²à€Ÿà€ à€¹à€à€Ÿà€à€šà¥à€ªà€°à¥à€šà¥ à€ªà€šà€¿ à€¹à¥à€šà¥à€ à¥€ 
+à€€à€ªà€Ÿà€ à€žà¥à€µà€à€¯à€²à¥ _cgiargbc1dirnameHtmlsafe_ à€žà€à€à¥à€°à€¹ à€²à€Ÿà€ à€¹à€à€Ÿà€à€šà¥à€ªà€°à¥à€šà¥ à€ªà€šà€¿ à€¹à¥à€šà¥à€ à¥€ 
 <li>_gsdlhome_/bin/script/delcol.pl. à€à€Ÿà€°à¥à€¯ à€žà¥à€à€Ÿà€°à¥ à€¹à¥à€šà€žà€à¥à€š, à€à¥à€ªà€¯à€Ÿ à€¯à¥ à€«à€Ÿà€à€²à€®à€Ÿ à€ªà€¢à¥à€š à€° à€€à€¯à€Ÿà€°à¥ à€«à€Ÿà€à€² à€žà¥à€à€Ÿà€²à€š à€
 à€šà¥à€®à€€à€¿ à€, à€à¥à€š à€µà€¿à€à€Ÿà€° à€à€°à¥à€šà¥à€¹à¥à€žà¥ à¥€ }  
 
-_textdelinv_ [l=ne] {Cgiaragbc1dirname à€žà€à€à€²à€š à€žà¥à€°à€à¥à€·à€¿à€€ à€° à€
+_textdelinv_ [l=ne] {_cgiargbc1dirnameHtmlsafe_ à€žà€à€à€²à€š à€žà¥à€°à€à¥à€·à€¿à€€ à€° à€
 à€šà¥à€ªà€¯à¥à€à¥à€€ à€ à¥€ à€¹à€à€Ÿà€à€à€à¥ à€žà¥à€à€šà€Ÿ à€
 à€žà¥à€µà¥à€à¥à€€ à€­à€¯à¥ à¥€  }  
 
-_textdelsuc_ [l=ne] {_cgiargbc1dirname_ à€žà€à€à¥à€°à€¹ à€žà€«à€²à€€à€Ÿà€ªà¥à€°à¥à€µà€à€Ÿ à€¹à€à€¯à¥ }  
-
-_textclonefail_ [l=ne] {Cgiarclonecol _ à€žà€à€à¥à€°à€¹à€à¥ à€ªà¥à€°à€€à€¿à€²à€¿à€ªà€¿ à€¬à€šà€Ÿà€à€š à€žà€à€¿à€à€š à¥€ à€¹à¥à€š à€žà€à¥à€šà¥ à€à€Ÿà€°à€£à€¹à€°à¥ :
+_textdelsuc_ [l=ne] {_cgiargbc1dirnameHtmlsafe_ à€žà€à€à¥à€°à€¹ à€žà€«à€²à€€à€Ÿà€ªà¥à€°à¥à€µà€à€Ÿ à€¹à€à€¯à¥ }  
+
+_textclonefail_ [l=ne] {_cgiarclonecolHtmlsafe_ à€žà€à€à¥à€°à€¹à€à¥ à€ªà¥à€°à€€à€¿à€²à€¿à€ªà€¿ à€¬à€šà€Ÿà€à€š à€žà€à€¿à€à€š à¥€ à€¹à¥à€š à€žà€à¥à€šà¥ à€à€Ÿà€°à€£à€¹à€°à¥ :
 <ul>
-<li>  The _cgiargclonecol_ à€žà€à€à¥à€°à€¹ à€à€ªà€²à€¬à¥à€§ à€à¥à€š 
-<li> The _cgiargclonecol_ à€žà€à€à¥à€°à€¹à€®à€Ÿ collect.cfg à€­à€šà¥à€šà¥ à€¬à€¿à€šà¥à€¯à€Ÿà€ž à€«à€Ÿà€à€² à€à¥à€š 
+<li>  The _cgiargclonecolHtmlsafe_ à€žà€à€à¥à€°à€¹ à€à€ªà€²à€¬à¥à€§ à€à¥à€š 
+<li> The _cgiargclonecolHtmlsafe_ à€žà€à€à¥à€°à€¹à€®à€Ÿ collect.cfg à€­à€šà¥à€šà¥ à€¬à€¿à€šà¥à€¯à€Ÿà€ž à€«à€Ÿà€à€² à€à¥à€š 
 <li> à€à¥à€°à€¿à€šà€žà¥à€à¥à€šà€²à€Ÿà€ collect .cfg à€¬à€¿à€šà¥à€¯à€Ÿà€ž à€«à€Ÿà€à€² à€ªà€¢à¥à€šà¥ à€
 à€šà¥à€®à€€à€¿ à€à¥à€š à¥€
@@ -422,5 +422,5 @@
 _textreloaderror_ [l=ne] {à€šà€¯à€Ÿà€ à€žà€à€à¥à€°à€¹ à€šà€¿à€°à¥à€®à€Ÿà€£à€®à€Ÿ à€€à¥à€°à¥à€à€¿ à€­à€¯à¥ à¥€ à€¯à¥ à€¹à¥à€šà¥à€®à€Ÿ "reload" à€µà€Ÿ "back" button à€à¥ à€ªà¥à€°à€¯à¥à€à€²à¥ à€à¥à€°à€¿à€šà€žà¥à€à¥à€š à€­à¥à€°à€®à€¿à€€ à€­à€à€à¥ à€¹à¥à€šà€žà€à¥à€ à¥€ ( à€à¥à€ªà€¯à€Ÿ à€¯à¥ à€µà€à€š à€²à€Ÿà€ à€žà€à€à€²à€šà€à€°à¥à€€à€Ÿà€à¥ à€ªà¥à€°à€¯à¥à€à€à€°à€¿ à€žà€à€à¥à€°à€¹ à€šà€¿à€°à¥à€®à€Ÿà€£ à€à€Ÿà€°à¥à€¯à€®à€Ÿ à€ªà¥à€°à€¯à¥à€ à€šà€à€°à¥à€šà¥à€¹à¥à€²à€Ÿ ) à€€à¥à€¯à€¹à€Ÿà€ à€«à¥à€°à¥ à€¶à¥à€°à¥ à€à€°à¥à€šà¥à€à¥ à€²à€Ÿà€à€¿ à€žà€à€à€²à€šà€à€°à¥à€€à€Ÿà€²à€Ÿà€ à€žà€¿à€«à€Ÿà€°à€¿à€ž à€à€°à¥à€š à€žà€à€¿à€šà¥à€ à¥€ }  
 
-_textexptsuc_ [l=ne] {_gsdlhome_/tmp/exported\__cgiargbc1dirname_ à€à€Ÿà€€à€®à€Ÿ _cgiargbc1dirname_  à€žà€à€à¥à€°à€¹ à€žà€«à€²à€€à€Ÿà€ªà¥à€°à¥à€µà€à€Ÿ à€šà€¿à€°à¥à€¯à€Ÿà€€ à€à€°à€¿à€¯à¥ à¥€}  
+_textexptsuc_ [l=ne] {_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ à€à€Ÿà€€à€®à€Ÿ _cgiargbc1dirnameHtmlsafe_  à€žà€à€à¥à€°à€¹ à€žà€«à€²à€€à€Ÿà€ªà¥à€°à¥à€µà€à€Ÿ à€šà€¿à€°à¥à€¯à€Ÿà€€ à€à€°à€¿à€¯à¥ à¥€}  
 
 _textexptfail_ [l=ne] {<p> à€¯à¥ à€¹à¥à€šà€žà€à¥à€šà¥à€ à€à€¿à€šà€­à€šà¥ à€à€µà€¶à¥à€¯à€Ÿà€ à€žà€¹à€¯à¥à€à¥ à€
@@ -609,5 +609,5 @@
 
 _textdeleteuser_ [l=ne] {à€ªà¥à€°à€¯à¥à€à€à€°à¥à€€à€Ÿ à€¹à€à€Ÿà€à€šà¥à€¹à¥à€ž  }  
-_textremwarn_ [l=ne] {à€žà¥à€¥à€Ÿà€à€°à¥à€ªà€®à¥ à€€à€ªà€Ÿà€ à€¯à¥ <b>_cgiargumun_</b> à€ªà¥à€°à€¯à¥à€à€à€°à¥à€€à€Ÿà€²à€Ÿà€ à€¹à€à€Ÿà€à€š à€à€Ÿà€¹à€šà¥à€¹à¥à€šà¥à€ ?}  
+_textremwarn_ [l=ne] {à€žà¥à€¥à€Ÿà€à€°à¥à€ªà€®à¥ à€€à€ªà€Ÿà€ à€¯à¥ <b>_cgiargumunHtmlsafe_</b> à€ªà¥à€°à€¯à¥à€à€à€°à¥à€€à€Ÿà€²à€Ÿà€ à€¹à€à€Ÿà€à€š à€à€Ÿà€¹à€šà¥à€¹à¥à€šà¥à€ ?}  
 
 
Index: main/trunk/greenstone2/macros/paperspast-english.dm
===================================================================
--- main/trunk/greenstone2/macros/paperspast-english.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/paperspast-english.dm	(revision 28888)
@@ -206,6 +206,6 @@
 _textresultsperpage_ [c=paperspast] {Results per page}
 
-_textprevresults_ {Previous _cgiargo_ results}
-_textnextresults_ {Next _cgiargo_ results}
+_textprevresults_ {Previous _cgiargoHtmlsafe_ results}
+_textnextresults_ {Next _cgiargoHtmlsafe_ results}
 
 # Search history macros
@@ -344,7 +344,7 @@
 _textarticleview_ {Article view}
 _textarticletextviewsidebar_ {
-<p><a class="dark" href="_gwcgi_?a=d&amp;d=_cgiargd_&amp;cl=_cgiargcl_&amp;srpos=_cgiargsrpos_&amp;_state_"><b>Click here to view this newspaper article</b></a></p>
-
-<p>This text was automatically generated by a computer. It has not been manually reviewed or corrected and may include errors. You can view the article in its <a class="dark" href="_gwcgi_?a=d&amp;d=_cgiargd_&amp;cl=_cgiargcl_&amp;srpos=_cgiargsrpos_&amp;_state_">original format</a> or read the <a class="dark" href="_gwcgi_?a=d&amp;d=_documentlevel:documentoid_._logicalsectionlevel:logicalsectionmetafirstpagelink_&amp;_state_">entire page</a>.</p>
+<p><a class="dark" href="_gwcgi_?a=d&amp;d=_cgiargdUrlsafe_&amp;cl=_cgiargclUrlsafe_&amp;srpos=_cgiargsrposUrlsafe_&amp;_state_"><b>Click here to view this newspaper article</b></a></p>
+
+<p>This text was automatically generated by a computer. It has not been manually reviewed or corrected and may include errors. You can view the article in its <a class="dark" href="_gwcgi_?a=d&amp;d=_cgiargdUrlsafe_&amp;cl=_cgiargclUrlsafe_&amp;srpos=_cgiargsrposUrlsafe_&amp;_state_">original format</a> or read the <a class="dark" href="_gwcgi_?a=d&amp;d=_documentlevel:documentoid_._logicalsectionlevel:logicalsectionmetafirstpagelink_&amp;_state_">entire page</a>.</p>
 
 <h4>About the computer-generated text</h4>
Index: main/trunk/greenstone2/macros/paperspast-maori.dm
===================================================================
--- main/trunk/greenstone2/macros/paperspast-maori.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/paperspast-maori.dm	(revision 28888)
@@ -216,6 +216,6 @@
 _textresultsperpage_ [c=paperspast,l=mi] {Wh&#257;rangi hua}
 
-_textprevresults_ [c=paperspast,l=mi] {Hua _cgiargo_ o mua}
-_textnextresults_ [c=paperspast,l=mi] {Hua _cgiargo_ ka whai mai}
+_textprevresults_ [c=paperspast,l=mi] {Hua _cgiargoHtmlsafe_ o mua}
+_textnextresults_ [c=paperspast,l=mi] {Hua _cgiargoHtmlsafe_ ka whai mai}
 
 # Search history macros
@@ -354,7 +354,7 @@
 _textarticleview_ [c=paperspast,l=mi] {Tirohanga tuhinga}
 _textarticletextviewsidebar_ [c=paperspast,l=mi] {
-<p><a class="dark" href="_gwcgi_?a=d&amp;d=_cgiargd_&amp;cl=_cgiargcl_&amp;srpos=_cgiargsrpos_&amp;_state_"><b>P&#257;whiri ki konei kia kitea t&#275;nei tuhinga &#257;-n&#363;pepa</b></a></p>
-
-<p>He mea mahi aunoa e te rorohiko t&#275;nei tuhinga. K&#257;ore an&#333; kia tirohia, kia whakatikangia r&#257;nei, he hapa pea o roto. Ka taea te tirotiro i te <a class="dark" href="_gwcgi_?a=d&amp;d=_cgiargd_&amp;cl=_cgiargcl_&amp;srpos=_cgiargsrpos_&amp;_state_">h&#333;putu taketake</a>, te p&#257;nui r&#257;nei i te <a class="dark" href="_gwcgi_?a=d&amp;d=_documentlevel:documentoid_._logicalsectionlevel:logicalsectionmetafirstpagelink_&amp;_state_">wh&#257;rangi katoa</a>.</p>
+<p><a class="dark" href="_gwcgi_?a=d&amp;d=_cgiargdUrlsafe_&amp;cl=_cgiargclUrlsafe_&amp;srpos=_cgiargsrposUrlsafe_&amp;_state_"><b>P&#257;whiri ki konei kia kitea t&#275;nei tuhinga &#257;-n&#363;pepa</b></a></p>
+
+<p>He mea mahi aunoa e te rorohiko t&#275;nei tuhinga. K&#257;ore an&#333; kia tirohia, kia whakatikangia r&#257;nei, he hapa pea o roto. Ka taea te tirotiro i te <a class="dark" href="_gwcgi_?a=d&amp;d=_cgiargdUrlsafe_&amp;cl=_cgiargclUrlsafe_&amp;srpos=_cgiargsrposUrlsafe_&amp;_state_">h&#333;putu taketake</a>, te p&#257;nui r&#257;nei i te <a class="dark" href="_gwcgi_?a=d&amp;d=_documentlevel:documentoid_._logicalsectionlevel:logicalsectionmetafirstpagelink_&amp;_state_">wh&#257;rangi katoa</a>.</p>
 
 <h4>M&#333; te tuhinga n&#257; te rorohiko i hanga</h4>
Index: main/trunk/greenstone2/macros/polish.dm
===================================================================
--- main/trunk/greenstone2/macros/polish.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/polish.dm	(revision 28888)
@@ -83,5 +83,5 @@
 _textdescrpref_ [l=pl] {Preferencje}
 _textdescrlogin_ [l=pl] {Logowanie}
-_textdescrlogout_ [l=pl] {Wyloguj siÄ jako _cgiargun_}
+_textdescrlogout_ [l=pl] {Wyloguj siÄ jako _cgiargunHtmlsafe_}
 
 _textdescrgreenstone_ [l=pl] {Biblioteka Cyfrowa Greenstone - oprogramowanie}
@@ -249,5 +249,5 @@
 _linktextPREFERENCES_ [l=pl] {PREFERENCJE}
 _linktextLOGIN_ [l=pl] {ZALOGUJ}
-_linktextLOGGEDIN_ [l=pl] {(zalogowano jako _cgiargun_)}
+_linktextLOGGEDIN_ [l=pl] {(zalogowano jako _cgiargunHtmlsafe_)}
 _linktextLOGOUT_ [l=pl] {WYLOGUJ}
 
@@ -427,5 +427,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=pl] {_If_(_thislast_,wynikÃ³w _thisfirst_ - _thislast_ dla zapytania: _cgiargq_,Brak wynikÃ³w dla zapytania: _cgiargq_)}
+_textquerytitle_ [l=pl] {_If_(_thislast_,wynikÃ³w _thisfirst_ - _thislast_ dla zapytania: _cgiargqHtmlsafe_,Brak wynikÃ³w dla zapytania: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=pl] {Strona wyszukiwania}
 
Index: main/trunk/greenstone2/macros/port-br.dm
===================================================================
--- main/trunk/greenstone2/macros/port-br.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/port-br.dm	(revision 28888)
@@ -319,5 +319,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=pt-br] {_If_(_thislast_,resultados _thisfirst_ - _thislast_ para a consulta: _cgiargq_,Nenhuma combinaÃ§Ã£o encontrada para a consulta: _cgiargq_)}  
+_textquerytitle_ [l=pt-br] {_If_(_thislast_,resultados _thisfirst_ - _thislast_ para a consulta: _cgiargqHtmlsafe_,Nenhuma combinaÃ§Ã£o encontrada para a consulta: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=pt-br] {PÃ¡gina de busca}  
 
Index: main/trunk/greenstone2/macros/port-br2.dm
===================================================================
--- main/trunk/greenstone2/macros/port-br2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/port-br2.dm	(revision 28888)
@@ -149,5 +149,5 @@
 
 # should have arguments of collection, collectionname and link
-_foundintcontent_ [l=pt-br] {<h3>Link to "_2_" acervo</h3> <p> O link que vocÃª selecionou Ã© externo para o "_collectionname_" acervo (ele links para o "_2_" acervo). Se vocÃª deseja ver este link no "_2_" acervo vocÃª pode <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_"> avanÃ§ar </a> para essa pÃ¡gina; senÃ£o use o batÃ£o "back" do seu navegador para retornar para o documento anterior.}  
+_foundintcontent_ [l=pt-br] {<h3>Link to "_2_" acervo</h3> <p> O link que vocÃª selecionou Ã© externo para o "_collectionname_" acervo (ele links para o "_2_" acervo). Se vocÃª deseja ver este link no "_2_" acervo vocÃª pode <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_"> avanÃ§ar </a> para essa pÃ¡gina; senÃ£o use o batÃ£o "back" do seu navegador para retornar para o documento anterior.}  
 
 
@@ -167,5 +167,5 @@
 _textpassword_ [l=pt-br] {senha}  
 
-_textmustbelongtogroup_ [l=pt-br] {Note que vocÃª deve pertencer ao "_cgiargug_"  do grupo para acessar esta pÃ¡gina}  
+_textmustbelongtogroup_ [l=pt-br] {Note que vocÃª deve pertencer ao "_cgiargugHtmlsafe_"  do grupo para acessar esta pÃ¡gina}  
 
 _textmessageinvalid_ [l=pt-br] {A pÃ¡gina que vocÃª pediu requer sua identificaÃ§Ã£o . <br> _If_(_cgiargug_,[_textmustbelongtogroup_]<br>) Favor entrar seu nome de usuÃ¡rio e senha Greenstone.}  
@@ -345,11 +345,11 @@
 _textretcoll_ [l=pt-br] {Retornar para o coletor}  
 
-_textdelperm_ [l=pt-br] {Alguns ou todos os _cgiargbc1dirname_ acervos nÃ£o puderam ser apagados. As possÃ­veis causas sÃ£o: <ul> <li> Greenstone nÃ£o tem permissÃ£o para apagar o _gsdlhome_/collect/_cgiargbc1dirname_ diretÃ³rio.<br> VocÃª pode precisar remover este diretÃ³rio manualmente para completar a remoÃ§Ã£o do  _cgiargbc1dirname_acervo de seu computador</li>. <li>Greenstone nÃ£o pode rodar o programa _gsdlhome_/bin/script/delcol.pl.. Tenha certeza de que este arquivo Ã© legÃ­vel e executÃ¡vel.</li> </ul>}  
-
-_textdelinv_ [l=pt-br] {O  _cgiargbc1dirname_acervo estÃ¡ protegido ou invÃ¡lido. SupressÃ£o foi cancelada}  
-
-_textdelsuc_ [l=pt-br] {O_cgiargbc1dirname_ acervo foi apagado com sucesso.}  
-
-_textclonefail_ [l=pt-br] {A _cgiargclonecol_coleÃ§Ã£o nÃ£o pode ser copiada. As possÃ­veis causas sÃ£o: <ul> <li> A _ cgiargclonecol_coleÃ§Ã£o nÃ£o existe <li> A_cgiargclonecol_ coleÃ§Ã£o nÃ£o tem a configuraÃ§Ã£o do arquivo collect.cfg <li> Greenstone nÃ£o tem permissÃ£o para ler a cofiguraÃ§Ã£o do arquivo collect.cfg}  
+_textdelperm_ [l=pt-br] {Alguns ou todos os _cgiargbc1dirnameHtmlsafe_ acervos nÃ£o puderam ser apagados. As possÃ­veis causas sÃ£o: <ul> <li> Greenstone nÃ£o tem permissÃ£o para apagar o _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ diretÃ³rio.<br> VocÃª pode precisar remover este diretÃ³rio manualmente para completar a remoÃ§Ã£o do  _cgiargbc1dirnameHtmlsafe_acervo de seu computador</li>. <li>Greenstone nÃ£o pode rodar o programa _gsdlhome_/bin/script/delcol.pl.. Tenha certeza de que este arquivo Ã© legÃ­vel e executÃ¡vel.</li> </ul>}  
+
+_textdelinv_ [l=pt-br] {O  _cgiargbc1dirnameHtmlsafe_acervo estÃ¡ protegido ou invÃ¡lido. SupressÃ£o foi cancelada}  
+
+_textdelsuc_ [l=pt-br] {O_cgiargbc1dirnameHtmlsafe_ acervo foi apagado com sucesso.}  
+
+_textclonefail_ [l=pt-br] {A _cgiargclonecolHtmlsafe_coleÃ§Ã£o nÃ£o pode ser copiada. As possÃ­veis causas sÃ£o: <ul> <li> A _ cgiargclonecolHtmlsafe_coleÃ§Ã£o nÃ£o existe <li> A_cgiargclonecolHtmlsafe_ coleÃ§Ã£o nÃ£o tem a configuraÃ§Ã£o do arquivo collect.cfg <li> Greenstone nÃ£o tem permissÃ£o para ler a cofiguraÃ§Ã£o do arquivo collect.cfg}  
 
 _textcolerr_ [l=pt-br] {Erro de coletor}  
@@ -365,7 +365,7 @@
 _textreloaderror_ [l=pt-br] {Um erro ocorreu enquanto criava o novo acervo. Isso pode ter sido em funÃ§Ã£o do Greenstone ter se confundido com o uso dos botÃµes "reload" ou "back" de seu navegador  (favor tentar evitar o uso destes botÃµes enquanto cria um acervo com o Coletor). Ã recomendado que vocÃª reinicie o Coletor desde o inÃ­cio.}  
 
-_textexptsuc_ [l=pt-br] {O acervo _cgiargbc1dirname_  foi exportado com sucesso para o _gsdlhome_/tmp/exported\__cgiargbc1dirname_ diretÃ³rio.}  
-
-_textexptfail_ [l=pt-br] {<p>Falha para exportar o _cgiargbc1dirname_ acervo. <p> Isso Ã© provavelmente porque o Greenstone foi instalado sem os componentes necessÃ¡rios para apoiar a funÃ§Ã£o  "Exportar para CD-ROM". <ul> Se vocÃª instalou uma versÃ£o anterior da 2.70w de um CD_ROM estes componentes nÃ£o terÃ£o sido instalados a menos que vocÃª os tenha selecionado durante uma instalaÃ§Ã£o  de "Costume". VocÃª pode adicionÃ¡-los para sua instalaÃ§Ã£o re-executando o procedimento de instalaÃ§Ã£o.  <li>Se vocÃª instalou Greenstone de uma distribuiÃ§Ã£o da web vocÃª precisarÃ¡  baixar e instalar um pacote adicional para habilitar essa funÃ§Ã£o. Favor visitar <a href="http://www.greenstone.org">http://www.greenstone.org</a> ou <a
+_textexptsuc_ [l=pt-br] {O acervo _cgiargbc1dirnameHtmlsafe_  foi exportado com sucesso para o _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ diretÃ³rio.}  
+
+_textexptfail_ [l=pt-br] {<p>Falha para exportar o _cgiargbc1dirnameHtmlsafe_ acervo. <p> Isso Ã© provavelmente porque o Greenstone foi instalado sem os componentes necessÃ¡rios para apoiar a funÃ§Ã£o  "Exportar para CD-ROM". <ul> Se vocÃª instalou uma versÃ£o anterior da 2.70w de um CD_ROM estes componentes nÃ£o terÃ£o sido instalados a menos que vocÃª os tenha selecionado durante uma instalaÃ§Ã£o  de "Costume". VocÃª pode adicionÃ¡-los para sua instalaÃ§Ã£o re-executando o procedimento de instalaÃ§Ã£o.  <li>Se vocÃª instalou Greenstone de uma distribuiÃ§Ã£o da web vocÃª precisarÃ¡  baixar e instalar um pacote adicional para habilitar essa funÃ§Ã£o. Favor visitar <a href="http://www.greenstone.org">http://www.greenstone.org</a> ou <a
  href="https://list.scms.waikato.ac.nz/mailman/listinfo/greenstone-users">the mailing list</a> para futuros detalhes. </ul>}  
 
@@ -523,5 +523,5 @@
 
 _textdeleteuser_ [l=pt-br] {Apagar um usuÃ¡rio}  
-_textremwarn_ [l=pt-br] {VocÃª realmente quer remover permanentemente este usuÃ¡rio <b>_cgiargumun_</b>?}  
+_textremwarn_ [l=pt-br] {VocÃª realmente quer remover permanentemente este usuÃ¡rio <b>_cgiargumunHtmlsafe_</b>?}  
 
 
Index: main/trunk/greenstone2/macros/port-pt.dm
===================================================================
--- main/trunk/greenstone2/macros/port-pt.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/port-pt.dm	(revision 28888)
@@ -50,5 +50,5 @@
 _textdescrpref_ [l=pt-pt] {PÃ¡gina de PreferÃªncias}
 _textdescrlogin_ [l=pt-pt] {pagina de entrada}  
-_textdescrlogout_ [l=pt-pt] {Sair como _cgiargun_}  
+_textdescrlogout_ [l=pt-pt] {Sair como _cgiargunHtmlsafe_}  
 
 _textdescrgreenstone_ [l=pt-pt] {Software da Biblioteca Digital Greenstone}
@@ -189,5 +189,5 @@
 _linktextPREFERENCES_ [l=pt-pt] {PREFERÃNCIAS}
 _linktextLOGIN_ [l=pt-pt] {ENTRAR}  
-_linktextLOGGEDIN_ [l=pt-pt] {(aceder como_cgiargun_)}  
+_linktextLOGGEDIN_ [l=pt-pt] {(aceder como_cgiargunHtmlsafe_)}  
 _linktextLOGOUT_ [l=pt-pt] {SAIR}  
 
@@ -337,5 +337,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=pt-pt] {_If_(_thislast_,resultados _thisfirst_ - _thislast_ para a pesquisa: _cgiargq_,Nunhuma resposta encontrada: _cgiargq_)}
+_textquerytitle_ [l=pt-pt] {_If_(_thislast_,resultados _thisfirst_ - _thislast_ para a pesquisa: _cgiargqHtmlsafe_,Nunhuma resposta encontrada: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=pt-pt] {PÃ¡gina de pesquisa}
 
Index: main/trunk/greenstone2/macros/pref.dm
===================================================================
--- main/trunk/greenstone2/macros/pref.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/pref.dm	(revision 28888)
@@ -39,5 +39,5 @@
     savedhrefs[i] = document.links[i].href;
 
-  s = "_cgiargcc_";
+  s = "_cgiargccJssafe_";
   a = s.split (",");
   for (i = 0; i < a.length ;i++) \{
@@ -98,5 +98,5 @@
 function updateel () \{
   value = document.PrefForm.el.options[document.PrefForm.el.selectedIndex].value;
-  if (value != "_cgiargel_") argel = "&el=" + value;
+  if (value != "_cgiargelJssafe_") argel = "&el=" + value;
   else argel = "";
   updatehrefs();
@@ -105,5 +105,5 @@
 function updateil () \{
   value = document.PrefForm.il.options[document.PrefForm.il.selectedIndex].value;
-  if (value != "_cgiargil_") argil = "&il=" + value;
+  if (value != "_cgiargilJssafe_") argil = "&il=" + value;
   else argil = "";
   updatehrefs();
@@ -111,5 +111,5 @@
 
 function updatefc(value) \{
-  if (value != _cgiargfc_) argfc = "&fc=" + value + "&f=" + value;
+  if (value != "_cgiargfcJssafe_") argfc = "&fc=" + value + "&f=" + value;
   else argfc = "";
   updatehrefs();
@@ -117,5 +117,5 @@
 
 function updatehl(value) \{
-  if (value != _cgiarghl_) arghl = "&hl=" + value;
+  if (value != "_cgiarghlJssafe_") arghl = "&hl=" + value;
   else arghl = "";
   updatehrefs();
@@ -157,5 +157,5 @@
 
 function updatek (value) \{
-  if (value != _cgiargk_) argk = "&k=" + value;
+  if (value != "_cgiargkJssafe_") argk = "&k=" + value;
   else argk = "";
   updatehrefs();
@@ -163,5 +163,5 @@
 
 function updates (value) \{
-  if (value != _cgiargs_) args = "&s=" + value;
+  if (value != "_cgiargsJssafe_") args = "&s=" + value;
   else args = "";
   updatehrefs();
@@ -169,5 +169,5 @@
 
 function updateaf (value) \{
-  if (value != _cgiargaf_) argaf = "&af=" + value;
+  if (value != "_cgiargafJssafe_") argaf = "&af=" + value;
   else argaf = "";
   updatehrefs();
@@ -176,8 +176,9 @@
 function updatem () \{
   value = document.PrefForm.m.options[document.PrefForm.m.selectedIndex].value;
-  if (value != _cgiargm_) argm = "&r=1&m=" + value;
+  if (value != "_cgiargmJssafe_") argm = "&r=1&m=" + value;
   else argm = "";
   updatehrefs();
 \}
+
 
 function updaterd () \{
@@ -190,6 +191,7 @@
 
 function updateo () \{
-  value = document.PrefForm.o.options[document.PrefForm.o.selectedIndex].value;
-  if (value != _cgiargo_) argo = "&r=1&o=" + value;
+  value = document.PrefForm.o.options[document.PrefForm.o.selectedIndex].value;  
+  //if (value != cgiargo ) argo = "&r=1&o=" + value;
+  if (value != "_cgiargoJssafe_") argo = "&r=1&o=" + value;  
   else argo = "";
   updatehrefs();
@@ -197,5 +199,5 @@
 
 function updateqt (value) \{
-  if (value != _cgiargqt_) argqt = "&qt=" + value;
+  if (value != "_cgiargqtJssafe_") argqt = "&qt=" + value;
   else argqt = "";
 
@@ -210,5 +212,5 @@
 function updatefqn () \{
   value = document.PrefForm.fqn.options[document.PrefForm.fqn.selectedIndex].value;
-  if (value != _cgiargfqn_) argfqn = "&fqn=" + value;
+  if (value != "_cgiargfqnJssafe_") argfqn = "&fqn=" + value;
   else argfqn = "";
   updatehrefs();
@@ -216,5 +218,5 @@
 
 function updateb (value) \{
-  if (value != _cgiargb_) argb = "&b=" + value;
+  if (value != "_cgiargbJssafe_") argb = "&b=" + value;
   else argb = "";
   updatehrefs();
@@ -224,9 +226,9 @@
   arghd="";
   if (document.PrefForm.hd[0].checked) \{
-     if ("_cgiarghd_" != "0") arghd = "&hd=0";
+     if ("_cgiarghdJssafe_" != "0") arghd = "&hd=0";
   \}
   else \{
      value = document.PrefForm.hdn[document.PrefForm.hdn.selectedIndex].value;
-     if (_cgiarghd_ != value) arghd = "&hd="+value;
+     if ("_cgiarghdJssafe_" != value) arghd = "&hd="+value;
   \}
   updatehrefs();
@@ -237,5 +239,5 @@
 
    value = document.PrefForm.qb.options[document.PrefForm.qb.selectedIndex].value;
-   if (value != _cgiargqb_) argqb = "&qb=" + value;
+   if (value != "_cgiargqbJssafe_") argqb = "&qb=" + value;
   else argqb = "";
    updatehrefs();
Index: main/trunk/greenstone2/macros/pushto.dm
===================================================================
--- main/trunk/greenstone2/macros/pushto.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/pushto.dm	(revision 28888)
@@ -431,6 +431,6 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ps] { ÙØªØšØ¬Ù Ø¯_If_(_thislast_,Ø¯_thisfirst_ - _thislast_Ø¯Ø³ÙØ³ÙÛ ÙÙŸØ§Ø±Ù Ø¯Ù:  _cgiargq_, Ø¯ÙŸÙÚØªÙÛ Ø³Ø± Ø³Ù
-ÙÙ ÙÙ Ø®ÙØ±Û: _cgiargq_)}  
+_textquerytitle_ [l=ps] { ÙØªØšØ¬Ù Ø¯_If_(_thislast_,Ø¯_thisfirst_ - _thislast_Ø¯Ø³ÙØ³ÙÛ ÙÙŸØ§Ø±Ù Ø¯Ù:  _cgiargqHtmlsafe_, Ø¯ÙŸÙÚØªÙÛ Ø³Ø± Ø³Ù
+ÙÙ ÙÙ Ø®ÙØ±Û: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=ps] {Ù
 Ø® ÙÙÙŒÙÛ}  
Index: main/trunk/greenstone2/macros/query.dm
===================================================================
--- main/trunk/greenstone2/macros/query.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/query.dm	(revision 28888)
@@ -133,10 +133,10 @@
 
 function inputQuery(value) \{
-  if ("_cgiargqt_" == "0") \{ // text search
+  if ("_cgiargqtJssafe_" == "0") \{ // text search
      document.QueryForm.q.value += " "+value;
      document.QueryForm.q.focus();
   \}
   else \{
-     if ("_cgiargb_" == "1") \{ // advanced query
+     if ("_cgiargbJssafe_" == "1") \{ // advanced query
         document.QueryForm.q.value += " "+value;
 	document.QueryForm.q.focus();	   
@@ -164,5 +164,5 @@
     if (document.QueryForm.t != null) \{
       value = document.QueryForm.t.options[document.QueryForm.t.selectedIndex].value;
-      if (value != "_cgiargt_") stdarg += "&t="+value;
+      if (value != "_cgiargtJssafe_") stdarg += "&t="+value;
     \}
     stdarg += "&r=1&hs=1";    
@@ -175,5 +175,5 @@
     if (document.QueryForm.g!= null) \{
     value = document.QueryForm.g.options[document.QueryForm.g.selectedIndex].value;
-    if (value != "_cgiargg_") stdarg += "&g="+value;
+    if (value != "_cgiarggJssafe_") stdarg += "&g="+value;
   \}
 }
@@ -181,10 +181,10 @@
 _getjarg_{
     value = document.QueryForm.j.options[document.QueryForm.j.selectedIndex].value;
-    if (value != "_cgiargj_") stdarg += "&j="+value;
+    if (value != "_cgiargjJssafe_") stdarg += "&j="+value;
 }
 
 _getnarg_{
     value = document.QueryForm.n.options[document.QueryForm.n.selectedIndex].value;
-    if (value != "_cgiargn_") stdarg += "&n="+value;
+    if (value != "_cgiargnJssafe_") stdarg += "&n="+value;
 }
 
@@ -193,5 +193,5 @@
 _If_("_cgiarga__cgiargct_" eq "q2",
     value = document.QueryForm.sf.options[document.QueryForm.sf.selectedIndex].value;
-    if (value != "_cgiargsf_") stdarg += "&sf="+value;
+    if (value != "_cgiargsfJssafe_") stdarg += "&sf="+value;
 )
 }
@@ -201,5 +201,5 @@
 _If_("_cgiarga__cgiargqt_" eq "sqlq2",
     value = document.QueryForm.sqlsf.options[document.QueryForm.sqlsf.selectedIndex].value;
-    if (value != "_cgiargsqlsf_") stdarg += "&sqlsf="+value;
+    if (value != "_cgiargsqlsfJssafe_") stdarg += "&sqlsf="+value;
 )
 }
@@ -207,13 +207,13 @@
 _formfunctions_{
 
-argfqf="_cgiargfqf_";	
-argfqv="_cgiargfqv_";
-argfqk="_cgiargfqk_";
-argfqs="_cgiargfqs_";
-argfqaf="_cgiargfqaf_";
-argfqc="_cgiargfqc_";
+argfqf="_cgiargfqfJssafe_";	
+argfqv="_cgiargfqvJssafe_";
+argfqk="_cgiargfqkJssafe_";
+argfqs="_cgiargfqsJssafe_";
+argfqaf="_cgiargfqafJssafe_";
+argfqc="_cgiargfqcJssafe_";
 _If_("_cgiarga_" eq "sqlq",
-argsqlfqf="_cgiargsqlfqf_";	
-argsqlfqc="_cgiargsqlfqc_";
+argsqlfqf="_cgiargsqlfqfJssafe_";	
+argsqlfqc="_cgiargsqlfqcJssafe_";
 )
 argq = "";
@@ -363,5 +363,5 @@
    var i,j;
    fqc = argfqc.split(",");
-   if (_cgiargfqn_ == 2) \{ // there will only be one fqc element
+   if ("_cgiargfqnJssafe_" == "2") \{ // there will only be one fqc element
        for (j=0;j<document.QueryForm.fqc.options.length;j++) \{
 	   if (fqc[0] == document.QueryForm.fqc.options[j].value) \{
@@ -389,5 +389,5 @@
    var i,j;
    argfqc = "";
-   if (_cgiargfqn_ == 2) \{
+   if ("_cgiargfqnJssafe_" == "2") \{
       j = document.QueryForm.fqc.selectedIndex;
       argfqc += document.QueryForm.fqc.options[j].value;
@@ -408,5 +408,5 @@
    
    var i;
-   if (_cgiargfqn_ == 2) \{
+   if ("_cgiargfqnJssafe_" == "2") \{
        document.QueryForm.fqc.options[0].selected = true;
    \}
@@ -425,5 +425,5 @@
    var i,j;
    sqlfqc = argsqlfqc.split(",");
-   if (_cgiargsqlfqn_ == 2) \{ // there will only be one sqlfqc element
+   if ("_cgiargsqlfqnJssafe_" == "2") \{ // there will only be one sqlfqc element
        for (j=0;j<document.QueryForm.sqlfqc.options.length;j++) \{
 	   if (sqlfqc[0] == document.QueryForm.sqlfqc.options[j].value) \{
@@ -451,5 +451,5 @@
    var i,j;
    argsqlfqc = "";
-   if (_cgiargsqlfqn_ == 2) \{
+   if ("_cgiargsqlfqnJssafe_" == "2") \{
       j = document.QueryForm.sqlfqc.selectedIndex;
       argsqlfqc += document.QueryForm.sqlfqc.options[j].value;
@@ -470,5 +470,5 @@
    
    var i;
-   if (_cgiargsqlfqn_ == 2) \{
+   if ("_cgiargsqlfqnJssafe_" == "2") \{
        document.QueryForm.sqlfqc.options[0].selected = true;
    \}
@@ -728,5 +728,5 @@
    clearfqv();
 
-   if ("_cgiargb_" == "1") \{
+   if ("_cgiargbJssafe_" == "1") \{
       if (document.QueryForm.fqk != null) \{clearfqk();\}
       if (document.QueryForm.fqs != null) \{clearfqs();\}
@@ -805,5 +805,5 @@
 <input type="hidden" name="r" value="1">
 <input type="hidden" name="hs" value="1">
-<input type="hidden" name="e" value="_decodedcompressedoptions_">
+<input type="hidden" name="e" value="_decodedcompressedoptionsAttrsafe_">
 _queryformcontent_
 _optdatesearch_
@@ -823,5 +823,5 @@
 <input type="hidden" name="r" value="1">
 <input type="hidden" name="hs" value="1">
-<input type="hidden" name="e" value="_decodedcompressedoptions_">
+<input type="hidden" name="e" value="_decodedcompressedoptionsAttrsafe_">
 _sqlqueryformcontent_
 </p>
@@ -864,11 +864,11 @@
 	<center>
 _textstartdate_
-<input type="text" name="ds" value="_cgiargds_" size="4" maxlength="4">
-<select name="dsbc" value="_cgiargdsbc_" size="1">
+<input type="text" name="ds" value="_cgiargdsAttrsafe_" size="4" maxlength="4">
+<select name="dsbc" value="_cgiargdsbcAttrsafe_" size="1">
 	<option value="0"_If_(_cgiargdsbc_,, selected)>_textad_
 	<option value="1"_If_(_cgiargdsbc_, selected)>_textbc_
 </select> 
 _textenddate_
-<input type="text" name="de" value="_cgiargde_" size="4" maxlength="4"> 
+<input type="text" name="de" value="_cgiargdeAttrsafe_" size="4" maxlength="4"> 
 <select name="debc" size="1">
 	<option value="0" _If_(_cgiargdebc_,, selected)>_textad_
@@ -884,9 +884,9 @@
 }
 
-_smallquerybox_ {<nobr><input type="text" name="q" value="_cgiargq_" size="50">&nbsp;<input type="submit" value="_textbeginsearch_"></nobr>}
+_smallquerybox_ {<nobr><input type="text" name="q" value="_cgiargqAttrsafe_" size="50">&nbsp;<input type="submit" value="_textbeginsearch_"></nobr>}
 
 _largequerybox_ {
 <tr><td><textarea name="q" cols="63" rows="10">
-_cgiargq_
+_cgiargqHtmlsafe_
 </textarea></td></tr>
 <tr align="right"><td><table>
@@ -973,5 +973,5 @@
 <table>
 <tr><td align="left">_textadvquery_</td></tr>
-<tr><td><textarea name="q" cols="57" rows="3" onChange="updateq();">_cgiargq_</textarea></td>
+<tr><td><textarea name="q" cols="57" rows="3" onChange="updateq();">_cgiargqHtmlsafe_</textarea></td>
 <td valign="bottom">
 <input type="button" value="_textrunquery_" onClick="runQuery();"></td></tr>
@@ -1130,5 +1130,5 @@
 _choosesimplesearch_ {_If_("_cgiargqt_" eq "2",_textsimplesqlsearch_,_textsimplesearch_)}
 
-_chooseadvancedsearch_ {_If_("_cgiarqt_" eq "2",_textadvancedsqlsearch_,_chooseadvancedsearchct_)}
+_chooseadvancedsearch_ {_If_("_cgiargqt_" eq "2",_textadvancedsqlsearch_,_chooseadvancedsearchct_)}
 _chooseadvancedsearchct_ {_If_(_cgiargct_,_If_("_cgiargct_" eq "2",_textadvancedlucenesearch_,_textadvancedmgppsearch_),_textadvancedsearch_}
 
Index: main/trunk/greenstone2/macros/romanian.dm
===================================================================
--- main/trunk/greenstone2/macros/romanian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/romanian.dm	(revision 28888)
@@ -344,5 +344,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ro] {_If_(_thislast_,results _thisfirst_ - _thislast_ pentru interogarea: _cgiargq_,No matches for query: _cgiargq_)}  
+_textquerytitle_ [l=ro] {_If_(_thislast_,results _thisfirst_ - _thislast_ pentru interogarea: _cgiargqHtmlsafe_,No matches for query: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=ro] {Pagina de cÄutare}  
 
Index: main/trunk/greenstone2/macros/romanian2.dm
===================================================================
--- main/trunk/greenstone2/macros/romanian2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/romanian2.dm	(revision 28888)
@@ -119,5 +119,5 @@
 <p> Linkul selectat este extern colecÅ£iei "_collectionname_" (se leagÄ de colecÅ£ia "_2_").
     DacÄ doriÅ£i vizualizarea acestui link din colecÅ£ia "_2_" puteÅ£i 
-    <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">merge</a> la aceastÄ paginÄ, altfel, folosiÅ£i butonul âbackâ al browserului pentru a vÄ Ã®ntoarce la documentul anterior.
+    <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">merge</a> la aceastÄ paginÄ, altfel, folosiÅ£i butonul âbackâ al browserului pentru a vÄ Ã®ntoarce la documentul anterior.
 
 }  
@@ -139,5 +139,5 @@
 _textpassword_ [l=ro] {parolÄ}  
 
-_textmustbelongtogroup_ [l=ro] {AtenÅ£ie, trebuie sÄ faceÅ£i parte din grupul "_cgiargug_" pentru a accesa aceastÄ paginÄ}  
+_textmustbelongtogroup_ [l=ro] {AtenÅ£ie, trebuie sÄ faceÅ£i parte din grupul "_cgiargugHtmlsafe_" pentru a accesa aceastÄ paginÄ}  
 
 _textmessageinvalid_ [l=ro] {Pagina cerutÄ necesitÄ Ã®nregistrarea.<br>
@@ -364,22 +364,22 @@
 _textretcoll_ [l=ro] {Ãntoarce-te la colector}  
 
-_textdelperm_ [l=ro] {O parte din colecÅ£ia _cgiargbc1dirname_ nu a putut fi ÅtearsÄ. Cauzele posibile pot fi:
+_textdelperm_ [l=ro] {O parte din colecÅ£ia _cgiargbc1dirnameHtmlsafe_ nu a putut fi ÅtearsÄ. Cauzele posibile pot fi:
 <ul>
-<li> Greenstone nu are permisiunea de a Återge directorul _gsdlhome_/collect/_cgiargbc1dirname_
+<li> Greenstone nu are permisiunea de a Återge directorul _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_
 .<br>
-Este posibil sÄ fie nevoie de Återgerea manualÄ a acestui director pentru a Ã®ncheia Återgerea colecÅ£iei _cgiargbc1dirname_ din acest computer.</li>
+Este posibil sÄ fie nevoie de Återgerea manualÄ a acestui director pentru a Ã®ncheia Återgerea colecÅ£iei _cgiargbc1dirnameHtmlsafe_ din acest computer.</li>
 <li>Greenstone nu poate rula programul _gsdlhome_/bin/script/delcol.pl. AsiguraÅ£i-vÄ cÄ acest fiÅier poate fi citit Åi este executabil.</li>
 </ul>
 }  
 
-_textdelinv_ [l=ro] {ColecÅ£ia _cgiargbc1dirname_ este protejatÄ sau nevalidÄ. Återgerea a fost anulatÄ.
-}  
-
-_textdelsuc_ [l=ro] {ColecÅ£ia _cgiargbc1dirname_ a fost ÅtearsÄ cu succes.}  
-
-_textclonefail_ [l=ro] {ColecÅ£ia _cgiargclonecol_ nu poate fi clonatÄ. Cauzele posibile sunt:
+_textdelinv_ [l=ro] {ColecÅ£ia _cgiargbc1dirnameHtmlsafe_ este protejatÄ sau nevalidÄ. Återgerea a fost anulatÄ.
+}  
+
+_textdelsuc_ [l=ro] {ColecÅ£ia _cgiargbc1dirnameHtmlsafe_ a fost ÅtearsÄ cu succes.}  
+
+_textclonefail_ [l=ro] {ColecÅ£ia _cgiargclonecolHtmlsafe_ nu poate fi clonatÄ. Cauzele posibile sunt:
 <ul>
-<li> ColecÅ£ia _cgiargclonecol_ nu existÄ
-<li> ColecÅ£ia _cgiargclonecol_ nu are fiÅier de configurare collect.cfg
+<li> ColecÅ£ia _cgiargclonecolHtmlsafe_ nu existÄ
+<li> ColecÅ£ia _cgiargclonecolHtmlsafe_ nu are fiÅier de configurare collect.cfg
 <li> Greenstone nu are permisiunea de a citi fiÅierul de configurare collect.cfg
 </ul>
@@ -407,8 +407,8 @@
 _textreloaderror_ [l=ro] {A apÄrut o eroare la crearea unei noi colecÅ£ii. Acest lucru se poate Ã®ntÃ¢mpla datoritÄ confuziei sistemului Greenstone privind utilizarea funcÅ£iei de âreloadâ sau a butoanelor âbackâ ale browserului folosit (vÄ rugÄm sÄ evitaÅ£i folosirea acestor butoane Ã®n timpul creÄrii unei colecÅ£ii cu ajutorul Colectorului). Se recomandÄ repornirea Colectorului de la Ã®nceput.}  
 
-_textexptsuc_ [l=ro] {ColecÅ£ia _cgiargbc1dirname_ a fost exportatÄ cu succes Ã®n directorul
-_gsdlhome_/tmp/exported\__cgiargbc1dirname_ .}  
-
-_textexptfail_ [l=ro] {<p>Eroare la exportarea colecÅ£iei _cgiargbc1dirname_ .
+_textexptsuc_ [l=ro] {ColecÅ£ia _cgiargbc1dirnameHtmlsafe_ a fost exportatÄ cu succes Ã®n directorul
+_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ .}  
+
+_textexptfail_ [l=ro] {<p>Eroare la exportarea colecÅ£iei _cgiargbc1dirnameHtmlsafe_ .
 
 <p>Acest lucru se Ã®ntÃ¢mplÄ de cele mai multe ori pentru cÄ Greenstone a fost instalat fÄrÄ componentele necesare pentru a suporta funcÅ£ia âExportÄ ColecÅ£iaâ.
@@ -571,5 +571,5 @@
 
 _textdeleteuser_ [l=ro] {Återge un utilizator}  
-_textremwarn_ [l=ro] {DoriÅ£i sÄ ÅtergeÅ£i definitiv utilizatorul <b>_cgiargumun_</b>?}  
+_textremwarn_ [l=ro] {DoriÅ£i sÄ ÅtergeÅ£i definitiv utilizatorul <b>_cgiargumunHtmlsafe_</b>?}  
 
 
Index: main/trunk/greenstone2/macros/russian.dm
===================================================================
--- main/trunk/greenstone2/macros/russian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/russian.dm	(revision 28888)
@@ -54,5 +54,5 @@
 _textdescrlogin_ [l=ru] {Ð¡ÑÑÐ°ÐœÐžÑÐ° Ð²Ñ
 ÐŸÐŽÐ°}
-_textdescrlogout_ [l=ru] {ÐÑÐ¹ÑÐž ÐžÐ· Ð² ÑÐžÑÑÐµÐŒÑ ÐºÐ°Ðº  _cgiargun_}
+_textdescrlogout_ [l=ru] {ÐÑÐ¹ÑÐž ÐžÐ· Ð² ÑÐžÑÑÐµÐŒÑ ÐºÐ°Ðº  _cgiargunHtmlsafe_}
 
 _textdescrgreenstone_ [l=ru] {Ð­Ð»ÐµÐºÑÑÐŸÐœÐœÐ°Ñ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐ° ÐÑÐžÐœÑÑÐŸÑÐœ}
@@ -195,5 +195,5 @@
 _linktextPREFERENCES_ [l=ru] {ÐÐÐ¡Ð¢Ð ÐÐÐÐ}
 _linktextLOGIN_ [l=ru] {ÐÐÐÐ¢Ð}
-_linktextLOGGEDIN_ [l=ru] {(Ð²ÐŸÐ¹ÑÐž Ð² ÑÐžÑÑÐµÐŒÑ ÐºÐ°Ðº _cgiargun_)}
+_linktextLOGGEDIN_ [l=ru] {(Ð²ÐŸÐ¹ÑÐž Ð² ÑÐžÑÑÐµÐŒÑ ÐºÐ°Ðº _cgiargunHtmlsafe_)}
 _linktextLOGOUT_ [l=ru] {ÐÐ«ÐÐ¢Ð}
 
@@ -355,5 +355,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ru] {_If_(_thislast_,ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑ _thisfirst_ - _thislast_ Ð¿ÐŸÐžÑÐºÐ° Ð¿ÐŸ Ð·Ð°Ð¿ÑÐŸÑÑ: _cgiargq_,ÐÐžÑÐµÐ³ÐŸ ÐœÐµ ÐœÐ°Ð¹ÐŽÐµÐœÐŸ Ð¿ÐŸ Ð·Ð°Ð¿ÑÐŸÑÑ: _cgiargq_)}
+_textquerytitle_ [l=ru] {_If_(_thislast_,ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑ _thisfirst_ - _thislast_ Ð¿ÐŸÐžÑÐºÐ° Ð¿ÐŸ Ð·Ð°Ð¿ÑÐŸÑÑ: _cgiargqHtmlsafe_,ÐÐžÑÐµÐ³ÐŸ ÐœÐµ ÐœÐ°Ð¹ÐŽÐµÐœÐŸ Ð¿ÐŸ Ð·Ð°Ð¿ÑÐŸÑÑ: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=ru] {Ð¡ÑÑÐ°ÐœÐžÑÐ° Ð¿ÐŸÐŒÐŸÑÐž}
 
Index: main/trunk/greenstone2/macros/russian2.dm
===================================================================
--- main/trunk/greenstone2/macros/russian2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/russian2.dm	(revision 28888)
@@ -150,5 +150,5 @@
 # should have arguments of collection, collectionname and link
 _foundintcontent_ [l=ru] {Ð¡ÑÑÐ»ÐºÐ° ÐœÐ° ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ " _2 _ " 
-Ð¡ÑÑÐ»ÐºÐ°, ÐºÐŸÑÐŸÑÑÑ Ð²Ñ Ð²ÑÐ±ÑÐ°Ð»Ðž, ÑÐ²Ð»ÑÐµÑÑÑ Ð²ÐœÐµÑÐœÐµÐ¹ Ðº " _collectionname _ " ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ (ÐŸÐœÐ° ÑÐ²ÑÐ·ÑÐ²Ð°ÐµÑÑÑ Ñ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐµÐ¹ " _2 _ " ). ÐÑÐ»Ðž Ð²Ñ Ð¶ÐµÐ»Ð°ÐµÑÐµ Ð¿ÐµÑÐµÐ¹ÑÐž Ð¿ÐŸ ÑÑÐŸÐ¹ ÑÑÑÐ»ÐºÐµ Ðº ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž " _2 _ ", ÑÐŸ Ð²Ñ ÐŒÐŸÐ¶ÐµÑÐµ <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">    ÐžÐŽÑÐž ÐŽÐ°Ð»ÑÑÐµ ÐœÐ° ÑÑÑ ÑÑÑÐ°ÐœÐžÑÑ </a>; ÐžÐœÐ°ÑÐµ Ð²ÐŸÑÐ¿ÐŸÐ»ÑÐ·ÑÐ¹ÑÐµÑÑ ÐºÐœÐŸÐ¿ÐºÐŸÐ¹ "back/ÐœÐ°Ð·Ð°ÐŽ" Ð² Ð²Ð°ÑÐµÐŒ Ð±ÑÐ°ÑÐ·ÐµÑÐµ, ÑÑÐŸÐ±Ñ Ð²ÐµÑÐœÑÑÑÑÑ Ðº Ð¿ÑÐµÐŽÑÐŽÑÑÐµÐŒÑ ÐŽÐŸÐºÑÐŒÐµÐœÑÑ. }
+Ð¡ÑÑÐ»ÐºÐ°, ÐºÐŸÑÐŸÑÑÑ Ð²Ñ Ð²ÑÐ±ÑÐ°Ð»Ðž, ÑÐ²Ð»ÑÐµÑÑÑ Ð²ÐœÐµÑÐœÐµÐ¹ Ðº " _collectionname _ " ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ (ÐŸÐœÐ° ÑÐ²ÑÐ·ÑÐ²Ð°ÐµÑÑÑ Ñ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐµÐ¹ " _2 _ " ). ÐÑÐ»Ðž Ð²Ñ Ð¶ÐµÐ»Ð°ÐµÑÐµ Ð¿ÐµÑÐµÐ¹ÑÐž Ð¿ÐŸ ÑÑÐŸÐ¹ ÑÑÑÐ»ÐºÐµ Ðº ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž " _2 _ ", ÑÐŸ Ð²Ñ ÐŒÐŸÐ¶ÐµÑÐµ <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">    ÐžÐŽÑÐž ÐŽÐ°Ð»ÑÑÐµ ÐœÐ° ÑÑÑ ÑÑÑÐ°ÐœÐžÑÑ </a>; ÐžÐœÐ°ÑÐµ Ð²ÐŸÑÐ¿ÐŸÐ»ÑÐ·ÑÐ¹ÑÐµÑÑ ÐºÐœÐŸÐ¿ÐºÐŸÐ¹ "back/ÐœÐ°Ð·Ð°ÐŽ" Ð² Ð²Ð°ÑÐµÐŒ Ð±ÑÐ°ÑÐ·ÐµÑÐµ, ÑÑÐŸÐ±Ñ Ð²ÐµÑÐœÑÑÑÑÑ Ðº Ð¿ÑÐµÐŽÑÐŽÑÑÐµÐŒÑ ÐŽÐŸÐºÑÐŒÐµÐœÑÑ. }
 
 
@@ -168,5 +168,5 @@
 _textpassword_ [l=ru] {ÐÐ°ÑÐŸÐ»Ñ}
 
-_textmustbelongtogroup_ [l=ru] {ÐÐ±ÑÐ°ÑÐžÑÐµ Ð²ÐœÐžÐŒÐ°ÐœÐžÐµ, ÑÑÐŸ ÐÑ ÐŽÐŸÐ»Ð¶ÐœÑ Ð¿ÑÐžÐœÐ°ÐŽÐ»ÐµÐ¶Ð°ÑÑ Ðº Ð³ÑÑÐ¿Ð¿Ðµ "_cgiargug_"   ÐŽÐŸÑÑÑÐ¿Ð° ÐœÐ° ÑÑÑ ÑÑÑÐ°ÐœÐžÑÑ.}
+_textmustbelongtogroup_ [l=ru] {ÐÐ±ÑÐ°ÑÐžÑÐµ Ð²ÐœÐžÐŒÐ°ÐœÐžÐµ, ÑÑÐŸ ÐÑ ÐŽÐŸÐ»Ð¶ÐœÑ Ð¿ÑÐžÐœÐ°ÐŽÐ»ÐµÐ¶Ð°ÑÑ Ðº Ð³ÑÑÐ¿Ð¿Ðµ "_cgiargugHtmlsafe_"   ÐŽÐŸÑÑÑÐ¿Ð° ÐœÐ° ÑÑÑ ÑÑÑÐ°ÐœÐžÑÑ.}
 
 _textmessageinvalid_ [l=ru] {Ð¡ÑÑÐ°ÐœÐžÑÐ° ÐºÐŸÑÑÑÑ Ð²Ñ Ð·Ð°Ð¿ÑÐ°ÑÐžÐ²Ð°ÐµÑÐµ ÑÑÐµÐ±ÑÐµÑ Ð°Ð²ÑÐŸÑÐžÐ·Ð°ÑÐžÐž<br>
@@ -416,17 +416,17 @@
 _textretcoll_ [l=ru] {ÐÐµÑÐœÑÑÑÑÑ Ð² ÐºÐŸÐ»Ð»ÐµÐºÑÐŸÑ}
 
-_textdelperm_ [l=ru] {<p> ÐÐµÐºÐŸÑÐŸÑÑÐµ ÑÐ°ÑÑÐž ÐžÐ»Ðž Ð²ÑÑ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ _cgiargbc1dirname_ ÐœÐµ ÐŒÐŸÐ¶ÐµÑ Ð±ÑÑÑ ÑÐŽÐ°Ð»ÐµÐœÐ°. ÐÐŸÐ·ÐŒÐŸÐ¶ÐœÑÐµ Ð¿ÑÐžÑÐžÐœÑ: 
+_textdelperm_ [l=ru] {<p> ÐÐµÐºÐŸÑÐŸÑÑÐµ ÑÐ°ÑÑÐž ÐžÐ»Ðž Ð²ÑÑ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ _cgiargbc1dirnameHtmlsafe_ ÐœÐµ ÐŒÐŸÐ¶ÐµÑ Ð±ÑÑÑ ÑÐŽÐ°Ð»ÐµÐœÐ°. ÐÐŸÐ·ÐŒÐŸÐ¶ÐœÑÐµ Ð¿ÑÐžÑÐžÐœÑ: 
 <ul>
-<li> Greenstone ÐœÐµ ÐžÐŒÐµÐµÑ ÑÐ°Ð·ÑÐµÑÐµÐœÐžÑ ÐœÐ° ÑÐŽÐ°Ð»ÐµÐœÐžÐµ ÐŽÐžÑÐµÐºÑÐŸÑÐžÐž gsdlhome_/collect/_cgiargbc1dirname_.
+<li> Greenstone ÐœÐµ ÐžÐŒÐµÐµÑ ÑÐ°Ð·ÑÐµÑÐµÐœÐžÑ ÐœÐ° ÑÐŽÐ°Ð»ÐµÐœÐžÐµ ÐŽÐžÑÐµÐºÑÐŸÑÐžÐž gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_.
 <br> ÐÐŸÐ¿ÑÐŸÐ±ÑÐ¹ÑÐµ Ð²ÑÑÑÐœÑÑ ÑÐŽÐ°Ð»ÐžÑÑ ÑÑÐŸÑ ÐºÐ°ÑÐ°Ð»ÐŸÐ³ Ñ Ð²Ð°ÑÐµÐ³ÐŸ ÐºÐŸÐŒÐ¿ÑÑÑÐµÑÐ°. }
 
-_textdelinv_ [l=ru] {ÐÐŸÐ»Ð»ÐµÐºÑÐžÑ _cgiargbc1dirname_ Ð·Ð°ÑÐžÑÐµÐœÐ° ÐžÐ»Ðž Ð¿ÐŸÐ²ÑÐµÐ¶ÐŽÐµÐœÐ°. ÐÑÐŸÑÐµÑÑ ÑÐŽÐ°Ð»ÐµÐœÐžÑ ÐŸÑÐŒÐµÐœÐµÐœ. }
-
-_textdelsuc_ [l=ru] {ÐÐŸÐ»Ð»ÐµÐºÑÐžÑ _cgiargbc1dirname_ Ð±ÑÐ»Ð° ÑÑÐ¿ÐµÑÐœÐŸ ÑÐŽÐ°Ð»ÐµÐœÐ°.}
-
-_textclonefail_ [l=ru] {ÐÐµÐ²ÐŸÐ·ÐŒÐŸÐ¶ÐœÐŸ ÑÐŸÐ·ÐŽÐ°ÑÑ ÐŽÑÐ±Ð»ÐžÐºÐ°Ñ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž _cgiargclonecol_. ÐÐŸÐ·ÐŒÐŸÐ¶ÐœÑÐµ Ð¿ÑÐžÑÐžÐœÑ: 
+_textdelinv_ [l=ru] {ÐÐŸÐ»Ð»ÐµÐºÑÐžÑ _cgiargbc1dirnameHtmlsafe_ Ð·Ð°ÑÐžÑÐµÐœÐ° ÐžÐ»Ðž Ð¿ÐŸÐ²ÑÐµÐ¶ÐŽÐµÐœÐ°. ÐÑÐŸÑÐµÑÑ ÑÐŽÐ°Ð»ÐµÐœÐžÑ ÐŸÑÐŒÐµÐœÐµÐœ. }
+
+_textdelsuc_ [l=ru] {ÐÐŸÐ»Ð»ÐµÐºÑÐžÑ _cgiargbc1dirnameHtmlsafe_ Ð±ÑÐ»Ð° ÑÑÐ¿ÐµÑÐœÐŸ ÑÐŽÐ°Ð»ÐµÐœÐ°.}
+
+_textclonefail_ [l=ru] {ÐÐµÐ²ÐŸÐ·ÐŒÐŸÐ¶ÐœÐŸ ÑÐŸÐ·ÐŽÐ°ÑÑ ÐŽÑÐ±Ð»ÐžÐºÐ°Ñ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž _cgiargclonecolHtmlsafe_. ÐÐŸÐ·ÐŒÐŸÐ¶ÐœÑÐµ Ð¿ÑÐžÑÐžÐœÑ: 
 <ul>
-<li> ÐÐŸÐ»Ð»ÐµÐºÑÐžÑ _cgiargclonecol_ ÐœÐµ ÑÑÑÐµÑÑÐ²ÑÐµÑ
-<li> ÐÐŸÐ»Ð»ÐµÐºÑÐžÑ _cgiargclonecol_ ÐœÐµ ÐžÐŒÐµÐµÑ ÑÐ°Ð¹Ð»Ð° ÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÐž collect.cfg 
+<li> ÐÐŸÐ»Ð»ÐµÐºÑÐžÑ _cgiargclonecolHtmlsafe_ ÐœÐµ ÑÑÑÐµÑÑÐ²ÑÐµÑ
+<li> ÐÐŸÐ»Ð»ÐµÐºÑÐžÑ _cgiargclonecolHtmlsafe_ ÐœÐµ ÐžÐŒÐµÐµÑ ÑÐ°Ð¹Ð»Ð° ÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÐž collect.cfg 
 <li> Greenstone ÐœÐµ ÐžÐŒÐµÐµÑ ÑÐ°Ð·ÑÐµÑÐµÐœÐžÑ ÐŽÐ»Ñ ÑÑÐµÐœÐžÑ ÑÐ°Ð¹Ð»Ð° ÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÐž collect.cfg </ul>}
 
@@ -452,7 +452,7 @@
  ÐºÐœÐŸÐ¿ÐŸÐº Ð¿ÑÐž ÑÐŸÐ·ÐŽÐ°ÐœÐžÐž ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž Ñ Ð¿ÐŸÐŒÐŸÑÑÑ ÐÐŸÐ»Ð»ÐµÐºÑÐŸÑÐ°). Ð ÐµÐºÐŸÐŒÐµÐœÐŽÑÐµÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð¿ÑÑÑÐžÑÑ ÐÐŸÐ»Ð»ÐµÐºÑÐŸÑ. }
 
-_textexptsuc_ [l=ru] {ÐÐŸÐ»Ð»ÐµÐºÑÐžÑ  _cgiargbc1dirname_ Ð±ÑÐ»Ð° ÑÑÐ¿ÐµÑÐœÐŸ ÑÐºÑÐ¿ÐŸÑÑÐžÑÐŸÐ²Ð°ÐœÐ° Ð² ÐŽÐžÑÐµÐºÑÐŸÑÐžÑ _gsdlhome_/tmp/exported\__cgiargbc1dirname_. }
-
-_textexptfail_ [l=ru] {Ð¡Ð±ÐŸÐ¹ Ð¿ÑÐž ÑÐºÑÐ¿ÐŸÑÑÐµ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž _cgiargbc1dirname_. 
+_textexptsuc_ [l=ru] {ÐÐŸÐ»Ð»ÐµÐºÑÐžÑ  _cgiargbc1dirnameHtmlsafe_ Ð±ÑÐ»Ð° ÑÑÐ¿ÐµÑÐœÐŸ ÑÐºÑÐ¿ÐŸÑÑÐžÑÐŸÐ²Ð°ÐœÐ° Ð² ÐŽÐžÑÐµÐºÑÐŸÑÐžÑ _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_. }
+
+_textexptfail_ [l=ru] {Ð¡Ð±ÐŸÐ¹ Ð¿ÑÐž ÑÐºÑÐ¿ÐŸÑÑÐµ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž _cgiargbc1dirnameHtmlsafe_. 
 Ð­ÑÐŸ, Ð²ÐµÑÐŸÑÑÐœÐŸ, Ð¿ÑÐŸÐžÐ·ÐŸÑÐ»ÐŸ Ð¿ÐŸÑÐŸÐŒÑ, ÑÑÐŸ Greenstone Ð±ÑÐ» ÑÑÑÐ°ÐœÐŸÐ²Ð»ÐµÐœ Ð±ÐµÐ· ÐœÐµÐŸÐ±Ñ
 ÐŸÐŽÐžÐŒÑÑ
@@ -660,5 +660,5 @@
 _textdeleteuser_ [l=ru] {Ð£ÐŽÐ°Ð»ÐžÑÑ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»Ñ}
 _textremwarn_ [l=ru] {ÐÑ  ÐŽÐµÐ¹ÑÑÐ²ÐžÑÐµÐ»ÑÐœÐŸ Ñ
-ÐŸÑÐžÑÐµ ÐŸÐºÐŸÐœÑÐ°ÑÐµÐ»ÑÐœÐŸ ÑÐŽÐ°Ð»ÐžÑÑ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»Ñ _cgiargumun_?}
+ÐŸÑÐžÑÐµ ÐŸÐºÐŸÐœÑÐ°ÑÐµÐ»ÑÐœÐŸ ÑÐŽÐ°Ð»ÐžÑÑ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»Ñ _cgiargumunHtmlsafe_?}
 
 
Index: main/trunk/greenstone2/macros/serbian-bh-cyr.dm
===================================================================
--- main/trunk/greenstone2/macros/serbian-bh-cyr.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/serbian-bh-cyr.dm	(revision 28888)
@@ -354,5 +354,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=sr-bh-cyr] {_If_(_thislast_,ÑÐµÐ·ÑÐ»ÑÐ°ÑÐž _thisfirst_ - _thislast_ ÑÐ¿ÐžÑÐ°: _cgiargq_,ÐÐµÐŒÐ° ÐŽÐŸÐºÑÐŒÐµÐœÐ°ÑÐ° ÐºÐŸÑÐž Ð·Ð°ÐŽÐŸÐ²ÐŸÑÐ°Ð²Ð°ÑÑ ÑÐ¿ÐžÑ: _cgiargq_)}  
+_textquerytitle_ [l=sr-bh-cyr] {_If_(_thislast_,ÑÐµÐ·ÑÐ»ÑÐ°ÑÐž _thisfirst_ - _thislast_ ÑÐ¿ÐžÑÐ°: _cgiargqHtmlsafe_,ÐÐµÐŒÐ° ÐŽÐŸÐºÑÐŒÐµÐœÐ°ÑÐ° ÐºÐŸÑÐž Ð·Ð°ÐŽÐŸÐ²ÐŸÑÐ°Ð²Ð°ÑÑ ÑÐ¿ÐžÑ: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=sr-bh-cyr] {Ð¡ÑÑÐ°ÐœÐžÑÐ° Ð·Ð° Ð¿ÑÐµÑÑÐ°Ð¶ÐžÐ²Ð°ÑÐµ}  
 
Index: main/trunk/greenstone2/macros/serbian-bh-lat.dm
===================================================================
--- main/trunk/greenstone2/macros/serbian-bh-lat.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/serbian-bh-lat.dm	(revision 28888)
@@ -346,5 +346,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=sr-bh-lat] {_If_(_thislast_,rezultati _thisfirst_ - _thislast_ upita: _cgiargq_,Nema dokumenata koji zadovoljavaju upit: _cgiargq_)}  
+_textquerytitle_ [l=sr-bh-lat] {_If_(_thislast_,rezultati _thisfirst_ - _thislast_ upita: _cgiargqHtmlsafe_,Nema dokumenata koji zadovoljavaju upit: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=sr-bh-lat] {Stranica za pretraÅŸivanje}  
 
Index: main/trunk/greenstone2/macros/serbian-cyr.dm
===================================================================
--- main/trunk/greenstone2/macros/serbian-cyr.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/serbian-cyr.dm	(revision 28888)
@@ -354,5 +354,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=sr-cyr] {_If_(_thislast_,ÑÐµÐ·ÑÐ»ÑÐ°ÑÐž _thisfirst_ - _thislast_ ÑÐ¿ÐžÑÐ°: _cgiargq_,ÐÐµÐŒÐ° ÐŽÐŸÐºÑÐŒÐµÐœÐ°ÑÐ° ÐºÐŸÑÐž Ð·Ð°ÐŽÐŸÐ²ÐŸÑÐ°Ð²Ð°ÑÑ ÑÐ¿ÐžÑ: _cgiargq_)}  
+_textquerytitle_ [l=sr-cyr] {_If_(_thislast_,ÑÐµÐ·ÑÐ»ÑÐ°ÑÐž _thisfirst_ - _thislast_ ÑÐ¿ÐžÑÐ°: _cgiargqHtmlsafe_,ÐÐµÐŒÐ° ÐŽÐŸÐºÑÐŒÐµÐœÐ°ÑÐ° ÐºÐŸÑÐž Ð·Ð°ÐŽÐŸÐ²ÐŸÑÐ°Ð²Ð°ÑÑ ÑÐ¿ÐžÑ: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=sr-cyr] {Ð¡ÑÑÐ°ÐœÐžÑÐ° Ð·Ð° Ð¿ÑÐµÑÑÐ°Ð¶ÐžÐ²Ð°ÑÐµ}  
 
Index: main/trunk/greenstone2/macros/serbian-lat.dm
===================================================================
--- main/trunk/greenstone2/macros/serbian-lat.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/serbian-lat.dm	(revision 28888)
@@ -346,5 +346,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=sr-lat] {_If_(_thislast_,rezultati _thisfirst_ - _thislast_ upita: _cgiargq_,Nema dokumenata koji zadovoljavaju upit: _cgiargq_)}  
+_textquerytitle_ [l=sr-lat] {_If_(_thislast_,rezultati _thisfirst_ - _thislast_ upita: _cgiargqHtmlsafe_,Nema dokumenata koji zadovoljavaju upit: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=sr-lat] {Stranica za pretraÅŸivanje}  
 
Index: main/trunk/greenstone2/macros/sinhalese.dm
===================================================================
--- main/trunk/greenstone2/macros/sinhalese.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/sinhalese.dm	(revision 28888)
@@ -78,5 +78,5 @@
 _textdescrlogin_ [l=si] {à¶Žà¶¯à·à¶°à¶­à·à¶ºà¶§ à¶à¶­à·à·
 à· à·à¶± / à¶Žà·à·à·à·à·à¶± à¶Žà·à¶§à·à·âââ		}  
-_textdescrlogout_ [l=si] {_cgiargun_ à¶œà·à· à¶Žà¶¯à·à¶°à¶­à·à¶ºà¶§ à¶à¶­à·à·
+_textdescrlogout_ [l=si] {_cgiargunHtmlsafe_ à¶œà·à· à¶Žà¶¯à·à¶°à¶­à·à¶ºà¶§ à¶à¶­à·à·
 à· à·à¶±à·à¶±		}  
 
@@ -230,5 +230,5 @@
 _linktextLOGIN_ [l=si] {à¶Žà¶¯à·à¶°à¶­à·à¶ºà¶§ à¶à¶­à·à·
 à· à·à·à¶ž / à¶Žà·à·à·à·à·à¶ž		}  
-_linktextLOGGEDIN_ [l=si] {( _cgiargun_à¶œà·à· à¶Žà¶¯à·à¶°à¶­à·à¶ºà¶§ à¶à¶­à·à¶œà· à·à¶±à·à¶± / à¶Žà·à·à·à·à·à¶±à·à¶±)}  
+_linktextLOGGEDIN_ [l=si] {( _cgiargunHtmlsafe_à¶œà·à· à¶Žà¶¯à·à¶°à¶­à·à¶ºà¶§ à¶à¶­à·à¶œà· à·à¶±à·à¶± / à¶Žà·à·à·à·à·à¶±à·à¶±)}  
 _linktextLOGOUT_ [l=si] {à¶Žà¶¯à·à¶°à¶­à·à¶ºà·à¶±à· à¶à·à¶­à· à·à·à¶ž		}  
 
@@ -410,5 +410,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=si] {_If_(_thislast_,results _thisfirst_ - _thislast_à·à·à¶žà·à·à¶žà· à·à¶³à·à·: _cgiargq_,à·à·à¶žà·à·à¶žà· à¶±à·à¶à·à¶à¶Žà·à¶± à·à·à¶§: _cgiargq_)}  
+_textquerytitle_ [l=si] {_If_(_thislast_,results _thisfirst_ - _thislast_à·à·à¶žà·à·à¶žà· à·à¶³à·à·: _cgiargqHtmlsafe_,à·à·à¶žà·à·à¶žà· à¶±à·à¶à·à¶à¶Žà·à¶± à·à·à¶§: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=si] {à·à·à·à·à¶žà· à¶Žà·à¶§à·à·}  
 
Index: main/trunk/greenstone2/macros/slovak.dm
===================================================================
--- main/trunk/greenstone2/macros/slovak.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/slovak.dm	(revision 28888)
@@ -71,5 +71,5 @@
 _textdescrpref_ [l=sk] {Nastavenia}
 _textdescrlogin_ [l=sk] {Prihlasovacia strÃ¡nka}
-_textdescrlogout_ [l=sk] {OdhlÃ¡siÅ¥ sa ako _cgiargun_}
+_textdescrlogout_ [l=sk] {OdhlÃ¡siÅ¥ sa ako _cgiargunHtmlsafe_}
 
 _textdescrgreenstone_ [l=sk] {SoftvÃ©r digitÃ¡lnej kniÅŸnice Greenstone}
@@ -210,5 +210,5 @@
 _linktextPREFERENCES_ [l=sk] {NASTAVENIA}
 _linktextLOGIN_ [l=sk] {PRIHLÃSIÅ€ SA}
-_linktextLOGGEDIN_ [l=sk] {(prihlÃ¡senÃœ ako _cgiargun_)}
+_linktextLOGGEDIN_ [l=sk] {(prihlÃ¡senÃœ ako _cgiargunHtmlsafe_)}
 _linktextLOGOUT_ [l=sk] {ODHLÃSIÅ€ SA}
 
@@ -359,5 +359,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=sk] {_If_(_thislast_,vÃœsledky _thisfirst_ - _thislast_ na dotaz: _cgiargq_,Åœiadne vÃœsledky: _cgiargq_)}
+_textquerytitle_ [l=sk] {_If_(_thislast_,vÃœsledky _thisfirst_ - _thislast_ na dotaz: _cgiargqHtmlsafe_,Åœiadne vÃœsledky: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=sk] {VyhÄŸadÃ¡vacia strana}
 
Index: main/trunk/greenstone2/macros/slovak2.dm
===================================================================
--- main/trunk/greenstone2/macros/slovak2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/slovak2.dm	(revision 28888)
@@ -105,5 +105,5 @@
 
 <p>ZvolenÃœ odkaz pre zbierku "_collectionname_" je externÃœ (spÃ¡ja zbierky "_2_"). Ak   
-chcete zobraziÅ¥ tento odkaz v zbierke "_2_" mÃŽÅŸete Ã­sÅ¥ <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">dopredu</a>na tÃºto strÃ¡nku. Pre nÃ¡vrat k predchÃ¡dzajÃºcemu dokumentu pouÅŸite tlaÄidlo "spÃ€Å¥" vo vaÅ¡om prehliadaÄi.}  
+chcete zobraziÅ¥ tento odkaz v zbierke "_2_" mÃŽÅŸete Ã­sÅ¥ <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">dopredu</a>na tÃºto strÃ¡nku. Pre nÃ¡vrat k predchÃ¡dzajÃºcemu dokumentu pouÅŸite tlaÄidlo "spÃ€Å¥" vo vaÅ¡om prehliadaÄi.}  
 
 
@@ -123,5 +123,5 @@
 _textpassword_ [l=sk] {heslo}  
 
-_textmustbelongtogroup_ [l=sk] {Pre prÃ­stup k tejto strÃ¡nke musÃ­te patriÅ¥ k uÅŸÃ­vateÄŸskej skupine "_cgiargug_".}  
+_textmustbelongtogroup_ [l=sk] {Pre prÃ­stup k tejto strÃ¡nke musÃ­te patriÅ¥ k uÅŸÃ­vateÄŸskej skupine "_cgiargugHtmlsafe_".}  
 
 _textmessageinvalid_ [l=sk] {Pre zobrazenie strÃ¡nky musÃ­te byÅ¥ prihlÃ¡senÃœ.<br>
@@ -300,12 +300,12 @@
 _textretcoll_ [l=sk] {SpÃ€Å¥ }  
 
-_textdelperm_ [l=sk] {Zbierka _cgiargbc1dirname_ nemohla byÅ¥ vymazanÃ¡. PravdepodobnÃ© prÃ­Äiny : <ul> <li> Greenstone nie je oprÃ¡vnenÃœ vymazaÅ¥ prieÄinok _gsdlhome_/collect/_cgiargbc1dirname_.<br> MoÅŸno budete musieÅ¥ prieÄinok zbierky _cgiargbc1dirname_ zmazaÅ¥ manuÃ¡lne.</li><li>Greenstone nemÃŽÅŸe spustiÅ¥ program _gsdlhome_/bin/script/delcol.pl. Uistite sa, ÅŸe sÃºbor je moÅŸnÃ© ÄÃ­taÅ¥ a spustiÅ¥.</li>
+_textdelperm_ [l=sk] {Zbierka _cgiargbc1dirnameHtmlsafe_ nemohla byÅ¥ vymazanÃ¡. PravdepodobnÃ© prÃ­Äiny : <ul> <li> Greenstone nie je oprÃ¡vnenÃœ vymazaÅ¥ prieÄinok _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_.<br> MoÅŸno budete musieÅ¥ prieÄinok zbierky _cgiargbc1dirnameHtmlsafe_ zmazaÅ¥ manuÃ¡lne.</li><li>Greenstone nemÃŽÅŸe spustiÅ¥ program _gsdlhome_/bin/script/delcol.pl. Uistite sa, ÅŸe sÃºbor je moÅŸnÃ© ÄÃ­taÅ¥ a spustiÅ¥.</li>
 </ul>}  
 
-_textdelinv_ [l=sk] {Zbierka _cgiargbc1dirname_ je chrÃ¡nenÃ¡, alebo nefunkÄnÃ¡. VaÅ¡a operÃ¡cia bola zruÅ¡enÃ¡. }  
-
-_textdelsuc_ [l=sk] {Zbierka _cgiargbc1dirname_ bola ÃºspeÅ¡ne zmazanÃ¡.}  
-
-_textclonefail_ [l=sk] {Zbierka _cgiargclonecol_ nemohla byÅ¥ vyklonovanÃ¡. MoÅŸnÃ© prÃ­Äiny :  <ul> <li> Zbierka _cgiargclonecol_ neexistuje.<li> Zbierka _cgiargclonecol_ nemÃ¡ konfiguraÄnÃœ sÃºbor collect.cfg <li> Greenstone nemÃ¡ prÃ¡vo ÄÃ­taÅ¥ sÃºbor collect.cfg</ul>}  
+_textdelinv_ [l=sk] {Zbierka _cgiargbc1dirnameHtmlsafe_ je chrÃ¡nenÃ¡, alebo nefunkÄnÃ¡. VaÅ¡a operÃ¡cia bola zruÅ¡enÃ¡. }  
+
+_textdelsuc_ [l=sk] {Zbierka _cgiargbc1dirnameHtmlsafe_ bola ÃºspeÅ¡ne zmazanÃ¡.}  
+
+_textclonefail_ [l=sk] {Zbierka _cgiargclonecolHtmlsafe_ nemohla byÅ¥ vyklonovanÃ¡. MoÅŸnÃ© prÃ­Äiny :  <ul> <li> Zbierka _cgiargclonecolHtmlsafe_ neexistuje.<li> Zbierka _cgiargclonecolHtmlsafe_ nemÃ¡ konfiguraÄnÃœ sÃºbor collect.cfg <li> Greenstone nemÃ¡ prÃ¡vo ÄÃ­taÅ¥ sÃºbor collect.cfg</ul>}  
 
 _textcolerr_ [l=sk] {Chyba ZberateÄŸa.}  
@@ -321,7 +321,7 @@
 _textreloaderror_ [l=sk] {Pri budovanÃ­ novej kolekcie nastala chyba. Greenstone mohlo zmiasÅ¥ pouÅŸÃ­vanie tlaÄidiel "spaÅ¥" a "obnov" vo vaÅ¡om prehliadaÄi (snaÅŸte sa poÄas budovania zbierky minimalizovaÅ¥ pouÅŸÃ­vanie tÃœchto tlaÄidiel). Teraz reÅ¡tartujte ZberateÄŸa.}  
 
-_textexptsuc_ [l=sk] {Zbierka _cgiargbc1dirname_ bola ÃºspeÅ¡ne exportovanÃ¡ do adresÃ¡ra _gsdlhome_/tmp/exported\__cgiargbc1dirname_.}  
-
-_textexptfail_ [l=sk] {<p>Export zbierky  _cgiargbc1dirname_ zlyhal. <p>Pravdepodobne ste nenainÅ¡talovali tÃºto funkciu.<ul> <li>Ak ste inÅ¡talovali Greenstone z CD-ROM (skorÅ¡iu verziu ako 2.70w), funkcia Export sa nenainÅ¡talovala, pokiaÄŸ ste poÄas inÅ¡talÃ¡cie nezvolili "VlastnÃº" (Custom) inÅ¡talÃ¡ciu. Funkciu je moÅŸnÃ© doinÅ¡talovaÅ¥ opÃ€tovnÃœm spustenÃ­m inÅ¡talÃ¡cie. <li>Ak ste inÅ¡talovali Greenstone z webovej distribÃºcie, musÃ­te si stiahnuÅ¥ inÅ¡talaÄnÃœ sÃºbor a doinÅ¡talovaÅ¥ potrebnÃº funkciu. Pre ÄalÅ¡ie informÃ¡cie navÅ¡tÃ­vte <a href="http://www.greenstone.org">http://www.greenstone.org</a> a <a  href="https://list.scms.waikato.ac.nz/mailman/listinfo/greenstone-users">diskusnÃº skupinu.</a></ul> }  
+_textexptsuc_ [l=sk] {Zbierka _cgiargbc1dirnameHtmlsafe_ bola ÃºspeÅ¡ne exportovanÃ¡ do adresÃ¡ra _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_.}  
+
+_textexptfail_ [l=sk] {<p>Export zbierky  _cgiargbc1dirnameHtmlsafe_ zlyhal. <p>Pravdepodobne ste nenainÅ¡talovali tÃºto funkciu.<ul> <li>Ak ste inÅ¡talovali Greenstone z CD-ROM (skorÅ¡iu verziu ako 2.70w), funkcia Export sa nenainÅ¡talovala, pokiaÄŸ ste poÄas inÅ¡talÃ¡cie nezvolili "VlastnÃº" (Custom) inÅ¡talÃ¡ciu. Funkciu je moÅŸnÃ© doinÅ¡talovaÅ¥ opÃ€tovnÃœm spustenÃ­m inÅ¡talÃ¡cie. <li>Ak ste inÅ¡talovali Greenstone z webovej distribÃºcie, musÃ­te si stiahnuÅ¥ inÅ¡talaÄnÃœ sÃºbor a doinÅ¡talovaÅ¥ potrebnÃº funkciu. Pre ÄalÅ¡ie informÃ¡cie navÅ¡tÃ­vte <a href="http://www.greenstone.org">http://www.greenstone.org</a> a <a  href="https://list.scms.waikato.ac.nz/mailman/listinfo/greenstone-users">diskusnÃº skupinu.</a></ul> }  
 
 ######################################################################
@@ -462,5 +462,5 @@
 
 _textdeleteuser_ [l=sk] {VymazaÅ¥ pouÅŸÃ­vateÄŸa}  
-_textremwarn_ [l=sk] {Ste si istÃœ, ÅŸe chcete zmazaÅ¥ pouÅŸÃ­vateÄŸa <b>_cgiargumun_</b>?}  
+_textremwarn_ [l=sk] {Ste si istÃœ, ÅŸe chcete zmazaÅ¥ pouÅŸÃ­vateÄŸa <b>_cgiargumunHtmlsafe_</b>?}  
 
 
Index: main/trunk/greenstone2/macros/spanish.dm
===================================================================
--- main/trunk/greenstone2/macros/spanish.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/spanish.dm	(revision 28888)
@@ -58,5 +58,5 @@
 _textdescrpref_ [l=es] {PÃ¡gina de Preferencias}
 _textdescrlogin_ [l=es] {PÃ¡gina de ingreso}
-_textdescrlogout_ [l=es] {Salir como _cgiargun_}
+_textdescrlogout_ [l=es] {Salir como _cgiargunHtmlsafe_}
 
 _textdescrgreenstone_ [l=es] {Programa de la Biblioteca Digital Greenstone}
@@ -199,5 +199,5 @@
 _linktextPREFERENCES_ [l=es] {PREFERENCIAS}
 _linktextLOGIN_ [l=es] {INGRESAR}
-_linktextLOGGEDIN_ [l=es] {(conectado como _cgiargun_)}
+_linktextLOGGEDIN_ [l=es] {(conectado como _cgiargunHtmlsafe_)}
 _linktextLOGOUT_ [l=es] {SALIR}
 
@@ -362,5 +362,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=es] {_If_(_thislast_,resultados _thisfirst_ - _thislast_ para la consulta:_cgiargq_,No se encontraron resultados correspondientes a  la consulta: _cgiargq_)}
+_textquerytitle_ [l=es] {_If_(_thislast_,resultados _thisfirst_ - _thislast_ para la consulta:_cgiargqHtmlsafe_,No se encontraron resultados correspondientes a  la consulta: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=es] {PÃ¡gina de bÃºsqueda}
 
Index: main/trunk/greenstone2/macros/spanish2.dm
===================================================================
--- main/trunk/greenstone2/macros/spanish2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/spanish2.dm	(revision 28888)
@@ -186,5 +186,5 @@
 "_collectionname_" (remite a la colecciÃ³n "_2_"). Si desea ver el
 documento que corresponde a este enlace en la colecciÃ³n "_2_", puede
-<a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">acudir</a> a esa pÃ¡gina;
+<a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">acudir</a> a esa pÃ¡gina;
 en caso contrario, pulse el botÃ³n "AtrÃ¡s" de su navegador para volver al
 documento anterior.
@@ -209,5 +209,5 @@
 
 _textmustbelongtogroup_ [l=es] {Se advierte que para acceder a esta pÃ¡gina usted debe
-pertenecer al grupo "_cgiargug_"}
+pertenecer al grupo "_cgiargugHtmlsafe_"}
 
 _textmessageinvalid_ [l=es] {Para acceder a la pÃ¡gina que usted ha solicitado es necesario conectarse.<br>
@@ -610,29 +610,29 @@
 }
 
-_textdelperm_ [l=es] {No se pudo suprimir toda o una parte de la colecciÃ³n _cgiargbc1dirname_ . Las causas pueden ser las siguientes:
+_textdelperm_ [l=es] {No se pudo suprimir toda o una parte de la colecciÃ³n _cgiargbc1dirnameHtmlsafe_ . Las causas pueden ser las siguientes:
 <ul>
-<li> Greenstone no tiene permiso para suprimir el directorio _gsdlhome_/collect/_cgiargbc1dirname_.<br> 
-Es posible que usted necesite eliminar este directorio manualmente para poder suprimir completamente la colecciÃ³n _cgiargbc1dirname_ de esta computadora.</</li>
+<li> Greenstone no tiene permiso para suprimir el directorio _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_.<br> 
+Es posible que usted necesite eliminar este directorio manualmente para poder suprimir completamente la colecciÃ³n _cgiargbc1dirnameHtmlsafe_ de esta computadora.</</li>
 <li>Greenstone no pudo correr el programa _gsdlhome_/bin/script/delcol.pl. AsegÃºrese de que este fichero se pueda leer y sea ejecutable.</li>
 </ul>
 }
 
-_textdelinv_ [l=es] {La colecciÃ³n _cgiargbc1dirname_ estÃ¡ protegida o no es vÃ¡lida. La
+_textdelinv_ [l=es] {La colecciÃ³n _cgiargbc1dirnameHtmlsafe_ estÃ¡ protegida o no es vÃ¡lida. La
 supresiÃ³n se cancelÃ³.
 
 }
 
-_textdelsuc_ [l=es] {Se suprimiÃ³ la colecciÃ³n _cgiargbc1dirname_.
-
-}
-
-_textclonefail_ [l=es] {No se pudo clonar la colecciÃ³n _cgiargclonecol_. Las causas posibles
+_textdelsuc_ [l=es] {Se suprimiÃ³ la colecciÃ³n _cgiargbc1dirnameHtmlsafe_.
+
+}
+
+_textclonefail_ [l=es] {No se pudo clonar la colecciÃ³n _cgiargclonecolHtmlsafe_. Las causas posibles
 son:
 
 <ul>
 
-<li>La colecciÃ³n _cgiargclonecol_ no existe
-
-<li>La colecciÃ³n _cgiargclonecol_ no tiene ningÃºn fichero collect.cfg
+<li>La colecciÃ³n _cgiargclonecolHtmlsafe_ no existe
+
+<li>La colecciÃ³n _cgiargclonecolHtmlsafe_ no tiene ningÃºn fichero collect.cfg
 
 <li>Greenstone no tiene permiso para leer el fichero de configuraciÃ³n
@@ -688,10 +688,10 @@
 }
 
-_textexptsuc_ [l=es] {La colecciÃ³n de _cgiargbc1dirname_ se exportÃ³ al directorio
-_gsdlhome_/tmp/exported\__cgiargbc1dirname_.
-
-}
-
-_textexptfail_ [l=es] {<p>Fallo en la exportaciÃ³n de la colecciÃ³n _cgiargbc1dirname_.
+_textexptsuc_ [l=es] {La colecciÃ³n de _cgiargbc1dirnameHtmlsafe_ se exportÃ³ al directorio
+_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_.
+
+}
+
+_textexptfail_ [l=es] {<p>Fallo en la exportaciÃ³n de la colecciÃ³n _cgiargbc1dirnameHtmlsafe_.
 
 <p>Esto puede deberse a que Greenstone fue instalado sin los componentes necesarios para soportar a la funciÃ³n "Exportar colecciÃ³n".
@@ -899,5 +899,5 @@
 
 _textdeleteuser_ [l=es] {Suprimir un usuario}
-_textremwarn_ [l=es] {Â¿Confirma usted que desea suprimir definitivamente el usuario <b>_cgiargumun_</b>?}
+_textremwarn_ [l=es] {Â¿Confirma usted que desea suprimir definitivamente el usuario <b>_cgiargumunHtmlsafe_</b>?}
 
 
Index: main/trunk/greenstone2/macros/style.dm
===================================================================
--- main/trunk/greenstone2/macros/style.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/style.dm	(revision 28888)
@@ -240,7 +240,7 @@
     \}
 
-    var un = "_cgiargun_";
-    var ky = "_cgiargky_";
-    var gsapi = new GSAjaxAPI("_gwcgi_","_cgiargc_","_cgiargun_","_cgiargky_");
+    var un = "_cgiargunJssafe_";
+    var ky = "_cgiargkyJssafe_";
+    var gsapi = new GSAjaxAPI("_gwcgi_","_cgiargcJssafe_","_cgiargunJssafe_","_cgiargkyJssafe_");
     
     // http://stackoverflow.com/questions/6312993/javascript-seconds-to-time-with-format-hhmmss
@@ -261,5 +261,5 @@
 
 	// else, if we have a usercommentdiv, we would have a docid. Get toplevel section of the docid
-	var doc_id = "_cgiargd_"; //escape("_cgiargd_");
+	var doc_id = "_cgiargdJssafe_"; //escape("cgiargd");
 	var period = doc_id.indexOf(".");
 	if(period != -1) \{
Index: main/trunk/greenstone2/macros/talkback.dm
===================================================================
--- main/trunk/greenstone2/macros/talkback.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/talkback.dm	(revision 28888)
@@ -34,5 +34,5 @@
       <input type="hidden" name="yes_upload" value="1" />
       <input type="hidden" name="process" value="1" />
-      <input type="hidden" name="fromCollect" value="_cgiargc_" />
+      <input type="hidden" name="fromCollect" value="_cgiargcAttrsafe_" />
       <input type="hidden" name="toCollect" value="_talktoCollect_" />
       <input type="hidden" name="oid" value="" />
Index: main/trunk/greenstone2/macros/tamil.dm
===================================================================
--- main/trunk/greenstone2/macros/tamil.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/tamil.dm	(revision 28888)
@@ -341,5 +341,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ta] {_If_(_thislast_,à®ªà®¯à®©à¯à®à®³à¯ _thisfirst_ - _thislast_ à®à¯à®³à¯à®µà®¿à®à¯à®à¯: _cgiargq_,à®à¯à®³à¯à®µà®¿à®à¯à®à¯ à®ªà¯à®°à¯à®šà¯à®€à®¿à®¯à®µà¯à®¯à®¿à®²à¯à®²à¯: _cgiargq_)}  
+_textquerytitle_ [l=ta] {_If_(_thislast_,à®ªà®¯à®©à¯à®à®³à¯ _thisfirst_ - _thislast_ à®à¯à®³à¯à®µà®¿à®à¯à®à¯: _cgiargqHtmlsafe_,à®à¯à®³à¯à®µà®¿à®à¯à®à¯ à®ªà¯à®°à¯à®šà¯à®€à®¿à®¯à®µà¯à®¯à®¿à®²à¯à®²à¯: _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=ta] {à®€à¯à®à®²à¯ à®ªà®à¯à®à®®à¯}  
 
Index: main/trunk/greenstone2/macros/tamil2.dm
===================================================================
--- main/trunk/greenstone2/macros/tamil2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/tamil2.dm	(revision 28888)
@@ -143,5 +143,5 @@
 _foundintcontent_ [l=ta] {<h3>à®à®£à¯à®à¯à®à®²à¯ "_2_" à®€à®¿à®°à®à¯à®à®²à¯</h3>
 
-<p> à®šà¯à®à®à®³à¯ à®€à¯à®°à¯à®šà¯à®€à¯à®à¯à®€à¯à®€  à®à®£à¯à®ªà¯à®ªà¯  "_collectionname_" à®€à®¿à®°à®à¯à®à®²à®à¯à®à¯ à®µà¯à®³à®¿à®ªà¯à®ªà¯à®°à®®à¯ à®à®³à¯à®³à®€à¯ (à®à®€à¯ "_2_" à®€à®¿à®°à®à¯à®à®²à¯à®²à®à¯à®à¯ à®à®£à¯à®à¯à®à®¿à®°à®€à¯). "_2_" à®€à®¿à®°à®à¯à®à®²à¯ à®à®šà¯à®€ à®à®£à¯à®ªà¯à®ªà¯ à®ªà®Ÿà®°à¯à®à¯à®à®µà¯à®£à¯à®à¯à®®à®Ÿà®©à®Ÿà®²à¯ <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_"> à®à¯à®à¯</a> à®®à¯à®©à¯à®à¯à®²à¯à®²à®µà¯à®®à¯. à®®à®±à¯à®±à®ªà®à®¿ à®à®à®à®³à¯ à®®à¯à®²à¯à®à¯à®à®¿à®à®³à®¿à®©à¯ "à®€à®¿à®°à¯à®®à¯à®ªà¯" à®ªà®¿à®€à¯à®€à®Ÿà®©à¯ à®à®ªà®¯à¯à®à®¿à®€à¯à®€à¯ à®®à¯à®©à¯â à®à®µà®£à®€à¯à®€à®¿à®°à¯à®à¯à®à¯ à®€à®¿à®°à¯à®®à¯à®ªà®µà¯à®®à¯.}  
+<p> à®šà¯à®à®à®³à¯ à®€à¯à®°à¯à®šà¯à®€à¯à®à¯à®€à¯à®€  à®à®£à¯à®ªà¯à®ªà¯  "_collectionname_" à®€à®¿à®°à®à¯à®à®²à®à¯à®à¯ à®µà¯à®³à®¿à®ªà¯à®ªà¯à®°à®®à¯ à®à®³à¯à®³à®€à¯ (à®à®€à¯ "_2_" à®€à®¿à®°à®à¯à®à®²à¯à®²à®à¯à®à¯ à®à®£à¯à®à¯à®à®¿à®°à®€à¯). "_2_" à®€à®¿à®°à®à¯à®à®²à¯ à®à®šà¯à®€ à®à®£à¯à®ªà¯à®ªà¯ à®ªà®Ÿà®°à¯à®à¯à®à®µà¯à®£à¯à®à¯à®®à®Ÿà®©à®Ÿà®²à¯ <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_"> à®à¯à®à¯</a> à®®à¯à®©à¯à®à¯à®²à¯à®²à®µà¯à®®à¯. à®®à®±à¯à®±à®ªà®à®¿ à®à®à®à®³à¯ à®®à¯à®²à¯à®à¯à®à®¿à®à®³à®¿à®©à¯ "à®€à®¿à®°à¯à®®à¯à®ªà¯" à®ªà®¿à®€à¯à®€à®Ÿà®©à¯ à®à®ªà®¯à¯à®à®¿à®€à¯à®€à¯ à®®à¯à®©à¯â à®à®µà®£à®€à¯à®€à®¿à®°à¯à®à¯à®à¯ à®€à®¿à®°à¯à®®à¯à®ªà®µà¯à®®à¯.}  
 
 
@@ -162,5 +162,5 @@
 
 _textmustbelongtogroup_ [l=ta] {à®à®µà®©à®¿à®à¯à®à®µà¯à®®à¯, à®à®šà¯à®€ à®ªà®à¯à®à®€à¯à®€à¯ à®
-à®£à¯à®à¯à®µà®€à®°à¯à®à¯à®à¯  à®šà¯à®à®à®³à¯ "_cgiargug_" à®à¯à®Žà¯à®µà®¿à®²à¯ à®à¯à®°à¯à®šà¯à®€à®µà®°à®Ÿà®¯à®¿à®°à¯à®à¯à® à®µà¯à®£à¯à®à¯à®®à¯}  
+à®£à¯à®à¯à®µà®€à®°à¯à®à¯à®à¯  à®šà¯à®à®à®³à¯ "_cgiargugHtmlsafe_" à®à¯à®Žà¯à®µà®¿à®²à¯ à®à¯à®°à¯à®šà¯à®€à®µà®°à®Ÿà®¯à®¿à®°à¯à®à¯à® à®µà¯à®£à¯à®à¯à®®à¯}  
 
 _textmessageinvalid_ [l=ta] {à®šà¯à®à®à®³à¯ à®à¯à®à¯à® à®ªà®à¯à®à®€à¯à®€à¯ à®
@@ -434,24 +434,24 @@
 
 _textdelperm_ [l=ta] {à®à®¿à®² à®
-à®²à¯à®²à®€à¯ à®®à¯à®Žà¯ _cgiargbc1dirname_ à®€à®¿à®°à®à¯à®à®²à¯ à®
+à®²à¯à®²à®€à¯ à®®à¯à®Žà¯ _cgiargbc1dirnameHtmlsafe_ à®€à®¿à®°à®à¯à®à®²à¯ à®
 à®Žà®¿à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯. à®à®¯à®±à¯à®±à®à¯à®à¯à®à®¿à®¯ à®à®Ÿà®°à®£à®à®à®³à¯: <ul>
-<li> à®à¯à®°à¯à®©à¯à®žà¯à®à¯à®£à¯à®à¯à®à¯  _gsdlhome_/collect/_cgiargbc1dirname_
+<li> à®à¯à®°à¯à®©à¯à®žà¯à®à¯à®£à¯à®à¯à®à¯  _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_
 à®
 à®à¯à®µà¯ à®
 à®Žà®¿à®à¯à® à®
 à®©à¯à®®à®€à®¿ à®à®¿à®à®¯à®Ÿà®€à¯. <br> à®à®šà¯à®€ à®
-à®à¯à®µà¯ à®à¯à®®à¯à®±à¯à®¯à®Ÿà®¯à¯  _cgiargbc1dirname_ à®€à®¿à®°à®à¯à®à®²à¯ à®à®£à®¿à®ªà¯à®ªà¯à®±à®¿à®¯à®¿à®°à¯à®šà¯à®€à¯ à®šà¯à®à¯à®à®²à®Ÿà®®à¯.</li>
+à®à¯à®µà¯ à®à¯à®®à¯à®±à¯à®¯à®Ÿà®¯à¯  _cgiargbc1dirnameHtmlsafe_ à®€à®¿à®°à®à¯à®à®²à¯ à®à®£à®¿à®ªà¯à®ªà¯à®±à®¿à®¯à®¿à®°à¯à®šà¯à®€à¯ à®šà¯à®à¯à®à®²à®Ÿà®®à¯.</li>
 <li>à®à¯à®°à¯à®©à¯à®žà¯à®à¯à®£à¯ _gsdlhome_/bin/script/delcol.pl à®šà®¿à®°à®²à¯ à®à®¯à®à¯à® à®®à¯à®à®¿à®¯à®Ÿà®€à¯. à®à®šà¯à®€ à®à¯à®ªà¯à®ªà¯ à®ªà®à®¿à®à¯à®à®µà¯à®®à¯ à®à®¯à®à¯à®à®µà¯à®®à¯ à®à¯à®¯à¯à®¯à®®à¯à®à®¿à®¯à¯à®®à¯à®©à¯à®±à¯ à®šà®¿à®à¯à®à®¯à®®à®Ÿà®à¯à®à®µà®®à¯. </li>
 </ul>}  
 
-_textdelinv_ [l=ta] {_cgiargbc1dirname_ à®€à®¿à®°à®à¯à®à®²à¯ à®à®Ÿà®ªà¯à®ªà®Ÿà®±à¯à®±à®ªà¯à®ªà®à¯à®à®¿à®°à¯à®à¯à®à®¿à®°à®€à¯ à®
+_textdelinv_ [l=ta] {_cgiargbc1dirnameHtmlsafe_ à®€à®¿à®°à®à¯à®à®²à¯ à®à®Ÿà®ªà¯à®ªà®Ÿà®±à¯à®±à®ªà¯à®ªà®à¯à®à®¿à®°à¯à®à¯à®à®¿à®°à®€à¯ à®
 à®²à¯à®²à®€à¯ à®à¯à®²à¯à®²à®Ÿà®€à®€à¯. à®
 à®Žà®¿à®ªà¯à®ªà¯ à®šà¯à®à¯à®à®ªà¯à®ªà®à¯à®à®€à¯.}  
 
-_textdelsuc_ [l=ta] {_cgiargbc1dirname_ à®€à®¿à®°à®à¯à®à®²à¯ à®
+_textdelsuc_ [l=ta] {_cgiargbc1dirnameHtmlsafe_ à®€à®¿à®°à®à¯à®à®²à¯ à®
 à®Žà®¿à®€à¯à®€à®²à¯ à®à®Ÿà®€à®¿à®à¯à®à®ªà¯à®ªà®à¯à®à®€à¯.}  
 
-_textclonefail_ [l=ta] {_cgiargclonecol_ à®€à®¿à®°à®à¯à®à®²à¯ à®šà®à®²à¯ à®à¯à®¯à¯à®¯ à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯. à®à®¯à®±à¯à®±à®à¯à®à¯à®à®¿à®¯ à®à®Ÿà®°à®£à®à®à®³à¯: <ul>
-<li>_cgiargclonecol_ à®€à®¿à®°à®à¯à®à®²à¯ à®à®²à¯à®²à¯<li>  _cgiargclonecol_ à®€à®¿à®°à®à¯à®à®²à¯à®²à¯à®à¯à®à¯ collect.cfg à®µà®à®¿à®µà®®à¯ à®à¯à®ªà¯à®ªà¯ à®à®²à¯à®²à¯<li> à®à¯à®°à¯à®©à¯à®žà¯à®à¯à®£à¯à®à¯à®à¯ collect.cfg à®µà®à®¿à®µà®®à¯ à®à¯à®ªà¯à®ªà¯ à®ªà®à®¿à®à¯à® à®
+_textclonefail_ [l=ta] {_cgiargclonecolHtmlsafe_ à®€à®¿à®°à®à¯à®à®²à¯ à®šà®à®²à¯ à®à¯à®¯à¯à®¯ à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯. à®à®¯à®±à¯à®±à®à¯à®à¯à®à®¿à®¯ à®à®Ÿà®°à®£à®à®à®³à¯: <ul>
+<li>_cgiargclonecolHtmlsafe_ à®€à®¿à®°à®à¯à®à®²à¯ à®à®²à¯à®²à¯<li>  _cgiargclonecolHtmlsafe_ à®€à®¿à®°à®à¯à®à®²à¯à®²à¯à®à¯à®à¯ collect.cfg à®µà®à®¿à®µà®®à¯ à®à¯à®ªà¯à®ªà¯ à®à®²à¯à®²à¯<li> à®à¯à®°à¯à®©à¯à®žà¯à®à¯à®£à¯à®à¯à®à¯ collect.cfg à®µà®à®¿à®µà®®à¯ à®à¯à®ªà¯à®ªà¯ à®ªà®à®¿à®à¯à® à®
 à®©à¯à®®à®€à®¿ à®à®¿à®à®¯à®Ÿà®€à¯ </ul>}  
 
@@ -480,8 +480,8 @@
 à®²à¯à®²à®€à¯ "à®€à®¿à®°à¯à®®à¯à®ªà¯"  à®ªà®¿à®€à¯à®€à®Ÿà®©à¯à®à®³à¯ à®à®ªà®¯à¯à®à®€à¯à®€à®Ÿà®²à¯ à®à¯à®Žà®ªà¯à®ªà®®à¯ à®à®£à¯à®à®Ÿà®à®¿à®¯à®¿à®°à¯à®à¯à®à®¿à®°à®€à¯ (à®€à®¯à®µà¯à®à¯à®¯à¯à®€à¯ à®€à®¿à®°à®à¯à®à®¿ à®à®°à¯ à®€à®¿à®°à®à¯à®à®²à¯ à®à®à¯à®à¯à®à®¯à®¿à®²à¯ à®à®šà¯à®€ à®ªà®¿à®€à¯à®€à®Ÿà®©à¯à®à®³à¯ à®à®ªà®¯à¯à®à®¿à®à¯à®à®Ÿà®€à¯à®°à¯à®à®³à¯). à®€à®¿à®°à®à¯à®à®¿à®¯à®¯à¯ à®®à¯à®£à¯à®à¯à®®à¯ à®à®°à®®à¯à®ªà®€à¯à®€à®¿à®²à®¿à®°à¯à®šà¯à®€à¯ à®à®¯à®à¯à® à®à®¿à®ªà®Ÿà®°à¯à®à¯ à®à¯à®¯à¯à®à®¿à®°à¯à®®à¯.}  
 
-_textexptsuc_ [l=ta] {_cgiargbc1dirname_ à®€à®¿à®°à®à¯à®à®²à¯  _gsdlhome_/tmp/exported\__cgiargbc1dirname_  à®
+_textexptsuc_ [l=ta] {_cgiargbc1dirnameHtmlsafe_ à®€à®¿à®°à®à¯à®à®²à¯  _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_  à®
 à®à¯à®µà¯à®à¯à®à¯ à®à®±à¯à®±à¯à®®à®€à®¿ à®à®¯à®¿à®±à¯à®±à¯.}  
 
-_textexptfail_ [l=ta] {<p>_cgiargbc1dirname_ à®€à®¿à®°à®à¯à®à®²à¯ à®à®±à¯à®±à¯à®®à®€à®¿ à®ªà®¯à®©à®à®¯à®µà®¿à®²à¯à®²à¯.  <p>à®à®€à®°à¯à®à¯à®à¯ à®à®Ÿà®°à®£à®®à¯ à®à¯à®°à¯à®©à¯à®žà¯à®à¯à®£à¯ "Export to CD-ROM" à®à¯à®¯à®²à¯à®à¯à®à¯ à®µà¯à®£à¯à®à®¿à®¯ à®à®±à¯à®ªà¯à®ªà¯à®à®³à¯ 
+_textexptfail_ [l=ta] {<p>_cgiargbc1dirnameHtmlsafe_ à®€à®¿à®°à®à¯à®à®²à¯ à®à®±à¯à®±à¯à®®à®€à®¿ à®ªà®¯à®©à®à®¯à®µà®¿à®²à¯à®²à¯.  <p>à®à®€à®°à¯à®à¯à®à¯ à®à®Ÿà®°à®£à®®à¯ à®à¯à®°à¯à®©à¯à®žà¯à®à¯à®£à¯ "Export to CD-ROM" à®à¯à®¯à®²à¯à®à¯à®à¯ à®µà¯à®£à¯à®à®¿à®¯ à®à®±à¯à®ªà¯à®ªà¯à®à®³à¯ 
 à®à®²à¯à®²à®Ÿà®®à®²à¯ à®šà®¿à®±à¯à®µà®ªà¯à®ªà®à¯à®à®¿à®°à¯à®à¯à®à®¿à®°à®€à¯. <ul>
 
@@ -686,5 +686,5 @@
 
 _textdeleteuser_ [l=ta] {à®à®°à¯ à®ªà®¯à®©à®°à¯ à®šà¯à®à¯à®à®µà¯à®®à¯}  
-_textremwarn_ [l=ta] {à®à®à®à®³à®à¯à®à¯ à®à®à¯à®à®Ÿà®¯à®®à®Ÿà® <b>_cgiargumun_</b>à®ªà®¯à®©à®°à¯ à®šà®¿à®°à®šà¯à®€à®°à®®à®Ÿà®¯à¯ à®šà¯à®à¯à®à®µà¯à®£à¯à®à¯à®®à®Ÿ?}  
+_textremwarn_ [l=ta] {à®à®à®à®³à®à¯à®à¯ à®à®à¯à®à®Ÿà®¯à®®à®Ÿà® <b>_cgiargumunHtmlsafe_</b>à®ªà®¯à®©à®°à¯ à®šà®¿à®°à®šà¯à®€à®°à®®à®Ÿà®¯à¯ à®šà¯à®à¯à®à®µà¯à®£à¯à®à¯à®®à®Ÿ?}  
 
 
Index: main/trunk/greenstone2/macros/telugu.dm
===================================================================
--- main/trunk/greenstone2/macros/telugu.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/telugu.dm	(revision 28888)
@@ -332,5 +332,5 @@
 # any matches
 _textquerytitle_ [l=te] {_If_(_thislast_,à°ªà°°à°¿à°£à°Ÿà°®à±Š_thisfirst_ - _thislast_à° à°ªà±à°°à°¶à±à°šà°à± 
-_cgiargq_,à° à°ªà±à°°à°¶à±à°šà°à± à°à°Šà°¿ à°®à±à°¯à°Ÿà°à± à°à°Ÿà°²à±à°Šà± _cgiargq_)}  
+_cgiargqHtmlsafe_,à° à°ªà±à°°à°¶à±à°šà°à± à°à°Šà°¿ à°®à±à°¯à°Ÿà°à± à°à°Ÿà°²à±à°Šà± _cgiargqHtmlsafe_)}  
 _textnoquerytitle_ [l=te] {à°¶à±à°§à°¿à°à°à°µà°²à°žà°¿à°š à°ªà±à°}  
 
Index: main/trunk/greenstone2/macros/thai.dm
===================================================================
--- main/trunk/greenstone2/macros/thai.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/thai.dm	(revision 28888)
@@ -325,5 +325,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=th] {"_If_(_thislast_,results _thisfirst_ - _thislast_ àžªàž³àž«àž£àž±àžàžàž³àžà¹àž: _cgiargq_,à¹àž¡à¹àžàž£àžàžàž±àžàžàž³àžà¹àž: _cgiargq_)"	}  
+_textquerytitle_ [l=th] {"_If_(_thislast_,results _thisfirst_ - _thislast_ àžªàž³àž«àž£àž±àžàžàž³àžà¹àž: _cgiargqHtmlsafe_,à¹àž¡à¹àžàž£àžàžàž±àžàžàž³àžà¹àž: _cgiargqHtmlsafe_)"	}  
 _textnoquerytitle_ [l=th] {àž«àžà¹àž²àžà¹àžàž«àž²	}  
 
Index: main/trunk/greenstone2/macros/thai2.dm
===================================================================
--- main/trunk/greenstone2/macros/thai2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/thai2.dm	(revision 28888)
@@ -138,5 +138,5 @@
     (àžàž¶à¹àžà¹àžàž·à¹àž­àž¡à¹àž¢àžà¹àžàž¢àž±àžàžàž­àž¥à¹àž¥àžàžàž±àž "_2_")
     àžà¹àž²àžàžžàžàžà¹àž­àžàžàž²àž£àžàž¹àžàž²àž£à¹àžàž·à¹àž­àž¡à¹àž¢àžàžàžµà¹à¹àžàžàž­àž¥à¹àž¥àžàžàž±àž "_2_" àžàžžàžàžªàž²àž¡àž²àž£àž 
-    <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">à¹àžàžà¹àž­àž¢àž±àž</a> àž«àžà¹àž²àžàžµà¹à¹àžà¹ 
+    <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">à¹àžàžà¹àž­àž¢àž±àž</a> àž«àžà¹àž²àžàžµà¹à¹àžà¹ 
     àž«àž£àž·àž­à¹àžà¹àžàžžà¹àž¡ "àž¢à¹àž­àžàžàž¥àž±àž" àžàžà¹àžàž£àž²àž§à¹àžàž­àž£à¹àžàž­àžàžàžžàžà¹àžàž·à¹àž­àžàž¥àž±àžà¹àžà¹àž­àžàžªàž²àž£àžà¹àž­àžàž«àžà¹àž²àžàžµà¹
 }  
@@ -158,5 +158,5 @@
 _textpassword_ [l=th] {àž£àž«àž±àžªàžà¹àž²àž}  
 
-_textmustbelongtogroup_ [l=th] {à¹àžàž£àžàžªàž±àžà¹àžàžàžžàž§à¹àž² àžàžžàžàžà¹àž­àžàž­àž¢àž¹à¹à¹àžàžàž¥àžžà¹àž¡ "_cgiargug_" à¹àžàž·à¹àž­à¹àžà¹àž²àžàž¶àžàž«àžà¹àž²àžàžµà¹}  
+_textmustbelongtogroup_ [l=th] {à¹àžàž£àžàžªàž±àžà¹àžàžàžžàž§à¹àž² àžàžžàžàžà¹àž­àžàž­àž¢àž¹à¹à¹àžàžàž¥àžžà¹àž¡ "_cgiargugHtmlsafe_" à¹àžàž·à¹àž­à¹àžà¹àž²àžàž¶àžàž«àžà¹àž²àžàžµà¹}  
 
 _textmessageinvalid_ [l=th] {àžàžžàžàžàž°àžà¹àž­àžà¹àžà¹àž²àžªàž¹à¹àž£àž°àžàžàžà¹àž­àžà¹àžàž¢àž±àžàž«àžà¹àž²àžàžµà¹àžàžžàžàž£à¹àž­àžàžàž­ <br>
@@ -431,21 +431,21 @@
 _textretcoll_ [l=th] {àžàž¥àž±àžà¹àžàž¢àž±àžàžàž±àž§àž£àž§àžàž£àž§àž¡}  
 
-_textdelperm_ [l=th] {à¹àž¡à¹àžªàž²àž¡àž²àž£àžàž¥àžàžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ àžàž²àžàžàž±àž§àž«àž£àž·àž­àžàž±à¹àžàž«àž¡àžà¹àžà¹
+_textdelperm_ [l=th] {à¹àž¡à¹àžªàž²àž¡àž²àž£àžàž¥àžàžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ àžàž²àžàžàž±àž§àž«àž£àž·àž­àžàž±à¹àžàž«àž¡àžà¹àžà¹
 àžªàž²à¹àž«àžàžžàžàžµà¹àž­àž²àžà¹àžà¹àžà¹àžà¹àž¡àžµàžàž±àžàžàžµà¹:
 <ul>
-<li> à¹àžàž£à¹àžàž£àž¡ Greenstone à¹àž¡à¹à¹àžà¹àž£àž±àžàž­àžàžžàžàž²àžà¹àž«à¹àž¥àžà¹àžà¹àž£àžàžàž­àž£àžµ _gsdlhome_/collect/_cgiargbc1dirname_<br>
-àžàžžàžàž­àž²àžàžàž³à¹àžà¹àžàžà¹àž­àžàž¥àžà¹àžà¹àž£àžàžàž­àž£àžµàžàžµà¹àž­àž­àžàžà¹àž§àž¢àžàžà¹àž­àž à¹àžàž·à¹àž­àžà¹àž§àž¢à¹àž«à¹àžàž²àž£àž¥àžàžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ àž­àž­àžàžàž²àžàžàž­àž¡àžàžŽàž§à¹àžàž­àž£à¹àžàžµà¹à¹àžªàž£à¹àžàžªàž¡àžàž¹àž£àžà¹</li>
+<li> à¹àžàž£à¹àžàž£àž¡ Greenstone à¹àž¡à¹à¹àžà¹àž£àž±àžàž­àžàžžàžàž²àžà¹àž«à¹àž¥àžà¹àžà¹àž£àžàžàž­àž£àžµ _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_<br>
+àžàžžàžàž­àž²àžàžàž³à¹àžà¹àžàžà¹àž­àžàž¥àžà¹àžà¹àž£àžàžàž­àž£àžµàžàžµà¹àž­àž­àžàžà¹àž§àž¢àžàžà¹àž­àž à¹àžàž·à¹àž­àžà¹àž§àž¢à¹àž«à¹àžàž²àž£àž¥àžàžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ àž­àž­àžàžàž²àžàžàž­àž¡àžàžŽàž§à¹àžàž­àž£à¹àžàžµà¹à¹àžªàž£à¹àžàžªàž¡àžàž¹àž£àžà¹</li>
 <li>à¹àžàž£à¹àžàž£àž¡ Greenstone à¹àž¡à¹àžªàž²àž¡àž²àž£àžà¹àž£àžµàž¢àžà¹àžà¹à¹àžàž£à¹àžàž£àž¡ _gsdlhome_/bin/script/delcol.pl à¹àžà¹ àžàž£àžžàžàž²àžàž£àž§àžàžªàž­àžà¹àž«à¹à¹àžà¹à¹àžàž§à¹àž² à¹àžà¹àž¡àžàžµà¹àžªàž²àž¡àž²àž£àžàž­à¹àž²àžà¹àž¥àž°àžàžàžŽàžàž±àžàžŽàžàž²àž£à¹àžà¹</li>
 </ul>
 }  
 
-_textdelinv_ [l=th] {àžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ à¹àžà¹àž£àž±àžàžàž²àž£àžà¹àž­àžàžàž±àžàž«àž£àž·àž­à¹àž¡à¹àžàž¹àžàžà¹àž­àž  àžàž²àž£àž¥àžàžàž¹àžàž¢àžà¹àž¥àžŽàž}  
-
-_textdelsuc_ [l=th] {àžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ àžàž¹àžàž¥àžà¹àž£àžµàž¢àžàž£à¹àž­àž¢à¹àž¥à¹àž§}  
-
-_textclonefail_ [l=th] {à¹àž¡à¹àžªàž²àž¡àž²àž£àžàž¥àž­àžà¹àžàžàžàž­àž¥à¹àž¥àžàžàž±àž _cgiargclonecol_ collection à¹àžà¹  àžªàž²à¹àž«àžàžžàžàžµà¹à¹àžà¹àžà¹àžà¹àžà¹à¹àžàžŽàžàžàž²àž:
+_textdelinv_ [l=th] {àžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ à¹àžà¹àž£àž±àžàžàž²àž£àžà¹àž­àžàžàž±àžàž«àž£àž·àž­à¹àž¡à¹àžàž¹àžàžà¹àž­àž  àžàž²àž£àž¥àžàžàž¹àžàž¢àžà¹àž¥àžŽàž}  
+
+_textdelsuc_ [l=th] {àžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ àžàž¹àžàž¥àžà¹àž£àžµàž¢àžàž£à¹àž­àž¢à¹àž¥à¹àž§}  
+
+_textclonefail_ [l=th] {à¹àž¡à¹àžªàž²àž¡àž²àž£àžàž¥àž­àžà¹àžàžàžàž­àž¥à¹àž¥àžàžàž±àž _cgiargclonecolHtmlsafe_ collection à¹àžà¹  àžªàž²à¹àž«àžàžžàžàžµà¹à¹àžà¹àžà¹àžà¹àžà¹à¹àžàžŽàžàžàž²àž:
 <ul>
-<li> à¹àž¡à¹àž¡àžµàžàž­àž¥à¹àž¥àžàžàž±àž _cgiargclonecol_ àž­àž¢àž¹à¹
-<li> àžàž­àž¥à¹àž¥àžàžàž±àž _cgiargclonecol_ à¹àž¡à¹àž¡àžµà¹àžà¹àž¡àžàž³àž«àžàžàžà¹àž² collect.cfg
+<li> à¹àž¡à¹àž¡àžµàžàž­àž¥à¹àž¥àžàžàž±àž _cgiargclonecolHtmlsafe_ àž­àž¢àž¹à¹
+<li> àžàž­àž¥à¹àž¥àžàžàž±àž _cgiargclonecolHtmlsafe_ à¹àž¡à¹àž¡àžµà¹àžà¹àž¡àžàž³àž«àžàžàžà¹àž² collect.cfg
 <li> à¹àžàž£à¹àžàž£àž¡Greenstone à¹àž¡à¹à¹àžà¹àž£àž±àžàž­àžàžžàžàž²àžà¹àž«à¹àž­à¹àž²àžà¹àžà¹àž¡àžàž³àž«àžàžàžà¹àž² collect.cfg
 </ul>
@@ -478,9 +478,9 @@
 àžàžàž°àžªàž£à¹àž²àžàžàž­àž¥à¹àž¥àžàžàž±àžàžà¹àž§àž¢àžàž±àž§àž£àž§àžàž£àž§àž¡)  àžàž­à¹àžàž°àžàž³à¹àž«à¹àžàžžàžà¹àž£àžŽà¹àž¡àžà¹àžàžàž±àž§àž£àž§àžàž£àž§àž¡à¹àž«àž¡à¹àžàž±à¹àžà¹àžà¹à¹àž£àž}  
 
-_textexptsuc_ [l=th] {àžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ collection à¹àžà¹àž£àž±àžàžàž²àž£àžªà¹àžàž­àž­àžà¹àžàž¢àž±àžà¹àžà¹àž£àžàžàž­àž£àžµ
-_gsdlhome_/tmp/exported\__cgiargbc1dirname_ à¹àž£àžµàž¢àžàž£à¹àž­àž¢à¹àž¥à¹àž§
-}  
-
-_textexptfail_ [l=th] {<p>à¹àž¡à¹àžªàž²àž¡àž²àž£àžàžªà¹àžàž­àž­àžàžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirname_ à¹àžà¹
+_textexptsuc_ [l=th] {àžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ collection à¹àžà¹àž£àž±àžàžàž²àž£àžªà¹àžàž­àž­àžà¹àžàž¢àž±àžà¹àžà¹àž£àžàžàž­àž£àžµ
+_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_ à¹àž£àžµàž¢àžàž£à¹àž­àž¢à¹àž¥à¹àž§
+}  
+
+_textexptfail_ [l=th] {<p>à¹àž¡à¹àžªàž²àž¡àž²àž£àžàžªà¹àžàž­àž­àžàžàž­àž¥à¹àž¥àžàžàž±àž _cgiargbc1dirnameHtmlsafe_ à¹àžà¹
 
 <p>àžàž±à¹àžàžàžµà¹àž­àž²àžàžàž°à¹àžàžŽàžàžàž²àžàžàž²àž£àžàžŽàžàžàž±à¹àžà¹àžàž£à¹àžàž£àž¡ Greenstone à¹àžàž¢à¹àž¡à¹à¹àžà¹àžàžŽàžàžàž±à¹àžàžàž­àž¡à¹àžà¹àžàžàžà¹àžàžµà¹àžàž³à¹àžà¹àž
@@ -699,5 +699,5 @@
 
 _textdeleteuser_ [l=th] {àž¥àžàžàž¹à¹à¹àžà¹}  
-_textremwarn_ [l=th] {àžàžžàžàžà¹àž­àžàžàž²àž£àž¥àžàžàž¹à¹à¹àžà¹ <b>_cgiargumun_</b> àž­àž­àžàž­àž¢à¹àž²àžàžàž²àž§àž£àž«àž£àž·àž­à¹àž¡à¹}  
+_textremwarn_ [l=th] {àžàžžàžàžà¹àž­àžàžàž²àž£àž¥àžàžàž¹à¹à¹àžà¹ <b>_cgiargumunHtmlsafe_</b> àž­àž­àžàž­àž¢à¹àž²àžàžàž²àž§àž£àž«àž£àž·àž­à¹àž¡à¹}  
 
 
Index: main/trunk/greenstone2/macros/tigrinya.dm
===================================================================
--- main/trunk/greenstone2/macros/tigrinya.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/tigrinya.dm	(revision 28888)
@@ -391,5 +391,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ti] {_If_(_thislast_á£áááµ _thisfirst_ - _thislast_ áá€ _cgiargq_ áááµáµá£ áá€ _cgiargq_ áá²áá¶ ááááá  ášáá )}  
+_textquerytitle_ [l=ti] {_If_(_thislast_á£áááµ _thisfirst_ - _thislast_ áá€ _cgiargqHtmlsafe_ áááµáµá£ áá€ _cgiargqHtmlsafe_ áá²áá¶ ááááá  ášáá )}  
 _textnoquerytitle_ [l=ti] {ááœ á£áá»}  
 
Index: main/trunk/greenstone2/macros/turkish.dm
===================================================================
--- main/trunk/greenstone2/macros/turkish.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/turkish.dm	(revision 28888)
@@ -290,5 +290,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=tr] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,Arama sonucu bulunamadÄ±: _cgiargq_)}
+_textquerytitle_ [l=tr] {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,Arama sonucu bulunamadÄ±: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=tr] {Arama sayfasÄ±}
 
Index: main/trunk/greenstone2/macros/turkish2.dm
===================================================================
--- main/trunk/greenstone2/macros/turkish2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/turkish2.dm	(revision 28888)
@@ -157,5 +157,5 @@
 ("_2_" koleksiyonuna link baÄlantÄ± kurmaktadÄ±r.)
 EÄer "_2_" koleksiyonundaki linki gÃ¶rÃŒntÃŒlemek istiyorsanÄ±z
-<a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">bu sayfaya ilerleyin</a>
+<a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">bu sayfaya ilerleyin</a>
 Linki gÃ¶rÃŒntÃŒlemek istemiyorsanÄ±z  tarayÄ±cÄ±nÄ±zdaki "back" (geri) 
 sekmesine tÄ±klayÄ±n ve Ã¶nceki belgeye ulaÅÄ±n.
@@ -181,5 +181,5 @@
 _textpassword_ [l=tr] {Åifre}
 
-_textmustbelongtogroup_ [l=tr] {Bu sayfaya ulaÅabilmek iÃ§in "_cgiargug_" grubuna kayÄ±tlÄ± olmanÄ±z gerekmektedir.}
+_textmustbelongtogroup_ [l=tr] {Bu sayfaya ulaÅabilmek iÃ§in "_cgiargugHtmlsafe_" grubuna kayÄ±tlÄ± olmanÄ±z gerekmektedir.}
 
 _textmessageinvalid_ [l=tr] {UlaÅmak istediÄiniz sayfa iÃ§i kullanÄ±cÄ± adÄ± ile kayÄ±t yapmanÄ±z gerekir.<br>
@@ -456,5 +456,5 @@
 
 _textviewbildsummary_ [l=tr] {Koleksiyon hakkÄ±nda yapÄ±landÄ±rma Ã¶zeti bilgisini daha ayrÄ±ntÄ±lÄ± olarak elde edebilirsiniz. 
-<a href="_httppagex_(bsummary)&c=_cgiargbc1dirname_" target=_top>. </a> 
+<a href="_httppagex_(bsummary)&c=_cgiargbc1dirnameUrlsafe_" target=_top>. </a> 
 }
 
@@ -476,22 +476,22 @@
 _textretcoll_ [l=tr] {Koleksiyon ayarlarÄ±na geri dÃ¶n}
 
-_textdelperm_ [l=tr] {_cgiargbc1dirname_ koleksiyonunun tamamÄ± veya bir kÄ±smÄ± silinemedi. 
+_textdelperm_ [l=tr] {_cgiargbc1dirnameHtmlsafe_ koleksiyonunun tamamÄ± veya bir kÄ±smÄ± silinemedi. 
 OlasÄ± sebepleri aÅaÄÄ±dadÄ±r:
 <ul>
-<li> Greenstone'un  _gsdlhome_/collect/_cgiargbc1dirname_ directory<br> dizinini silmeye izni yok.
-Bilgisayardan _cgiargbc1dirname_ koleksiyonunu kaldÄ±rmak iÃ§in bu dizini program dÄ±ÅÄ±ndan "manuel"
+<li> Greenstone'un  _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ directory<br> dizinini silmeye izni yok.
+Bilgisayardan _cgiargbc1dirnameHtmlsafe_ koleksiyonunu kaldÄ±rmak iÃ§in bu dizini program dÄ±ÅÄ±ndan "manuel"
 silmeniz gerekiyor.
 </ul>
 }
 
-_textdelinv_ [l=tr] {_cgiargbc1dirname_ koleksiyonu korunmalÄ± ya da geÃ§ersiz. Silme iÅlemi iptal edildi.
-}
-
-_textdelsuc_ [l=tr] {_cgiargbc1dirname_ koleksiyonu baÅarÄ± ile silindi.}
-
-_textclonefail_ [l=tr] {_cgiargclonecol_ koleksiyonu klonlanamadÄ±. OlasÄ± sebepler ÅunlardÄ±r:
+_textdelinv_ [l=tr] {_cgiargbc1dirnameHtmlsafe_ koleksiyonu korunmalÄ± ya da geÃ§ersiz. Silme iÅlemi iptal edildi.
+}
+
+_textdelsuc_ [l=tr] {_cgiargbc1dirnameHtmlsafe_ koleksiyonu baÅarÄ± ile silindi.}
+
+_textclonefail_ [l=tr] {_cgiargclonecolHtmlsafe_ koleksiyonu klonlanamadÄ±. OlasÄ± sebepler ÅunlardÄ±r:
 <ul>
-<li>  _cgiargclonecol_ koleksiyonu yok.
-<li> _cgiargclonecol_ koleksiyonu collect.cfg konfigÃŒrasyon dosyasÄ±na sahip deÄil.
+<li>  _cgiargclonecolHtmlsafe_ koleksiyonu yok.
+<li> _cgiargclonecolHtmlsafe_ koleksiyonu collect.cfg konfigÃŒrasyon dosyasÄ±na sahip deÄil.
 }
 
@@ -525,9 +525,9 @@
 }
 
-_textexptsuc_ [l=tr] {_cgiargbc1dirname_ koleksiyonu baÅarÄ±lÄ± bir biÃ§imde 
-_gsdlhome_/tmp/exported\__cgiargbc1dirname_  dizinine  ihraÃ§ edildi.
-}
-
-_textexptfail_ [l=tr] {<p> _cgiargbc1dirname_ koleksiyonunu ihraÃ§ ederken hata oluÅtu.
+_textexptsuc_ [l=tr] {_cgiargbc1dirnameHtmlsafe_ koleksiyonu baÅarÄ±lÄ± bir biÃ§imde 
+_gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_  dizinine  ihraÃ§ edildi.
+}
+
+_textexptfail_ [l=tr] {<p> _cgiargbc1dirnameHtmlsafe_ koleksiyonunu ihraÃ§ ederken hata oluÅtu.
 
 <p> Bunun nedeni Greenstone'un "koleksiyon ihracÄ±" iÅlevini destekleyen 
Index: main/trunk/greenstone2/macros/ukrainian.dm
===================================================================
--- main/trunk/greenstone2/macros/ukrainian.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/ukrainian.dm	(revision 28888)
@@ -243,5 +243,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=uk] {_If_(_thislast_,ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑÐ² _thisfirst_ - _thislast_ ÐŽÐ»Ñ Ð·Ð°Ð¿ÐžÑÑ: _cgiargq_,ÐÐµÐŒÐ°Ñ ÑÐ¿ÑÐ²Ð¿Ð°ÐŽÐ°ÐœÑ ÐŽÐ»Ñ Ð·Ð°Ð¿ÐžÑÑ: _cgiargq_)}
+_textquerytitle_ [l=uk] {_If_(_thislast_,ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑÐ² _thisfirst_ - _thislast_ ÐŽÐ»Ñ Ð·Ð°Ð¿ÐžÑÑ: _cgiargqHtmlsafe_,ÐÐµÐŒÐ°Ñ ÑÐ¿ÑÐ²Ð¿Ð°ÐŽÐ°ÐœÑ ÐŽÐ»Ñ Ð·Ð°Ð¿ÐžÑÑ: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=uk] {Ð¡ÑÐŸÑÑÐœÐºÐ° Ð¿ÐŸÑÑÐºÑ}
 
Index: main/trunk/greenstone2/macros/urdu.dm
===================================================================
--- main/trunk/greenstone2/macros/urdu.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/urdu.dm	(revision 28888)
@@ -95,5 +95,5 @@
 Ø§Øª}
 _textdescrlogin_ [l=ur] {ÙØ§Ú¯ Ø§Ù ØµÙØ­Û}
-_textdescrlogout_ [l=ur] {ÙØ§Ú¯ Ø¢ÙÙ¹ ØšØ·ÙØ± _cgiargun_}
+_textdescrlogout_ [l=ur] {ÙØ§Ú¯ Ø¢ÙÙ¹ ØšØ·ÙØ± _cgiargunHtmlsafe_}
 
 _textdescrgreenstone_ [l=ur] {Ú¯Ø±ÛÙ Ø³Ù¹ÙÙ ÚÛØ¬ÛÙ¹Ù ÙØ§Ø¡ØšØ±ÛØ±Û Ø³Ø§ÙÙ¹ ÙÛØŠØ±}
@@ -301,5 +301,5 @@
 Ø§Øª}
 _linktextLOGIN_ [l=ur] {ÙØ§Ú¯ Ø§Ù}
-_linktextLOGGEDIN_ [l=ur] {(ÙØ§Ú¯ Ø§Ù ØšØ·ÙØ± _cgiargun_ )}
+_linktextLOGGEDIN_ [l=ur] {(ÙØ§Ú¯ Ø§Ù ØšØ·ÙØ± _cgiargunHtmlsafe_ )}
 _linktextLOGOUT_ [l=ur] {ÙØ§Ú¯ Ø¢ÙÙ¹}
 
@@ -526,5 +526,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=ur] {Ø§Ú¯Ø±_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,No matches for query: _cgiargq}
+_textquerytitle_ [l=ur] {Ø§Ú¯Ø±_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargqHtmlsafe_,No matches for query: _cgiargqHtmlsafe_}
 _textnoquerytitle_ [l=ur] {ØµÙØ­Û ØªÙØ§ØŽ}
 
Index: main/trunk/greenstone2/macros/urdu2.dm
===================================================================
--- main/trunk/greenstone2/macros/urdu2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/urdu2.dm	(revision 28888)
@@ -351,5 +351,5 @@
 _textpassword_ [l=ur] {Ø®ÙÛÛ Ú©ÙÚ}
 
-_textmustbelongtogroup_ [l=ur] {ÛØ§Ø¯ Ø±Ú©ÚŸÛÛ Ú©Û Ø¢ÙŸ Ú©Ù Ø§Ø³ ØµÙØ­Û ØªÚ© Ø±Ø³Ø§ØŠÛ Ú©Û ÙÛÛ"_cgiargug_" Ú¯Ø±ÙÙŸ Ú©Ø§ Ù
+_textmustbelongtogroup_ [l=ur] {ÛØ§Ø¯ Ø±Ú©ÚŸÛÛ Ú©Û Ø¢ÙŸ Ú©Ù Ø§Ø³ ØµÙØ­Û ØªÚ© Ø±Ø³Ø§ØŠÛ Ú©Û ÙÛÛ"_cgiargugHtmlsafe_" Ú¯Ø±ÙÙŸ Ú©Ø§ Ù
 Ù
 ØšØ± ÛÙÙØ§ ÙØ§Ø²Ù
@@ -705,5 +705,5 @@
 _textdelinv_ [l=ur] {Ù
 Ø¬Ù
-ÙØ¹Û _cgiargbc1dirname_ Ù
+ÙØ¹Û _cgiargbc1dirnameHtmlsafe_ Ù
 Ø­ÙÙØž ØŽØ¯Û Ø­Ø§ÙØª Ù
 ÛÚº ÛÛÛ Ø§Ø³ ÙÛÛ ÚÛÙÛÙ¹ ÙÛÛÚº Ú©ÛØ§ Ø¬Ø§ Ø³Ú©ØªØ§}
@@ -711,5 +711,5 @@
 _textdelsuc_ [l=ur] {Ù
 Ø¬Ù
-ÙØ¹Û _cgiargbc1dirname_ Ú©Ø§Ù
+ÙØ¹Û _cgiargbc1dirnameHtmlsafe_ Ú©Ø§Ù
 ÛØ§ØšÛ Ø³Û ÚÛÙÛÙ¹ ÛÙ Ú¯ÛØ§ ÛÛ}
 
@@ -938,5 +938,5 @@
 
 _textdeleteuser_ [l=ur] {ØµØ§Ø±Ù Ú©Ù ÚÛÙÛÙ¹ Ú©Ø±ÛÚº}
-_textremwarn_ [l=ur] {Ú©ÛØ§ Ø¢ÙŸ Ø­ÙÛÙØªØ§ <b>_cgiargumun_</b>? Ú©Ù Ù
+_textremwarn_ [l=ur] {Ú©ÛØ§ Ø¢ÙŸ Ø­ÙÛÙØªØ§ <b>_cgiargumunHtmlsafe_</b>? Ú©Ù Ù
 Ú©Ù
 Ù Ø·ÙØ± ÙŸØ± Ø®ØªÙ
Index: main/trunk/greenstone2/macros/usability.dm
===================================================================
--- main/trunk/greenstone2/macros/usability.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/usability.dm	(revision 28888)
@@ -48,5 +48,5 @@
 function failnicely(message,usabwindow)\{
   var errhtml='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">';
-  errhtml+='<head><title>_greenstoneusabilitytext__texterror_</title><meta http-equiv="Content-Type" content="text/html; charset=_cgiargw_"></head><body bgcolor="#FFFFFF">';
+  errhtml+='<head><title>_greenstoneusabilitytext__texterror_</title><meta http-equiv="Content-Type" content="text/html; charset=_cgiargwJssafe_"></head><body bgcolor="#FFFFFF">';
   errhtml+='_usabbanner_';	
   errhtml+=message;
@@ -86,5 +86,5 @@
 
   //need a character type for valid html
-  winhtml+='<meta http-equiv="Content-Type" content="text/html; charset=_cgiargw_"></head><body bgcolor=\"#FFFFFF\">';
+  winhtml+='<meta http-equiv="Content-Type" content="text/html; charset=_cgiargwJssafe_"></head><body bgcolor=\"#FFFFFF\">';
 
   //get the location of the cgi program
@@ -131,5 +131,5 @@
   winhtml+=('<input type="hidden" name="opentime" value="'+(new Date()).toString()+'">');	
   winhtml+=('<input type="hidden" name="sendtime" value="None">');
-  winhtml+=('<input type="hidden" name="collection" value="_cgiargc_">');
+  winhtml+=('<input type="hidden" name="collection" value="_cgiargcJssafe_">');
   if(document.getElementsByTagName)\{	
    //get interface variables
Index: main/trunk/greenstone2/macros/users.dm
===================================================================
--- main/trunk/greenstone2/macros/users.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/users.dm	(revision 28888)
@@ -59,5 +59,5 @@
 <input type=hidden name="e" value="_decodedcompressedoptions_">
 <input type=hidden name="a" value="um">
-<input type=hidden name="uma" value="_cgiarguma_">
+<input type=hidden name="uma" value="_cgiargumaAttrsafe_">
 
 <table border=0>
@@ -112,6 +112,6 @@
 <input type=hidden name="e" value="_decodedcompressedoptions_">
 <input type=hidden name="a" value="um">
-<input type=hidden name="uma" value="_cgiarguma_">
-<input type=hidden name="umun" value="_cgiargumun_">
+<input type=hidden name="uma" value="_cgiargumaAttrsafe_">
+<input type=hidden name="umun" value="_cgiargumunAttrsafe_">
 <font color=red>_textremwarn_</font>
 <input type="submit" name=cm value="no">
@@ -150,5 +150,5 @@
 <input type=hidden name="e" value="_decodedcompressedoptions_">
 <input type=hidden name="a" value="um">
-<input type=hidden name="uma" value="_cgiarguma_">
+<input type=hidden name="uma" value="_cgiargumaAttrsafe_">
 <table border=0>
 <tr><td align=right>_textoldpw_</td><td><input type="password" name="umpw" size=9></td></tr>
Index: main/trunk/greenstone2/macros/vietnamese.dm
===================================================================
--- main/trunk/greenstone2/macros/vietnamese.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/vietnamese.dm	(revision 28888)
@@ -53,5 +53,5 @@
 _textdescrpref_ [l=vi] {Thuá»c tÃ­nh}
 _textdescrlogin_ [l=vi] {Trang ÄÄng nháº­p}  
-_textdescrlogout_ [l=vi] {ÄÄng nháº­p nhÆ° _cgiargun_}  
+_textdescrlogout_ [l=vi] {ÄÄng nháº­p nhÆ° _cgiargunHtmlsafe_}  
 
 _textdescrgreenstone_ [l=vi] {Pháº§n má»m thÆ° viá»n sá» Greenstone}
@@ -192,5 +192,5 @@
 _linktextPREFERENCES_ [l=vi] {Thuá»c tÃ­nh}
 _linktextLOGIN_ [l=vi] {ÄÄNG NHáº¬P}  
-_linktextLOGGEDIN_ [l=vi] {(ÄÄng nháº­p nhÆ° _cgiargun_)}  
+_linktextLOGGEDIN_ [l=vi] {(ÄÄng nháº­p nhÆ° _cgiargunHtmlsafe_)}  
 _linktextLOGOUT_ [l=vi] {THOÃT RA}  
 
@@ -341,5 +341,5 @@
 # 'No matches for query: querystring', depending on whether or not there were
 # any matches
-_textquerytitle_ [l=vi] {_If_(_thislast_,káº¿t quáº£ _thisfirst_ - _thislast_ cho cÃ¢u truy váº¥n: _cgiargq_,KhÃŽng cÃ³ káº¿t quáº£ khá»p vá»i cÃ¢u truy váº¥n: _cgiargq_)}
+_textquerytitle_ [l=vi] {_If_(_thislast_,káº¿t quáº£ _thisfirst_ - _thislast_ cho cÃ¢u truy váº¥n: _cgiargqHtmlsafe_,KhÃŽng cÃ³ káº¿t quáº£ khá»p vá»i cÃ¢u truy váº¥n: _cgiargqHtmlsafe_)}
 _textnoquerytitle_ [l=vi] {Trang tÃ¬m kiáº¿m}
 
Index: main/trunk/greenstone2/macros/vietnamese2.dm
===================================================================
--- main/trunk/greenstone2/macros/vietnamese2.dm	(revision 28887)
+++ main/trunk/greenstone2/macros/vietnamese2.dm	(revision 28888)
@@ -128,5 +128,5 @@
 
 <p>LiÃªn káº¿t báº¡n chá»n náº±m bÃªn ngoÃ i bá» sÆ°u táº­p "_collectionname_".
-    Náº¿u báº¡n muá»n xem liÃªn káº¿t nÃ y trong bá» sÆ°u táº­p "_collectionname_" báº¡n cÃ³ thá» <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">Äi tiáº¿p</a>
+    Náº¿u báº¡n muá»n xem liÃªn káº¿t nÃ y trong bá» sÆ°u táº­p "_collectionname_" báº¡n cÃ³ thá» <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">Äi tiáº¿p</a>
     Äáº¿n trang nÃ y; máº·t khÃ¡c sá»­ dá»¥ng nÃºt "back" trÃªn trÃ¬nh duyá»t cá»§a báº¡n Äá» trá» vá» tÃ i liá»u trÆ°á»c.
 </p>
@@ -376,9 +376,9 @@
 _textretcoll_ [l=vi] {Quay láº¡i Táº¡o bá» sÆ°u táº­p}
 
-_textdelperm_ [l=vi] {Má»t sá» hoáº·c táº¥t cáº£ _cgiargbc1dirname_ bá» sÆ°u táº­p khÃŽng thá» ÄÆ°á»£c xoÃ¡. NguyÃªn nhÃ¢n cÃ³ thá» lÃ :
+_textdelperm_ [l=vi] {Má»t sá» hoáº·c táº¥t cáº£ _cgiargbc1dirnameHtmlsafe_ bá» sÆ°u táº­p khÃŽng thá» ÄÆ°á»£c xoÃ¡. NguyÃªn nhÃ¢n cÃ³ thá» lÃ :
 <ul>
-<li> Greenstone khÃŽng cÃ³ quyá»n xoÃ¡ thÆ° má»¥c _gsdlhome_/collect/_cgiargbc1dirname_ .
+<li> Greenstone khÃŽng cÃ³ quyá»n xoÃ¡ thÆ° má»¥c _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_ .
 <br>
-Báº¡n cáº§n tá»± tay xoÃ¡ bá» thÆ° má»¥c nÃ y Äá» hoÃ n táº¥t viá»c xoÃ¡ bá» sÆ°u táº­p _cgiargbc1dirname_
+Báº¡n cáº§n tá»± tay xoÃ¡ bá» thÆ° má»¥c nÃ y Äá» hoÃ n táº¥t viá»c xoÃ¡ bá» sÆ°u táº­p _cgiargbc1dirnameHtmlsafe_
 .</li>
 <li>Greenstone khÃŽng thá» cháº¡y chÆ°Æ¡ng trÃ¬nh _gsdlhome_/bin/script/delcol.pl. Báº¡n pháº£i báº£o Äáº£m táº­p tin nÃ y cÃ³ thá» Äá»c vÃ  thá»±c thi.</li>
@@ -386,13 +386,13 @@
 }
 
-_textdelinv_ [l=vi] {Bá» sÆ°u táº­p _cgiargbc1dirname_ ÄÆ°á»£c báº£o vá» hoáº·c khÃŽng há»£p lá». QuÃ¡ trÃ¬nh xoÃ¡ ÄÆ°á»£c huá»· bá».
-}
-
-_textdelsuc_ [l=vi] {Bá» sÆ°u táº­p _cgiargbc1dirname_ ÄÆ°á»£c xoÃ¡ thÃ nh cÃŽng.}
-
-_textclonefail_ [l=vi] {Bá» sÆ°u táº­p _cgiargclonecol_ khÃŽng thá» sao chÃ©p. NguyÃªn nhÃ¢n cÃ³ thá» lÃ :
+_textdelinv_ [l=vi] {Bá» sÆ°u táº­p _cgiargbc1dirnameHtmlsafe_ ÄÆ°á»£c báº£o vá» hoáº·c khÃŽng há»£p lá». QuÃ¡ trÃ¬nh xoÃ¡ ÄÆ°á»£c huá»· bá».
+}
+
+_textdelsuc_ [l=vi] {Bá» sÆ°u táº­p _cgiargbc1dirnameHtmlsafe_ ÄÆ°á»£c xoÃ¡ thÃ nh cÃŽng.}
+
+_textclonefail_ [l=vi] {Bá» sÆ°u táº­p _cgiargclonecolHtmlsafe_ khÃŽng thá» sao chÃ©p. NguyÃªn nhÃ¢n cÃ³ thá» lÃ :
 <ul>
-<li> Bá» sÆ°u táº­p _cgiargclonecol_ khÃŽng tá»n tÃ i
-<li> Bá» sÆ°u táº­p _cgiargclonecol_ khÃŽng cÃ³ táº­p tin cáº¥u hÃ¬nh collect.cfg
+<li> Bá» sÆ°u táº­p _cgiargclonecolHtmlsafe_ khÃŽng tá»n tÃ i
+<li> Bá» sÆ°u táº­p _cgiargclonecolHtmlsafe_ khÃŽng cÃ³ táº­p tin cáº¥u hÃ¬nh collect.cfg
 <li> Greenstone khÃŽng cÃ³ quyá»n Äá»c táº­p tin cáº¥u hÃ¬nh collect.cfg
 </ul>
@@ -422,8 +422,8 @@
 }
 
-_textexptsuc_ [l=vi] {Bá» sÆ°u táº­p _cgiargbc1dirname_ export thÃ nh cÃŽng Äáº¿n thÆ° má»¥c _gsdlhome_/tmp/exported\__cgiargbc1dirname_.
-}
-
-_textexptfail_ [l=vi] {<p>Export tháº¥t báº¡i bá» sÆ°u táº­p _cgiargbc1dirname_.  <p>Äiá»u nÃ y hÃ¬nh nhÆ° lÃ  do Greenstone ÄÆ°á»£c cÃ i Äáº·t mÃ  khÃŽng cÃ³ cÃ¡c thÃ nh pháº§n cáº§n thiáº¿t Äá» há» trá»£ chá»©c nÄng  "Truy xuáº¥t Collection". <ul>   <li>Khi báº¡n cÃ i Äáº·t Greenstone tá»« CD-ROM cÃ¡c thÃ nh pháº§n nÃ y sáºœ khÃŽng ÄÆ°á»£c ÄÆ°á»£c cÃ i Äáº·t máº·c nhiÃªn báº¡n pháº£i chá»n chÃºng trong má»¥c "Custom". Báº¡n cÃ³ thá» thÃªm chÃºng trong báº£n cÃ i Äáº·t cá»§a báº¡n báº±ng cÃ¡ch cháº¡y láº¡i thá»§ tá»¥c cÃ i Äáº·t.   <li>Khi báº¡n cÃ i Äáº·t Greenstone tá»« má»t Äiá»m phÃ¢n phá»i trÃªn Internet báº¡n cáº§n táº£i xuá»ng vÃ  cÃ i Äáº·t thÃªm cÃ¡c gÃ³i cho phÃ©p sá»­ dá»¥ng chá»©c nÄng nÃ y. LiÃªn há» trang web nÃ y <a href="http://www.greenstone.org">http://www.greenstone.org</a> hoáº·c Äá»a chá» email <a  href="mailto:greenstone@cs.waikato.ac.nz">greenstone@cs.waikato.ac.nz</a> Äá» biáº¿t thÃªm chi tiáº¿t.  </ul> }  
+_textexptsuc_ [l=vi] {Bá» sÆ°u táº­p _cgiargbc1dirnameHtmlsafe_ export thÃ nh cÃŽng Äáº¿n thÆ° má»¥c _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_.
+}
+
+_textexptfail_ [l=vi] {<p>Export tháº¥t báº¡i bá» sÆ°u táº­p _cgiargbc1dirnameHtmlsafe_.  <p>Äiá»u nÃ y hÃ¬nh nhÆ° lÃ  do Greenstone ÄÆ°á»£c cÃ i Äáº·t mÃ  khÃŽng cÃ³ cÃ¡c thÃ nh pháº§n cáº§n thiáº¿t Äá» há» trá»£ chá»©c nÄng  "Truy xuáº¥t Collection". <ul>   <li>Khi báº¡n cÃ i Äáº·t Greenstone tá»« CD-ROM cÃ¡c thÃ nh pháº§n nÃ y sáºœ khÃŽng ÄÆ°á»£c ÄÆ°á»£c cÃ i Äáº·t máº·c nhiÃªn báº¡n pháº£i chá»n chÃºng trong má»¥c "Custom". Báº¡n cÃ³ thá» thÃªm chÃºng trong báº£n cÃ i Äáº·t cá»§a báº¡n báº±ng cÃ¡ch cháº¡y láº¡i thá»§ tá»¥c cÃ i Äáº·t.   <li>Khi báº¡n cÃ i Äáº·t Greenstone tá»« má»t Äiá»m phÃ¢n phá»i trÃªn Internet báº¡n cáº§n táº£i xuá»ng vÃ  cÃ i Äáº·t thÃªm cÃ¡c gÃ³i cho phÃ©p sá»­ dá»¥ng chá»©c nÄng nÃ y. LiÃªn há» trang web nÃ y <a href="http://www.greenstone.org">http://www.greenstone.org</a> hoáº·c Äá»a chá» email <a  href="mailto:greenstone@cs.waikato.ac.nz">greenstone@cs.waikato.ac.nz</a> Äá» biáº¿t thÃªm chi tiáº¿t.  </ul> }  
 
 ######################################################################
@@ -576,5 +576,5 @@
 
 _textdeleteuser_ [l=vi] {XoÃ¡ ngÆ°á»i sá»­ dá»¥ng}
-_textremwarn_ [l=vi] {Báº¡n cÃ³ tháº­t sá»± muá»n xoÃ¡ ngÆ°á»i sá»­ dá»¥ng khÃŽng <b>_cgiargumun_</b>?}
+_textremwarn_ [l=vi] {Báº¡n cÃ³ tháº­t sá»± muá»n xoÃ¡ ngÆ°á»i sá»­ dá»¥ng khÃŽng <b>_cgiargumunHtmlsafe_</b>?}
 
 
Index: main/trunk/greenstone2/runtime-src/packages/Makefile.in
===================================================================
--- main/trunk/greenstone2/runtime-src/packages/Makefile.in	(revision 28887)
+++ main/trunk/greenstone2/runtime-src/packages/Makefile.in	(revision 28888)
@@ -29,8 +29,4 @@
 USE_YAZ=@USE_YAZ@
 USE_APACHE_HTTPD=@USE_APACHE_HTTPD@
-
-
-SECURITY=security/libgpg-error-1.12
-#security/libgcrypt-1.6.1
 
 ifeq ($(USE_Z3950), 1)
@@ -74,5 +70,5 @@
 # is assumed that each package will have at least four rules: all, install,
 # clean, and distclean.
-INSTALLDIRS =   $(YAZ) $(D2M) $(CORBA) $(SECURITY)
+INSTALLDIRS =   $(YAZ) $(D2M) $(CORBA)
 PACKAGEDIRS =	$(INSTALLDIRS) $(HTTPD)
 
@@ -133,7 +129,4 @@
 	cd yaz/yaz-2.1.4/src; $(MAKE)  $(MDEFINES) install
 endif
-
-# make install all packages in the security folder
-
 
 # now install everything except apache, since that had already been installed during "all"
Index: main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in
===================================================================
--- main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in	(revision 28887)
+++ main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in	(revision 28888)
@@ -155,4 +155,5 @@
 APACHE_MODULE =
 endif
+
 
 # Extension support
@@ -229,4 +230,5 @@
 	$(RSS_SOURCES) \
 	statusaction.cpp \
+	securitytools.cpp \
 	summarise.cpp \
 	tipaction.cpp \
@@ -278,4 +280,5 @@
 	$(RSS_OBJECTS) \
 	statusaction.o \
+	securitytools.o \
 	summarise.o \
 	tipaction.o \
Index: main/trunk/greenstone2/runtime-src/src/recpt/action.h
===================================================================
--- main/trunk/greenstone2/runtime-src/src/recpt/action.h	(revision 28887)
+++ main/trunk/greenstone2/runtime-src/src/recpt/action.h	(revision 28888)
@@ -34,4 +34,5 @@
 #include "recptproto.h"
 #include "browserclass.h"
+#include "securitytools.h"
 
 #if defined(GSDL_USE_OBJECTSPACE)
Index: main/trunk/greenstone2/runtime-src/src/recpt/basequeryaction.cpp
===================================================================
--- main/trunk/greenstone2/runtime-src/src/recpt/basequeryaction.cpp	(revision 28887)
+++ main/trunk/greenstone2/runtime-src/src/recpt/basequeryaction.cpp	(revision 28888)
@@ -651,5 +651,5 @@
 
     // Display the "this collection is not installed on this system" page
-    disp.setmacro("cvariable", displayclass::defaultpackage, collection);
+    disp.setmacro("cvariable", displayclass::defaultpackage, encodeForHTML(collection));
     disp.setmacro("content", "query", "<p>_textbadcollection_<p>");
 
Index: main/trunk/greenstone2/runtime-src/src/recpt/cgiutils.cpp
===================================================================
--- main/trunk/greenstone2/runtime-src/src/recpt/cgiutils.cpp	(revision 28887)
+++ main/trunk/greenstone2/runtime-src/src/recpt/cgiutils.cpp	(revision 28888)
@@ -44,5 +44,5 @@
 
 // set to false to undo security changes (url-encoding arguments)
-static bool do_safe_cgi_args = true;
+static bool do_safe_cgi_args = false;
 
 static unsigned short hexdigit (unsigned short c) {
Index: main/trunk/greenstone2/runtime-src/src/recpt/pageaction.cpp
===================================================================
--- main/trunk/greenstone2/runtime-src/src/recpt/pageaction.cpp	(revision 28887)
+++ main/trunk/greenstone2/runtime-src/src/recpt/pageaction.cpp	(revision 28888)
@@ -751,5 +751,5 @@
   if (arg_p == "about") {
     if (cinfo == NULL) {
-      disp.setmacro("cvariable", displayclass::defaultpackage, arg_c);
+      disp.setmacro("cvariable", displayclass::defaultpackage, encodeForHTML(arg_c));
       disp.setmacro("content", arg_p, "<p>_textbadcollection_<p>");
       return;
@@ -797,5 +797,5 @@
   
     if (cinfo == NULL) {
-      disp.setmacro("cvariable", displayclass::defaultpackage, arg_c);
+      disp.setmacro("cvariable", displayclass::defaultpackage, encodeForHTML(arg_c));
       disp.setmacro("content", arg_p, "<p>_textbadcollection_<p>");
       return;
@@ -1009,7 +1009,7 @@
   text_t &arg_p = args["p"];
 
-  textout << outconvert << disp << ("_" + arg_p + ":header_\n")
-	  << ("_" + arg_p + ":content_\n")
-	  << ("_" + arg_p + ":footer_\n");
+  textout << outconvert << disp << ("_" + encodeForHTML(arg_p) + ":header_\n")
+	  << ("_" + encodeForHTML(arg_p) + ":content_\n")
+	  << ("_" + encodeForHTML(arg_p) + ":footer_\n");
 
   return true;
Index: main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp
===================================================================
--- main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp	(revision 28887)
+++ main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp	(revision 28888)
@@ -1010,5 +1010,5 @@
 
     // Display the "this collection is not installed on this system" page
-    disp.setmacro("cvariable", displayclass::defaultpackage, main_collection);
+    disp.setmacro("cvariable", displayclass::defaultpackage, encodeForHTML(main_collection));
     disp.setmacro("content", "query", "<p>_textbadcollection_<p>");
 
@@ -1394,5 +1394,8 @@
 	}
 
-	disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, dm_safe(compressedoptions));
+	text_t macrovalue = dm_safe(compressedoptions);
+	disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, macrovalue);
+	disp.setmacro ("decodedcompressedoptionsAttrsafe", displayclass::defaultpackage, encodeForHTMLAttr(macrovalue));
+	
       }
     } // form search
Index: main/trunk/greenstone2/runtime-src/src/recpt/receptionist.cpp
===================================================================
--- main/trunk/greenstone2/runtime-src/src/recpt/receptionist.cpp	(revision 28887)
+++ main/trunk/greenstone2/runtime-src/src/recpt/receptionist.cpp	(revision 28888)
@@ -36,4 +36,5 @@
 #include "gsdltimes.h"
 #include "OIDtools.h"
+#include "securitytools.h"
 #include <assert.h>
 #include <time.h>
@@ -1485,5 +1486,8 @@
     compressedoptions = to_uni(compressedoptions);
   }
-  disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, dm_safe(compressedoptions)); 
+
+  text_t dmacrovalue = dm_safe(compressedoptions);
+  disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, dmacrovalue); 
+  disp.setmacro ("decodedcompressedoptionsAttrsafe", displayclass::defaultpackage, encodeForHTMLAttr(dmacrovalue));
 
 #if defined (__WIN32__)
@@ -1495,4 +1499,7 @@
   cgiargsclass::const_iterator argsend = args.end();
   while (argshere != argsend) {
+
+    text_t macrovalue = (*argshere).second.value; // and stays like that if ((*argshere).first == "hp")
+
     if (((*argshere).first == "q") ||
 	((*argshere).first == "qa") ||
@@ -1502,13 +1509,37 @@
 	((*argshere).first == "qpl") ||
 	((*argshere).first == "qr") ||
-	((*argshere).first == "q2"))
+	((*argshere).first == "q2")) {
+
       // need to escape special characters from query string
-      disp.setmacro ("cgiarg" + (*argshere).first, 
-		     displayclass::defaultpackage, html_safe((*argshere).second.value));
-    else if ((*argshere).first == "hp") {
-      disp.setmacro ("cgiarg" + (*argshere).first, displayclass::defaultpackage, (*argshere).second.value);
-    } else {
-      disp.setmacro ("cgiarg" + (*argshere).first, displayclass::defaultpackage, dm_safe((*argshere).second.value));
-    }
+      macrovalue = html_safe(macrovalue);
+
+    } else  if ((*argshere).first == "hp") {
+      if(!isValidURLProtocol(macrovalue)) {
+	macrovalue = encodeForURL(macrovalue); // URL has invalid protocol like javascript:, so URL encode it
+      }
+    }
+    else {
+      macrovalue = dm_safe(macrovalue);
+    }   
+
+    // set the default value for the macro
+    disp.setmacro ("cgiarg" + (*argshere).first, displayclass::defaultpackage, macrovalue);
+
+    // set macros for the encoded versions of the same value. Uses the functions in securitytools.h
+    // https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet
+
+    text_t htmlsafe = encodeForHTML(macrovalue);
+    text_t attrsafe = encodeForHTMLAttr(macrovalue);
+    text_t urlsafe = encodeForURL(macrovalue);
+    text_t jssafe = encodeForJavascript(macrovalue);
+    text_t csssafe = encodeForCSS(macrovalue);
+
+    disp.setmacro ("cgiarg" + (*argshere).first + "Htmlsafe", displayclass::defaultpackage, htmlsafe);    
+    disp.setmacro ("cgiarg" + (*argshere).first + "Attrsafe", displayclass::defaultpackage, attrsafe);
+    disp.setmacro ("cgiarg" + (*argshere).first + "Jssafe", displayclass::defaultpackage, jssafe);
+    disp.setmacro ("cgiarg" + (*argshere).first + "Csssafe", displayclass::defaultpackage, csssafe);
+    disp.setmacro ("cgiarg" + (*argshere).first + "Urlsafe", displayclass::defaultpackage, urlsafe);
+    
+
     ++argshere;
   }
Index: main/trunk/greenstone2/runtime-src/src/recpt/securitytools.cpp
===================================================================
--- main/trunk/greenstone2/runtime-src/src/recpt/securitytools.cpp	(revision 28888)
+++ main/trunk/greenstone2/runtime-src/src/recpt/securitytools.cpp	(revision 28888)
@@ -0,0 +1,399 @@
+/**********************************************************************
+ *
+ * securitytools.cpp -- a C++ port of the required functions from the OWASP ESAPI for Java
+ * Copyright (C) 2014  The New Zealand Digital Library Project
+ *
+ * A component of the Greenstone digital library software
+ * from the New Zealand Digital Library Project at the
+ * University of Waikato, New Zealand.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *********************************************************************/
+/*
+ * https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet
+ * http://owasp-esapi-cplusplus.googlecode.com/svn/trunk/doc/html/classesapi_1_1_encoder.html
+ * http://owasp-esapi-cplusplus.googlecode.com/svn/trunk/doc/html/classesapi_1_1_default_encoder.html
+ * http://owasp-esapi-cplusplus.googlecode.com/svn/trunk/doc/html/_default_encoder_8cpp_source.html
+ * 
+ * The OWASP-ESAPI for C++'s online API is outdated/different to the actual method definitions in the
+ * downloaded version of the code at runtime-src/packages/security/installed/include
+ * Further, most of the necessary methods in the ESAPI-for-C++ have not been implemented yet.
+ * The ESAPI-for-C, whose code is more complete, doesn't seem to have the same structure as the Java version.
+ *
+ * As a consequence, this file now contains custom Greenstone C++ functions that port the Java versions of the 
+ * required methods from the OWASP for Java API at http://code.google.com/p/owasp-esapi-java/. 
+ * In particular the codecs and the DefaultEncoder at 
+ * http://code.google.com/p/owasp-esapi-java/source/browse/trunk/src/main/java/org/owasp/esapi/#esapi%2Fcodecs
+ * http://code.google.com/p/owasp-esapi-java/source/browse/trunk/src/main/java/org/owasp/esapi/#esapi%2Freference%253Fstate%253Dclosed
+*/
+
+//http://www.cplusplus.com/reference/cctype/isalnum/
+#include <ctype.h>
+#include <stdio.h>
+#include "securitytools.h"
+
+static bool security_on = true;
+
+// function prototype - unused. Using ctype::isalphanum(int) instead
+bool isAlphaNumeric(const unsigned short c);
+
+/*  
+    Rule 5 of the OWASP XSS cheat sheet states: 
+    https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.235_-_URL_Escape_Before_Inserting_Untrusted_Data_into_HTML_URL_Parameter_Values
+    
+    WARNING: Do not encode complete or relative URL's with URL encoding! If untrusted input is meant to be placed into 
+    href, src or other URL-based attributes, it should be validated to make sure it does not point to an unexpected 
+    protocol, especially Javascript links. URL's should then be encoded based on the context of display like any other
+    piece of data. For example, user driven URL's in HREF links should be attribute encoded. For example:
+
+    String userURL = request.getParameter( "userURL" )
+    boolean isValidURL = ESAPI.validator().isValidInput("URLContext", userURL, "URL", 255, false); 
+    if (isValidURL) {  
+    <a href="<%=encoder.encodeForHTMLAttribute(userURL)%>">link</a>
+    }
+
+    The following function is simpler than theirs as it only looks for any "javascript:" in the string. If present, it 
+    returns false and the string should get URL encoded. Otherwise, the protocol is assumed to be valid and it returns true.
+*/
+bool isValidURLProtocol(const text_t& url) {
+  text_t::const_iterator here = url.begin();
+  text_t::const_iterator end = url.end();
+
+  if(findword(here, end, "javascript:") != end) {
+    return true;
+  }
+  return false;
+}
+
+
+text_t encodeForHTMLAttr(const text_t& in, const text_t& immuneChars) {
+  text_t out;
+  text_t::const_iterator here = in.begin();
+  text_t::const_iterator end = in.end();
+  while (here != end) {
+    out += encodeForHTML(immuneChars, *here); // IMMUNE_HTMLATTR by default
+    ++here;
+  }
+  return out;
+}
+  
+text_t encodeForHTML(const text_t& in, const text_t& immuneChars) {
+  text_t out;
+  text_t::const_iterator here = in.begin();
+  text_t::const_iterator end = in.end();
+  while (here != end) {
+    out += encodeForHTML(immuneChars, *here); // IMMUNE_HTML by default
+    ++here;
+  }
+  return out;
+}
+
+text_t encodeForCSS(const text_t& in, const text_t& immuneChars) {
+  text_t out;
+  text_t::const_iterator here = in.begin();
+  text_t::const_iterator end = in.end();
+  while (here != end) {
+    out += encodeForCSS(immuneChars, *here); // IMMUNE_CSS by default
+    ++here;
+  }
+  return out;
+}
+
+
+text_t encodeForURL(const text_t& in, const text_t& immuneChars) {
+  text_t out;
+  text_t::const_iterator here = in.begin();
+  text_t::const_iterator end = in.end();
+  while (here != end) {
+    out += encodeForURL(immuneChars, *here); // IMMUNE_URL by default
+    ++here;
+  }
+  return out;
+}
+
+text_t encodeForJavascript(const text_t& in, const text_t& immuneChars) {
+  text_t out;
+  text_t::const_iterator here = in.begin();
+  text_t::const_iterator end = in.end();
+  while (here != end) {
+    out += encodeForJavascript(immuneChars, *here); // IMMUNE_JAVASCRIPT by default
+    ++here;
+  }
+  return out;
+}
+
+text_t encodeForMySQL(const text_t& in, const text_t& immuneChars, const SQLMode mode) {
+  text_t out;
+  text_t::const_iterator here = in.begin();
+  text_t::const_iterator end = in.end();
+  while (here != end) {
+    out += encodeForMySQL(immuneChars, *here, mode); // IMMUNE_SQL and STANDARD SQLMode by default
+    ++here;
+  }
+  return out;
+}
+
+
+/*
+The encodeForURL() here function follows the same rules as Java's URLEncoder, since that is called
+by the OWASP-for-Java code when the OWASP project wishes to encode strings for URL contexts:
+http://docs.oracle.com/javase/6/docs/api/java/net/URLEncoder.html
+
+When encoding a String, the following rules apply:
+
+    The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain the same.
+    The special characters ".", "-", "*", and "_" remain the same.
+    The space character " " is converted into a plus sign "+".
+    All other characters are unsafe and are first converted into one or more bytes using some encoding scheme. Then each byte is represented by the 3-character string "%xy", where xy is the two-digit hexadecimal representation of the byte. The recommended encoding scheme to use is UTF-8. However, for compatibility reasons, if an encoding is not specified, then the default encoding of the platform is used. 
+
+*/
+text_t encodeForURL(const text_t& immuneChars, const unsigned short in) {
+  
+  text_t result = "";
+  text_t::const_iterator here = immuneChars.begin();
+  text_t::const_iterator end = immuneChars.end();
+
+  // Check if the character is in the list of chars immune to encoding
+  if(findchar(here, end, in) != end) {
+    result.push_back(in);
+  }
+
+  else if(isalnum((int)in)) {
+    result.push_back(in);
+  }
+
+  // for URLs, space becomes +
+  else if(in == ' ' ) {
+    result.push_back('+');
+  }  
+
+  // all other chars converted to hexadecimal %XY
+  else {
+    char hex_char[4];
+    sprintf(hex_char,"%%%02X",in);
+    result = text_t(hex_char); // result += hex_char;
+  }
+
+  return result;
+}
+
+// encodes for both HTML and HTML attributes. 
+// The chars in the immuneChars array determines which of the two this is
+// See http://code.google.com/p/owasp-esapi-java/source/browse/trunk/src/main/java/org/owasp/esapi/codecs/HTMLEntityCodec.java
+text_t encodeForHTML(const text_t& immuneChars, const unsigned short in) {
+  
+  text_t result = "";
+  text_t::const_iterator here = immuneChars.begin();
+  text_t::const_iterator end = immuneChars.end();
+
+  // Check if the character is in the list of chars immune to encoding
+  if(findchar(here, end, in) != end) {
+    result.push_back(in);
+  }
+
+  else if(isalnum((int)in)) {
+    result.push_back(in);
+  }
+
+  // check for illegal characters
+  // http://code.google.com/p/owasp-esapi-java/source/browse/trunk/src/main/java/org/owasp/esapi/codecs/HTMLEntityCodec.java
+  // 0x1f is the unit separator, an invisible character, 0x7f is the ascii control code for delete, not sure about 0x9f
+  // Encode all these as the UTF-8 replacement char ufffd, which is used to replace an unknown or unrepresentable character
+
+  else if ( ( in <= 0x1f && in != '\t' && in != '\n' && in != '\r' ) || ( in >= 0x7f && in <= 0x9f ) ) {
+    result = "&#x" + REPLACEMENT_HEX + ";";
+    // Let's entity encode this instead of returning it
+    //c = REPLACEMENT_CHAR;
+  }  
+
+  // all other chars are to be converted to hexadecimal AB, then return the hex entity, which is of the form &#xAB;
+  else {
+    char hex_char[3];
+    sprintf(hex_char,"%02X",in);
+    result = "&#x" + text_t(hex_char) + ";";
+  }
+
+  return result;
+}
+
+// http://code.google.com/p/owasp-esapi-java/source/browse/trunk/src/main/java/org/owasp/esapi/codecs/CSSCodec.java
+// return the hex and end in whitespace to terminate
+text_t encodeForCSS(const text_t& immuneChars, const unsigned short in) {
+  
+  text_t result = "";
+  text_t::const_iterator here = immuneChars.begin();
+  text_t::const_iterator end = immuneChars.end();
+
+  // Check if the character is in the list of chars immune to encoding
+  if(findchar(here, end, in) != end) {
+    result.push_back(in);
+  }
+
+  else if(isalnum((int)in)) {
+    result.push_back(in);
+  }
+
+  // all other chars converted to hexadecimal AB, then return the hex entity, which is of the form &#xAB;
+  else {
+    char hex_char[3];
+    sprintf(hex_char,"%02X",in);    
+    // return the hex and end in whitespace to terminate
+    result = "\\" + text_t(hex_char) + " ";
+  }
+
+  return result;
+}
+
+// http://code.google.com/p/owasp-esapi-java/source/browse/trunk/src/main/java/org/owasp/esapi/codecs/JavaScriptCodec.java
+text_t encodeForJavascript(const text_t& immuneChars, const unsigned short in) {
+  
+  text_t result = "";
+  text_t::const_iterator start = immuneChars.begin();
+  text_t::const_iterator end = immuneChars.end();
+
+  // Check if the character is in the list of chars immune to encoding
+  if(findchar(start, end, in) != end) {
+    result.push_back(in);
+  }
+
+  else if(isalnum((int)in)) {
+    result.push_back(in);
+  }
+
+  // Do not use these shortcuts as they can be used to break out of a context
+  // if ( ch == 0x00 ) return "\\0";
+  // if ( ch == 0x08 ) return "\\b";
+  // if ( ch == 0x09 ) return "\\t";
+  // if ( ch == 0x0a ) return "\\n";
+  // if ( ch == 0x0b ) return "\\v";
+  // if ( ch == 0x0c ) return "\\f";
+  // if ( ch == 0x0d ) return "\\r";
+  // if ( ch == 0x22 ) return "\\\"";
+  // if ( ch == 0x27 ) return "\\'";
+  // if ( ch == 0x5c ) return "\\\\";
+
+
+  // encode up to 256 with hexadecimal \\xHH, otherwise encode with \\uHHHH
+  else {
+
+    // encode up to 256 with \\xHH
+    if(in < 256) {
+      char hex_char[3];
+      sprintf(hex_char,"%02X",in);
+      result = "\\x" + text_t(hex_char);
+    }
+    // otherwise encode with \\uHHHH
+    else {
+      char hex_char[5];
+      sprintf(hex_char,"%04X",in);
+      result = "\\u" + text_t(hex_char);
+    }
+    
+  }
+
+  return result;
+}
+
+
+/* 
+http://code.google.com/p/owasp-esapi-java/source/browse/trunk/src/main/java/org/owasp/esapi/codecs/MySQLCodec.java
+ Defense Option 3 of https://www.owasp.org/index.php/SQL_Injection_Prevention_Cheat_Sheet
+ which states: 
+ "This technique works like this. Each DBMS supports one or more character escaping schemes 
+ specific to certain kinds of queries. If you then escape all user supplied input using the 
+ proper escaping scheme for the database you are using, the DBMS will not confuse that input 
+ with SQL code written by the developer, thus avoiding any possible SQL injection vulnerabilities."
+
+http://www.php.net/manual/en/mysqli.real-escape-string.php
+http://www.php.net/manual/en/function.mysql-real-escape-string.php
+http://www.php.net/manual/en/function.sqlite-escape-string.php
+http://stackoverflow.com/questions/8838913/difference-between-mysql-sqlite-etc-databases
+http://stackoverflow.com/questions/633245/sql-escape-with-sqlite-in-c-sharp
+
+*/
+text_t encodeForMySQL(const text_t& immuneChars, const unsigned short in, const SQLMode mode) {
+  
+  text_t result = "";
+  text_t::const_iterator start = immuneChars.begin();
+  text_t::const_iterator end = immuneChars.end();
+
+  // Check if the character is in the list of chars immune to encoding
+  if(findchar(start, end, in) != end) {
+    result.push_back(in);
+  }
+
+  else if(isalnum((int)in)) {
+    result.push_back(in);
+  }
+
+  // switch( mode ) {
+  // case ANSI: return encodeCharacterANSI( c );
+  // case STANDARD: return encodeCharacterMySQL( c );
+  // }
+
+  if(mode == STANDARD) { // encodeCharacterMySQL: Encode a character suitable for MySQL
+
+    if ( in == 0x00 ) result = "\\0";
+    else if ( in == 0x08 ) result = "\\b";
+    else if ( in == 0x09 ) result = "\\t";
+    else if ( in == 0x0a ) result = "\\n";
+    else if ( in == 0x0d ) result = "\\r";
+    else if ( in == 0x1a ) result = "\\Z";
+    else if ( in == 0x22 ) result = "\\\"";
+    else if ( in == 0x25 ) result = "\\%";
+    else if ( in == 0x27 ) result = "\\'";
+    else if ( in == 0x5c ) result = "\\\\";
+    else if ( in == 0x5f ) result = "\\_";
+    else { 
+      result = "\\";
+      result.push_back(in);
+    }
+
+  } else { // mode is ANSI, encodeCharacterANSI:
+
+    /* Encode for ANSI SQL. 
+     Apostrophe is encoded
+     Bug ###: In ANSI Mode Strings can also be passed in using the quotation. 
+     In ANSI_QUOTES mode a quotation is considered to be an identifier, thus 
+     cannot be used at all in a value and will be dropped completely. 
+     returns a string encoded to standards of MySQL running in ANSI mode
+    */
+
+    if ( in == '\'' ) result = "\'\'";
+    else if ( in == '\"' ) result = "";
+    else result.push_back(in);
+    
+  }
+
+  return result;
+}
+
+// See Codec.hex[] initialization and Codec.getHexForNonAlphanumeric(c) and Codec.toHex(c)
+// http://code.google.com/p/owasp-esapi-java/source/browse/trunk/src/main/java/org/owasp/esapi/codecs/Codec.java
+// See Integer.toHexString()
+// http://docs.oracle.com/javase/6/docs/api/java/lang/Integer.html#toHexString%28int%29
+// http://stackoverflow.com/questions/3370004/what-is-static-block-in-c-or-c
+bool isAlphaNumeric(const unsigned short c) {
+  if(c >= 0xFF) {   // >= 256 need no further checking, it is not alphanumeric
+    return false;
+  }
+  // alphanumeric: 0 - 9 || A - Z || a - z
+  if ( c >= 0x30 && c <= 0x39 || c >= 0x41 && c <= 0x5A || c >= 0x61 && c <= 0x7A ) {
+    return true;
+  }
+  // < 255, but not alphanumeric
+  return false;
+}
Index: main/trunk/greenstone2/runtime-src/src/recpt/securitytools.h
===================================================================
--- main/trunk/greenstone2/runtime-src/src/recpt/securitytools.h	(revision 28888)
+++ main/trunk/greenstone2/runtime-src/src/recpt/securitytools.h	(revision 28888)
@@ -0,0 +1,40 @@
+#ifndef SECURITYTOOLS_H
+#define SECURITYTOOLS_H
+
+#include "text_t.h"
+
+// enums start numbering at 0 unless otherwise specified
+enum SQLMode { STANDARD, ANSI }; // public static enum Mode { ANSI(1),STANDARD(0); ...}
+
+
+// two bytes
+static const text_t REPLACEMENT_HEX = "fffd";
+//static const unsigned short REPLACEMENT_CHAR = '\ufffd';
+static const text_t IMMUNE_CSS = "";
+static const text_t IMMUNE_HTML = ",.-_ ";
+static const text_t IMMUNE_HTMLATTR = ",.-_";
+static const text_t IMMUNE_JAVASCRIPT = ",._";
+static const text_t IMMUNE_URL = "*.-_"; // See http://docs.oracle.com/javase/6/docs/api/java/net/URLEncoder.html
+static const text_t IMMUNE_SQL = " ";
+
+
+// a very simple version of esapi's Validator.isValidInput()
+bool isValidURLProtocol(const text_t& url);
+
+// String conversion
+text_t encodeForHTML(const text_t& input, const text_t& immuneChars=IMMUNE_HTML);
+text_t encodeForURL(const text_t& input, const text_t& immuneChars=IMMUNE_URL);
+text_t encodeForJavascript(const text_t& input, const text_t& immuneChars=IMMUNE_JAVASCRIPT);
+text_t encodeForHTMLAttr(const text_t& input, const text_t& immuneChars=IMMUNE_HTMLATTR);
+text_t encodeForCSS(const text_t& input, const text_t& immuneChars=IMMUNE_CSS);
+text_t encodeForMySQL(const text_t& input, const text_t& immuneChars=IMMUNE_SQL, const SQLMode mode=STANDARD);
+
+// Character conversions
+text_t encodeForHTML(const text_t& immuneChars, const unsigned short input);
+text_t encodeForURL(const text_t& immuneChars, const unsigned short input);
+text_t encodeForJavascript(const text_t& immuneChars, const unsigned short input);
+text_t encodeForCSS(const text_t& immuneChars, const unsigned short input);
+text_t encodeForMySQL(const text_t& immuneChars, const unsigned short input, const SQLMode mode);
+
+
+#endif
Index: main/trunk/greenstone2/runtime-src/src/recpt/sqlqueryaction.cpp
===================================================================
--- main/trunk/greenstone2/runtime-src/src/recpt/sqlqueryaction.cpp	(revision 28887)
+++ main/trunk/greenstone2/runtime-src/src/recpt/sqlqueryaction.cpp	(revision 28888)
@@ -309,6 +309,8 @@
 	  compressedoptions = to_uni(compressedoptions);
 	}
-
-	disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, dm_safe(compressedoptions));
+	
+	text_t dmacrovalue = dm_safe(compressedoptions);
+	disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, dmacrovalue);
+	disp.setmacro ("decodedcompressedoptionsAttrsafe", displayclass::defaultpackage, encodeForHTMLAttr(dmacrovalue));
       }
     } // form search
@@ -317,8 +319,4 @@
     logout << "ERROR (sqlqueryaction::get_formatted_query_string): querytype not defined\n";
   }
-
-
-
-
 
 }
