Index: /gsdl/trunk/macros/chinese-trad.dm
===================================================================
--- /gsdl/trunk/macros/chinese-trad.dm	(revision 18478)
+++ /gsdl/trunk/macros/chinese-trad.dm	(revision 18479)
@@ -4,4 +4,5 @@
 # Traditional Chinese Language text and icon macros
 # Many thanks to Shu-Jen Show and team (translated November 2004) 
+# Many thanks to Lilly Ho (updated February 2009)
 #
 ######################################################################
@@ -19,4 +20,6 @@
 
 _textperiodicals_ [l=zh-tr] {éèª}
+
+# these three used by the default format statement of the demo and dls collections.
 _textsource_ [l=zh-tr] {åèäŸæºïŒ}
 _textdate_ [l=zh-tr] {åºçæ¥æïŒ}
@@ -40,9 +43,9 @@
 # this is only used by the collector (where the above _collectionextra_
 # macro will always be set to another value)
-_collectorextra_ [l=zh-tr] {<p>éåè³æåº«å
+_collectorextra_ [l=zh-tr] {<p>éåå
+žèè³æåº«å
 å« _numdocs_ _If_("_numdocs_" eq "1",ä»œæä»¶,ä»œæä»¶)ïŒå
-±æ _numbytes_.
-<p><a href="_httppagex_(bsummary)">é»éžæ­€è</a> äŸæª¢èŠå»ºç«è³æåº«æçæèŠã
-}
+±æ _numbytes_ çæå­å metadataã
+<p><a href="_httppagex_(bsummary)">æäžéè£</a>ä»¥æª¢èŠå»ºç«éåè³æåº«æçæèŠã}  
 
 _textdescrcollection_ [l=zh-tr] {}
@@ -54,90 +57,88 @@
 _textdescrusab_ [l=zh-tr] {äœ åšäœ¿çšäžæç¢°å°ä»éºŒå°é£åïŒ}
 
-_textdescrSearch_ [l=zh-tr] {æŸå°æŽç²Ÿç¢ºçå­äž²}
+
+# Metadata names and navigation bar labels
+
+_textSearch_ [l=zh-tr] {æå°}  
+_labelSearch_ [l=zh-tr] {æå°}  
 
 # Dublin Core Metadata Element Set, Version 1.1
-_textdescrTitle_ [l=zh-tr] {äŸæšé¡å­é åºçèŠœ}
-_textdescrCreator_ [l=zh-tr] {äŸäœè
-å­æ¯é åºçèŠœ}
-_textdescrSubject_ [l=zh-tr] {äŸäž»é¡åé¡çèŠœ}
-_textdescrDescription_ [l=zh-tr] {äŸæè¿°çèŠœ}
-_textdescrPublisher_ [l=zh-tr] {äŸåºçè
-çèŠœ}
-_textdescrContributor_ [l=zh-tr] {äŸè²¢ç»è
-çèŠœ}
-_textdescrDate_ [l=zh-tr] {äŸæ¥æçèŠœ}
-_textdescrType_ [l=zh-tr] {äŸè³æºé¡åçèŠœ}
-_textdescrFormat_ [l=zh-tr] {äŸæ ŒåŒçèŠœ}
-_textdescrIdentifier_ [l=zh-tr] {äŸè³æºç¢ºèªè
-çèŠœ}
-_textdescrSource_ [l=zh-tr] {äŸåå§æªåçèŠœ}
-_textdescrLanguage_ [l=zh-tr] {äŸèªèšçèŠœ}
-_textdescrRelation_ [l=zh-tr] {äŸéä¿çèŠœ}
-_textdescrCoverage_ [l=zh-tr] {äŸç¯åçèŠœ}
-_textdescrRights_ [l=zh-tr] {äŸæ¬å©çèŠœ}
-
-_textdescrOrganization_ [l=zh-tr] {äŸçµç¹çèŠœ}
-_textdescrKeyword_ [l=zh-tr] {äŸééµå­çèŠœ}
-_textdescrHowto_ [l=zh-tr] {äŸ âåŠäœ..âæ¹åŒäŸçèŠœ}
-_textdescrList_ [l=zh-tr] {äŸæä»¶æž
-å®çèŠœ}
-_textdescrSeries_ [l=zh-tr] {äŸå·æçèŠœ}
-_textdescrTo_ [l=zh-tr] {äŸæªæ­¢æŒæ¬äœçèŠœ}
-_textdescrFrom_ [l=zh-tr] {äŸéå§æ¬äœçèŠœ}
-_textdescrTopic_ [l=zh-tr] {äŸç¹å¥è­°é¡å·æçèŠœ}
-_textdescrBrowse_ [l=zh-tr] {çèŠœ}
-_textdescrCollage_ [l=zh-tr] {äŸåœ±åéçèŠœ}
-_textdescrPeople_ [l=zh-tr] {äŸäººåå­æ¯é åºçèŠœ}
-_textdescrAcronym_ [l=zh-tr] {äŸçž®å¯«å­çèŠœ}
-_textdescrPhrase_ [l=zh-tr] {äŸçèªçèŠœ}
-_textdescrArtist_ [l=zh-tr] {äŸèè¡å®¶çèŠœ}
-_textdescrVolume_ [l=zh-tr] {äŸå·æçèŠœ}
-_textdescrCountries_ [l=zh-tr] {äŸåå®¶å¥çèŠœ}
-_textdescrCaptions_ [l=zh-tr] {äŸåçæšé¡çèŠœ}
-
-
-_labelSearch_ [l=zh-tr] {æå°}
-
-# Dublin Core Metadata Element Set, Version 1.1
-_labelTitle_ [l=zh-tr] {æšé¡ A-Z}
+_textTitle_ [l=zh-tr] {æšé¡}  
+_labelTitle_ [l=zh-tr] {æšé¡}  
+_textCreator_ [l=zh-tr] {åµäœè
+}  
 _labelCreator_ [l=zh-tr] {äœè
- A-Z}
+}  
+_textSubject_ [l=zh-tr] {äž»é¡}  
 _labelSubject_ [l=zh-tr] {äž»é¡}
+_textDescription_ [l=zh-tr] {æè¿°}  
 _labelDescription_ [l=zh-tr] {æè¿°}
+_textPublisher_ [l=zh-tr] {åºçè
+}  
 _labelPublisher_ [l=zh-tr] {åºçè
 }
+_textContributor_ [l=zh-tr] {è²¢ç»è
+}  
 _labelContributor_ [l=zh-tr] {è²¢ç»è
 }
+_textDate_ [l=zh-tr] {æ¥æ}  
 _labelDate_ [l=zh-tr] {æ¥æ}
+_textType_ [l=zh-tr] {çš®é¡}  
 _labelType_ [l=zh-tr] {çš®é¡}
+_textFormat_ [l=zh-tr] {æ ŒåŒ}  
 _labelFormat_ [l=zh-tr] {æ ŒåŒ}
+_textIdentifier_ [l=zh-tr] {éå®è
+}  
 _labelIdentifier_ [l=zh-tr] {ç¢ºèªè
 }
+_textSource_ [l=zh-tr] {æªæ¡åçš±}  
 _labelSource_ [l=zh-tr] {æªæ¡å}
+_textLanguage_ [l=zh-tr] {èªèš}  
 _labelLanguage_ [l=zh-tr] {èªèš}
+_textRelation_ [l=zh-tr] {éä¿}  
 _labelRelation_ [l=zh-tr] {éä¿}
+_textCoverage_ [l=zh-tr] {èŠèç¯å}  
 _labelCoverage_ [l=zh-tr] {ç¯å}
+_textRights_ [l=zh-tr] {æ¬å}  
 _labelRights_ [l=zh-tr] {æ¬å©}
 
-_labelOrg_ [l=zh-tr] {çµç¹}
+# DLS metadata set
+_textOrganization_ [l=zh-tr] {çµç¹}  
+_labelOrganization_ [l=zh-tr] {çµç¹}  
+_textKeyword_ [l=zh-tr] {ééµè©}  
 _labelKeyword_ [l=zh-tr] {ééµå­}
-_labelHow_ [l=zh-tr] {åŠäœ..}
-_labelSeries_ [l=zh-tr] {éå¢å}
-_labelList_ [l=zh-tr] {æž
-å®}
+_textHowto_ [l=zh-tr] {åŠäœ}  
+_labelHowto_ [l=zh-tr] {åŠäœ}  
+
+# Miscellaneous Greenstone metadata
+_textPhrase_ [l=zh-tr] {æ
+£çšèª}  
+_labelPhrase_ [l=zh-tr] {çèª}  
+_textCollage_ [l=zh-tr] {çŸè¡æŒè²Œ}  
+_labelCollage_ [l=zh-tr] {åèŒ¯}  
+_textBrowse_ [l=zh-tr] {çèŠœ}  
+_labelBrowse_ [l=zh-tr] {çèŠœ}  
+_textTo_ [l=zh-tr] {å»}  
 _labelTo_ [l=zh-tr] {æªæ­¢æŒ}
+_textFrom_ [l=zh-tr] {ç±}  
 _labelFrom_ [l=zh-tr] {éå§æŒ}
-_labelTopic_ [l=zh-tr] {äž»æš}
-_labelBrwse_ [l=zh-tr] {çèŠœ+B165}
-_labelCollage_ [l=zh-tr] {åèŒ¯}
-_labelBrows_ [l=zh-tr] {çèŠœ}
-_labelPeople_ [l=zh-tr] {äººå A-Z}
+_textAcronym_ [l=zh-tr] {éŠå­æ¯ççž®å¯«}  
 _labelAcronym_ [l=zh-tr] {çž®å¯«å­}
-_labelPhrase_ [l=zh-tr] {çèª}
-_labelArtist_ [l=zh-tr] {èè¡å®¶}
-_labelVolume_ [l=zh-tr] {å¢æž}
-_labelCaptions_ [l=zh-tr] {æšé¡}
-_labelCountries_ [l=zh-tr] {åå®¶}
-
+
+# Navigation bar tooltip - to customize this for a specific metadata, add a macro named _textdescrXXX_ where XXX is the metadata name
+_textdescrdefault_ [l=zh-tr] {ä»¥ _1_ çèŠœ}  
+
+_textdescrSearch_ [l=zh-tr] {æŸå°æŽç²Ÿç¢ºçå­äž²}
+_textdescrType_ [l=zh-tr] {äŸè³æºé¡åçèŠœ}  
+_textdescrIdentifier_ [l=zh-tr] {äŸè³æºç¢ºèªè
+çèŠœ}  
+_textdescrSource_ [l=zh-tr] {äŸåå§æªåçèŠœ}  
+_textdescrTo_ [l=zh-tr] {äŸæªæ­¢æŒæ¬äœçèŠœ}  
+_textdescrFrom_ [l=zh-tr] {äŸéå§æ¬äœçèŠœ}  
+_textdescrCollage_ [l=zh-tr] {äŸåœ±åéçèŠœ}  
+_textdescrAcronym_ [l=zh-tr] {äŸçž®å¯«å­çèŠœ}  
+_textdescrPhrase_ [l=zh-tr] {äŸçèªçèŠœ}  
+_textdescrHowto_ [l=zh-tr] {äŸ âåŠäœ..âæ¹åŒäŸçèŠœ}  
+_textdescrBrowse_ [l=zh-tr] {çèŠœæä»¶}  
 _texticontext_ [l=zh-tr] {åé±æä»¶}
 _texticonclosedbook_ [l=zh-tr] {æéæ­€æä»¶äžŠäžæª¢èŠå
@@ -146,19 +147,19 @@
 _texticonprev_ [l=zh-tr] {ååäžæ®µèœ}
 
-# -- Missing translation: _texticonworld_
+_texticonworld_ [l=zh-tr] {æª¢èŠç¶²é çæä»¶}  
 
 _texticonmidi_ [l=zh-tr] {æª¢èŠMIDIæä»¶}
 _texticonmsword_ [l=zh-tr] {æª¢èŠMicrosoft Wordæä»¶}
-# -- Missing translation: _texticonmp3_
-_texticonpdf_ [l=zh-tr] {æª¢èŠ PDF æä»¶}
-_texticonps_ [l=zh-tr] {æª¢èŠPostScriptæä»¶}
-_texticonppt_ [l=zh-tr] {æª¢èŠPowerPointæä»¶}
-_texticonrtf_ [l=zh-tr] {æª¢èŠRTFæä»¶}
-_texticonxls_ [l=zh-tr] {æª¢èŠMicrosoft Excel æä»¶}
+_texticonmp3_ [l=zh-tr] {æª¢èŠ MP3 æ ŒåŒçæä»¶}  
+_texticonpdf_ [l=zh-tr] {æª¢èŠ PDF æä»¶}  
+_texticonps_ [l=zh-tr] {æª¢èŠ PostScript æä»¶}  
+_texticonppt_ [l=zh-tr] {æª¢èŠ PowerPoint æä»¶}  
+_texticonrtf_ [l=zh-tr] {æª¢èŠ RTF æä»¶}  
+_texticonxls_ [l=zh-tr] {æª¢èŠ Microsoft Excel æä»¶}  
 
 _page_ [l=zh-tr] {é }
 _pages_ [l=zh-tr] {é }
 _of_ [l=zh-tr] {ç}
-_vol_ [l=zh-tr] {å}
+_vol_ [l=zh-tr] {å}  
 _num_ [l=zh-tr] {åŠ}
 
@@ -191,5 +192,4 @@
 çŽè¥¿è­}
 
-
 _linktextHOME_ [l=zh-tr] {éŠé }
 _linktextHELP_ [l=zh-tr] {å¹«å©}
@@ -203,4 +203,10 @@
 
 _textpagetitle_ [l=zh-tr] {Greenstone æžäœåæžé€š}
+
+_textnocollections_ [l=zh-tr] {æ²æåé©çå
+žèè³æåº«ï¹äŸåŠå·²å»ºç«åå
+¬å
+±çï¹å¯äŸäœ¿çš}  
+
 _textadmin_ [l=zh-tr] {ç®¡çé é¢}
 _textabgs_ [l=zh-tr] {éæŒGreenstone}
@@ -216,5 +222,4 @@
 _textdescrgodocs_ [l=zh-tr] {Greenstone æå}
 
-
 #####################################################################
 # some macros used on the home page from other packages
@@ -229,13 +234,19 @@
 _textcollector_ [l=zh-tr] {è³æåº«å
 žèä»é¢}
-_textdescrcollector_ [l=zh-tr] {è³æåº«å
-žèä»é¢èŒæ©æŒåæžé€šå¡ä»é¢çŒå±ïŒåæçºäºå€§éšåå¯Šéçç®çïŒç¶­è­·è³æåº«å»ºè­°ééåæžé€šå¡ä»é¢ã}
+_textdescrcollector_ [l=zh-tr] {éåèŒæ©æŒåæžé€šé€šé·ä»é¢ççŒå±ïŒåæçºäºå€§éšåå¯Šéçç®çïŒèæ¡çšåæžé€šé€šé·ä»é¢ã}  
 
 package depositor
 
