Index: main/trunk/greenstone2/macros/arabic.dm
===================================================================
--- main/trunk/greenstone2/macros/arabic.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/arabic.dm	(revision 22051)
@@ -584,6 +584,11 @@
 Ø³ØªÙÙ )_If_(_nselection_,ÙÙ _nselection_ ÙØºØ© )Ø§ÙØªÙ ØªØ­ØªÙÙ Ø¹ÙÙ _querytypeselection_ Ù
 Ù Ø§ÙÙÙÙ
-Ø§Øª_If_(_sfselection_,\,_allowformbreak_ ÙØ±Ø² Ø§ÙÙØªØ§ØŠØ¬ ØšÙØ§Ø³Ø·Ø© _sfselection_)
-}  
+Ø§Øª_If_(_sfselection_,\,_allowformbreak_ ÙØ±Ø² Ø§ÙÙØªØ§ØŠØ¬ ØšÙØ§Ø³Ø·Ø© _sfselection_)}
+_textsimplesqlsearch_ [l=ar] {Ø§ØšØ­Ø« _indexselection_ _If_(_jselection_, Ù
+Ø±ØªØšØ·Ø© ØšÙ _jselection_ )_If_(_gselection_, ÙÙ _gselection_ Ù
+Ø³ØªÙÙ )_If_(_nselection_,ÙÙ _nselection_ ÙØºØ© )Ø§ÙØªÙ ØªØ­ØªÙÙ Ø¹ÙÙ _querytypeselection_ Ù
+Ù Ø§ÙÙÙÙ
+Ø§Øª_If_(_sqlsfselection_,\,_allowformbreak_ ÙØ±Ø² Ø§ÙÙØªØ§ØŠØ¬ ØšÙØ§Ø³Ø·Ø© _sqlsfselection_)}
+
 
 _textadvancedsearch_ [l=ar] {Ø§ØšØ­ÙØ« _indexselection_ _If_(_jselection_,Ù
@@ -598,13 +603,20 @@
 Ù _jselection_) _If_(_gselection_, ÙÙ _gselection_ Ù
 Ø³ØªÙÙ)_If_(_nselection_, ÙÙ _nselection_ ÙØºØ©)_If_(_sfselection_,\,_allowformbreak_ ÙØ±Ø² Ø§ÙÙØªØ§ØŠØ¬ Øš _sfselection_\,) ÙÙ }  
+_textadvancedsqlsearch_ [l=ar] {Ø§ÙØšØ­Ø« _indexselection__If_(_jselection_, Ù
+Ù _jselection_) _If_(_gselection_, ÙÙ _gselection_ Ù
+Ø³ØªÙÙ)_If_(_nselection_, ÙÙ _nselection_ ÙØºØ©)_If_(_sqlsfselection_,\,_allowformbreak_ ÙØ±Ø² Ø§ÙÙØªØ§ØŠØ¬ Øš _sqlsfselection_\,) ÙÙ }  
 
 _textformsimplesearch_ [l=ar] {Search_If_(_jselection_, _jselection_)_If_(_gformselection_, ÙÙ _gformselection_ Ù
 Ø³ØªÙÙ)_If_(_nselection_, ÙÙ _nselection_ ÙØºØ©)_If_(_sfselection_,\, ÙØ±Ø² Ø§ÙÙØªØ§ØŠØ¬ ØšÙØ§Ø³Ø·Ø© _sfselection_\,) ÙÙ _formquerytypesimpleselection_ Ù
 Ù}  
-
+_textformsimplesearchsql_ [l=ar] {Search_If_(_jselection_, _jselection_)_If_(_gformselection_, ÙÙ _gformselection_ Ù
+Ø³ØªÙÙ)_If_(_nselection_, ÙÙ _nselection_ ÙØºØ©)_If_(_sqlsfselection_,\, ÙØ±Ø² Ø§ÙÙØªØ§ØŠØ¬ ØšÙØ§Ø³Ø·Ø© _sqlsfselection_\,) ÙÙ _formquerytypesimpleselection_ Ù
+Ù}  
+q
 _textformadvancedsearchmgpp_ [l=ar] {Search_If_(_jselection_,_jselection_ )_If_(_gformselection_, ÙÙ  _gformselection_ Ù
 Ø³ØªÙÙ )_If_(_nselection_, ÙÙ _nselection_ ÙØºØ© ) ÙØ§Ø¹Ø±Ø¶ ÙØªØ§ØŠØ¬ Ø§ÙØšØ­Ø« ÙÙ Ø§ÙØªØ±ØªÙØš  _formquerytypeadvancedselection_}  
 
 _textformadvancedsearchlucene_ [l=ar] {Search _If_(_jselection_, _jselection_)_If_(_gformselection_,  ÙÙ _gformselection_ level)_If_(_nselection_, ÙÙ  _nselection_ language)_If_(_sfselection_,\, ÙØ±Ø² Ø§ÙÙØªØ§ØŠØ¬ ØšÙØ§Ø³Ø·Ø© _sfselection_\,) Ù}  
+_textformadvancedsearchsql_ [l=ar] {Search _If_(_jselection_, _jselection_)_If_(_gformselection_,  ÙÙ _gformselection_ level)_If_(_nselection_, ÙÙ  _nselection_ language)_If_(_sqlsfselection_,\, ÙØ±Ø² Ø§ÙÙØªØ§ØŠØ¬ ØšÙØ§Ø³Ø·Ø© _sqlsfselection_\,) Ù}  
 
 _textnojsformwarning_ [l=ar] {ØªØ­Ø°ÙØ±: Javascript ØºÙØ± Ù
Index: main/trunk/greenstone2/macros/chinese-trad.dm
===================================================================
--- main/trunk/greenstone2/macros/chinese-trad.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/chinese-trad.dm	(revision 22051)
@@ -411,4 +411,6 @@
 _textsimplesearch_ [l=zh-tr] {åš _indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_, at _gselection_ level )_If_(_nselection_,in _nselection_ language ) é²è¡æå°ïŒå
 å« _querytypeselection_ ç words_If_(_sfselection_,\,_allowformbreak_ sorting results by _sfselection_)}  
+_textsimplesqlsearch_ [l=zh-tr] {åš _indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_, at _gselection_ level )_If_(_nselection_,in _nselection_ language ) é²è¡æå°ïŒå
+å« _querytypeselection_ ç words_If_(_sqlsfselection_,\,_allowformbreak_ sorting results by _sqlsfselection_)}  
 
 _textadvancedsearch_ [l=zh-tr] {åš _indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_,at _gselection_ level )_If_(_nselection_,in _nselection_ language ) é²è¡æå°ïŒå¯äœ¿çš _querytypeselection_ èªæ³æ¥è©¢}  
@@ -417,4 +419,5 @@
 
 _textadvancedlucenesearch_ [l=zh-tr] {åš _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ sorting results by _sfselection_\,) é²è¡æå° ïŒä»¥äœ}  
+_textadvancedsqlsearch_ [l=zh-tr] {åš _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ sorting results by _sqlsfselection_\,) é²è¡æå° ïŒä»¥äœ}  
 
 _textformsimplesearch_ [l=zh-tr] {åš _If_(_jselection_, _jselection_ )_If_(_gformselection_,at _gformselection_ level )_If_(_nselection_,in _nselection_ language) é²è¡æå°ïŒä»¥ _formquerytypesimpleselection_ æ¥è©¢}  
@@ -423,4 +426,5 @@
 
 _textformadvancedsearchlucene_ [l=zh-tr] {åš _If_(_jselection_, _jselection_)_If_(_gformselection_,  at _gformselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\, sorting results by _sfselection_\,) é²è¡æå°ïŒä»¥äœ }  
+_textformadvancedsearchsql_ [l=zh-tr] {åš _If_(_jselection_, _jselection_)_If_(_gformselection_,  at _gformselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\, sorting results by _sqlsfselection_\,) é²è¡æå°ïŒä»¥äœ }  
 
 _textnojsformwarning_ [l=zh-tr] {è­Šå: Javascript å·è¡ç°å¢è¢«çèŠœåšééäºïŒ<br>çºäºèŠå·è¡è¡šæ Œæ¥è©¢è«éåJavascriptã}
Index: main/trunk/greenstone2/macros/dutch.dm
===================================================================
--- main/trunk/greenstone2/macros/dutch.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/dutch.dm	(revision 22051)
@@ -377,4 +377,5 @@
 
 _textsimplesearch_ [l=nl] {Zoek in _indexselection_ _If_(_jselection_, verbonden met _jselection_ )_If_(_gselection_, at _gselection_ niveau )_If_(_nselection_, in _nselection_ language ) dat bevat(ten) _querytypeselection_ van de woorden _If_(_sfselection_,\,_allowformbreak_ resultaten gesorteerd volgens  _sfselection_)
+_textsimplesqlsearch_ [l=nl] {Zoek in _indexselection_ _If_(_jselection_, verbonden met _jselection_ )_If_(_gselection_, at _gselection_ niveau )_If_(_nselection_, in _nselection_ language ) dat bevat(ten) _querytypeselection_ van de woorden _If_(_sqlsfselection_,\,_allowformbreak_ resultaten gesorteerd volgens  _sqlsfselection_)
 }  
 
@@ -384,10 +385,13 @@
 
 _textadvancedlucenesearch_ [l=nl] {Zoek in _indexselection__If_(_jselection_, verbonden met _jselection_)_If_(_gselection_, op _gselection_ niveau )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ resultaten gesorteerd volgens  _sfselection_\,) voor}  
+_textadvancedsqlsearch_ [l=nl] {Zoek in _indexselection__If_(_jselection_, verbonden met _jselection_)_If_(_gselection_, op _gselection_ niveau )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ resultaten gesorteerd volgens  _sqlsfselection_\,) voor}  
 
 _textformsimplesearch_ [l=nl] {Zoek in _If_(_jselection_, _jselection_)_If_(_gformselection_, at _gformselection_ niveau )_If_(_nselection_, in _nselection_ taal)_If_(_sfselection_,\,  resultaten gesorteerd naar _sfselection_\,) voor _formquerytypesimpleselection_ van}  
+_textformsimplesearchsql_ [l=nl] {Zoek in _If_(_jselection_, _jselection_)_If_(_gformselection_, at _gformselection_ niveau )_If_(_nselection_, in _nselection_ taal)_If_(_sqlsfselection_,\,  resultaten gesorteerd naar _sqlsfselection_\,) voor _formquerytypesimpleselection_ van}  
 
 _textformadvancedsearchmgpp_ [l=nl] {Zoek in _If_(_jselection_,_jselection_ )_If_(_gformselection_,op _gformselection_ niveau )_If_(_nselection_,in _nselection_ taal )en toon resultaten in _formquerytypeadvancedselection_ volgorde: }  
 
 _textformadvancedsearchlucene_ [l=nl] {Zoek in _If_(_jselection_, _jselection_)_If_(_gformselection_,  at _gformselection_ niveau )_If_(_nselection_, in _nselection_ taal)_If_(_sfselection_,\, resultaten gesorteerd naar _sfselection_\,) voor}  
+_textformadvancedsearchsql_ [l=nl] {Zoek in _If_(_jselection_, _jselection_)_If_(_gformselection_,  at _gformselection_ niveau )_If_(_nselection_, in _nselection_ taal)_If_(_sqlsfselection_,\, resultaten gesorteerd naar _sqlsfselection_\,) voor}  
 
 _textnojsformwarning_ [l=nl] {Waarschuwing: Javascript is in Uw webbrowser afgezet. <br>Om een zoekformulier te kunnen gebruiken, moet U het aanzetten.}  
Index: main/trunk/greenstone2/macros/english.dm
===================================================================
--- main/trunk/greenstone2/macros/english.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/english.dm	(revision 22051)
@@ -409,4 +409,6 @@
 _textwordphrase_ {Words}
 _textinfield_ {... in field}
+_textfieldphrase_ {Field}
+_textinwords_ {... in word(s)}
 _textfoldstem_ {(fold, stem)}
 
@@ -425,4 +427,5 @@
 
 _textsimplesearch_ {Search in _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ sorting results by _sfselection_) for _querytypeselection_ of the words}
+_textsimplesqlsearch_ {Search in _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ sorting results by _sqlsfselection_) for _querytypeselection_ of the words}
 
 _textadvancedsearch_ {Search in _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language) using _querytypeselection_ query}
@@ -431,12 +434,15 @@
 
 _textadvancedlucenesearch_ {Search in _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ sorting results by _sfselection_\,) for }
+_textadvancedsqlsearch_ {Search in _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ sorting results by _sqlsfselection_\,) for }
 
 # the space after "Search" is required, otherwise no space between "Search" and "in"
 
 _textformsimplesearch_ {Search _If_(_jselection_, in _jselection_)_If_(_gformselection_, at _gformselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\, sorting results by _sfselection_\,) for _formquerytypesimpleselection_ of }
+_textformsimplesearchsql_ {Search _If_(_jselection_, in _jselection_)_If_(_gformselection_, at _gformselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\, sorting results by _sqlsfselection_\,) for _formquerytypesimpleselection_ of }
 
 _textformadvancedsearchmgpp_ {Search _If_(_jselection_, in _jselection_)_If_(_gformselection_, at _gformselection_ level )_If_(_nselection_, in _nselection_ language), and display results in _formquerytypeadvancedselection_ order, for }
 
 _textformadvancedsearchlucene_ {Search _If_(_jselection_, in _jselection_)_If_(_gformselection_, at _gformselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\, sorting results by _sfselection_\,) for }
+_textformadvancedsearchsql_ {Search _If_(_jselection_, in _jselection_)_If_(_gformselection_, at _gformselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\, sorting results by _sqlsfselection_\,) for }
 
 _textnojsformwarning_ {Warning: Javascript is disabled in your web browser. <br>To use form searching, please enable it.}
@@ -518,4 +524,5 @@
 _textsearchtype_ {Query style:}
 _textformsearchtype_ {fielded with _formnumfieldoption_ fields}
+_textsqlformsearchtype_ {SQL fielded with _sqlformnumfieldoption_ fields}
 _textplainsearchtype_ {normal with _boxsizeoption_ query box}
 _textregularbox_ {single line}