+_textdepositor_ [l=zh-tr] {å­æ¬Ÿè
+}  
+_textdescrdepositor_ [l=zh-tr] {åå©æšå å
+¥æä»¶è³çŸå­çå
+žèè³æåº«}  
 
 package gti
 
+_textgti_ [l=zh-tr] {Greenstone ç¿»è­¯ä»é¢}  
 _textdescrtranslator_ [l=zh-tr] {åå©äœ ç¶­æææ°çGreenstonå€èªèšçæ¬ã}
+
 
 ######################################################################
@@ -258,7 +269,5 @@
 äœ å¯ä»¥åšåäººåå¥œèš­å®é æ¥è©¢ïŒäžŠä¿®æ¹ïŒç®åæ­£åšäœ¿çšäž­çè³æåº«ã}
 
-
 _titleabout_ [l=zh-tr] {éæŒ}
-
 
 
@@ -272,7 +281,4 @@
 # text macros
 #------------------------------------------------------------
-
-# Dublin Core Metadata Element Set, Version 1.1
-
 
 _texticonopenbookshelf_ [l=zh-tr] {ééæ¬æ®µèœ}
@@ -309,18 +315,28 @@
 _textCONTINUE_ [l=zh-tr] {ç¹ŒçºïŒ?}
 
-_textEXPANDTEXT_ [l=zh-tr] {å±éæå­}
-
-_textCONTRACTCONTENTS_ [l=zh-tr] {ééç®æ¬¡}
+_textEXPANDTEXT_ [l=zh-tr] {å±éæå­}  
+
+_textCONTRACTCONTENTS_ [l=zh-tr] {ééç®é}  
 
 _textDETACH_ [l=zh-tr] {éåæ°èŠçª}
 
-_textEXPANDCONTENTS_ [l=zh-tr] {éåç®æ¬¡}
-
-_textCONTRACT_ [l=zh-tr] {ééæå­}
-
-_textHIGHLIGHT_ [l=zh-tr] {åçœé¡¯ç€º}
-
-_textNOHIGHLIGHT_ [l=zh-tr] {äžåçœé¡¯ç€º}
-
+_textEXPANDCONTENTS_ [l=zh-tr] {éåç®é}  
+
+_textCONTRACT_ [l=zh-tr] {ééæå­}  
+
+_textHIGHLIGHT_ [l=zh-tr] {åçœé¡¯ç€º}  
+
+_textNOHIGHLIGHT_ [l=zh-tr] {äžåçœé¡¯ç€º}  
+
+_textPRINT_ [l=zh-tr] {åå°}  
+
+_textnextsearchresult_ [l=zh-tr] {äžäžåæå°çµæ}  
+_textprevsearchresult_ [l=zh-tr] {åäžåæå°çµæ}  
+
+# macros for printing page
+_textreturnoriginal_ [l=zh-tr] {éååäŸçé é¢}  
+_textprintpage_ [l=zh-tr] {åå°éé }  
+_textshowcontents_ [l=zh-tr] {é¡¯ç€ºç®é}  
+_texthidecontents_ [l=zh-tr] {é±èç®é}  
 
 ######################################################################
@@ -346,8 +362,5 @@
 _textranked_ [l=zh-tr] {æå}
 _textnatural_ [l=zh-tr] {èªç¶}
-#_textsome_ {_If_(_cgiargb_,ranked,some)}
-#_textall_ {_If_(_cgiargb_,boolean,all)}
-#_textformsome_ {_If_(_cgiargb_,ranked,some)}
-#_textformall_ {_If_(_cgiargb_,natural,all)}
+_textsortbyrank_ [l=zh-tr] {é©å®çç­çŽ}  
 _texticonsearchhistorybar_ [l=zh-tr] {æå°æ­·å²çŽé}
 
@@ -361,4 +374,7 @@
 )}
 _textinvalidquery_ [l=zh-tr] {é¯èª€çæ¥è©¢èªæ³}
+_textstopwordsmsg_ [l=zh-tr] {ä»¥äžçå­å¥éæŒæ®éèè¢«å¿œç¥ïŒ}  
+_textlucenetoomanyclauses_ [l=zh-tr] {æšçæ¥è©¢èªæ³å
+æ¬å€ªå€çæå°è©åœïŒè«åè©ŠäžåæŽæç¢ºçæ¥è©¢ã}  
 
 _textmorethan_ [l=zh-tr] {å€§æŒ}
@@ -369,24 +385,23 @@
 _textmatches_ [l=zh-tr] {åç¬Šå}
 _textbeginsearch_ [l=zh-tr] {éå§æå°}
-_textrunquery_ [l=zh-tr] {éå§æå°}
+_textrunquery_ [l=zh-tr] {éå§æå°}  
 _textclearform_ [l=zh-tr] {æž
-é€}
+é€è¡šæ Œ}  
 
 #these go together in form search:
-#"Word or phrase  (fold, stem)  ... in field"
-_textwordphrase_ [l=zh-tr] {å­è©æçèª}
+#"Words  (fold, stem)  ... in field"
+_textwordphrase_ [l=zh-tr] {å­å¥}  
 _textinfield_ [l=zh-tr] {... åšé å}
 _textfoldstem_ [l=zh-tr] {(è³æå€Ÿ, çµå°Ÿ)}
 
 _textadvquery_ [l=zh-tr] {æçŽæ¥èŒžå
-¥æ¥è©¢é 
-ç®:}
+¥æ¥è©¢èªæ³ïŒ}  
 _textallfields_ [l=zh-tr] {å
-šéšæ¬äœ}
+šéšæ¬äœ}  
 _texttextonly_ [l=zh-tr] {åªéæå­}
-_textand_ [l=zh-tr] {äž}
-_textor_ [l=zh-tr] {æ}
-_textandnot_ [l=zh-tr] {äžäžå
-æ¬}
+_textand_ [l=zh-tr] {å}  
+_textor_ [l=zh-tr] {æ}  
+_textandnot_ [l=zh-tr] {åäžå
+æ¬}  
 
 # _indexselection_, _jselection_, _nselection_ and _gselection_ are set from 
@@ -394,14 +409,18 @@
 # unset
 
-_textsimplesearch_ [l=zh-tr] {æç
-§ _indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_, at _gselection_ level )_If_(_nselection_,in _nselection_ language ) æ¥è©¢ïŒæä»¶äž­å
-å« _querytypeselection_ çééµå­}
-
-_textadvancedsearch_ [l=zh-tr] {_indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_,at _gselection_ level )_If_(_nselection_,in _nselection_ language )äœ¿çš _querytypeselection_ èªæ³æ¥è©¢}
-
-_textformsimplesearch_ [l=zh-tr] {_If_(_jselection_, _jselection_ )_If_(_gformselection_,at _gformselection_ level )_If_(_nselection_,in _nselection_ language )ä»¥ _formquerytypesimpleselection_ æ¥è©¢}
-
-_textformadvancedsearch_ [l=zh-tr] {_If_(_jselection_,_jselection_ )_If_(_gformselection_,at _gformselection_ level )_If_(_nselection_,in _nselection_ language )æ¥è©¢äžŠäžä»¥ _formquerytypeadvancedselection_ é åºé¡¯ç€ºæ¥è©¢çµæ}
-
+_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_)}  
+
+_textadvancedsearch_ [l=zh-tr] {åš _indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_,at _gselection_ level )_If_(_nselection_,in _nselection_ language ) é²è¡æå°ïŒå¯äœ¿çš _querytypeselection_ èªæ³æ¥è©¢}  
+
+_textadvancedmgppsearch_ [l=zh-tr] {åš _indexselection_ _If_(_jselection_,associated with _jselection_ )_If_(_gselection_,at _gselection_ level )_If_(_nselection_,in _nselection_ language ) é²è¡æå°ïŒäžŠå°çµæé¡¯ç€ºæŒ _formquerytypeadvancedselection_ orderïŒä»¥äœ}  
+
+_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_\,) é²è¡æå° ïŒä»¥äœ}  
+
+_textformsimplesearch_ [l=zh-tr] {åš _If_(_jselection_, _jselection_ )_If_(_gformselection_,at _gformselection_ level )_If_(_nselection_,in _nselection_ language) é²è¡æå°ïŒä»¥ _formquerytypesimpleselection_ æ¥è©¢}  
+
+_textformadvancedsearchmgpp_ [l=zh-tr] {åš _If_(_jselection_,_jselection_ )_If_(_gformselection_,at _gformselection_ level )_If_(_nselection_,in _nselection_ language ) é²è¡æå°ïŒäžŠå°çµæä»¥ã_formquerytypeadvancedselection_ æ¬¡åºé¡¯ç€ºåºäŸïŒ}  
+
+_textformadvancedsearchlucene_ [l=zh-tr] {åš _If_(_jselection_, _jselection_)_If_(_gformselection_,  at _gformselection_ level )_If_(_nselection_, in _nselection_ language)_If_(_sfselection_,\, sorting results by _sfselection_\,) é²è¡æå°ïŒä»¥äœ }  
 
 _textnojsformwarning_ [l=zh-tr] {è­Šå: Javascript å·è¡ç°å¢è¢«çèŠœåšééäºïŒ<br>çºäºèŠå·è¡è¡šæ Œæ¥è©¢è«éåJavascriptã}
@@ -414,6 +433,6 @@
 }
 _textexplaineras_ [l=zh-tr] {C.E. å B.C.E çºè¥¿å
-(A.D)èè¥¿å
-å(B.C)ä¹åçŸ©è©ïŒåå¥ä»£è¡š"Common Era"è"Before the Common Era"}
+ (A.D) èè¥¿å
+å (B.C) ä¹åçŸ©è©ïŒåå¥ä»£è¡š "Common Era" è "Before the Common Era"}  
 
 _textstemon_ [l=zh-tr] {(å¿œç¥å­å°Ÿ)}
@@ -454,11 +473,16 @@
 _textpreferences_ [l=zh-tr] {åäººåå¥œ}
 _textcasediffs_ [l=zh-tr] {å€§å°å¯«èŠçºäžå:}
-_textignorecase_ [l=zh-tr] {å€§å°å¯«èŠçºçžå}
+_textignorecase_ [l=zh-tr] {å€§å°å¯«èŠçºçžå}  
 _textmatchcase_ [l=zh-tr] {å€§å°å¯«éå®å
-šäžèŽ}
-_textwordends_ [l=zh-tr] {æå­çµå°Ÿ:}
-_textstem_ [l=zh-tr] {å¿œç¥æå­çµå°Ÿ}
+šäžèŽ}  
+_textwordends_ [l=zh-tr] {æå­çµå°ŸïŒ}  
+_textstem_ [l=zh-tr] {å¿œç¥æå­çµå°Ÿ}  
 _textnostem_ [l=zh-tr] {æŽåæå­å¿
-é äžèŽ}
+é äžèŽ}  
+_textaccentdiffs_ [l=zh-tr] {äžåçå£é³}  
+_textignoreaccents_ [l=zh-tr] {å¿œç¥å£é³}  
+_textmatchaccents_ [l=zh-tr] {å¿
+éå»åå£é³}  
+
 _textprefop_ [l=zh-tr] {æå€åå³ _maxdocoption_ åæ¥è©¢çµæïŒäžé é¡¯ç€º _hitsperpageoption_ åæ¥è©¢çµæã}
 _textextlink_ [l=zh-tr] {è®åå€éšç¶²é :}
@@ -469,7 +493,7 @@
 _textall_ [l=zh-tr] {å
 šéš}
-_textquerymode_ [l=zh-tr] {æ¥è©¢æš¡åŒ:}
-_textsimplemode_ [l=zh-tr] {ç°¡å®æ¥è©¢æš¡åŒ}
-_textadvancedmode_ [l=zh-tr] {é²éæ¥è©¢æš¡åŒ (å¯äœ¿çš åžæåŒ !, &, |, åéç®åŒ)}
+_textquerymode_ [l=zh-tr] {æ¥è©¢æš¡åŒïŒ}  
+_textsimplemode_ [l=zh-tr] {ç°¡å®æ¥è©¢æš¡åŒ}  
+_textadvancedmode_ [l=zh-tr] {é²éæ¥è©¢æš¡åŒï¹å¯äœ¿çš !ã&ã| çéèŒ¯æ§éç®å­åçèªé²è¡æå°ï¹}  
 _textlinkinterm_ [l=zh-tr] {éééæ¥ç¶²é }
 _textlinkdirect_ [l=zh-tr] {çŽæ¥é£å°}
@@ -483,25 +507,16 @@
 <br>}
 
+_textsearchtype_ [l=zh-tr] {æ¥è©¢èªæ³æ¬ŸåŒ}  
+_textformsearchtype_ [l=zh-tr] {å¡«æ»¿ _formnumfieldoption_ æ¬äœ}  
+_textplainsearchtype_ [l=zh-tr] {æ­£åžžç _boxsizeoption_ æ¥è©¢èªæ³é 
+ç®}  
+_textregularbox_ [l=zh-tr] {å®è¡}  
+_textlargebox_ [l=zh-tr] {å€§}  
+
 _textrelateddocdisplay_ [l=zh-tr] {ååºçžéæä»¶}
-_textsearchhistory_ [l=zh-tr] {æ¥è©¢çŽé:}
-_textnohistory_ [l=zh-tr] {äžèŠæ¥è©¢çŽé}
-_texthistorydisplay_ [l=zh-tr] {ååº_historynumrecords_ æ¥è©¢çæ­·å²çŽé}
-_textnohistorydisplay_ [l=zh-tr] {äžèŠååºæ¥è©¢çæ­·å²çŽé}
-
-#_texttypesearch_ {Type of search:}
-#_texttextsearch_ {text search}
-_textformsearch_ [l=zh-tr] {è¡šæ Œæ¥è©¢:}
-_textplainsearch_ [l=zh-tr] {å®äžæ¥è©¢:}
-_textqueryboxsize_ [l=zh-tr] {æ¥è©¢èŒžå
-¥æ¡å€§å°:}
-_textregbox_ [l=zh-tr] {äžè¬æ¥è¯¢æ¡}
-_textbigbox_ [l=zh-tr] {å å€§å°ºå¯ž}
-_textformtype_ [l=zh-tr] {è¡šæ Œç±»åïŒ}
-_textsimple_ [l=zh-tr] {ç°¡å®}
-_textadvanced_ [l=zh-tr] {é²é}
-
-# used in "with 4 fields" in the form search box
-_textwith_ [l=zh-tr] {è}
-_textfields_ [l=zh-tr] {é å}
+_textsearchhistory_ [l=zh-tr] {æ¥è©¢çŽéïŒ}  
+_textnohistory_ [l=zh-tr] {äžèŠæ¥è©¢çŽé}  
+_texthistorydisplay_ [l=zh-tr] {ååº _historynumrecords_ çæ¥è©¢çæ­·å²çŽé}  
+_textnohistorydisplay_ [l=zh-tr] {äžèŠååºæ¥è©¢çæ­·å²çŽé}  
 
 
@@ -523,5 +538,5 @@
 _textwords_ [l=zh-tr] {å±¬æŒäžæ®µè©±}
 _textleaveblank_ [l=zh-tr] {äžéžææ­€é 
-ç®å¯ä»¥åŸå°æææä»¶}
+ç®ïŒä»¥åŸå°æææä»¶}  
 
 _browsebuttontext_ [l=zh-tr] {"æä»¶æåº"}