Index: main/trunk/greenstone2/macros/farsi.dm
===================================================================
--- main/trunk/greenstone2/macros/farsi.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/farsi.dm	(revision 22051)
@@ -551,7 +551,10 @@
 
 _textadvancedlucenesearch_ [l=fa] {Ø¬Ø³ØªØ¬Ù(Ú©Ø±Ø¯Ù) _indexselection__If_(_jselection_, of _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ sorting results by _sfselection_\,) ØšØ±Ø§Û"}  
+_textadvancedsqlsearch_ [l=fa] {Ø¬Ø³ØªØ¬Ù(Ú©Ø±Ø¯Ù) _indexselection__If_(_jselection_, of _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ sorting results by _sqlsfselection_\,) ØšØ±Ø§Û"}  
 
 _textformsimplesearch_ [l=fa] {Ø¬Ø³ØªØ¬ÙÛ _If_(_jselection_, _jselection_)_If_(_gformselection_, Ø¯Ø± _gformselection_ Ø³Ø·Ø­ )_If_(_nselection_, Ø¯Ø± _nselection_ language)_If_(_sfselection_,\, Ù
 Ø±ØªØš Ú©Ø±Ø¯Ù ÙØªØ§ÛØ¬ ØšØ§}  
+_textformsimplesearchsql_ [l=fa] {Ø¬Ø³ØªØ¬ÙÛ _If_(_jselection_, _jselection_)_If_(_gformselection_, Ø¯Ø± _gformselection_ Ø³Ø·Ø­ )_If_(_nselection_, Ø¯Ø± _nselection_ language)_If_(_sqlsfselection_,\, Ù
+Ø±ØªØš Ú©Ø±Ø¯Ù ÙØªØ§ÛØ¬ ØšØ§}  
 
 _textformadvancedsearchmgpp_ [l=fa] {Ø¬Ø³ØªØ¬ÙÛ _If_(_jselection_,_jselection_ )_If_(_gformselection_,at _gformselection_ level )_If_(_nselection_,in _nselection_ language )Ù ÙÙ
@@ -559,4 +562,5 @@
 
 _textformadvancedsearchlucene_ [l=fa] {Ø¬Ø³ØªØ¬ÙÛ _If_(_jselection_, _jselection_)_If_(_gformselection_,  Ø¯Ø± _gformselection_ level)_If_(_nselection_, Ø¯Ø± Ø²ØšØ§Ù _nselection_ language)_If_(_sfselection_,\,  ØšÙ ØªØ±ØªÛØš _sfselection_\,)  ØšØ±Ø§Û}  
+_textformadvancedsearchsql_ [l=fa] {Ø¬Ø³ØªØ¬ÙÛ _If_(_jselection_, _jselection_)_If_(_gformselection_,  Ø¯Ø± _gformselection_ level)_If_(_nselection_, Ø¯Ø± Ø²ØšØ§Ù _nselection_ language)_If_(_sqlsfselection_,\,  ØšÙ ØªØ±ØªÛØš _sqlsfselection_\,)  ØšØ±Ø§Û}  
 
 _textnojsformwarning_ [l=fa] {ØªØ°Ú¯Ø± : Ø¬Ø§ÙØ§ Ø§Ø³Ú©Ø±ÛÙŸØª Ø¯Ø± Ù
Index: main/trunk/greenstone2/macros/french.dm
===================================================================
--- main/trunk/greenstone2/macros/french.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/french.dm	(revision 22051)
@@ -397,4 +397,5 @@
 
 _textsimplesearch_ [l=fr] {Rechercher dans _indexselection__If_(_jselection_,associÃ©(e) Ã  _jselection_)_If_(_gselection_, au niveau de _gselection_)_If_(_nselection_,en langue _nselection_)_If_(_sfselection_,\,_allowformbreak_ en triant les rÃ©sultats par _sfselection_\,) _querytypeselection_ mots :}  
+_textsimplesqlsearch_ [l=fr] {Rechercher dans _indexselection__If_(_jselection_,associÃ©(e) Ã  _jselection_)_If_(_gselection_, au niveau de _gselection_)_If_(_nselection_,en langue _nselection_)_If_(_sqlsfselection_,\,_allowformbreak_ en triant les rÃ©sultats par _sqlsfselection_\,) _querytypeselection_ mots :}  
 
 _textadvancedsearch_ [l=fr] {Rechercher dans _indexselection__If_(_jselection_, associÃ©(e) Ã  _jselection_)_If_(_gselection_, au niveau de _gselection_)_If_(_nselection_, en langue _nselection_) par requÃªte _querytypeselection_ :}  
@@ -403,12 +404,15 @@
 
 _textadvancedlucenesearch_ [l=fr] {Rechercher dans _indexselection__If_(_jselection_, associÃ©(e) Ã  _jselection_)_If_(_gselection_, au niveau de _gselection_)_If_(_nselection_, en langue _nselection_)_If_(_sfselection_,_allowformbreak_ en triant les rÃ©sultats par _sfselection_) : }  
+_textadvancedsqlsearch_ [l=fr] {Rechercher dans _indexselection__If_(_jselection_, associÃ©(e) Ã  _jselection_)_If_(_gselection_, au niveau de _gselection_)_If_(_nselection_, en langue _nselection_)_If_(_sqlsfselection_,_allowformbreak_ en triant les rÃ©sultats par _sqlsfselection_) : }  
 
 # the space after "Search" is required, otherwise no space between "Search" and "in"
 
 _textformsimplesearch_ [l=fr] {Rechercher _If_(_jselection_, _jselection_) _If_(_gformselection_, au niveau de _gformselection_ ) _If_(_nselection_, en langue _nselection_)_If_(_sfselection_,\, en triant les rÃ©sultats par _sfselection_\,) selon _formquerytypesimpleselection_ critÃšres suivants : }  
+_textformsimplesearchsql_ [l=fr] {Rechercher _If_(_jselection_, _jselection_) _If_(_gformselection_, au niveau de _gformselection_ ) _If_(_nselection_, en langue _nselection_)_If_(_sqlsfselection_,\, en triant les rÃ©sultats par _sqlsfselection_\,) selon _formquerytypesimpleselection_ critÃšres suivants : }  
 
 _textformadvancedsearchmgpp_ [l=fr] {Rechercher _If_(_jselection_,_jselection_ )_If_(_gformselection_,au niveau de _gformselection_)_If_(_nselection_,en langue _nselection_ ) et afficher les rÃ©sultats en disposition  _formquerytypeadvancedselection_ :}  
 
 _textformadvancedsearchlucene_ [l=fr] {Rechercher _If_(_jselection_, _jselection_)_If_(_gformselection_,  au niveau de _gformselection_)_If_(_nselection_, en langue _nselection_)_If_(_sfselection_,\, en triant les rÃ©sultats par _sfselection_\,) selon les critÃšres suivants : }  
+_textformadvancedsearchsql_ [l=fr] {Rechercher _If_(_jselection_, _jselection_)_If_(_gformselection_,  au niveau de _gformselection_)_If_(_nselection_, en langue _nselection_)_If_(_sqlsfselection_,\, en triant les rÃ©sultats par _sqlsfselection_\,) selon les critÃšres suivants : }  
 
 _textnojsformwarning_ [l=fr] {Attention: Javascript est dÃ©sactivÃ© dans votre navigateur web. <br> Pour utiliser la recherche par formulaire, veuillez l'activer.}
Index: main/trunk/greenstone2/macros/german.dm
===================================================================
--- main/trunk/greenstone2/macros/german.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/german.dm	(revision 22051)
@@ -372,4 +372,5 @@
 
 _textsimplesearch_ [l=de] {Suche nach _indexselection_ _If_(_jselection_, aus _jselection_)_If_(_gselection_, im Level _gselection_ ) _If_(_nselection_, in der Sprache _nselection_ ), die _querytypeselection_ der WÃ¶rter enthalten _If_(_sfselection_,\,_allowformbreak_ Ergebnisse sortiert nach _sfselection_)}  
+_textsimplesqlsearch_ [l=de] {Suche nach _indexselection_ _If_(_jselection_, aus _jselection_)_If_(_gselection_, im Level _gselection_ ) _If_(_nselection_, in der Sprache _nselection_ ), die _querytypeselection_ der WÃ¶rter enthalten _If_(_sqlsfselection_,\,_allowformbreak_ Ergebnisse sortiert nach _sqlsfselection_)}  
 
 _textadvancedsearch_ [l=de] {Suche nach _indexselection_ _If_(_jselection_, aus _jselection_) _If_(_gselection_, at _gselection_ level)_If_(_nselection_, in der _nselection_ Sprache) mit einer _querytypeselection_ Anfrage}
@@ -378,10 +379,13 @@
 
 _textadvancedlucenesearch_ [l=de] {Search _indexselection__If_(_jselection_, of _jselection_)_If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ sorting results by _sfselection_\,) for}  
+_textadvancedsqlsearch_ [l=de] {Search _indexselection__If_(_jselection_, of _jselection_)_If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ sorting results by _sqlsfselection_\,) for}  
 
 _textformsimplesearch_ [l=de] {Suche  _If_(_jselection_, _jselection_)_If_(_gformselection_, at _gformselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\, sortiere Ergebnisse nach _sfselection_\,) fÃŒr _formquerytypesimpleselection_ von }  
+_textformsimplesearchsql_ [l=de] {Suche  _If_(_jselection_, _jselection_)_If_(_gformselection_, at _gformselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\, sortiere Ergebnisse nach _sqlsfselection_\,) fÃŒr _formquerytypesimpleselection_ von }  
 
 _textformadvancedsearchmgpp_ [l=de] {Suche _If_(_jselection_,_jselection_ )_If_(_gformselection_,at _gformselection_ level )_If_(_nselection_,in _nselection_ language ) und zeige die Ergebnisse in Reihenfolge _formquerytypeadvancedselection_ an}  
 
 _textformadvancedsearchlucene_ [l=de] {Suche _If_(_jselection_, _jselection_)_If_(_gformselection_,  at _gformselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\, Ergebnisse geordnet nach _sfselection_\,) fÃŒr}  
+_textformadvancedsearchsql_ [l=de] {Suche _If_(_jselection_, _jselection_)_If_(_gformselection_,  at _gformselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\, Ergebnisse geordnet nach _sqlsfselection_\,) fÃŒr}  
 
 _textnojsformwarning_ [l=de] {Warnung: Javascript wird in Ihrem Webbrowser gesperrt. <br>Um die Suchfunktion zu benutzen, lassen Sie bitte Javascript zu.}  
Index: main/trunk/greenstone2/macros/hungarian.dm
===================================================================
--- main/trunk/greenstone2/macros/hungarian.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/hungarian.dm	(revision 22051)
@@ -373,4 +373,5 @@
 
 _textsimplesearch_ [l=hu] {Keress a _indexselection_ _If_(_jselection_,_jselection_-bol )_If_(_gselection_, _gselection_ levo szinten )_If_(_nselection_, _nselection_ -beli nyelvben ) ami tartalmazza _querytypeselection_ a szavait _If_(_sfselection_,\,_allowformbreak_ rendezve az eredmenyt _sfselection_ szerint)}  
+_textsimplesqlsearch_ [l=hu] {Keress a _indexselection_ _If_(_jselection_,_jselection_-bol )_If_(_gselection_, _gselection_ levo szinten )_If_(_nselection_, _nselection_ -beli nyelvben ) ami tartalmazza _querytypeselection_ a szavait _If_(_sqlsfselection_,\,_allowformbreak_ rendezve az eredmenyt _sqlsfselection_ szerint)}  
 
 _textadvancedsearch_ [l=hu] {Keress _indexselection_ _If_(_jselection_, _jselection_-bol )_If_(_gselection_, _gselection_ levo szinten )_If_(_nselection_, _nselection_ -beli nyelvben) felhasznalva a _querytypeselection_ lekerdezest}  
@@ -379,10 +380,13 @@
 
 _textadvancedlucenesearch_ [l=hu] {Keress _indexselection__If_(_jselection_, _jselection_-bol)_If_(_gselection_, _gselection_ levo szinten)_If_(_nselection_, _nselection_-ban language)_If_(_sfselection_,\,_allowformbreak_ rendezd az eredmenyt _sfselection_\ szerint,) -nek }  
+_textadvancedsqlsearch_ [l=hu] {Keress _indexselection__If_(_jselection_, _jselection_-bol)_If_(_gselection_, _gselection_ levo szinten)_If_(_nselection_, _nselection_-ban language)_If_(_sqlsfselection_,\,_allowformbreak_ rendezd az eredmenyt _sqlsfselection_\ szerint,) -nek }  
 
 _textformsimplesearch_ [l=hu] {Keress _If_(_jselection_, _jselection_)_If_(_gformselection_,  _gformselection_ levo szinten)_If_(_nselection_, _nselection_ -beli nyelvben)_If_(_sfselection_,\, rendezve az eredmenyeket _sfselection_\ szerint,) for _formquerytypesimpleselection_ of }  
+_textformsimplesearchsql_ [l=hu] {Keress _If_(_jselection_, _jselection_)_If_(_gformselection_,  _gformselection_ levo szinten)_If_(_nselection_, _nselection_ -beli nyelvben)_If_(_sqlsfselection_,\, rendezve az eredmenyeket _sqlsfselection_\ szerint,) for _formquerytypesimpleselection_ of }  
 
 _textformadvancedsearchmgpp_ [l=hu] {Keress _If_(_jselection_,_jselection_ )_If_(_gformselection_, _gformselection_ levo szinten)_If_(_nselection_, _nselection_ -beli nyelvben ) es mutasd az eredmenyt a _formquerytypeadvancedselection_ lekerdezes sorendjeben}  
 
 _textformadvancedsearchlucene_ [l=hu] {Keress _If_(_jselection_, _jselection_)_If_(_gformselection_,  _gformselection_ levo szinten)_If_(_nselection_, _nselection_ -beli nyelvben)_If_(_sfselection_,\, rendezve az eredmenyeket _sfselection_\ szerint,)  }  
+_textformadvancedsearchsql_ [l=hu] {Keress _If_(_jselection_, _jselection_)_If_(_gformselection_,  _gformselection_ levo szinten)_If_(_nselection_, _nselection_ -beli nyelvben)_If_(_sqlsfselection_,\, rendezve az eredmenyeket _sqlsfselection_\ szerint,)  }  
 
 _textnojsformwarning_ [l=hu] {FigyelmeztetÃ©s: Javascript hasznÃ¡lata nem engedÃ©lyezett a web bÃ¶ngÃ©szÅben. <br> âformâ keresÃ©shez kÃ©rem engedÃ©lyezze.}  
Index: main/trunk/greenstone2/macros/kannada.dm
===================================================================
--- main/trunk/greenstone2/macros/kannada.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/kannada.dm	(revision 22051)
@@ -389,4 +389,5 @@
 
 _textsimplesearch_ [l=kn] {à²à²²à³à²²à²¿ à²¶à³à²§à²¿à²žà²¿ _indexselection_ _If_( _jselection_à²° à²à³à²€à³ à²žà²à²ªà²°à³à²à²µà²¿à²°à³à²µ _jselection_)_If_(_gselection_,  _gselection_ à²®à²à³à²à²Š )_If_(_nselection_, _nselection_ à²­à²Ÿà²·à³ à²¯à²²à³à²²à²¿ )à²à²Šà²šà³à²šà³ à²à²³à²à³à²à²¡à²¿à²°à³à²µ _querytypeselection_ à² à²ªà²Šà²à²³_If_(_sfselection_,\,_allowformbreak_ à²«à²²à²¿à²€à²Ÿà²à²¶à²à²³à²šà³à²šà³ à² à²ªà³à²°à²à²Ÿà²° à²µà²¿à²à²à²¡à²¿à²žà²¿   _sfselection_)}  
+_textsimplesqlsearch_ [l=kn] {à²à²²à³à²²à²¿ à²¶à³à²§à²¿à²žà²¿ _indexselection_ _If_( _jselection_à²° à²à³à²€à³ à²žà²à²ªà²°à³à²à²µà²¿à²°à³à²µ _jselection_)_If_(_gselection_,  _gselection_ à²®à²à³à²à²Š )_If_(_nselection_, _nselection_ à²­à²Ÿà²·à³ à²¯à²²à³à²²à²¿ )à²à²Šà²šà³à²šà³ à²à²³à²à³à²à²¡à²¿à²°à³à²µ _querytypeselection_ à² à²ªà²Šà²à²³_If_(_sqlsfselection_,\,_allowformbreak_ à²«à²²à²¿à²€à²Ÿà²à²¶à²à²³à²šà³à²šà³ à² à²ªà³à²°à²à²Ÿà²° à²µà²¿à²à²à²¡à²¿à²žà²¿   _sqlsfselection_)}  
 
 _textadvancedsearch_ [l=kn] {à²à²²à³à²²à²¿  à²¶à³à²§à²¿à²žà²¿  _indexselection_ _If_(_jselection_, _jselection_ )à²š_If_(_gselection_, _gselection_ level )à²šà²²à³à²²à²¿_If_(_nselection_, _nselection_ à²­à²Ÿà²·à³à²¯à²²à³à²²à²¿ ) _querytypeselection_ à²à²ªà²¯à³à²à²¿à²žà²¿ à²ªà³à²°à²¶à³à²šà²¿à²žà²¿}  
@@ -395,12 +396,15 @@
 
 _textadvancedlucenesearch_ [l=kn] {à²à²²à³à²²à²¿ à²¶à³à²§à²¿à²žà²¿ _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ à²«à²²à²¿à²€à²Ÿà²à²¶à²à²³à²šà³à²šà³ _sfselection_\,) à²µà²¿à²à²à²¡à²¿à²žà²¿ }  
+_textadvancedsqlsearch_ [l=kn] {à²à²²à³à²²à²¿ à²¶à³à²§à²¿à²žà²¿ _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ à²«à²²à²¿à²€à²Ÿà²à²¶à²à²³à²šà³à²šà³ _sqlsfselection_\,) à²µà²¿à²à²à²¡à²¿à²žà²¿ }  
 
 # the space after "Search" is required, otherwise no space between "Search" and "in"
 
 _textformsimplesearch_ [l=kn] {à²à²²à³à²²à²¿  à²¶à³à²§à²¿à²žà²¿ _If_(_jselection_, _jselection_)_If_(_gformselection_,  _gformselection_ à²šà²²à³à²²à²¿ à²®à²à³à² )_If_(_nselection_,  _nselection_ à²­à²Ÿà²·à³à²¯à²²à³à²²à²¿)_If_(_sfselection_,\, à²«à²²à²¿à²€à²Ÿà²à²¶à²à²³à²šà³à²šà³ _sfselection_\,) for _formquerytypesimpleselection_ à² à²ªà³à²°à²à²Ÿà²° à²µà²¿à²à²à²¡à²¿à²žà²¿}  
+_textformsimplesearchsql_ [l=kn] {à²à²²à³à²²à²¿  à²¶à³à²§à²¿à²žà²¿ _If_(_jselection_, _jselection_)_If_(_gformselection_,  _gformselection_ à²šà²²à³à²²à²¿ à²®à²à³à² )_If_(_nselection_,  _nselection_ à²­à²Ÿà²·à³à²¯à²²à³à²²à²¿)_If_(_sqlsfselection_,\, à²«à²²à²¿à²€à²Ÿà²à²¶à²à²³à²šà³à²šà³ _sqlsfselection_\,) for _formquerytypesimpleselection_ à² à²ªà³à²°à²à²Ÿà²° à²µà²¿à²à²à²¡à²¿à²žà²¿}  
 
 _textformadvancedsearchmgpp_ [l=kn] {à²à²²à³à²²à²¿  à²¶à³à²§à²¿à²žà²¿ _If_(_jselection_,_jselection_ )_If_(_gformselection_, _gformselection_ level )à²šà²²à³à²²à²¿_If_(_nselection_, _nselection_ à²­à²Ÿà²·à³à²¯à²²à³à²²à²¿ )à²®à²€à³à²€à³ à²«à²²à²¿à²€à²Ÿà²à²¶à²à²³à²šà³à²šà³  _formquerytypeadvancedselection_ à² à²ªà³à²°à²à²Ÿà²° à²µà²¿à²à²à²¡à²¿à²žà²¿:}  
 
 _textformadvancedsearchlucene_ [l=kn] {à²à²²à³à²²à²¿  à²¶à³à²§à²¿à²žà²¿ _If_(_jselection_, _jselection_)_If_(_gformselection_,  _gformselection_ level )à²šà²²à³à²²à²¿_If_(_nselection_,  _nselection_ à²®à²€à³à²€à³ à²­à²Ÿà²·à³)_If_(_sfselection_,\, à²«à²²à²¿à²€à²Ÿà²à²¶à²à²³à²šà³à²šà³  _sfselection_\,) à² à²ªà³à²°à²à²Ÿà²° à²µà²¿à²à²à²¡à²¿à²žà²¿ }  
+_textformadvancedsearchsql_ [l=kn] {à²à²²à³à²²à²¿  à²¶à³à²§à²¿à²žà²¿ _If_(_jselection_, _jselection_)_If_(_gformselection_,  _gformselection_ level )à²šà²²à³à²²à²¿_If_(_nselection_,  _nselection_ à²®à²€à³à²€à³ à²­à²Ÿà²·à³)_If_(_sqlsfselection_,\, à²«à²²à²¿à²€à²Ÿà²à²¶à²à²³à²šà³à²šà³  _sqlsfselection_\,) à² à²ªà³à²°à²à²Ÿà²° à²µà²¿à²à²à²¡à²¿à²žà²¿ }  
 
 _textnojsformwarning_ [l=kn] {à²à²à³à²à²°à²¿à²à³: à²šà²¿à²®à³à²® à²µà³à²¬à³âà²¬à³à²°à³à²žà²°à³âà²šà²²à³à²²à²¿ à²à²Ÿà²µà²žà³à²à³à²°à²¿à²ªà³à²à³â à²šà²¿à²·à³à²à³à²°à²¿à²¯à²µà²Ÿà²à²¿à²Šà³.<br>à²¶à³à²§à²šà³ à²šà²®à³à²šà³à²¯à²šà³à²šà³ à²à²ªà²¯à³à²à²¿à²žà²²à³ à²Šà²¯à²µà²¿à²à³à²à³ à²à²Ÿà²µà²žà³à²à³à²°à²¿à²ªà³à²à³âà²šà³à²šà³ à²žà²à³à²°à²¿à²¯à²à³à²³à²¿à²žà²¿}  
Index: main/trunk/greenstone2/macros/malayalam.dm
===================================================================
--- main/trunk/greenstone2/macros/malayalam.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/malayalam.dm	(revision 22051)
@@ -402,4 +402,5 @@
 
 _textsimplesearch_ [l=ml] {àŽàµàŽ£àµàŽàµàŽªàŽ²àŽàŽ¯àŽ¿àŽ²àµ àŽ€àŽ¿àŽ°àŽ¯àµàŽ__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ sorting results by _sfselection_) for _querytypeselection_ of the àŽµàŽŸàŽàµàŽàµàŽàŽ³àµàŽ³àµàŽ³}  
+_textsimplesqlsearch_ [l=ml] {àŽàµàŽ£àµàŽàµàŽªàŽ²àŽàŽ¯àŽ¿àŽ²àµ àŽ€àŽ¿àŽ°àŽ¯àµàŽ__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ sorting results by _sqlsfselection_) for _querytypeselection_ of the àŽµàŽŸàŽàµàŽàµàŽàŽ³àµàŽ³àµàŽ³}  
 
 
Index: main/trunk/greenstone2/macros/marathi.dm
===================================================================
--- main/trunk/greenstone2/macros/marathi.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/marathi.dm	(revision 22051)
@@ -410,4 +410,5 @@
 
 _textsimplesearch_ [l=mr] {à€¶à¥à€§à€Ÿ in _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ sorting results by _sfselection_) à€à¥ _querytypeselection_ of the words}  
+_textsimplesqlsearch_ [l=mr] {à€¶à¥à€§à€Ÿ in _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ sorting results by _sqlsfselection_) à€à¥ _querytypeselection_ of the words}  
 
 _textadvancedsearch_ [l=mr] {à€¶à¥à€§à€Ÿ in _indexselection__If_(_jselection_, associated with _jselection_)_If_(_gselection_, at _gselection_ level )_If_(_nselection_, in _nselection_ language) using _querytypeselection_ query}  
@@ -416,12 +417,15 @@
 
 _textadvancedlucenesearch_ [l=mr] {à€¶à¥à€§à€Ÿ _à€šà€¿à€°à¥à€Šà¥à€¶à€šà€¿à€µà€¡ _ _à€à€°__(_jselection_, of _jselection_)_If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ sorting results by _sfselection_\,) for }  
+_textadvancedsqlsearch_ [l=mr] {à€¶à¥à€§à€Ÿ _à€šà€¿à€°à¥à€Šà¥à€¶à€šà€¿à€µà€¡ _ _à€à€°__(_jselection_, of _jselection_)_If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ sorting results by _sqlsfselection_\,) for }  
 
 # the space after "Search" is required, otherwise no space between "Search" and "in"
 
 _textformsimplesearch_ [l=mr] {à€¶à¥à€§à€Ÿ _If_(_jselection_, in _jselection_)_If_(_gformselection_, at _gformselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\, sorting results by _sfselection_\,) à€žà€Ÿà€ à¥ _formquerytypesimpleselection_ à€à¥}  