@@ -541,146 +556,17 @@
 
 _textHelp_ [l=zh-tr] {å¹«å©}
-_textSearchshort_ [l=zh-tr] {æå°ç¹å®æå­}
-
-
-# Dublin Core Metadata Element Set, Version 1.1
-_textTitleshort_ [l=zh-tr] {ä»¥æšé¡çºçŽ¢åŒæ¥è©¢æä»¶}
-_textCreatorshort_ [l=zh-tr] {ä»¥äœè
-çºçŽ¢åŒæ¥è©¢æä»¶}
-_textSubjectshort_ [l=zh-tr] {ä»¥äž»é¡çºçŽ¢åŒæ¥è©¢æä»¶}
-_textDescriptionshort_ [l=zh-tr] {ä»¥æè¿°çºçŽ¢åŒæ¥è©¢æä»¶}
-_textPublishershort_ [l=zh-tr] {ä»¥åºçè
-çºçŽ¢åŒæ¥è©¢æä»¶}
-_textContributorshort_ [l=zh-tr] {ä»¥è²¢ç»è
-çºçŽ¢åŒæ¥è©¢æä»¶}
-_textDateshort_ [l=zh-tr] {ä»¥æ¥æçºçŽ¢åŒæ¥è©¢æä»¶}
-_textTypeshort_ [l=zh-tr] {ä»¥é¡å¥çºçŽ¢åŒæ¥è©¢æä»¶}
-_textFormatshort_ [l=zh-tr] {ä»¥æ ŒåŒçºçŽ¢åŒæ¥è©¢æä»¶}
-_textIdentifiershort_ [l=zh-tr] {ä»¥ç¢ºèªè
-åèœæåæ¥é
-æä»¶}
-_textSourceshort_ [l=zh-tr] {ä»¥æªæ¡åçš±çºçŽ¢åŒæ¥è©¢æä»¶}
-_textLanguageshort_ [l=zh-tr] {ä»¥èªèšçºçŽ¢åŒæ¥è©¢æä»¶}
-_textRelationshort_ [l=zh-tr] {ä»¥éä¿çºçŽ¢åŒæ¥è©¢æä»¶}
-_textCoverageshort_ [l=zh-tr] {ä»¥ç¯åçºçŽ¢åŒæ¥è©¢æä»¶}
-_textRightsshort_ [l=zh-tr] {ä»¥æ¬å©çºçŽ¢åŒæ¥è©¢æä»¶}
-
-_textSeriesshort_ [l=zh-tr] {ä»¥éå¢åçºçŽ¢åŒæ¥è©¢æä»¶}
-_textToshort_ [l=zh-tr] {ä»¥toçºçŽ¢åŒæ¥è©¢æä»¶}
-_textFromshort_ [l=zh-tr] {ä»¥Fromæ¬äœçºçŽ¢åŒæ¥è©¢æä»¶}
-_textBrowseshort_ [l=zh-tr] {çèŠœæä»¶}
-_textOrganizationshort_ [l=zh-tr] {ä»¥çµç¹çºçŽ¢åŒæ¥è©¢æä»¶}
-_textHowtoshort_ [l=zh-tr] {ä»¥âåŠäœ..âåèœæåæ¥é
-æä»¶}
-_textTopicshort_ [l=zh-tr] {ä»¥äž»æšçºçŽ¢åŒæ¥è©¢æä»¶}
-_textPeopleshort_ [l=zh-tr] {ä»¥PeopleçºçŽ¢åŒæ¥è©¢æä»¶}
-_textAcronymshort_ [l=zh-tr] {ä»¥çž®å¯«å­æ¯åŠåºçŸäŸæ¥è©¢æä»¶}
-_textPhraseshort_ [l=zh-tr] {ä»¥çèªçºçŽ¢åŒæ¥è©¢æä»¶}
-_textArtistshort_ [l=zh-tr] {ä»¥èè¡å®¶çºçŽ¢åŒæ¥è©¢æä»¶}
-_textKeywordshort_ [l=zh-tr] {ä»¥ééµå­çºçŽ¢åŒæ¥è©¢æä»¶}
-_textVolumeshort_ [l=zh-tr] {ä»¥å¢æžçºçŽ¢åŒæ¥è©¢æä»¶}
-_textCountriesshort_ [l=zh-tr] {ä»¥åå®¶çºçŽ¢åŒæ¥è©¢æä»¶}
-_textdefaultshorttext_ [l=zh-tr] {æªå®çŸ©çåé¡}
-
-_textSearchlong_ [l=zh-tr] {<p>äœ å¯ä»¥ <i>ä»¥ç¹å®çè©èªæå°</i>èéäºæå­å°æåšæå°çæä»¶äž­åçŸãæšå¯ä»¥åš"æ¥è©¢"é é¢å
-§çäŸç¹å®è©èªæ¥è©¢ãæ­€é æ¯éå§çç¬¬äžé ïŒæšä¹å¯ä»¥åšå
-¶å®é ææ¥è©¢éµåå°æ¥è©¢é ã}
-
-
-# Dublin Core Metadata Element Set, Version 1.1
-
-_textTitlelong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥æšé¡çºçŽ¢åŒæ¥è©¢æä»¶</i> 
-èç±æäž <i>æšé¡a-z</i>æéãå°æžæ¬ä»¥æšé¡ä¹è±æå­æ¯é åºååºã}
-
-# Not true DC, kept for legacy reasons
-_textCreatorlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥äœè
-çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>äœè
- a-z</i>æéãååºä»¥äœè
-æåºçæä»¶æž
-å®ã }
-
-_textSubjectlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥äž»é¡çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>äž»é¡</i>æéãäžåäž»é¡ä¹æä»¶å°æè¢«æ­žé¡åšäžåæžæ«å
-§ã}
-
-_textDescriptionlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥æè¿°çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>æè¿°</i> æéãååºä»¥æè¿°äŸåé¡çææç®éã }
-
-_textPublisherlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥åºçè
-çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>åºçè
-</i>æéãååºä»¥åºçè
-äŸåé¡çç®éã}
-
-_textContributorlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥è²¢ç»è
-çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>è²¢ç»è
-</i>æéãååºè²¢ç»è
-ç®éã}
-
-_textDatelong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥æ¥æçºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>æ¥æ</i> æéãååºä»¥å¹Žä»£äŸåé¡çææç®éã }
-
-_textTypelong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥é¡å¥çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>é¡å¥</i> æéãååºé¡å¥ä»¥äŸçèŠœã}
-
-_textFormatlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥æ ŒåŒçºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>æ ŒåŒ</i> æéãååºä»¥æ ŒåŒäŸåé¡çææç®éã }
-
-_textIdentifierlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥ç¢ºèªè
-çºçŽ¢åŒæ¥è©¢æä»¶</i>
-èç±æäž<i>ç¢ºèªè
-</i>æéãååºä»¥ç¢ºèªè
-æåºçæä»¶æž
-å®ã 
-}
-
-# Not true DC, kept for legacy reasons
-_textSourcelong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥æªæ¡åçš±çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>æªå</i>æéãååºä»¥æªæ¡åçš±æåºçç®éã}
-
-_textLanguagelong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥èªèšçºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>èªèš</i>æéãååºä»¥èªèšåé¡çç®éã}
-
-_textRelationlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥éä¿çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>éä¿</i>æéãååºä»¥éä¿äŸåé¡çç®éã}
-
-_textCoveragelong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥ç¯åçºçŽ¢åŒæ¥è©¢æä»¶</i> bèç±æäž<i>ç¯å</i>æéãååºç¯åç®éã}
-
-_textRightslong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥æ¬å©çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>æ¬å</i>æéãååºä»¥æ¬å©äŸåé¡çç®éã}
-
-
-
-_textOrganizationlong_ [l=zh-tr] {<p>äœ èœå€ <i>ä»¥çµç¹çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>çµç¹</i> æéãååºä»¥çµç¹æåºå°æä»¶æž
-å®ã}
-
-_textHowtolong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥âåŠäœ..âçºçŽ¢åŒæ¥è©¢æä»¶</i>
-èç±æäž<i>åŠäœ..</i>æéãååºä»¥âåŠäœ..âæåºçæä»¶æž
-å®ã 
-}
-
-_textTopiclong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥äž»æšçºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>äž»æš</i> æéãååºäž»æšä»¥äŸçèŠœã}
-
-_textTolong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥toçºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>to</i>æéã  ååºæ¶ä¿¡äººå°åæž
-å®ã}
-
-_textFromlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥Fromæ¬äœæ¥è©¢æä»¶</i>èç±æäž<i>From</i>æéãååºéåºäººæž
-å®ã }
-
-_textSerieslong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥éå¢åçºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>éå¢å</i>æéãååºäœæŒè³æåº«äž­ææçéå¢ååè¡šã }
-
-_textBrowselong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>çèŠœæä»¶</i>èç±æäž
-<i>çèŠœ</i>æéã}
-
-_textPeoplelong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥PeopleçºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>People a-z</i>æéãååºä»¥PeopleäŸåé¡çç®éã}
-
-_textAcronymlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥çž®å¯«å­æ¯åŠåºçŸäŸæ¥è©¢æä»¶</i>ïŒè«æ
-<i>çž®å¯«å­</i>æéãéæš£å°æååºçž®å¯«å­çåè¡šïŒäžŠæšç€ºä»ååºçŸçäœçœ®ã  }
-
-_textPhraselong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥çèªçºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>çèª</i>æéãéé 
-æäœäœ¿çšPhine phraseçèŠœåšã }
-
-_textArtistlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥èè¡å®¶çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>èè¡å®¶</i>æéãååºä»¥èè¡å®¶å§ååé¡çç®éã}
-
-_textKeywordlong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥ééµå­çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>ééµå­</i>æéãååºä»¥ééµå­åé¡çç®éã}
-
-_textVolumelong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥å¢æžçºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>å¢æž</i>æéãååºå¢æžç®éã}
-
-_textCaptionslong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥æšé¡çºçŽ¢åŒæ¥è©¢æä»¶</i>èç±æäž<i>æšé¡</i>æéãååºæšé¡ç®éã}
-
-_textCountrieslong_ [l=zh-tr] {<p>äœ å¯ä»¥<i>ä»¥åå®¶çºçŽ¢åŒæ¥è©¢æä»¶</i> bèç±æäž<i>åå®¶</i>æéãååºåå®¶ç®éã}
-
-
-_textdefaultlongtext_ [l=zh-tr] {<p>æäž <i>æªç¥</i> æé. ååºæªç¥é ååé¡ã}
+
+# Macros giving a brief help message for navigation bar access buttons
+# The arguments to this will be _textXXX_ and _labelXXX_, where XXX is the metadata name. For example, to print out the help message for a titles classifier, the library will use _textdefaulthelp_(_textTitle_,_labelTitle_)
+# To customize this for a specific metadata, add a macro named _textXXXhelp_ where XXX is the metadata name
+_textdefaulthelp_ [l=zh-tr] {æäžäž  _2_ éµïŒä»¥ _1_ äŸçèŠœæä»¶ã}  
+
+_textSearchhelp_ [l=zh-tr] {æäž  _labelSearch_  éµïŒä»¥æå°åºçŸæŒæå­å
+§çç¹å®å­å¥}  
+_textTohelp_ [l=zh-tr] {æäžäž _labelTo_ éµïŒä»¥æªæ­¢æŒæ¬äœçèŠœæä»¶}  
+_textFromhelp_ [l=zh-tr] {æäžäž _labelFrom_ éµïŒä»¥æ ¹æ From æ¬äœäŸçèŠœæä»¶ã}  
+_textBrowsehelp_ [l=zh-tr] {çèŠœæä»¶}  
+_textAcronymhelp_ [l=zh-tr] {æäžäž _labelAcronym_ éµïŒä»¥æ ¹æéŠå­æ¯çž®å¯«çæ¬¡åºäŸçèŠœæä»¶ã}  
+_textPhrasehelp_ [l=zh-tr] {æäž_labelPhrase_ éµïŒä»¥çèŠœåºçŸæŒæä»¶ççèªãéæ¯å©çš phind çèªçèŠœåšã}  
 
 _texthelptopicstitle_ [l=zh-tr] {ç®é}
@@ -688,19 +574,17 @@
 _textreadingdocs_ [l=zh-tr] {åŠäœé±è®æä»¶}
 
-_texthelpreadingdocs_ [l=zh-tr] {
-<p>è®åæäžæä»¶æïŒééå°é¢æåçå°±ç¥éè¢å¹æ­£åšé¡¯ç€ºåªäžåæä»¶ãæäºéåçå°é¢æéæ¯ç®éè¡šïŒèæäºéåå
+_texthelpreadingdocs_ [l=zh-tr] {<p>è®åæäžåæä»¶æïŒééå°é¢æåçå°±ç¥éè¢å¹æ­£åšé¡¯ç€ºåªäžåæä»¶ãäžäºå
+žèè³æåº«çå°é¢æéæ¯ç®éè¡šïŒèæäºå
+žèè³æåº«å
 å
 æ¬ç®åçé ç¢Œåå¯ä»¥éžæåé²åŸéçéžé 
-ãç®éè¡šæ¯å¯å±éçïŒæäžç®éè¡šå¯æéæééæä»¶ïŒæäžæéæä»¶çäžæ¹å¯ä»¥ééå®ã</p>
-
-<p>åšäžé¢æ¯ç®åéšåçæ¬æïŒç¶äœ å·²ç¶è®éæïŒåºéšæäžåç®­é ­å¯ä»¥è®äœ å°äžäžç« ç¯ææ¯åå°åäžç« ç¯ã</p>
-
-<p>åšæšé¡æå°é¢äžçæéïŒæäž
-<i>å±é</i> å±éæç« ææžæ¬å
-§å®¹. åŠææä»¶å€ªå€§å°æè±è²»èš±å€æéèèšæ¶é«! æäž <i>å±éå
-§å®¹</i>å°å±éæŽä»œç®éïŒäœ èœçèŠå
-šéšç« ç¯åæšé¡ãæäž<i>éåæ°èŠçª</i>ä»¥æ°èŠçªéåæä»¶ïŒ(ç¶äœ æ³æ¯èŒæåæè®å
-©ç¯æç« ïŒéååèœåŸæçšã) æåŸïŒç¶äœ æå°æïŒææå°çæå­æè¢«åçœæšç€ºïŒæäž <i>äžæšç€º</i> åæç§»é€æå­åçœæšç€ºã</p>
-}
+ãç®éè¡šæ¯å¯å±éçïŒæäžç®éè¡šå¯æéæééæä»¶ïŒæäžæéæä»¶çäžæ¹åå¯ä»¥ééå®ã</p>
+
+<p>åšäžé¢æ¯ç®åéšåçæ¬æïŒç¶æšå·²ç¶è®éæïŒåºéšæäžåç®­é ­å¯ä»¥è®æšå°äžäžç« ç¯ææ¯åå°åäžç« ç¯ã</p>
+
+<p>åšæšé¡æå°é¢äžçæéïŒæäž<i>_document:textEXPANDTEXT_</i>ïŒä»¥å±éæç« ææžæ¬å
+§å®¹ãåŠææä»¶å€ªå€§ïŒå°æè±è²»èŒå€çæéèèšæ¶é«ïŒæäž<i>_document:textEXPANDCONTENTS_</i>å°å±éæŽä»œç®éïŒæšèœçèŠå
+šéšç« ç¯åæšé¡ãæäž<i>_document:textDETACH_</i>ä»¥æ°èŠçªéåæä»¶ãï¹ç¶æšæ³æ¯èŒæåæé±è®å
+©ç¯æç« ïŒéååèœåŸæçšãï¹æåŸïŒç¶æšæå°æïŒææå°çæå­æè¢«åçœé¡¯ç€ºïŒæäž<i>_document:textNOHIGHLIGHT_</i>åæç§»é€æå­çåçœé¡¯ç€ºã</p>}  
 
 # help about the icons