+_textformsimplesearchsql_ [l=mr] {à€¶à¥à€§à€Ÿ _If_(_jselection_, in _jselection_)_If_(_gformselection_, at _gformselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\, sorting results by _sqlsfselection_\,) à€žà€Ÿà€ à¥ _formquerytypesimpleselection_ à€à¥}  
 
 _textformadvancedsearchmgpp_ [l=mr] {à€¶à¥à€§à€Ÿ _If_(_jselection_, in _jselection_)_If_(_gformselection_, at _gformselection_ level )_If_(_nselection_, in _nselection_ language), and display results in _formquerytypeadvancedselection_ order, for}  
 
 _textformadvancedsearchlucene_ [l=mr] {à€¶à¥à€§à€Ÿ _If_(_jselection_, in _jselection_)_If_(_gformselection_, at _gformselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\, sorting results by _sfselection_\,) à€žà€Ÿà€ à¥}  
+_textformadvancedsearchsql_ [l=mr] {à€¶à¥à€§à€Ÿ _If_(_jselection_, in _jselection_)_If_(_gformselection_, at _gformselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\, sorting results by _sqlsfselection_\,) à€žà€Ÿà€ à¥}  
 
 _textnojsformwarning_ [l=mr] {à€žà¥à€à€šà€Ÿà€à€à€Ÿà€µà€Ÿà€žà¥à€à¥à€°à€¿à€ªà¥à€ à€€à¥à€®à€à¥à€¯à€Ÿ à€¬à¥à€°à€Ÿà€à€à€° à€µà€° à€¬à€à€Š à€à€¹à¥. à€¶à¥à€§à€£à¥à€¯à€Ÿà€žà€Ÿà€ à¥ à€«à¥à€°à¥à€® à€¹à€µà€Ÿ à€
Index: main/trunk/greenstone2/macros/polish.dm
===================================================================
--- main/trunk/greenstone2/macros/polish.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/polish.dm	(revision 22051)
@@ -469,4 +469,7 @@
 c wyniki wg _sfselection_) zawierajÄ
 ce _querytypeselection_ sÅowa}
+_textsimplesqlsearch_ [l=pl] {ZnajdÅº _indexselection_ _If_(_jselection_,z _jselection_ )_If_(_gselection_, na poziomie _gselection_ )_If_(_nselection_,w jÄzyku _nselection_ ) _If_(_sqlsfselection_,\,_allowformbreak_ sortujÄ
+c wyniki wg _sqlsfselection_) zawierajÄ
+ce _querytypeselection_ sÅowa}
 
 _textadvancedsearch_ [l=pl] {ZnajdÅº _indexselection_ _If_(_jselection_,z _jselection_ )_If_(_gselection_, na poziomie _gselection_ )_If_(_nselection_,w jÄzyku _nselection_ )za pomocÄ
@@ -477,4 +480,6 @@
 _textadvancedlucenesearch_ [l=pl] {Szukaj _indexselection__If_(_jselection_, z _jselection_)_If_(_gselection_, na poziomie _gselection_)_If_(_nselection_, w jÄzyku _nselection_)_If_(_sfselection_,\,_allowformbreak_ sortujÄ
 c wyniki wg _sfselection_\,) dla }  
+_textadvancedsqlsearch_ [l=pl] {Szukaj _indexselection__If_(_jselection_, z _jselection_)_If_(_gselection_, na poziomie _gselection_)_If_(_nselection_, w jÄzyku _nselection_)_If_(_sqlsfselection_,\,_allowformbreak_ sortujÄ
+c wyniki wg _sqlsfselection_\,) dla }  
 
 # the space after "Search" is required, otherwise no space between "Search" and "in"
@@ -482,4 +487,6 @@
 _textformsimplesearch_ [l=pl] {ZnajdÅº _If_(_jselection_,_jselection_ )_If_(_gformselection_, na poziomie _gformselection_ )_If_(_nselection_, w jÄzyku _nselection_ )_If_(_sfselection_,\, sortujÄ
 c wyniki wg _sfselection_\,)  dla _formquerytypesimpleselection_ }
+_textformsimplesearchsql_ [l=pl] {ZnajdÅº _If_(_jselection_,_jselection_ )_If_(_gformselection_, na poziomie _gformselection_ )_If_(_nselection_, w jÄzyku _nselection_ )_If_(_sqlsfselection_,\, sortujÄ
+c wyniki wg _sqlsfselection_\,)  dla _formquerytypesimpleselection_ }
 
 _textformadvancedsearchmgpp_ [l=pl] {Szukaj _If_(_jselection_,_jselection_ )_If_(_gformselection_,na poziomie _gformselection_ )_If_(_nselection_,w jÄzyku _nselection_) i wyÅwietl wg _formquerytypeadvancedselection_ dla }  
@@ -487,4 +494,6 @@
 _textformadvancedsearchlucene_ [l=pl] {Szukaj _If_(_jselection_, _jselection_)_If_(_gformselection_,  na poziomie _gformselection_)_If_(_nselection_, w jÄzyku _nselection_)_If_(_sfselection_,\, sortujÄ
 c wyniki wg _sfselection_\,) dla }  
+_textformadvancedsearchsql_ [l=pl] {Szukaj _If_(_jselection_, _jselection_)_If_(_gformselection_,  na poziomie _gformselection_)_If_(_nselection_, w jÄzyku _nselection_)_If_(_sqlsfselection_,\, sortujÄ
+c wyniki wg _sqlsfselection_\,) dla }  
 
 _textnojsformwarning_ [l=pl] {Uwaga: wyÅÄ
Index: main/trunk/greenstone2/macros/port-br.dm
===================================================================
--- main/trunk/greenstone2/macros/port-br.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/port-br.dm	(revision 22051)
@@ -369,4 +369,5 @@
 
 _textsimplesearch_ [l=pt-br] {Buscar por _indexselection_ _If_(_jselection_, associado com _jselection_)_If_(_gselection_, no nÃ­vel _gselection_)_If_(_nselection_, no idioma_nselection_) _If_(_sfselection_,\,_allowformbreak_ organizando os resultados por _sfselection_) para _querytypeselection_ das palavras}  
+_textsimplesqlsearch_ [l=pt-br] {Buscar por _indexselection_ _If_(_jselection_, associado com _jselection_)_If_(_gselection_, no nÃ­vel _gselection_)_If_(_nselection_, no idioma_nselection_) _If_(_sqlsfselection_,\,_allowformbreak_ organizando os resultados por _sqlsfselection_) para _querytypeselection_ das palavras}  
 
 _textadvancedsearch_ [l=pt-br] {Buscar em _indexselection_ _If_(_jselection_, associado com _jselection_)_If_(_gselection_, em nÃ­vel _gselection_ )_If_(_nselection_, no idioma _nselection_ ) usando a consulta _querytypeselection_}  
@@ -375,10 +376,13 @@
 
 _textadvancedlucenesearch_ [l=pt-br] {Buscar em _indexselection__if_(_jselection_, associado com _jselection_)_If_(_gselection_, em nÃ­vel _gselection_ )_If_(_nselection_, no idioma _nselection_)_If_(_sfselection_,\,_allowformbreak_ organizando os resultados por _sfselection_\,) para }  
+_textadvancedsqlsearch_ [l=pt-br] {Buscar em _indexselection__if_(_jselection_, associado com _jselection_)_If_(_gselection_, em nÃ­vel _gselection_ )_If_(_nselection_, no idioma _nselection_)_If_(_sqlsfselection_,\,_allowformbreak_ organizando os resultados por _sqlsfselection_\,) para }  
 
 _textformsimplesearch_ [l=pt-br] {Buscar em _If_(_jselection_, em _jselection_)_If_(_gformselection_, em nÃ­vel _gformselection_  )_If_(_nselection_, em idioma _nselection_)_If_(_sfselection_,\, organizando os resultados por _sfselection_\,) para _formquerytypesimpleselection_ de}  
+_textformsimplesearchsql_ [l=pt-br] {Buscar em _If_(_jselection_, em _jselection_)_If_(_gformselection_, em nÃ­vel _gformselection_  )_If_(_nselection_, em idioma _nselection_)_If_(_sqlsfselection_,\, organizando os resultados por _sqlsfselection_\,) para _formquerytypesimpleselection_ de}  
 
 _textformadvancedsearchmgpp_ [l=pt-br] {Buscar em _If_(_jselection_, em _jselection_ )_If_(_gformselection_, em nÃ­vel _gformselection_  )_If_(_nselection_, no idioma _nselection_) e mostrar resultados na ordem _formquerytypeadvancedselection_, para :}  
 
 _textformadvancedsearchlucene_ [l=pt-br] {Buscar em _If_(_jselection_, em _jselection_)_If_(_gformselection_,  no nÃ­vel _gformselection_ )_If_(_nselection_, no idioma _nselection_)_If_(_sfselection_,\, organizando os resultados por _sfselection_\,) para}  
+_textformadvancedsearchsql_ [l=pt-br] {Buscar em _If_(_jselection_, em _jselection_)_If_(_gformselection_,  no nÃ­vel _gformselection_ )_If_(_nselection_, no idioma _nselection_)_If_(_sqlsfselection_,\, organizando os resultados por _sqlsfselection_\,) para}  
 
 _textnojsformwarning_ [l=pt-br] {Aviso: Javascript estÃ¡ desativado em seu navegador. <br>Para utilizar busca por formas, por favor ative o Javascript.}  
Index: main/trunk/greenstone2/macros/pushto.dm
===================================================================
--- main/trunk/greenstone2/macros/pushto.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/pushto.dm	(revision 22051)
@@ -505,4 +505,8 @@
 ØŽØªÙ
 Ù ÙŸÙ_If_(_nselection_,Ø¯Ø§ÙÙØ§ØžÙ _If_(_sfselection_,\,_allowformbreak_ Ø¯ØªØ±ØªÛØš ÙØªÛØ¬Ù ÙŸÙ _sfselection_)ÙÛ}  
+_textsimplesqlsearch_ [l=ps] {Ø¯_indexselection_ _If_(_jselection_,Ø¯_jselection_ )_If_(_gselection_,ÙŸÙ_gselection_ Ø³Ø·Ø­Ù )ÙŸÙ _If_(_nselection_, ÚØšÙ ÙŸÙÙŒÙÙ ÙÚ©ÚÛ) Ú©ÙÙ
+ ÚÛ Ù
+ØŽØªÙ
+Ù ÙŸÙ_If_(_nselection_,Ø¯Ø§ÙÙØ§ØžÙ _If_(_sqlsfselection_,\,_allowformbreak_ Ø¯ØªØ±ØªÛØš ÙØªÛØ¬Ù ÙŸÙ _sqlsfselection_)ÙÛ}  
 
 
Index: main/trunk/greenstone2/macros/romanian.dm
===================================================================
--- main/trunk/greenstone2/macros/romanian.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/romanian.dm	(revision 22051)
@@ -395,4 +395,5 @@
 
 _textsimplesearch_ [l=ro] {CautÄ dupÄ _indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_, at _gselection_ level )_If_(_nselection_,in _nselection_ language )care conÅ£in _querytypeselection_ cuvintele _If_(_sfselection_,\,_allowformbreak_ sortarea rezultatelor dupÄ _sfselection_)}  
+_textsimplesqlsearch_ [l=ro] {CautÄ dupÄ _indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_, at _gselection_ level )_If_(_nselection_,in _nselection_ language )care conÅ£in _querytypeselection_ cuvintele _If_(_sqlsfselection_,\,_allowformbreak_ sortarea rezultatelor dupÄ _sqlsfselection_)}  
 
 _textadvancedsearch_ [l=ro] {CÄutare _indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_,at _gselection_ level )_If_(_nselection_,in _nselection_ language )folosind _querytypeselection_ query}  
@@ -401,10 +402,13 @@
 
 _textadvancedlucenesearch_ [l=ro] {CÄutare _indexselection__If_(_jselection_, of _jselection_)_If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ sortarea rezultatelor dupÄ _sfselection_\,) pentru}  
+_textadvancedsqlsearch_ [l=ro] {CÄutare _indexselection__If_(_jselection_, of _jselection_)_If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ sortarea rezultatelor dupÄ _sqlsfselection_\,) pentru}  
 
 _textformsimplesearch_ [l=ro] {CautÄ _If_(_jselection_, _jselection_)_If_(_gformselection_, la _gformselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\, sortÃ¢nd rezultatele dupÄ _sfselection_\,) pentru _formquerytypesimpleselection_ ale}  
+_textformsimplesearchsql_ [l=ro] {CautÄ _If_(_jselection_, _jselection_)_If_(_gformselection_, la _gformselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\, sortÃ¢nd rezultatele dupÄ _sqlsfselection_\,) pentru _formquerytypesimpleselection_ ale}  
 
 _textformadvancedsearchmgpp_ [l=ro] {CautÄ _If_(_jselection_,_jselection_ )_If_(_gformselection_,at _gformselection_ level )_If_(_nselection_,in _nselection_ language )Åi afiÅeazÄ rezultatele dupÄ _formquerytypeadvancedselection_ order }  
 
 _textformadvancedsearchlucene_ [l=ro] {CautÄ _If_(_jselection_, _jselection_)_If_(_gformselection_,  at _gformselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\, sortÃ¢nd rezultatele dupÄ _sfselection_\,) for }  
+_textformadvancedsearchsql_ [l=ro] {CautÄ _If_(_jselection_, _jselection_)_If_(_gformselection_,  at _gformselection_ level)_If_(_nselection_, in _nselection_ language)_If_(_sqlsfselection_,\, sortÃ¢nd rezultatele dupÄ _sqlsfselection_\,) for }  
 
 _textnojsformwarning_ [l=ro] {Avertisment: Javascript este dezactivat pentru browserul pe care-l folosiÅ£i. <br>Pentru a folosi cÄutarea prin intermediul formularului, vÄ rugÄm activaÅ£i aceastÄ opÅ£iune.}  
Index: main/trunk/greenstone2/macros/slovak.dm
===================================================================
--- main/trunk/greenstone2/macros/slovak.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/slovak.dm	(revision 22051)
@@ -386,4 +386,5 @@
 
 _textsimplesearch_ [l=sk] {HÄŸadaj _indexselection_ _If_(_jselection_,z _jselection_ )_If_(_gselection_, na _gselection_ level )_If_(_nselection_,v jazyku _nselection_ ) s pomocou _querytypeselection_ slov_If_(_sfselection_,\,_allowformbreak_ a zoraÄ vÃœsledky podÄŸa _sfselection_)}  
+_textsimplesqlsearch_ [l=sk] {HÄŸadaj _indexselection_ _If_(_jselection_,z _jselection_ )_If_(_gselection_, na _gselection_ level )_If_(_nselection_,v jazyku _nselection_ ) s pomocou _querytypeselection_ slov_If_(_sqlsfselection_,\,_allowformbreak_ a zoraÄ vÃœsledky podÄŸa _sqlsfselection_)}  
 
 _textadvancedsearch_ [l=sk] {HÄŸadaj _indexselection_ _If_(_jselection_,z _jselection_ )_If_(_gselection_,na Ãºrovni _gselection_ level )_If_(_nselection_,v jazyku _nselection_ )s pouÅŸitÃ­m _querytypeselection_ dotazu}  
@@ -392,10 +393,13 @@
 
 _textadvancedlucenesearch_ [l=sk] {HÄŸadaj  _indexselection_ _If_(_jselection_,z _jselection_ )_If_(_gselection_,na Ãºrovni _gselection_)_If_(_nselection_, v _nselection_ jazyku)_If_(_sfselection_,\,_allowformbreak_ zoraÄ vÃœsledky podÄŸa _sfselection_\,)}  