@@ -714,11 +598,12 @@
 _texthelphighlight_ [l=zh-tr] {æšç€ºæäžæšç€ºæå°é 
 ç®}
+_texthelpsectionarrows_ [l=zh-tr] {å»åäžåæäžäžåç« ç¯}  
+
 
 _texthelpsearchingtitle_ [l=zh-tr] {åŠäœæå°ç¹å®æç« }
 
-_texthelpsearching_ [l=zh-tr] {
-<p>
- åšæå°é é¢å¯ä»¥åç°¡å®çæ¥è©¢æ­¥é©:<p>
- 
+_texthelpsearching_ [l=zh-tr] {<p>
+ åšæå°é é¢å¯ä»¥åç°¡å®çæ¥è©¢æ­¥é©ïŒ<p>
+
  <ol><li>æå®èŠæå°çé 
 ç®
@@ -729,51 +614,69 @@
  </ol>
 
-<p>ç¶æå°å®ææïŒæ¯é æé¡¯ç€º20ç­ç¬Šåçè³æïŒäœ å¯ä»¥ææéé¡¯ç€ºäž20ç­è³æ.æé¡¯ç€ºå20ç­è³æïŒææ¯ç­è³ææçæéïŒå¯ä»¥çèŠè³æçå
-§å®¹
-
-<p>æå€å¯ä»¥é¡¯ç€º100ç­è³æïŒäœ å¯ä»¥æ¹è®é¡¯ç€ºæžéç¶äœ æäžæäžæ¹
- <i>åäººåå¥œ</i> çæéã<p>
-}
-
-_texthelpqueryterms_ [l=zh-tr] {
-<p>èŒžå
-¥çä»»äœè³æçš±çº"æª¢çŽ¢é 
-ç®." æ¯åæª¢çŽ¢é 
-ç®åªå¯æ¯å­æ¯ææ¯æžå­ïŒæª¢çŽ¢æ¢ä»¶ä¹éçšç©ºçœåéïŒæšé»ç¬Šèæè¢«èŠçºç©ºçœèè¢«å¿œç¥ïŒæä»¥äžå¯å°æå°æ¢ä»¶èš­çºæšé»ç¬Šè
+<p>ç¶æå°å®ææïŒæ¯é æé¡¯ç€º 20 åç¬Šåçæä»¶è³æãæšå¯ä»¥æäžäžæéïŒä»¥é¡¯ç€ºäžäžçµ 20 åçæä»¶è³æïŒæé¡¯ç€ºåäžçµ 20 åçæä»¶è³æïŒåŠæ­€é¡æšãæäžäžä»»äœæä»¶è³æçé¡ç®é£çµææéçæéïŒæšäŸ¿å¯ä»¥é±è®æéçæä»¶è³æå
+§å®¹ã
+
+<p>æå€å¯ä»¥é¡¯ç€º 50 åæä»¶è³æãæšå¯ä»¥æäžé é¢äžæ¹ç<i>_Global:linktextPREFERENCES_</i>æéïŒä»¥æ¹è®é¡¯ç€ºæžéã<p>}  
+
+_texthelpquerytermstitle_ [l=zh-tr] {æå°è©åœ}  
+_texthelpqueryterms_ [l=zh-tr] {<p>èŒžå
+¥çä»»äœè³æçš±çº"æå°é 
+ç®" ïŒèæ¯åæå°é 
+ç®åªå¯æ¯å­æ¯ææ¯æžå­ãæå°æ¢ä»¶ä¹éçšç©ºçœåéïŒæšé»ç¬Šèæè¢«èŠçºç©ºçœèè¢«å¿œç¥ïŒæä»¥äžå¯å°æå°æ¢ä»¶èš­çºæšé»ç¬Šèã
 
 <p>æ¥è©¢çç¯äŸ<p>
    <ul><kbd> Agro-forestry in the Pacific Islands. Systems for Sustainability(1993)</kbd></ul>
      <p>åä»¥äžèŠçºçžå<p>
-     <ul><kbd>Agro forestry in the Pacific Islands  Systems for Sustainability  1993 </kbd></ul><p>
-}
-
+     <ul><kbd>Agro forestry in the Pacific Islands  Systems for Sustainability  1993 </kbd></ul><p>}  
+
+_texthelpmgppsearching_ [l=zh-tr] {ç± MGPP å»ºæçå
+žèè³æåº«ïŒå¯æäŸå
+¶ä»éžæã
+<ul>
+<li><b>*</b>æŸåšæ¥è©¢è©åœçæ«ç«¯ïŒåå¯é
+å°ææä»¥éå­å¥çºéŠçå­å¥ãäŸåŠïŒ<b>comput*</b>å¯ä»¥é
+å°ææä»¥ <b>comput</b> çºéŠçå­å¥ã.
+<li><b>/x</b>å¯çµŠäºæ¥è©¢è©åœäžåæå€æŒäžåçæŽé«åéãäŸåŠïŒç¶æåæä»¶æïŒ<b>computer/10 science</b>åè¡šç€ºçµŠäº computer 10 åå€æŒ science çåéã
+</ul>}  
+
+_texthelplucenesearching_ [l=zh-tr] {ç± Lucene å»ºæçå
+žèè³æåº«ïŒå¯æäŸå
+¶ä»éžæã
+<ul>
+<li><b>?</b>å¯çšäœçºè¬çšå­å
+ (wildcard)ïŒä»¥åä»£åå¥çå­æ¯ã äŸåŠïŒ<b>b?t</b>å¯é
+å°æ<b>bet</b>ã<b>bit</b>æ<b>bat</b>ç­ç­ã
+<li><b>*</b>å¯çšäœçºè¬çšå­å
+ (wildcard)ïŒä»¥åä»£å€æŒäžåçå­æ¯ãäŸåŠïŒ<b>comput*</b>å¯é
+å°æææä»¥<b>comput</b>çºå§çè±æå­æ¯ã
+</ul>
+ææçè¬çšå­å
+ (wildcard) éœå¯æŸåšè©åœçäž­å€®ææ«ç«¯ïŒäœå»äžå¯æŸåšæå°è©åœçéå§ã}  
 
 _texthelpquerytypetitle_ [l=zh-tr] {æ¥è©¢é¡å}