+_textadvancedsqlsearch_ [l=sk] {HÄŸadaj  _indexselection_ _If_(_jselection_,z _jselection_ )_If_(_gselection_,na Ãºrovni _gselection_)_If_(_nselection_, v _nselection_ jazyku)_If_(_sqlsfselection_,\,_allowformbreak_ zoraÄ vÃœsledky podÄŸa _sqlsfselection_\,)}  
 
 _textformsimplesearch_ [l=sk] {HÄŸadaj _If_(_jselection_,_jselection_ )_If_(_gformselection_, na Ãºrovni _gformselection_ level )_If_(_nselection_, v _nselection_ jazyku)_If_(_sfselection_,\, zoraÄ vÃœsledky podÄŸa _sfselection_\,) pre _formquerytypesimpleselection_}  
+_textformsimplesearchsql_ [l=sk] {HÄŸadaj _If_(_jselection_,_jselection_ )_If_(_gformselection_, na Ãºrovni _gformselection_ level )_If_(_nselection_, v _nselection_ jazyku)_If_(_sqlsfselection_,\, zoraÄ vÃœsledky podÄŸa _sqlsfselection_\,) pre _formquerytypesimpleselection_}  
 
 _textformadvancedsearchmgpp_ [l=sk] {HÄŸadaj _If_(_jselection_,_jselection_ )_If_(_gformselection_, v _gformselection_)_If_(_nselection_,v _nselection_ jazyku ) a zobraz vÃœsledky v _formquerytypeadvancedselection_ poradÃ­}  
 
 _textformadvancedsearchlucene_ [l=sk] {HÄŸadaj _If_(_jselection_, _jselection_)_If_(_gformselection_,  v _gformselection_ level)_If_(_nselection_, v _nselection_ jazyku)_If_(_sfselection_,\, usporiadaj vÃœsledky podÄŸa _sfselection_\,)}  
+_textformadvancedsearchsql_ [l=sk] {HÄŸadaj _If_(_jselection_, _jselection_)_If_(_gformselection_,  v _gformselection_ level)_If_(_nselection_, v _nselection_ jazyku)_If_(_sqlsfselection_,\, usporiadaj vÃœsledky podÄŸa _sqlsfselection_\,)}  
 
 _textnojsformwarning_ [l=sk] {Pozor: Javascript vo vaÅ¡om prehliadaÄi je vypnutÃœ. <br>Ak chcete vyhÄŸadÃ¡vaÅ¥ podÄŸa polÃ­, zapnite ho.}  
Index: main/trunk/greenstone2/macros/spanish.dm
===================================================================
--- main/trunk/greenstone2/macros/spanish.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/spanish.dm	(revision 22051)
@@ -395,4 +395,5 @@
 
 _textsimplesearch_ [l=es] {Buscar en _indexselection__If_(_jselection_, asociada con _jselection_)_If_(_gselection_, a nivel de _gselection_)_If_(_nselection_, en idioma _nselection_) _allowformbreak_ que contenga  _querytypeselection_ de las palabras _If_(_sfselection_,\,_allowformbreak_ ordenando los resultados por _sfselection_)
+_textsimplesearchsql_ [l=es] {Buscar en _indexselection__If_(_jselection_, asociada con _jselection_)_If_(_gselection_, a nivel de _gselection_)_If_(_nselection_, en idioma _nselection_) _allowformbreak_ que contenga  _querytypeselection_ de las palabras _If_(_sqlsfselection_,\,_allowformbreak_ ordenando los resultados por _sqlsfselection_)
 }  
 
@@ -402,12 +403,15 @@
 
 _textadvancedlucenesearch_ [l=es] {Buscar en _indexselection__If_(_jselection_, asociado con _jselection_)_If_(_gselection_, a nivel de _gselection_ )_If_(_nselection_, en idioma _nselection_ )_If_(_sfselection_,\,_allowformbreak_ ordenando los resultados por _sfselection_\,)}  
+_textadvancedsqlsearch_ [l=es] {Buscar en _indexselection__If_(_jselection_, asociado con _jselection_)_If_(_gselection_, a nivel de _gselection_ )_If_(_nselection_, en idioma _nselection_ )_If_(_sqlsfselection_,\,_allowformbreak_ ordenando los resultados por _sqlsfselection_\,)}  
 
 # the space after "Search" is required, otherwise no space between "Search" and "in"
 
 _textformsimplesearch_ [l=es] {Buscar_If_(_jselection_, en _jselection_)_If_(_gformselection_, a nivel de _gformselection_)_If_(_nselection_, en idioma  _nselection_ )_If_(_sfselection_,\, ordenando los resultados por _sfselection_\,) para _formquerytypesimpleselection_ }  
+_textformsimplesearchsql_ [l=es] {Buscar_If_(_jselection_, en _jselection_)_If_(_gformselection_, a nivel de _gformselection_)_If_(_nselection_, en idioma  _nselection_ )_If_(_sqlsfselection_,\, ordenando los resultados por _sqlsfselection_\,) para _formquerytypesimpleselection_ }  
 
 _textformadvancedsearchmgpp_ [l=es] {Buscar _If_(_jselection_, en _jselection_)_If_(_gformselection_, a nivel de _gformselection_)_If_(_nselection_, en idioma _nselection_), y mostrar los resultados en orden _formquerytypeadvancedselection_}  
 
 _textformadvancedsearchlucene_ [l=es] {Buscar_If_(_jselection_, en _jselection_)_If_(_gformselection_, a nivel de _gformselection_)_If_(_nselection_, en idioma _nselection_ )_If_(_sfselection_,\, ordenando los resultados por _sfselection_\,)}  
+_textformadvancedsearchsql_ [l=es] {Buscar_If_(_jselection_, en _jselection_)_If_(_gformselection_, a nivel de _gformselection_)_If_(_nselection_, en idioma _nselection_ )_If_(_sqlsfselection_,\, ordenando los resultados por _sqlsfselection_\,)}  
 
 _textnojsformwarning_ [l=es] {Advertencia: Javascript no estÃ¡ habilitado en su navegador. <br>Para usar la bÃºsqueda de formas, por favor habilÃ­telo.}
Index: main/trunk/greenstone2/macros/tamil.dm
===================================================================
--- main/trunk/greenstone2/macros/tamil.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/tamil.dm	(revision 22051)
@@ -397,4 +397,5 @@
 
 _textsimplesearch_ [l=ta] {à®€à¯à®à®µà¯à®®à¯ _indexselection__If_(_jselection_, à®à®£à¯à®¯à®Ÿà®© _jselection_)_If_(_gselection_, at _gselection_ à®šà®¿à®²à®¯à®¿à®²à¯)_If_(_nselection_,  _nselection_ à®®à¯à®Žà®¿_If_(_sfselection_,\,_allowformbreak_ à®ªà®¯à®©à¯ à®µà®Ÿà®°à¯à®€à¯à®€à¯à®à®³à¯ à®µà®°à®¿à®à¯ à®ªà®à¯à®€à¯à®€à®µà®®à¯ _sfselection_)  _querytypeselection_ }  
+_textsimplesqlsearch_ [l=ta] {à®€à¯à®à®µà¯à®®à¯ _indexselection__If_(_jselection_, à®à®£à¯à®¯à®Ÿà®© _jselection_)_If_(_gselection_, at _gselection_ à®šà®¿à®²à®¯à®¿à®²à¯)_If_(_nselection_,  _nselection_ à®®à¯à®Žà®¿_If_(_sqlsfselection_,\,_allowformbreak_ à®ªà®¯à®©à¯ à®µà®Ÿà®°à¯à®€à¯à®€à¯à®à®³à¯ à®µà®°à®¿à®à¯ à®ªà®à¯à®€à¯à®€à®µà®®à¯ _sqlsfselection_)  _querytypeselection_ }  
 
 _textadvancedsearch_ [l=ta] { _indexselection_ à®€à¯à®à®µà¯à®®à¯ _If_(_jselection_, à®à®£à¯à®¯à®Ÿà®© _jselection_)_If_(_gselection_,  _gselection_ à®šà®¿à®²à¯à®¯à®²à¯ )_If_(_nselection_,  _nselection_ à®®à¯à®Žà®¿à®¯à®¿à®²à¯) à®à®ªà®¯à¯à®à®¿à®€à¯à®€à¯  _querytypeselection_ à®à¯à®³à¯à®µà®¿}  
@@ -403,12 +404,15 @@
 
 _textadvancedlucenesearch_ [l=ta] {_indexselection_à®€à¯à®à®µà¯à®®à¯ _If_(_jselection_, à®à®£à¯à®¯à®Ÿà®© _jselection_)_If_(_gselection_,  _gselection_ à®šà®¿à®²à®¯à®¿à®²à¯ )_If_(_nselection_, _nselection_ à®®à¯à®Žà®¿à®¯à®¿à®²à¯)_If_(_sfselection_,\,_allowformbreak_ à®ªà®¯à®©à¯ à®µà®°à®¿à®à¯ à®ªà®à¯à®€à¯à®€à®µà¯à®®à¯  _sfselection_\,)}  
+_textadvancedsqlsearch_ [l=ta] {_indexselection_à®€à¯à®à®µà¯à®®à¯ _If_(_jselection_, à®à®£à¯à®¯à®Ÿà®© _jselection_)_If_(_gselection_,  _gselection_ à®šà®¿à®²à®¯à®¿à®²à¯ )_If_(_nselection_, _nselection_ à®®à¯à®Žà®¿à®¯à®¿à®²à¯)_If_(_sqlsfselection_,\,_allowformbreak_ à®ªà®¯à®©à¯ à®µà®°à®¿à®à¯ à®ªà®à¯à®€à¯à®€à®µà¯à®®à¯  _sqlsfselection_\,)}  
 
 # the space after "Search" is required, otherwise no space between "Search" and "in"
 
 _textformsimplesearch_ [l=ta] {à®€à¯à®à®µà¯à®®à¯ _If_(_jselection_,  _jselection_)_If_(_gformselection_,  _gformselection_ à®šà®¿à®²à®¯à®¿à®²à¯ )_If_(_nselection_, in _nselection_ à®®à¯à®Žà®¿à®¯à®¿à®²à¯)_If_(_sfselection_,\, à®ªà®¯à®©à¯ à®µà®°à®¿à®à¯ à®ªà®à¯à®€à¯à®€à®µà¯à®®à¯ _sfselection_\,)  _formquerytypesimpleselection_}  
+_textformsimplesearchsql_ [l=ta] {à®€à¯à®à®µà¯à®®à¯ _If_(_jselection_,  _jselection_)_If_(_gformselection_,  _gformselection_ à®šà®¿à®²à®¯à®¿à®²à¯ )_If_(_nselection_, in _nselection_ à®®à¯à®Žà®¿à®¯à®¿à®²à¯)_If_(_sqlsfselection_,\, à®ªà®¯à®©à¯ à®µà®°à®¿à®à¯ à®ªà®à¯à®€à¯à®€à®µà¯à®®à¯ _sqlsfselection_\,)  _formquerytypesimpleselection_}  
 
 _textformadvancedsearchmgpp_ [l=ta] {à®€à¯à®à®µà¯à®®à¯ _If_(_jselection_,  _jselection_)_If_(_gformselection_,  _gformselection_ à®šà®¿à®²à®¯à®¿à®²à¯_If_(_nselection_,  _nselection_ à®®à¯à®Žà®¿à®¯à®¿à®²à¯), à®ªà®¿à®°à®à¯ à®ªà®¯à®©à¯ à®à®Ÿà®à¯à®à®µà¯à®®à¯_formquerytypeadvancedselection_  à®µà®°à®¿à®à¯}  
 
 _textformadvancedsearchlucene_ [l=ta] {à®€à¯à®à®µà¯à®®à¯ _If_(_jselection_,  _jselection_)_If_(_gformselection_,  _gformselection_ à®šà®¿à®²à®¯à®¿à®²à¯ )_If_(_nselection_,  _nselection_ à®®à¯à®Žà®¿à®¯à®¿à®²à¯)_If_(_sfselection_,\, à®ªà®¯à®©à¯ à®µà®°à®¿à®à¯ à®ªà®à¯à®€à¯à®€à®µà¯à®®à¯ _sfselection_\,)}  
+_textformadvancedsearchsql_ [l=ta] {à®€à¯à®à®µà¯à®®à¯ _If_(_jselection_,  _jselection_)_If_(_gformselection_,  _gformselection_ à®šà®¿à®²à®¯à®¿à®²à¯ )_If_(_nselection_,  _nselection_ à®®à¯à®Žà®¿à®¯à®¿à®²à¯)_If_(_sqlsfselection_,\, à®ªà®¯à®©à¯ à®µà®°à®¿à®à¯ à®ªà®à¯à®€à¯à®€à®µà¯à®®à¯ _sqlsfselection_\,)}  
 
 _textnojsformwarning_ [l=ta] {à®à®à¯à®à®°à®¿à®à¯à®à¯: à®à®à®à¯à®³à¯ à®µà®²à¯ à®®à¯à®²à¯à®à¯à®à®¿à®¯à®¿à®²à¯ Javascript à®®à¯à®à®à¯à®à®¿à®¯à®¿à®°à¯à®à¯à®à®¿à®±à®€à¯. <br> à®ªà®à®¿à®µà®®à¯ à®€à¯à®à®²à¯â à®à®ªà®¯à¯à®à®¿à®à¯à® à®
Index: main/trunk/greenstone2/macros/vietnamese.dm
===================================================================
--- main/trunk/greenstone2/macros/vietnamese.dm	(revision 22050)
+++ main/trunk/greenstone2/macros/vietnamese.dm	(revision 22051)
@@ -375,4 +375,5 @@
 
 _textsimplesearch_ [l=vi] {TÃ¬m kiáº¿m trong _indexselection_ _If_(_jselection_, of _jselection_) _If_(_gselection_, táº¡i _gselection_ level) _If_(_nselection_, trong _nselection_ language)cÃ³ chá»©a _querytypeselection_ tá»« _If_(_sfselection_,\,_allowformbreak_ sáº¯p xáº¿p káº¿t quáº£ theo _sfselection_)} 
+_textsimplesqlsearch_ [l=vi] {TÃ¬m kiáº¿m trong _indexselection_ _If_(_jselection_, of _jselection_) _If_(_gselection_, táº¡i _gselection_ level) _If_(_nselection_, trong _nselection_ language)cÃ³ chá»©a _querytypeselection_ tá»« _If_(_sqlsfselection_,\,_allowformbreak_ sáº¯p xáº¿p káº¿t quáº£ theo _sqlsfselection_)} 
 
 _textadvancedsearch_ [l=vi] {TÃ¬m kiáº¿m _If_(_hselection_, _hselection_, _defaultindextext_) _If_(_jselection_,_textjselect_) _If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language) 
@@ -382,10 +383,13 @@
 
 _textadvancedlucenesearch_ [l=vi] {TÃ¬m kiáº¿m _indexselection__If_(_jselection_, cá»§a _jselection_)_If_(_gselection_, táº¡i _gselection_ level)_If_(_nselection_, trong _nselection_ language)_If_(_sfselection_,\,_allowformbreak_ sáº¯p xáº¿p káº¿t quáº£ tÃ¬m ÄÆ°á»£c theo _sfselection_\,) Äá» }  
+_textadvancedsqlsearch_ [l=vi] {TÃ¬m kiáº¿m _indexselection__If_(_jselection_, cá»§a _jselection_)_If_(_gselection_, táº¡i _gselection_ level)_If_(_nselection_, trong _nselection_ language)_If_(_sqlsfselection_,\,_allowformbreak_ sáº¯p xáº¿p káº¿t quáº£ tÃ¬m ÄÆ°á»£c theo _sqlsfselection_\,) Äá» }  
 
 _textformsimplesearch_ [l=vi] {TÃ¬m kiáº¿m _If_(_jselection_,_jselection_ )_If_(_gformselection_,táº¡i _gformselection_ level )_If_(_nselection_, trong _nselection_ language)_If_(_sfselection_,\, sáº¯p xáº¿p káº¿t quáº£ tÃ¬m ÄÆ°á»£c theo _sfselection_\,) cho _formquerytypesimpleselection_ cá»§a}  
+_textformsimplesearchsql_ [l=vi] {TÃ¬m kiáº¿m _If_(_jselection_,_jselection_ )_If_(_gformselection_,táº¡i _gformselection_ level )_If_(_nselection_, trong _nselection_ language)_If_(_sqlsfselection_,\, sáº¯p xáº¿p káº¿t quáº£ tÃ¬m ÄÆ°á»£c theo _sqlsfselection_\,) cho _formquerytypesimpleselection_ cá»§a}  
 
 _textformadvancedsearchmgpp_ [l=vi] {TÃ¬m kiáº¿m _If_(_jselection_,_jselection_ )_If_(_gformselection_,táº¡i _gformselection_ level )_If_(_nselection_, trong _nselection_ language )vÃ  hiá»n thá» káº¿t quáº£ theo thá»© tá»± _formquerytypeadvancedselection_}  
 
 _textformadvancedsearchlucene_ [l=vi] {TÃ¬m kiáº¿m _If_(_jselection_, _jselection_)_If_(_gformselection_,  táº¡i _gformselection_ level)_If_(_nselection_, trong _nselection_ language)_If_(_sfselection_,\, sáº¯p xáº¿p káº¿t quáº£ tÃ¬m ÄÆ°á»£c theo _sfselection_\,) Äá»}  
+_textformadvancedsearchsql_ [l=vi] {TÃ¬m kiáº¿m _If_(_jselection_, _jselection_)_If_(_gformselection_,  táº¡i _gformselection_ level)_If_(_nselection_, trong _nselection_ language)_If_(_sqlsfselection_,\, sáº¯p xáº¿p káº¿t quáº£ tÃ¬m ÄÆ°á»£c theo _sqlsfselection_\,) Äá»}  
 
 _textnojsformwarning_ [l=vi] {Cáº£nh bÃ¡o: Javascript bá» táº¯t hoáº¡t Äá»ng trÃªn trÃ¬nh duyá»t. <br>Äá» sá»­ dá»¥ng máº«u tÃ¬m kiáº¿m, vui lÃ²ng báº­t láº¡i nÃ³.}  