-_texthelpquerytype_ [l=zh-tr] {
-<p>å
-©çš®äžåé¡åçæ¥è©¢ã
+_texthelpquerytype_ [l=zh-tr] {<p>å
+©çš®äžåé¡åçæ¥è©¢èªæ³ã
 
 <ul>
- <li>æ¥è©¢ <b>èæ¥è©¢é 
+ <li>æ¥è©¢<b>èæ¥è©¢èªæ³é 
 ç®å®å
-š</b> çžåïŒæ¥è©¢å°çè³æ(æè
- 
-ç« æè
+š</b>çžåïŒæ¥è©¢å°çæä»¶(ç« ç¯æè
 æšé¡)å
-å«äœ å·²ç¶æå®çå
-šéšééµè©å°äŸå­æ¯æåºèååº
-ã<p>
-
- <li>æ¥è©¢<b>èæ¥è©¢é 
-ç®éšå</b> çžåïŒå°æ¥è©¢å°çæä»¶ååºïŒäžŠäŸèæ¥è©¢é 
-ç®ççžäŒŒåºŠæåºã
+å«æšå·²ç¶æå®çå
+šéšééµè©å°äŸå­æ¯æåºèååºäŸ ã<p>
+<p>
+
+<li>æ¥è©¢<b>èæ¥è©¢èªæ³é 
+ç®éšå</b> çžåïŒå°æ¥è©¢å°çæä»¶ååºïŒäžŠäŸç
+§èæ¥è©¢é 
+ç®ççžäŒŒåºŠäŸæåºã
 
      <p><ul>
        <li>æ¥è©¢é 
-ç®æå€æåŸå°çæå°çµææè¶æ¥è¿æèŠç;
-       <li> çšçšç¹çæ¥è©¢é 
-ç®ææ¯äžè¬çæ¥è©¢é 
+ç®æå€ïŒæåŸå°çæå°çµææè¶æ¥è¿æèŠç;
+       <li>çšçšç¹çæ¥è©¢é 
+ç®æèŒäžè¬çæ¥è©¢é 
 ç®æå°èŒäœ³;
-       <li> èŒç­çæ¥è©¢é 
+       <li>èŒç­çæ¥è©¢é 
 ç®ææ¯èŒé·çæ¥è©¢é 
 ç®æŽææŒç¬Šåæä»¶å
@@ -783,19 +686,69 @@
 
 <p>äœ¿çšå€äžé»æ¥è©¢é 
-ç®ïŒåæ¯æŽæ®µå¥å­ææç« ïŒåŠæäœ åªäœ¿çšäžåæ¥è©¢é 
+ç®ïŒåæ¯æŽæ®µå¥å­ææç« ïŒåŠææšåªäœ¿çšäžåæ¥è©¢é 
 ç®ïŒæå°ççµæå°äŸæ¥è©¢é 
-ç®åšæä»¶äž­åºçŸçé »çæåºã<p>
-}
-
-_textdatesearch_ [l=zh-tr] {æ¥è©¢æå¯ä»¥åŠå€åå äžæéæ¢ä»¶}
-
-_texthelpdatesearch_ [l=zh-tr] {
-äŸæ¥ææå°å¯ä»¥æŸåºç¬Šåæäžæéæ¢ä»¶çæä»¶ïŒå¯ä»¥åªèŒžå
+ç®åšæä»¶äž­åºçŸçé »çäŸæåºã<p>}  
+
+_texthelpadvancedsearchtitle_ [l=zh-tr] {äœ¿çš _1_ æå°åšïŒä»¥äœé²éæå°}  
+
+_texthelpadvancedsearch_ [l=zh-tr] {<p>åè¥æšå·²éžæé²éæ¥è©¢åèœï¹åšæçææäž­ï¹ïŒæšåææäžåçæå°éžæã}  
+
+_texthelpadvsearchmg_ [l=zh-tr] {MG å
+žèè³æåº«çé²éæå°ïŒåå¥çºæšæäŸå
+©é 
+éžæïŒéçŽæ§åéèŒ¯æ§ã
+<b>éçŽæ§</b>æå°æ¯çžç­æŒ<a href="\#query-type">_texthelpquerytypetitle_</a>æåœ¢å®¹ç<b>éšä»œ</b>æå°ã
+<p>_texthelpbooleansearch_}  
+
+_texthelpbooleansearch_ [l=zh-tr] {<b>éèŒ¯æ§</b>æå°è®æšäœ¿çšäžåçéèŒ¯æ§éç®å­äŸçµåå­å¥ïŒäŸåŠïŒ& ï¹ä»£è¡šãåãï¹ã|ï¹ä»£è¡šãæãï¹ã èå !ï¹ä»£è¡šãåŠãï¹ã
+<p>
+èäŸäŸèªªïŒ<b>snail & farming</b>æå°ææå«æ<b>snail</b>å<b>farming</b>çæä»¶çžé
+äžèµ·ïŒè<b>snail | farming</b>åå°å«æ<b>snail</b>æ<b>farming</b>çæä»¶çžé
+äžèµ·ãè³æŒ<b>sanil ! farming</b>åå°å«æ<b>snail</b>ïŒäœäžå
+æ¬<b>farming</b>çæä»¶çžé
+äžèµ·ã
+<p>
+é©ç¶å°éçšéç®å­äŸçµåæå°æ¥è©¢ïŒå¯åŸåºæŽæºç¢ºççµæãäŸåŠïŒ<b>(sheep | cattle) & (farm | station)</b>ïŒæ<b>sheep | cattle | goat !pig</b>.}  
+
+_texthelpadvsearchmgpp_ [l=zh-tr] {MGPP å
+žèè³æåº«çé²éæå°æ¯äœ¿çšéèŒ¯éç®å­ (operator) çã_texthelpbooleansearch_
+<p>æ­£åŠ<a href="\#query-type">_texthelpquerytypetitle_</a>æåœ¢å®¹ç<b>éšä»œ</b>æå°ïŒçµæéœä»¥<b>éçŽæ§</b>æãèªç¶ãï¹ãå»ºç«ãï¹çæ¬¡åºäŸé¡¯ç€ºãåŸè
+(ãèªç¶ãæãå»ºç«ãæ¬¡åºï¹æ¯ææä»¶æŒè£œäœå
+žèè³æåº«ææå»ºæçæ¬¡åºã
+<p>
+é²äžæ­¥çéç®å­å
+æ¬<b>NEARx</b>å<b>WITHINx</b>ãNEARx æ¯çšäŸæåºæé·çè·é¢ï¹x å­å¥ï¹ïŒéè·é¢å¯ä»¥åéæä»¶å
+§çå
+©çµæ¥è©¢ã
+WITHINx æåºç¬¬äºçµ<i>ç·æ¥è</i>ç¬¬äžçµåºçŸç x å­å¥ïŒæ
+æ³é¡äŒŒ NEARïŒäœæ¬¡åºçžå°å°èŒçºéèŠãé èš­çè·é¢çº 20ã}  
+
+_texthelpadvancedsearchextra_ [l=zh-tr] {æ³šæïŒåè¥æšéžæç°¡ææ¥è©¢åèœïŒéäºéç®å­ (operators) å°æå
+šéšè¢«å¿œç¥ã}  
+
+_texthelpadvsearchlucene_ [l=zh-tr] {Lucene å
+žèè³æåº«çé²éæå°äœ¿çšéèŒ¯éç®å­ã _texthelpbooleansearch_}  
+
+_texthelpformsearchtitle_ [l=zh-tr] {æ¬äœæå°}  
+
+_texthelpformsearch_ [l=zh-tr] {<p>æ¬äœæå°è®æšå¯ä»¥åäœµæ¬äœïŒä»¥äœæå°ãäŸåŠïŒæšå¯ä»¥åææå°é¡ç® "Smith" åäž»é¡ "snail farming"ãåšç°¡ææ¥è©¢åèœè£ïŒè¡šæ Œå
+§çæ¯äžè¡åŠæ­£åžžçå®è¡æå°ãè¡šæ Œå
+§çåå¥è¡æ¯ç± ANDï¹ä»¥äŸææçæå°ï¹æ OR ï¹ä»¥äŸéšä»œçæå°ï¹çµæïŒèæ¬äœå
+§çè©åœäºŠä»¥éæ¹æ³çµæãåšé²éæ¥è©¢åèœè£ïŒæäžæž
+å®äŸ¿å¯ä»¥æåºæ¬äœéäžåç AND/OR/NOT çµåïŒèåšæ¬äœå
+§ïŒæšåå¯äŸ¿çšéèŒ¯æ§éç®å­ã}  
+
+_texthelpformstemming_ [l=zh-tr] {è³æå€Ÿ (Fold) åçµå°Ÿ (stem) å­ç®±è®æšæåºæ¬äœå
+§çè©åœæ¯ casefoldïŒéæ¯ stemãäžè« casefold æ stemïŒååšé²éæå°å
+§èš­å®çºééã}  
+
+_textdatesearch_ [l=zh-tr] {æ¥è©¢æå¯ä»¥åŠå€åå äžæéæ¢ä»¶}  
+
+_texthelpdatesearch_ [l=zh-tr] {äŸæ¥ææå°å¯ä»¥æŸåºç¬Šåæäžæéæ¢ä»¶çæä»¶ïŒå¯ä»¥åªèŒžå
 ¥æéäŸæå°ïŒæéå¯ä»¥æ¯æç¢ºçæéé»ææ¯äžæ®µåéçæéã<p>
 }
 
 _texthelpdatehowtotitle_ [l=zh-tr] {åŠäœäœ¿çš:}
-_texthelpdatehowto_ [l=zh-tr] {
-<ul>
+_texthelpdatehowto_ [l=zh-tr] {<ul>
   <li>çšæç¢ºçæéæ¢ä»¶æå°:<p>
   <ul>
@@ -826,6 +779,6 @@
 }
 
-_texthelpdateresults_ [l=zh-tr] {
-åŠææå°1903å¹Žçæä»¶äžŠéæå°1903å¹Žå¯«çæä»¶èæ¯æå°è1903æéçæä»¶ïŒåŠæç¡æ³æå°å°æç¢ºæ¥æççžéæä»¶ïŒæèš±å¯ä»¥çšåéæå°ïŒäŸåŠ:1903å°±ä»æŒ20è21äžçŽçåéå
+_texthelpdateresultstitle_ [l=zh-tr] {æå°çµæçæ¹æ³ã}  
+_texthelpdateresults_ [l=zh-tr] {åŠææå°1903å¹Žçæä»¶äžŠéæå°1903å¹Žå¯«çæä»¶èæ¯æå°è1903æéçæä»¶ïŒåŠæç¡æ³æå°å°æç¢ºæ¥æççžéæä»¶ïŒæèš±å¯ä»¥çšåéæå°ïŒäŸåŠ:1903å°±ä»æŒ20è21äžçŽçåéå
 §ã<p>
 }
@@ -833,46 +786,64 @@
 _textchangeprefs_ [l=zh-tr] {æŽæ¹åäººåå¥œ}
 
-_texthelppreferences_ [l=zh-tr] {
-<p>ç¶äœ æäžåšé é¢æäžæ¹ç <i>åäººåå¥œ</i> æéïŒå¯ä»¥æ¹è®åå¥œèš­å®ã
-}
+_texthelppreferences_ [l=zh-tr] {<p>ç¶æšæäžäžåšé é¢æäžæ¹ç<i>åäººåå¥œ</i> æéïŒæšäŸ¿å¯ä»¥å æåäººåå¥œèäœåºç¹å®çæ¹è®ã}  
 
 _texthelpcollectionprefstitle_ [l=zh-tr] {è³æåº«åäººåå¥œèš­å®}
-_texthelpcollectionprefs_ [l=zh-tr] {
-äžäºæä»¶éåå
-æ¬äžäºå­éåïŒéäºéåå¯åå¥æå°ææ¯äžèµ·æå°ïŒæä»¥å¯ä»¥åšåå¥œçæå°é é¢äž­éžææå°å­éåéžé 
+_texthelpcollectionprefs_ [l=zh-tr] {äžäºå
+žèè³æåº«å
+æ¬äžäºå­éåïŒè®çšæ¶å¯äœåå¥æå°ææ¯äžèµ·æå°ãå æ­€ïŒæšå¯ä»¥åšåå¥œçæå°é é¢äž­éžææå°å­éåéžé 
 ã
-}
+}  
 
 _texthelplanguageprefstitle_ [l=zh-tr] {èªèšåå¥œ}
-_texthelplanguageprefs_ [l=zh-tr] {
-æ¯åæ¶èéœæé èš­çèªèšïŒäœæ¯å¯ä»¥æ¹æåå¥œçèªèšã æšéå¯ä»¥æ¹è®Greenstoneè»é«çºèŒžåºå°çèŠœåšææ¡çšçé èš­çç·šç¢Œç³»çµ±é
+_texthelplanguageprefs_ [l=zh-tr] {æ¯åå
+žèè³æåº«éœæé èš­çèªèšïŒäœæ¯æšå¯ä»¥æ¹æåå¥œçèªèšãæšäºŠå¯ä»¥æ¹è® Greenstone çºèŒžåºè³çèŠœåšææ¡çšçé èš­çç·šç¢Œç³»çµ±é
 çœ®ïŒäœæ¯æäºçèŠœåšæå æ¡çšäžåçç·šç¢Œç³»çµ±é
 çœ®èç²åŸæŽå¥œçèŠèŠºææïŒæçšçæ¶èå
-èš±æšåŸæšæºçååœ¢çé¢èœå°æå­çé¢ïŒéé»å°æŒæèŠèŠºéç€èäœ¿çšå€§åå­é«æèªèšè­å¥åšççšæ¶ç¹å¥æçšã
-}
+èš±æšåŸæšæºçååœ¢ä»é¢èœå°æå­ä»é¢ïŒéé»å°æŒæèŠèŠºéç€èäœ¿çšå€§åå­é«æèªèšè­å¥åšççšæ¶ç¹å¥æçšã}  
 
 _texthelppresentationprefstitle_ [l=zh-tr] {æå°åå¥œèš­å®}
-_texthelppresentationprefs_ [l=zh-tr] {
-æ ¹æäžåçæä»¶éåçæå°ïŒå¯ä»¥èš­å®äžåçæå°åå¥œã
-
-<p>ç¶²é æ¶èå
-èš±åšæ¯åé éŠäžé¡¯ç€ºGreenstoneè»é«çå°èªåïŒéæš£æšå¯ä»¥çŽæ¥çèŠœæéåç¶²é ïŒäžæé¡¯ç€ºä»»äœGreenstoneè»é«çé éŠãæšå¯ä»¥çšçèŠœåšç"åå°äžäžé "æéé²è¡åŠå€çæ¥è©¢ãç¶æšæäžæåè¶
-é£çµèé¢éæžäœåæžé€šçæåïŒéäºè³æåº«éå¯å
-èš±æšäžé¡¯ç€ºGreenstoneè»é«çè­Šåèšæ¯ãåšæäºç¶²é è³æåº«äž­æšå¯ä»¥æ§å¶åš"æ¥è©¢çµæ"é æ¯åŠçŽæ¥é£æ¥å°å¯ŠéçURLïŒéæ¯æžäœåæžé€šçåä»œã
-}
+_texthelppresentationprefs_ [l=zh-tr] {æ ¹æäžåå
+žèè³æåº«çæå°ïŒæšå¯ä»¥èš­å®äžåçæå°åå¥œã
+ïŒp>ç¶²é å
+žèè³æåº«å
+èš±åšæ¯åé éŠäžé¡¯ç€º Greenstone çå°èªåïŒéæš£æšå¯ä»¥çŽæ¥çèŠœæéåçç¶²é ïŒäžŠäžæé¡¯ç€ºä»»äœ Greenstone çé éŠãæšäºŠå¯ä»¥çšçèŠœåšç"åå°äžäžé "æéé²è¡åŠå€çæ¥è©¢ãç¶æšæäžæåè¶
+é£çµèé¢éæžç¢Œåæžé€šçæåïŒéäºè³æåº«éå¯å
+èš±æšäžé¡¯ç€º Greenstone çè­Šåèšæ¯ãåšäžäºç¶²é çå
+žèè³æåº«äž­ïŒæšå¯ä»¥æ§å¶"æ¥è©¢çµæ"é æ¯åŠçŽæ¥é£æ¥å°å¯ŠéçURLïŒéæ¯æžç¢Œåæžé€šçåä»œã}  
 
 _texthelpsearchprefstitle_ [l=zh-tr] {æå°çåå¥œ}
-_texthelpsearchprefs_ [l=zh-tr] {
-<p>æå
-©åæéå¯å°æå°çæå­æ¢ä»¶åèš­å®ïŒç¬¬äžåæ¯èš­å®æ¯åŠå¿œç¥å€§å°å¯«ïŒç¬¬äºåæ¯èš­å®æ¯åŠå¿œç¥æå­çµå°ŸïŒéçšæ®µèœæå°å°ææå¿«éçæå°å€§éæå­è³æã
-<p>äŸåŠïŒåŠææé <i>å¿œç¥å€§å°å¯«</i> å
-<i>å¿œç¥æå­çµå°Ÿ</i> åšæéžæçæ¢ä»¶<p>
-   <ul><kbd>African building</kbd></ul>
-     <p>å°èŠçº<p>
-     <ul><kbd>africa builds</kbd></ul><p>
-å çºå€§å¯«å­"African"æè¢«èœçºå°å¯«ïŒå­å°Ÿ"n" å "ing"æåå¥åŸ"African" and "building"äž­ç§»é€ïŒ "s"ä¹æåŸ"builds"äž­ç§»é€ã
-     <p>äœ å¯ä»¥äœ¿æ¹çšé²éæ¥è©¢æš¡åŒïŒå¯äœ¿çšAND (&)ïŒ OR (|)ïŒ and NOT (!)æ¢ä»¶å­ïŒç¢çæŽç²Ÿç¢ºçæ¥è©¢ïŒä¹å¯ä»¥æ¥è©¢æŸç¶æ¥è©¢éçæ­·å²çŽéïŒå°æååºæè¿æ¥è©¢éçäžäºçŽéïŒäœ¿åŸæŽæ¹äŸ¿æ¹è®å
-åçæ¥è©¢æ¢ä»¶ïŒæåŸïŒäœ ä¹å¯ä»¥æ¹è®ç¬Šåè³æååºçç­æžèæ¯é ååºçç­æžã
-}
+_texthelpsearchprefs_ [l=zh-tr] {<p>æšå¯ä»¥äœ¿æ¹çšé²éæ¥è©¢æš¡åŒïŒä»¥å
+èš±æšäœ¿çš AND (&)ãOR (|) å NOT (!) äŸçµåè©åœæçèªäœæå°ïŒä»¥åŸåºæŽç²Ÿç¢ºçæ¥è©¢ã
+<p>_selectsearchtypeprefs_
+<p>_selectwordmodificationprefs_
+
+<p>æšäºŠå¯ä»¥éåæ¥è©¢æ­·å²åèœïŒä»¥é¡¯ç€ºæè¿æ¥è©¢éçäžäºçŽéïŒéäºŠæ¹äŸ¿æšæ¹è®å
+åçæ¥è©¢æ¢ä»¶ã
+<p>æåŸïŒæšä¹å¯ä»¥æ¹è®ååºç¬Šåè³æçæžç®ïŒèåæ¯é ååºçæžç®ã}  
+
+_textcasefoldprefs_ [l=zh-tr] {ç¶é²è¡æå°æïŒäžå°æéææ§èå­æ¯çå€§å¯«æå°å¯«ãèäŸäŸèªªïŒè¥æšéžæ "_preferences:textignorecase_"ïŒ<i>snail farming</i>å°æè¢«èŠçºç­åæŒ<i>Snail Farming</i>å<i>SNAIL FARMING</i>ã}  
+_textstemprefs_ [l=zh-tr] {åšæå°æïŒäžå°æéææ±ºå®æ¯åŠå¿œç¥å­å¥çå°ŸéšãäŸåŠïŒè¥å·²éžæ _preferences:textstem_ïŒ<i>snail farming</i> éœæçäœçº <i>snails farm</i>å<i>snail farmer</i>ãäœæ¯ïŒéæ
+æ³åªé©çšæŒè±æçæç«  _selectstemoptionsprefs_ã}  
+_textaccentfoldprefs_ [l=zh-tr] {ç¶é²è¡æå°æïŒäžå°æéææ§èè¿äŒŒçå­æ¯çŒé³ãèäŸäŸèªªïŒè¥æšéžæ "_preferences:textignoreaccents_"ïŒ<i>fÃ©dÃ©ration</i>å°æè¢«èŠçºç­åæŒ<i>fedÃ©ration</i>å<i>federation</i>ã}  
+ 
+_textstemoptionsprefs_ [l=zh-tr] {å©çšäžè¿°æåçæå°è©åœ truncation åèœ "_texthelpquerytermstitle_"ïŒæèŒçºæ¹äŸ¿ææºç¢ºã}  
+
+_textsearchtypeprefsplain_ [l=zh-tr] {æšå¯ä»¥åŸå°èŒå€§çæ¥è©¢é 
+ç®ïŒè®æšå¯ä»¥å®¹æå°äœ¿çšæ®µèœå€§å°äŸé²è¡æå°ãæšæçŒçŸéæš£æå éæå°ç¹å€çæå­ã}  
+
+_textsearchtypeprefsform_ [l=zh-tr] {æšå¯ä»¥æ¹è®é¡¯ç€ºæŒæå°è¡šæ Œå
+§çæ¬äœæžç®ã}  
+
+_textsearchtypeprefsboth_ [l=zh-tr] {æšå¯ä»¥èœè®å
+žèè³æåº«çæå°åœ¢åŒïŒæ­£åžžåæ¬äœæå°ã 
+<ul>
+<li>æ­£åžžæå°æäŸå®äžçæ¥è©¢é 
+ç® _textsearchtypeprefsplain_</li>
+<li>æ¬äœæå°æäŸæžåæ¥è©¢é 
+ç®ïŒä»¥æ¥è©¢äžåæ¬äœççŽ¢åŒïŒéäºŠé©
+äœ¿æå°å¯åæéæŽå€§æå°è³äžåçæ¬äœã_textsearchtypeprefsform_ </li>
+</ul>}  
+
+
 
 _texttanumbrowseoptions_ [l=zh-tr] {çš _numbrowseoptions_ çš®æ¹åŒäŸæå°è³æåº«äž­çæä»¶è³æ:}
@@ -881,10 +852,8 @@
 
 _texthelpscopetitle_ [l=zh-tr] {æ¥è©¢çç¯å}
-
-_texthelpscope_ [l=zh-tr] {
-<p>
-åšå€§å€æžçæä»¶éåäž­å¯ä»¥çšäžåçæå°æ¢ä»¶æå°ïŒäŸåŠïŒå¯ä»¥çšäœè
-ææ¯æšé¡äŸæå°ïŒææ¯ä»¥ç« ç¯ææ®µèœäŸæå°ïŒäžè¬äŸèªªïŒäœ¿çšèŒçšç¹çæ¥è©¢æ¢ä»¶æææŸå°å®å
+_texthelpscope_ [l=zh-tr] {<p>
+åšå€§å€æžçå
+žèè³æåº«äž­ïŒæšå¯ä»¥çšäžåçæå°çŽ¢åŒäŸæå°ãäŸåŠïŒäœ¿çšäœè
+ææšé¡çŽ¢åŒäŸæå°ïŒæä»¥ç« ç¯ææ®µèœçŽ¢åŒäŸæå°ãäžè¬äŸèªªïŒäœ¿çšèŒçšç¹çæ¥è©¢çŽ¢åŒïŒæææŸå°å®å
 šçžç¬Šçæä»¶ã
-<p>åŠææä»¶æ¯äžæ¬æžïŒåå°æåšå°æžæ¬éåšåé©çé æžã
-}
+<p>åŠææä»¶æ¯äžæ¬æžïŒåæå°æžæ¬éåšåé©çé æžã}  
Index: /gsdl/trunk/macros/chinese-trad2.dm
===================================================================
--- /gsdl/trunk/macros/chinese-trad2.dm	(revision 18478)
+++ /gsdl/trunk/macros/chinese-trad2.dm	(revision 18479)
@@ -2,7 +2,9 @@
 ######################################################################
 #
-# Traditional Chinese Language text and icon macros 
+# Traditional Chinese Language text and icon macros  
 # -- this file contains text that is of less importance
 # -- to translate when creating a new interface language
+# 
+# Many thanks to Lilly Ho (updated February 2009)
 ######################################################################
 
@@ -23,4 +25,6 @@
 _colnotbuilt_ [l=zh-tr] {æ¬²å»ºç«çè³æåº«ã}
 
+### taken from here
+
 _textpoem_ [l=zh-tr] {<br><h2>Kia papapounamu te moana</h2>
 
@@ -34,17 +38,11 @@
 }
 
-_textgreenstone_ [l=zh-tr] {<p>Greenstoneæ¯äžçš®ç¢æŒçŽè¥¿è­çç¶ å¯¶ç³(å°±åéå¥è»é«)ãåšå³çµ±çæ¯å©ç€ŸæïŒå®
-æ¯åšææç©è³ªäž­æçè²Žååæ­¡è¿çãå®å¯ä»¥åžæ¶åä¿æ<i>wairua</i>ïŒäžçš®é­é­æçåœå, äžè³Šæå³çµ±çŸåŸ·çç¹æ§äœ¿å®æçºå
+_textgreenstone_ [l=zh-tr] {<p>Greenstone æ¯äžçš®ç¢æŒçŽè¥¿è­çç¶ å¯¶ç³ï¹åŠéå¥è»ä»¶çåçš±ï¹ãåšå³çµ±çæ¯å©äººç€Ÿæè£ïŒGreenstone æ¯ææç©è³ªçç²Ÿé«ïŒäºŠæ¯æçè²ŽåçœæçãGreenstone æ¢å¯ä»¥åžæ¶åææéæ°£/çåœå<i>wairua</i>ïŒèäžè³Šæå³çµ±çŸåŸ·çç¹æ§ãå æ­€ïŒGreenstone æ¯å
 ¬å
-±é åæžäœåæžé€šèšç«çåŸœç« ïŒå®çå
-åœ©
-ä»£è¡šæ
+±é åæžç¢Œåæžé€šèšå (public-domain digital library project) çè±¡åŸœãGreenstone çå
+åœ©ä»£è¡šæ
 æïŒå®çééä»£è¡šèª å¯ŠïŒå®çå 
-ç¡¬ä»£è¡šåæ°£ïŒå®æèœæ¿åçå©åä»£è¡šæ­£
-çŸ©ã Greenstoneæžäœåæžé€šè»é«æšèªäž­éå»ç<i>patu</i>ææææ£æ¯æåæ­€èšç«äž­æ
-æå¡çå³å®¶å¯¶ãåšåŸææ°åœ¹äž­å®çè¡šçŸæ¯éåžžå¿«éãæ­£ç¢ºåå®å
-šçãæååžæ
-æåçè»é«ä¹æéäºç¹è³ªïŒ<i>patu</i>éå©çéç·£è±¡åŸµèç§æçåç·£ã
-}
+ç¡¬ä»£è¡šåæ°£ïŒèå®æèœæ¿åçå©åä»£è¡šæ­£çŸ©ãGreenstone æžç¢Œåæžé€šè»ä»¶çæšèªæ¯äžåéå» <i>patu</i> ï¹ææææ£ï¹ïŒäºŠæ¯éåæžç¢Œåæžé€šèšåäž­ææå¡çå³å®¶ä¹å¯¶ãåšåŸææ°åœ¹äž­ïŒGreenstone çå³éè¡šçŸæ¯å¿«éãæºç¢ºåå®æŽçãæååžæéå¥è»ä»¶ææå³çµ± Greenstone çç¹æ§ïŒèéå©ç<i>patu</i>åè±¡åŸµéå¥è»ä»¶èµ°åç§æçåç«¯ã</p>
+}  
 
 _textaboutgreenstone_ [l=zh-tr] {<p> Greenstoneæ¯å»ºç«åå³äœæžäœåæžé€šå
@@ -118,12 +116,7 @@
 }
 
+
 _textdescrselcol_ [l=zh-tr] {éžæå
 žèè³æåº«}
-
-
-
-
-
-
 
 
@@ -174,5 +167,5 @@
 _textextlink_ [l=zh-tr] {å€éšé£çµ}
 _textlinknotfound_ [l=zh-tr] {æªçŒçŸå
-§éšé£çµ}
+§éšé£çµ}  
 
 _textextlinkcontent_ [l=zh-tr] {äœ æéžæçåçºç®åæéžå
@@ -194,16 +187,14 @@
 
 # should have arguments of collection, collectionname and link
-_foundintcontent_ [l=zh-tr] {<h3>é£å° "_2_" å
-žèè³æåº«</h3>
-
-<p> äœ æéžæçé£çµçº "_collectionname_" å
-žèè³æåº«çå€éšé£çµïŒ
-    ä»å°æè¢«é£å° "_2_" å
-žèè³æåº«ã
-     åŠæäœ éèŠæª¢èŠäœæŒ "_2_" å
-žèè³æåº«çé£çµïŒäœ å¯ä»¥æäž
-    <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">ååŸ</a> é£çµå°è©²é ; 
-    ææ¯äœ¿çšçèŠœåšç "åå°äžäžé " æéåå°åäžé ã
-}
+_foundintcontent_ [l=zh-tr] {<h3> é£çµè³ "_2_" å
+žèè³æåº« </h3>
+
+<p> æšæéžæçé£çµçº "_collectionname_" å
+žèè³æåº«çå€éšé£çµ (é£çµè³ "_2_" å
+žèè³æåº«)ãåŠæ
+Ÿæª¢èŠæŒ "_2_" å
+žèè³æåº«å
+§çé£çµïŒæšå¯ä»¥æäžäž<a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_"> éè£çé£çµ</a>ïŒä»¥ååŸè©²é ïŒæè
+ïŒæäžäžçèŠœåšçãåå°äžäžé ãéµïŒä»¥åå°åäžé ã}  
 
 
@@ -285,6 +276,65 @@
 ######################################################################
 # collectoraction
+package wizard
+
+_textbild_ [l=zh-tr] {å»ºç«å
+žèè³æåº«}  
+_textbildsuc_ [l=zh-tr] {å
+žèè³æåº«å·²æåå°å»ºç«ã}  
+_textviewbildsummary_ [l=zh-tr] {æééåå
+žèè³æåº«çé²äžæ­¥è³æïŒæšå¯ä»¥äœ¿çš<a href="_httppagex_(bsummary)" target=_top>éåé£çµ</a>ïŒä»¥æª¢èŠå·²å»ºç«çå
+žèè³æåº«ä¹éçšçŽéã}  
+_textview_ [l=zh-tr] {æª¢èŠå
+žèè³æåº«}  
+
+_textbild1_ [l=zh-tr] {å
+žèè³æåº«æ­£åšå»ºç«äž­ïŒéæé²è¡ãå·è¡çæ
+é¡¯ç€ºæŒäžæ¹ã}  
+
+_textbild2_ [l=zh-tr] {æäžäžéè£ïŒä»¥çµæ­¢å»ºç«éçšã
+<br>å·¥äœäž­çå
+žèè³æåº«å°äžååœ±é¿ã}  
+
+_textstopbuild_ [l=zh-tr] {çµæ­¢å»ºç«éçš}  
+
+_textbild3_ [l=zh-tr] {åŠèŠé¢ééé  (äžŠæªæéµçµæ­¢å»ºç«éçš)ïŒå
+žèè³æåº«å°æç¹Œçºé²è¡å»ºç«åå®è£éçšïŒçŽè³æŽåçšåºå®æçºæ­¢ã}  
+
+_textbuildcancelled_ [l=zh-tr] {å»ºç«éçšå·²è¢«åæ¶}  
+
+_textbildcancel1_ [l=zh-tr] {å
+žèè³æåº«å»ºç«éçšå·²è¢«åæ¶ãæäžäžä»¥äžçé»è²éµïŒä»¥æŽæ¹å
+žèè³æåº«æéæ°ååå»ºç«éçšã}  
+
+_textbsupdate1_ [l=zh-tr] {å»ºç«çæ
+å°æŒ 1 ç§å
+§æŽæ°}  
+_textbsupdate2_ [l=zh-tr] {å»ºç«çæ
+æŽæ°æ¥æçº}  
+_textseconds_ [l=zh-tr] {ç§}  
+
+_textfailmsg11_ [l=zh-tr] {ç±æŒå
+žèè³æåº«äžŠæªå²å­è³æïŒå
+žèè³æåº«å æ­€äžèœå»ºç«ãè«ç¢ºå®è³å°æäžåç®éææªæ¡æ¯åºçŸæŒ<i>åå§æžæ</i>çç¶²é äžïŒèåææ¯ Greenstone èœå€ å·è¡çäžçš®æªæ¡ã }  
+
+_textfailmsg21_ [l=zh-tr] {å
+žèè³æåº«äžèœå»ºç« (æ»å
+¥ import.pl å€±æ)ã}  
+_textfailmsg31_ [l=zh-tr] {å
+žèè³æåº«äžèœå»ºç« (å»ºç« buildcol.pl å€±æ).}  
+_textfailmsg41_ [l=zh-tr] {å
+žèè³æåº«ç¶å·²æåå»ºç«ïŒäœäžèœå®è£ã}  
+_textfailmsg71_ [l=zh-tr] {åè©Šå»ºç«å
+žèè³æåº«çæåïŒé¯èª€åºçŸã}  
+
+
+_textblcont_ [l=zh-tr] {å»ºç«æ¥èªå
+æ¬ä»¥äžçè³èšïŒ}  
+
+######################################################################
+# collectoraction
 package collector
 ######################################################################
+
 
 
@@ -300,10 +350,6 @@
 _textconf_ [l=zh-tr] {èš­å®å
 žèè³æåº«}
-_textbild_ [l=zh-tr] {å»ºç«å
-žèè³æåº«}
-_textview_ [l=zh-tr] {æª¢èŠå
-žèè³æåº«}
 _textdel_ [l=zh-tr] {åªé€å
-žèè³æåº«}
+žèè³æåº«}  
 _textexpt_ [l=zh-tr] {å¯åºå
 žèè³æåº«}
@@ -504,5 +550,5 @@
 é åçŸææ¶èäžæš¡äžæš£ã<dd><dl>
 </ul>
-}
+}  
 
 _textbtco_ [l=zh-tr] {å
@@ -557,46 +603,4 @@
 _textreset_ [l=zh-tr] {åŸ©å}
 
-_textbild1_ [l=zh-tr] {çŸæ­£åšå»ºæ§å
-žè:éå¯èœéèŠäžäºæéïŒäžæ¹çå»ºæ§çæ
-åé¡¯ç€ºç®åé²åºŠã
-}
-
-_textbild2_ [l=zh-tr] {åæ­¢å»ºæ§ïŒé»éžéè£¡ïŒ  
-<br>äœ æ­£åšå·¥äœçå
-žèäžæååœ±é¿ã 
-}
-
-_textstopbuild_ [l=zh-tr] {åæ­¢å»ºæ§}
-
-_textbild3_ [l=zh-tr] {è¥äœ çåšéé (äžæ²ææâåæ­¢å»ºæ§âéµäŸåæ¶å»ºæ§éçš)åæç¹Œçºå»ºæ§å
-žèè³æåº«äžŠåšå®æåŸå®è£ã}
-
-_textbuildcancelled_ [l=zh-tr] {å»ºæ§å·²åæ¶}
-
-_textbildcancel1_ [l=zh-tr] {å»ºæ§å
-žèè³æåº«éçšå·²è¢«åæ¶ïŒäœ¿çšé»è²éµæŽæ¹å
-žèæéæ°éå§å»ºæ§çšåºã }
-
-_textbsupdate1_ [l=zh-tr] {äžç§éå
-§æŽæ°å»ºæ§çæ
-}
-_textbsupdate2_ [l=zh-tr] {æŽæ°å»ºæ§çæ
-åš}
-_textseconds_ [l=zh-tr] {ç§}
-_textbildsuc_ [l=zh-tr] {å
-žèè³æåº«å»ºæ§æå}
-
-_textviewbildsummary_ [l=zh-tr] {äœ å¯ä»¥<a href="_httppagex_(bsummary)&c=_cgiargbc1dirname_" target=_top>æª¢èŠå»ºæ§æèŠ</a>åŸå°æŽå€å»ºæ§çŽ°ç¯ã
-}
-
-_textfailmsg11_ [l=zh-tr] {å
-žèè³æåº«å
-§è¥ç¡äŸæºè³ææä»¶åç¡æ³è¢«å»ºæ§ïŒè«ç¢ºå®<i>äŸæºè³ææä»¶</i>é é¢æäœ æå®çäžåæäžåä»¥äžçç®éææªæ¡ïŒäžæ¯Greenstoneå¯ä»¥èççæªæ¡é¡åã 
-}
-
-_textfailmsg21_ [l=zh-tr] {ç¡æ³å»ºæ§å
-žèè³æåº«(import.plå€±æ).}
-_textblcont_ [l=zh-tr] {å»ºæ§æ¥èªå
-å«äžåè³èšïŒ}
 
 _texttryagain_ [l=zh-tr] {è«<a href="_httppagecollector_" target=_top>éæ°ååå
@@ -604,10 +608,5 @@
 }
 
-_textfailmsg31_ [l=zh-tr] {æ³å»ºæ§å
-žèè³æåº«(buildcol.plå€±æ)}
-_textfailmsg41_ [l=zh-tr] {æåå»ºæ§å
-žèè³æåº«äœç¡æ³å®è£}
-_textfailmsg71_ [l=zh-tr] {å»ºæ§å
-žèè³æåº«æçŒçç¡æ³é æçé¯èª€}
+
 _textretcoll_ [l=zh-tr] {åå°å
 žèè³æåº«ä»é¢}
@@ -644,11 +643,10 @@
 žèè³æåº«ä»é¢é¯èª€}
 
-_texttmpfail_ [l=zh-tr] {å
-žèè³æåº«ä»é¢ç¡æ³è®åæå¯«å
-¥äžèšææªæç®é.ïŒå¯èœåå çºïŒ 
+_texttmpfail_ [l=zh-tr] {å­æ¬Ÿè
+äžèœè®åææå¯«è³èšææªæ¡æåéãå¯èœåºçŸçåå æïŒ
 <ul>
-<li>â¢	Greenstone åš_gsdlhome_/tmpç®éç¡è®/å¯«æ¬éã 
+<li>Greenstone æ²æè®å/æå¯«è³ _gsdlhome_/tmp åéçæ¬é
 </ul>
-}
+}  
 
 _textmkcolfail_ [l=zh-tr] {åšæ°å
@@ -683,26 +681,68 @@
 }
 
-_textexptfail_ [l=zh-tr] {<p>ç¡æ³èŒžåº _cgiargbc1dirname_ å
+_textexptfail_ [l=zh-tr] { <p>ç¡æ³èŒžåº _cgiargbc1dirname_ çå
 žèè³æåº«ã
- 
-<p>éå¯èœæ¯å çºGreenstoneæ²æå®è£å°æ¯æŽâèŒžåºå
-žèè³æåº«âåèœçå¿
+
+<p>éå¯èœæ¯å çº Greenstone æ²æå®è£æ¯æŽãèŒžåºè³å
+ç¢ãåèœçå¿
 èŠå
-ä»¶. 
+ä»¶ã 
 <ul>
-<li>â¢	è¥äœ äœ¿çš CD-ROM å®è£GreenstoneïŒé€éäœ åšâé²ééžé 
-âå®è£ææéžæïŒåŠ
-åæ­€äºå
-ä»¶äžæè¢«å®è£ïŒäœ å¿
-é èŠéæ°å®è£äžŠèšåŸå å
-¥ã
-<li>â¢	è¥äœ äœ¿çšç¶²è·¯å®è£ïŒäœ å¿
-é äžèŒåå®è£é¡å€å¥ä»¶æå¯äœ¿çšæ­€åèœïŒè©³æ
-
-è«è³<a href="http://www.greenstone.org">http://www.greenstone.org</a> æ é»éµ<a
- href="mailto:greenstone@cs.waikato.ac.nz">
-email greenstone@cs.waikato.ac.nz</a>.
-</ul>
-}
+<li> åè¥äœ äœ¿çšå
+ç¢å®è£ 2.70 æä¹åçæ¬ç GreenstoneïŒé€éæšåšå®è£æéžæãé²ééžé 
+ãïŒåŠåéäºå
+ä»¶äžæè¢«å®è£ãæšå¿
+é éæ°å®è£ GreenstoneïŒäžŠå å
+¥éåå¿
+èŠå
+ä»¶ã
+<li> åè¥äœ äœ¿çšç¶²è·¯å®è£ïŒæšå¿
+é äžèŒåå®è£é¡å€å¥ä»¶ïŒæ¹å¯äœ¿çšæ­€é 
+åèœãè©³æ
+è«çèŠœç¶²å <a href="http://www.greenstone.org">http://www.greenstone.org</a> æ <a href="https://list.scms.waikato.ac.nz/mailman/listinfo/greenstone-users">å å
+¥éµå¯æž
+å®</a>
+</ul>}  
+
+######################################################################
+# depositoraction
+package depositor
+######################################################################
+
+
+_textdepositorblurb_ [l=zh-tr] {<p> è«èªªæä»¥äžæªæ¡çè³æåæ _textintro_ </p>}  
+
+_textcaec_ [l=zh-tr] {å å
+¥çŸå­çå
+žèè³æåº«}  
+_textbild_ [l=zh-tr] {å­å
+¥é 
+ç®}  
+_textintro_ [l=zh-tr] {éžææªæ¡}  
+_textconfirm_ [l=zh-tr] {ç¢ºå®}  
+_textselect_ [l=zh-tr] {éžæå
+žèè³æåº«}  
+_textmeta_ [l=zh-tr] {èªªæå
+æžæ}  
+_textselectoption_ [l=zh-tr] {éžæå
+žèè³æåº«}  
+
+_texttryagain_ [l=zh-tr] {è«<a href="_httppagedepositor_" target=_top>éæ°éå§å­æ¬Ÿè
+</a>ç¶åŸååè©Šã\}  
+
+_textselectcol_ [l=zh-tr] {éžæäžåèŠå¢å æ°æä»¶çå
+žèè³æåº«}  
+_textfilename_ [l=zh-tr] {æªæ¡åçš±}  
+_textfilesize_ [l=zh-tr] {æªæ¡å€§å°}  
+
+_textretcoll_ [l=zh-tr] {éåè³å­æ¬Ÿè
+}  
+
+
+_texttmpfail_ [l=zh-tr] {å­æ¬Ÿè
+äžèœè®åææå¯«è³èšææªæ¡æåéãå¯èœåºçŸçåå æïŒ
+<ul>
+<li> Greenstone æ²æè®å/æå¯«è³ _gsdlhome_/tmp åéçæ¬é
+</ul>}  
 
 
@@ -798,6 +838,5 @@
 
 _textbugstitle_ [l=zh-tr] {Bugs}
-_textreport_ [l=zh-tr] {æåèŠç¢ºä¿æ­€è»é«å·¥äœæ­£åžžïŒæbugsè«éå ±<a href="mailto:greenstone@cs.waikato.ac.nz">greenstone@cs.waikato.ac.nz</a>
-}
+_textreport_ [l=zh-tr] {çºç¢ºä¿éè»ä»¶éäœæ­£åžžïŒåŠæšåšäœ¿çšæçŒçŸæä»»äœåé¡ïŒæè«é»éµ<a href="mailto:greenstone@cs.waikato.ac.nz">greenstone@cs.waikato.ac.nz</a>ã}  
 
 _textgs3title_ [l=zh-tr] {åšç¢åäž­}
@@ -885,4 +924,36 @@
 
 _textaboutgroups_ [l=zh-tr] {çŸ€çµçºäžéèåéçè¡šå®ïŒéèåŸäžå¯æç©ºæ Œã}
+_textavailablegroups_ [l=zh-tr] {é å
+èš­å®çŸ€çµïŒå
+æ¬ç®¡çè
+ãå
+¶ä»æ¬éåé
+è
+ (äŸåŠäœ¿çšåæžé€šé€šé·ä»é¢ïŒä»¥å»ºç«é ç«¯å
+žèè³æåº«) æå­æ¬Ÿè
+ïŒ
+<ul>
+<li><b>ç®¡çè
+</b>ïŒ çµŠäºå
+èš±ïŒä»¥é²å
+¥åæŽæ¹ç¶²ç«çé
+çœ®åäœ¿çšè
+åž³æ¶è³æ
+<li><b>åäºº-å
+žèè³æåº«-ç·šèŒ¯</b>ïŒ çµŠäºå
+èš±ïŒä»¥å»ºç«æ°çåäººå
+žèè³æåº«
+<li><b><å
+žèè³æåº«-åçš±>-å
+žèè³æåº«-ç·šèŒ¯</b>ïŒçµŠäºå
+èš±ïŒä»¥å»ºç«åç·šèŒ¯ "collection-name" çå
+žèè³æåº«ïŒäŸåŠïŒå ±å-å
+žèè³æåº«-ç·šèŒ¯
+<li><b>ææ-å
+žèè³æåº«-ç·šèŒ¯</b>ïŒçµŠäºå
+èš±ïŒä»¥å»ºç«/ç·šèŒ¯æ°çåäººåç°çå
+žèè³æåº«<b>ææ</b>å
+žèè³æåº«
+</ul>}  
 
 
@@ -1053,67 +1124,71 @@
 #------------------------------------------------------------
 
-_textbsummary_ [l=zh-tr] {å»ºç«_collectionname_è³æåº«ä¹éçšçŽé}
-_textflog_ [l=zh-tr] {_collectionname_è³æåº«ä¹å€±ææ¥èª}
-
+_textbsummary_ [l=zh-tr] {å»ºç« _collectionname_ å
+žèè³æåº«çéçšçŽé}  
+_textflog_ [l=zh-tr] {_collectionname_ å
+žèè³æåº«çå€±ææ¥èª}  
+_textilog_ [l=zh-tr] {å¯å
+¥"_collectionname_" å
+žèè³æåº«çæ¥èª}  
 
 ############################################################################
 #
-# This stuff is only used by the usability (I'd like to Complain) stuff
+# This stuff is only used by the usability (SEND FEEDBACK) stuff
 #
 ############################################################################
 package Global
 
+# old cusab button
+_linktextusab_ [l=zh-tr] {éåºä¿¡æ¯}  
+
 _greenstoneusabilitytext_ [l=zh-tr] {Greenstone ä¹å¯çšæ§}
 
-_textwhy_ [l=zh-tr] {<p>éåºæ­€ä»œå ±åæ¯åæ¹æ³ïŒå¯ä»¥æåºäœ æŸçŒçŸæè§çå°é£æå€±æä¹ç¶²é ã}
+_textwhy_ [l=zh-tr] {<p>éåºéä»œå ±åæ¯äžåæ¹æ³ïŒä»¥æåºäžäºææª¢èŠå°é£æå€±æä¹ç¶²é ã}  
 _textextraforform_ [l=zh-tr] {äœ ç¡é å¡«å®è¡šæ Œ â ä»»äœèšæ¯éœæå¹«å©ã}
-_textprivacybasic_ [l=zh-tr] {<p>æ­€ä»œå ±ååªå
-å«äœ æè§çæéGreenstone ç¶²é ä¹èšæ¯ïŒä»¥åäœ æäœ¿çšçè§çæè¡ 
-(å äžäœ ææäŸä¹éžææ§è³èš)ã
-}
-_textstillsend_ [l=zh-tr] {äœ æ¯åŠä»èèŠéåºæ­€ä»œå ±å?}
+_textprivacybasic_ [l=zh-tr] {<p>éä»œå ±ååªå
+å«æšææª¢èŠæé Greenstone ç¶²é ä¹ä¿¡æ¯ïŒèåæšæäœ¿çšçæª¢èŠæè¡ ï¹å äžæšææäŸä¹éžææ§è³èšï¹ã}  
+_textstillsend_ [l=zh-tr] {æšæ¯åŠä»èèŠéåºéä»œå ±åïŒ}  
 
 _texterror_ [l=zh-tr] {é¯èª€}
-_textyes_ [l=zh-tr] {æ¯}
-_textno_ [l=zh-tr] {åŠ}
-_textclosewindow_ [l=zh-tr] {ééèŠçª}
+_textyes_ [l=zh-tr] {æ¯}  
+_textno_ [l=zh-tr] {åŠ}  
+_textclosewindow_ [l=zh-tr] {ééèŠçª}  
 _textabout_ [l=zh-tr] {æé}
 _textprivacy_ [l=zh-tr] {ç§äž}
 _textsend_ [l=zh-tr] {éåº}
-_textdontsend_ [l=zh-tr] {äžèŠéåº}
-_textoptionally_ [l=zh-tr] {å¯éžææ§ç}
-
-_textunderdev_ [l=zh-tr] {äºå
-é èŠœå ±åæçŽ°çåèœïŒå°åšæ­£åŒçæ¬äž­å
-æ¬ã}
-
-_textviewdetails_ [l=zh-tr] {è§çå ±å}
-_textmoredetails_ [l=zh-tr] {æŽè©³çŽ°}
-_texttrackreport_ [l=zh-tr] {è¿œè¹€æ­€ä»œå ±å}
-_textcharacterise_ [l=zh-tr] {éæ¯å±¬æŒåªäžé¡åé¡}
-_textseverity_ [l=zh-tr] {æ­€åé¡åŸç³ç³}
+_textdontsend_ [l=zh-tr] {äžèŠéåº}  
+_textoptionally_ [l=zh-tr] {éžææ§ç}  
+
+_textunderdev_ [l=zh-tr] {æåŸä¿®æ­£ççæ¬å°å
+æ¬è©³çŽ°é èŠœå ±åçåèœã}  
+
+_textviewdetails_ [l=zh-tr] {æª¢èŠè©³çŽ°çå ±å}  
+_textmoredetails_ [l=zh-tr] {æŽè©³çŽ°}  
+_texttrackreport_ [l=zh-tr] {è¿œè¹€éä»œå ±å}  
+_textcharacterise_ [l=zh-tr] {éæ¯å±¬æŒåªäžé¡åé¡}  
+_textseverity_ [l=zh-tr] {éåé¡åŸç³ç³}  
  
-_textbadrender_ [l=zh-tr] {é é¢çèµ·äŸåŸå¥æª}
+_textbadrender_ [l=zh-tr] {é é¢çèµ·äŸåŸå¥æª}  
 _textcontenterror_ [l=zh-tr] {å
-§å®¹é¯èª€}
-_textstrangebehaviour_ [l=zh-tr] {å¥æªçè¡çº}
-_textunexpected_ [l=zh-tr] {çŒçäžé æä¹æ
-åœ¢}
-_textfunctionality_ [l=zh-tr] {åŸé£äœ¿çš}
+§å®¹é¯èª€}  
+_textstrangebehaviour_ [l=zh-tr] {å¥æªçè¡çº}  
+_textunexpected_ [l=zh-tr] {çŒçæªèœé æä¹æ
+æ³}  
+_textfunctionality_ [l=zh-tr] {åŸé£äœ¿çš}  
 _textother_ [l=zh-tr] {å
-¶ä»}
-
-_textcritical_ [l=zh-tr] {è©è«ç}
-_textmajor_ [l=zh-tr] {åŽé}
-_textmedium_ [l=zh-tr] {äž­ç­}
-_textminor_ [l=zh-tr] {èŒå°ç}
-_texttrivial_ [l=zh-tr] {ç£ç¢ç}
-
-_textwhatdoing_ [l=zh-tr] {äœ è©Šèå»äœä»éºŒ?}
-_textwhatexpected_ [l=zh-tr] {äœ æåŸ
-äœäºçŒç?}
-_textwhathappened_ [l=zh-tr] {å¯ŠéäžçŒçäœäº?}
-
-_cannotfindcgierror_ [l=zh-tr] {<h2>Sorry!</h2> Can\\'t find the server programs for the "I\\'d Like to Complain" button.}
+¶ä»}  
+
+_textcritical_ [l=zh-tr] {è©è«ç}  
+_textmajor_ [l=zh-tr] {åŽéç}  
+_textmedium_ [l=zh-tr] {äž­ç­ç}  
+_textminor_ [l=zh-tr] {èŒå°ç}  
+_texttrivial_ [l=zh-tr] {ç£ç¢ç}  
+
+_textwhatdoing_ [l=zh-tr] {æšåè©Šåä»éºŒ?}  
+_textwhatexpected_ [l=zh-tr] {æšæåŸ
+äœäºçŒç?}  
+_textwhathappened_ [l=zh-tr] {å¯ŠéäžçŒçäœäº?}  
+
+_cannotfindcgierror_ [l=zh-tr] {<h2>å°äžèµ·ïŒ</h2>æªèœæŸåº ãææ¬²æèšŽãçäŒºæåšçšåŒã}  
 
 _textusabbanner_ [l=zh-tr] {the Greenstone koru-é¡å æšèª}
@@ -1130,42 +1205,101 @@
 #------------------------------------------------------------
 	
-# -- Missing translation: _textgti_
-
-# -- Missing translation: _textgtierror_
-
-# -- Missing translation: _textgtihome_
-
-# -- Missing translation: _textgtiselecttlc_
-
-# -- Missing translation: _textgtiselecttfk_
-
-# -- Missing translation: _textgticoredm_
-# -- Missing translation: _textgtiauxdm_
-# -- Missing translation: _textgtiglidict_
-# -- Missing translation: _textgtiperlmodules_
-# -- Missing translation: _textgtigreenorg_
-
-# -- Missing translation: _textgtienter_
-
-# -- Missing translation: _textgticorrectexistingtranslations_
-# -- Missing translation: _textgtidownloadtargetfile_
-# -- Missing translation: _textgtiviewtargetfileinaction_
-
-# -- Missing translation: _textgtinumchunksmatchingquery_
-
-# -- Missing translation: _textgtinumchunkstranslated_
-# -- Missing translation: _textgtinumchunksrequiringupdating_
-# -- Missing translation: _textgtinumchunksrequiringtranslation_
-
-# -- Missing translation: _textgtienterquery_
-# -- Missing translation: _textgtifind_
-
-# -- Missing translation: _textgtitranslatingchunk_
-# -- Missing translation: _textgtiupdatingchunk_
-# -- Missing translation: _textgtisubmit_
-
-# -- Missing translation: _textgtilastupdated_
-
-# -- Missing translation: _textgtitranslationfilecomplete_
+_textgtierror_ [l=zh-tr] {çŒçé¯èª€}  
+
+_textgtihome_ [l=zh-tr] {éé åå©æšæ¹å Greenstone çå€èªèšæ¯æŽãå©çšéåæ¯æŽïŒäœ å¯ä»¥
+<ul>
+  <li> çºéšä»œç Greenstone ç¿»è­¯äžäºæ°èªèš
+  <li> åšè±èªä»é¢æææ¹è®æ (äŸåŠåŒé²æ°ç Greenstone èš­å)ïŒæŽæ°çŸå­çèªèšä»é¢
+  <li> ç³Ÿæ­£çŸæç¿»è­¯çé¯èª€
+</ul>
+
+äžç³»åçç¶²é å°æåçŸæšççŒåïŒéå
+æ¬éèŠç¿»è­¯çè©åœã
+éééæ­¥ç¿»è­¯èªèšçä»é¢ïŒæšå¯ä»¥ç¹Œçºã
+èš±å€è©åœåå
+æ¬ HTML æ ŒåŒçæä»€ïŒæšäžæè©²åè©Šç¿»è­¯éäºè©åœïŒå»èŠåè©Šä¿æéäºè©åœæŒå·²ç¿»è­¯ççæ¬ãäžäºå·²æäžåç·çè©åœ (äŸåŠ _this_ ) äŸ¿äžæè©²ç¿»è­¯äº (å éæ¯ Greenstone "macro" åçš±)ã
+<p>
+åè¥æšæ­£åšæŽæ°çŸå­çèªèšä»é¢ïŒå·²ç¿»è­¯çè©åœå°äžæåçŸæŒæšççŒåãææåïŒå·²ç¿»è­¯ççæ¬äžŠæªè·éšè±æçæ¬æ¹è®ãåšéæ
+æ³äžïŒGreenstone å°ææäŸçŸæçç¿»è­¯ïŒè®æšæéèŠæå¯ä»¥æª¢æ¥åèªææŽæ°ã
+<p>
+åŠèŠç³Ÿæ­£å·²æŽæ°çç¿»è­¯ïŒå¯äœ¿çš Greenstone æäŸç "Correct existing translations" åèœã
+<p>
+æ¯é éœä»¥ "_textgtisubmit_" æéçºçµçµãç¶æšæäžæ­€æéïŒåéå®è£ Greenstone æŒ nzdl.org çæ¹è®éŠ¬äžåºçŸïŒèäžæ¯é åæåºçŸäžåæéå»é²å
+¥éåç¶²åã}  
+
+_textgtiselecttlc_ [l=zh-tr] {è«éžæèªèš}  
+
+#for status page
+_textgtiviewstatus_ [l=zh-tr] {æäžäžæ­€éµïŒä»¥æª¢èŠææèªèšçç¿»è­¯çæ
+}  
+_textgtiviewstatusbutton_ [l=zh-tr] {æª¢èŠçæ
+}  
+_textgtistatustable_ [l=zh-tr] {ååºææèªèšçç¿»è­¯çæ
+}  
+_textgtilanguage_ [l=zh-tr] {èªèš}  
+_textgtitotalnumberoftranslations_ [l=zh-tr] {ç¿»è­¯ççžœæž}  
+
+_textgtiselecttfk_ [l=zh-tr] {è«éžæéèŠå·¥äœçæªæ¡}  
+
+_textgticoredm_ [l=zh-tr] {Greenstone ä»é¢ (äž»èŠ)}  
+_textgtiauxdm_ [l=zh-tr] {Greenstone ä»é¢ (èŒå©)}  
+_textgtiglidict_ [l=zh-tr] {GLI åé}  
+_textgtiglihelp_ [l=zh-tr] {GLI å©æ}  
+_textgtiperlmodules_ [l=zh-tr] {Perl æš¡åŒ}  
+_textgtitutorials_ [l=zh-tr] {åäººç·Žç¿}  
+_textgtigreenorg_ [l=zh-tr] {Greenstone.org}  
+_textgtigs3interface_ [l=zh-tr] {Greenstone3 ä»é¢}  
+
+#for greenstone manuals
+_textgtidevmanual_ [l=zh-tr] {Greenstone éçŒæå}  
+_textgtiinstallmanual_ [l=zh-tr] {Greenstone å®è£è
+æå}  
+_textgtipapermanual_ [l=zh-tr] {Greenstone æå (æŽ»é è³æŽåå
+žèè³æåº«)}  
+_textgtiusermanual_ [l=zh-tr] {Greenstone äœ¿çšè
+æå}  
+
+_textgtienter_ [l=zh-tr] {èŒžå
+¥}  
+
+_textgticorrectexistingtranslations_ [l=zh-tr] {ç³Ÿæ­£çŸå­çç¿»è­¯}  
+_textgtidownloadtargetfile_ [l=zh-tr] {äžèŒæªæ¡}  
+_textgtiviewtargetfileinaction_ [l=zh-tr] {æª¢èŠéåæªæ¡}  
+_textgtitranslatefileoffline_ [l=zh-tr] {é¢ç·ç¿»è­¯éåæªæ¡}  
+
+_textgtinumchunksmatchingquery_ [l=zh-tr] {é
+åé¡åçæå­æžç®}  
+
+_textgtinumchunkstranslated_ [l=zh-tr] {ç¿»è­¯ç¶å·²å®æ}  
+_textgtinumchunksrequiringupdating_ [l=zh-tr] {å æ­€ïŒ _1_ éèŠæŽæ°}  
+_textgtinumchunksrequiringtranslation_ [l=zh-tr] {é€äžçç¿»è­¯}  
+
+#for status page
+_textgtinumchunkstranslated2_ [l=zh-tr] {å·²å®æç¿»è­¯çæžç®}  
+_textgtinumchunksrequiringupdating2_ [l=zh-tr] {éèŠæŽæ°çç¿»è­¯æžç®}  
+_textgtinumchunksrequiringtranslation2_ [l=zh-tr] {é€äžçç¿»è­¯æžç®}  
+
+_textgtienterquery_ [l=zh-tr] {èŒžå
+¥æšæ¬²ç³Ÿæ­£çå­å¥æçèª}  
+_textgtifind_ [l=zh-tr] {å°æŸ}  
+
+_textgtitranslatingchunk_ [l=zh-tr] {ç¿»è­¯æå­ <i>_1_</i>}  
+_textgtiupdatingchunk_ [l=zh-tr] {æŽæ°æå­ <i>_1_</i>}  
+_textgtisubmit_ [l=zh-tr] {éåº}  
+
+_textgtilastupdated_ [l=zh-tr] {æåŸæŽæ°}  
+
+_textgtitranslationfilecomplete_ [l=zh-tr] {å€è¬æŽæ°éæªæ¡ - æŽæ°çŸå·²å®æïŒ<p>å©çšä»¥äžçé£çµïŒæšå¯ä»¥äžèŒéæªæ¡çå¯æ¬ãéé£çµäºŠæèšèŒæŒæ°çŒäœç Greenstone äžã}  
+
+_textgtiofflinetranslation_ [l=zh-tr] {å©çš Microsoft Excel æŽ»é ç°¿è¡šæ Œæªæ¡ïŒæšå¯ä»¥é¢ç·ç¿»è­¯ééšä»œç GreenstoneïŒ
+<ol>
+<li>äžèŒ<a href="_gwcgi_?a=gti&p=excel&e=_compressedoptions_">æªæ¡</a>.
+<li> éåå·²äžèŒç Microsoft Excel æªæ¡ (Office 2003/XP æèŒæ°ççæ¬) åå²å­çº Microsoft Excel å·¥äœè¡š (.xls) æ ŒåŒã
+<li> æŒå·²æäŸçæ¹æ Œå
+§èŒžå
+¥ç¿»è­¯ã
+<li> ç¶äœ å®æç¿»è­¯ææçå­äž²ïŒé»éµ .xls æ ŒåŒçæªæ¡è³<a href="mailto:_gtiadministratoremail_"> _gtiadministratoremail_</a>ã
+</ol>}  
+
 
 
@@ -1176,30 +1310,30 @@
 
 _textglilong_ [l=zh-tr] {Greenstone åæžé€šå¡ç¶­è­·ä»é¢}
-_textglihelp_ [l=zh-tr] {Greenstoneåæžé€šå¡ä»é¢ (GLI)
-çµŠäœ äºäœ¿çšGreenstone's åèœæå®¹æäœ¿çš- 'é»éžåæéµ' ä»é¢ïŒéæå
-èš±äœ æ¶éæ
-ä»¶ïŒåœå
-¥æèš­èšmetadataïŒä»¥ååšGreenstoneå»ºç«å
+_textglihelp_ [l=zh-tr] {<p>Greenstone çåæžé€šé€šé·ä»é¢ (Greenstone Librarian Interface, GLI) çºæšæäŸææŒäœ¿çšçãé»éžåæéµãä»é¢ïŒä»¥æ¹äŸ¿æšäœ¿çšäžåç Greenstone åèœãåæïŒäºŠå®¹èš±æšæ¶éæä»¶ãå¯å
+¥æé
+çœ®å
+æžæïŒèåå»ºç« Greenstone å
 žèè³æåº«ã 
-<p>
-æ³šæGLIæ¯åGreenstoneåšäŒºæåšç«¯äžèµ·å·è¡çïŒåšäœ çGreenstoneå®è£äž­GLIæ¯å®è£åšæ¬¡ç®éïŒäžç®¡äœ æ¯äžèŒå
-¶äž­äžåGreenstoneå
-ä»¶ïŒææ¯åŸGreenstoneå
-ç¢çäž­å®è£å®ïŒå
-¶å¯Šéœæ¯çžåçã
-
-<h4>åšWindows äžå·è¡ GLI</h4>
-
-åšWindowsäžïŒåš<i>éå§å·¥å
-·å</i>éžæ<i>çšåŒé</i>æ¥äžäŸé²å
-¥<i> Greenstone æžäœåæžé€š</i>ç®éäžéžæ<i>åæžé€šå¡ä»é¢</i>ã
-
-<h4>åšUnixäžå·è¡GLI </h4>
-
-åšUnixäžå·è¡GLIïŒåšäœ çGreenstone å®è£äž­æ¹è®æ<i>gli</i>ç®éïŒå·è¡<i>gli.sh</i> scriptã
-
-<h4>åšMac OS X äžå·è¡GLI</h4>
-
-çèŠœ<i>æçšçšåŒ</i>ïŒ<i>Greenstone</i> (ååŠäœ åšé èš­ä¹èå®è£Greenstone)å·è¡<i>GLI</i>æçšçšåŒ. 
-}
-
+
+<p>è«æ³šæ GLI æ¯è Greenstone äŒºæåšç«¯äžèµ·å·è¡çïŒèäž GLI æ¯å®è£æŒ Greenstone çå­ç®éãåè¥æšå·²äžèŒå
+¶äž­äžå Greenstone çå
+ä»¶ïŒæå·²åŸ Greenstone å
+ç¢äž­éžåå®è£ïŒæ
+æ³åæ¯äžæš£çã
+
+<h4>åš Windows èŠçªå·è¡ GLI</h4>
+
+åŠèŠåš Windows èŠçªå·è¡åæžé€šé€šé·ä»é¢ïŒå
+åš<i>éå§</i>å·¥å
+·åäž­ïŒéžå<i>çšåŒé</i>ïŒç¶åŸïŒåš<i>Greenstone æžç¢Œåæžé€š</i>çç®éå
+§ïŒéžå<i>åæžé€šé€šé·ä»é¢</i>ã
+
+<h4>åš Unix èŠçªå·è¡ GLI</h4>
+
+åŠèŠåš Unix èŠçªå·è¡ GLIïŒå
+åš Greenstone å®è£çšåºäž­æŽæ¹ <i>gli</i> ç®éïŒåå·è¡ <i>gli.sh</i> scriptã
+
+<h4>åš Mac OS X èŠçªå·è¡ GLI</h4>
+
+çèŠœ<i>æçšçšåŒ</i>äžŠéžå<i>Greenstone</i> (åŠæšå·²å®è£ Greenstone åšé èš­çäœçœ®å
+§)ïŒç¶åŸå·è¡<i>GLI</i>æçšçšåŒã}  
