Changeset 7373

Timestamp:

2004-05-24T13:12:10+12:00 (20 years ago)

Author:

mdewsnip

Message:

Updated Maori interface, thanks to Te Taka Keegan (translated May 2004).

File:

• trunk/gsdl/macros/maori.dm (modified) (13 diffs)

trunk/gsdl/macros/maori.dm

@@ -1 +1 @@
 # this file must be UTF-8 encoded
-######################################################################
+#####################################################################
 #
 # Maori Language text and icon macros 
+# Many thanks to Te Taka Keegan (translated May 2004)
+#
+######################################################################
+#
+# This is the main macro file for translation when creating an 
+# interface in another language.
+
+# Under the 'text macros' comments are text macros of the form:
+# _macroname_ {macro value}
+# Everything between the {} is the text to be translated. This text 
+# may itself contain macros (i.e. characters other than space between
+# underscore characters, e.g. _about:numdocs_ or _textpage_). These
+# macro names occurring within text shouldn't be translated but should
+# be left as they are. Underscores or curly brackets occurring 
+# naturally within the text should be escaped with a leading backslash
+# (i.e. '\_', '\{' or '\}).
+#
+# Under the 'icons' comments are macros concerned with displaying
+# icons which themselves contain text.
+# Above each macro (or group of macros) for an icon is a comment line
+# that looks something like '## "HOME" ## top_nav_button ## chome ##'.
+# The first field of the comment ("HOME" in this case) is the text
+# that appears in the english version of the icon. This is the text
+# that must be translated, nothing needs to be done to the macros 
+# themselves. The other two fields of the comments are used by 
+# automatic icon generating software which reads the newly translated
+# file and generates appropriate icons.
+#
+# Comment lines (other than those described above) need not be 
+# translated (i.e. any lines beginning with '#', like this line).
+#
+# The simplest way to translate this file is to save it as something
+# else (e.g. french.dm) and work through translating all the text
+# macro values and icon comments.
 #
 ######################################################################
@@ -12 +46 @@
 ######################################################################
 
+
 #------------------------------------------------------------
 # text macros
 #------------------------------------------------------------
 
-_textimagehelp_ [l=mi] {Te whārangi whakamārama}
+_textperiodicals_ [l=mi] {Tānga Pukapuka}
+_textsource_ [l=mi] {tohutoro pūtake:}
+_textdate_ [l=mi] {rā tānga: }
+_textnumpages_ [l=mi] {e hia ngā whārangi:}
+
+_textsignin_ [l=mi] {whakauru mai}
+
+_textdefaultcontent_ [l=mi] {Kāore tō whārangi tono i kitea. Pāwhiritia te pātene 'back' i tō pūmanawa tirotiro, pāwhiritia rānei te pātene kāinga o runga ake kia hoki atu ai ki te
+Greenstone Digital Library.}
+
+_textdefaulttitle_ [l=mi] {He hē GSDL}
+
+_textbadcollection_ [l=mi] {Kāore te kohikohinga (called "_cvariable_") e noho mai ana i tēnei pūnaha o Greenstone.}
+
+_textselectpage_ [l=mi] {–Whiriwhirihia he Whārangi–}
+
+_collectionextra_ [l=mi] {E _about:numdocs_ ngā  tuhinga kei tēnei kohikohinga.
+He mea hanga _about:builddate_ ngā rā i mua.}
+
+# this is only used by the collector (where the above _collectionextra_
+# macro will always be set to another value)
+_collectorextra_ [l=mi] {<p>Kei tēnei kohikohinga _numdocs_ _If_("_numdocs_" eq "1",te tuhinga,ngā tuhinga), ā, ko te rahi  _numbytes_ ngā bytes.
+<p><a href="_httppagex_(bsummary)">Pāwhiritia tēnei</a> kia panui ai te pūrongo hanga o tēnei kohikohinga.
+}
+
+_textimagecollection_ [l=mi] {}
+_textimageabout_ [l=mi] {Whārangi whakamārama}
+_textimagehome_ [l=mi] {Whārangi kāinga}
+_textimagehelp_ [l=mi] {Whārangi āwhina}
 _textimagepref_ [l=mi] {Te whārangi o ngā whiriwhiringa}
-_textimagehome_ [l=mi] {Te whārangi kāinga}
+_textimagegreenstone_ [l=mi] {Greenstone Digital Library Software}
+_textimageusab_ [l=mi] {He aha ngā mea uaua hei whakamahi?}
+
 _textimagesearch_ [l=mi] {rapua he kupu}
+_textimageTitle_ [l=mi] {Tirotiro pūrārangi taitara}
+_textimageList_ [l=mi] {Tirotiro whakarārangi tuhinga}
+_textimageCreator_ [l=mi] {Tirotiro pūrārangi kaitito}
+_textimageSeries_ [l=mi] {Tirotiro tānga pukapuka}
+_textimageDate_ [l=mi] {Tirotiro whakarārangi wātaka}
+_textimageSubject_ [l=mi] {Tirotiro kaupapa}
+_textimageTo_ [l=mi] {Tirotiro āpure Ki a Wai}
+_textimageFrom_ [l=mi] {Tirotiro āpure Nā Wai}
+_textimageOrganization_ [l=mi] {Tirotiro rōpū}
+_textimageHowto_ [l=mi] {Tirotiro āpure Pēwhea Te}
+_textimageTopic_ [l=mi] {Tirotiro kaupapa motuhake}
+_textimageBrowse_ [l=mi] {Tirotiro}
+_textimageCollage_ [l=mi] {Tirotiro kāpunupuni whakaahua}
+_textimagePeople_ [l=mi] {Tirotiro pūrārangi tāngata}
+_textimageLanguage_ [l=mi] {Tirotiro reo}
+_textimageAcronym_ [l=mi] {Tirotiro Pūtauākī}
+_textimagePhrase_ [l=mi] {Tirotiro kīwaha}
+_textimageArtist_ [l=mi] {Tirotiro kaitito}
+_textimageSource_ [l=mi] {Tirotiro ingoa kōnae taketake}
+_textimageKeyword_ [l=mi] {Tirotiro kupu matua}
+_textimageVolume_ [l=mi] {Tirotiro pukapuka}
+_textimageCountries_ [l=mi] {Tirotiro whenua}
+_textimageCaptions_ [l=mi] {Tirotiro whakaahua rerekōrero}
+
+_texticontabsearchgreen_ [l=mi] {Rapu}
+_texticontabdategreen_ [l=mi] {Ngā Rā}
+_texticontabseriesgreen_ [l=mi] {Tānga Pukapuka}
+_texticontabauthorgreen_ [l=mi] {Kaitito A-Z}
+_texticontabtitlegreen_ [l=mi] {Taitara A-Z}
+_texticontablistgreen_ [l=mi] {Whakarārangi}
+_texticontabsubjectgreen_ [l=mi] {Kaupapa}
+_texticontabtogreen_ [l=mi] {Ki a Wai}
+_texticontabfromgreen_ [l=mi] {Nā Wai}
+_texticontaborggreen_ [l=mi] {Rōpū}
+_texticontabhowgreen_ [l=mi] {Pēwhea te}
+_texticontabtopicgreen_ [l=mi] {Kaupapa}
+_texticontabbrwsegreen_ [l=mi] {Tirotiro}
+_texticontabCollagegreen_ [l=mi] {Kāpunipuni Whakaahua}
+_texticontabbrowsgreen_ [l=mi] {Tirotiro}
+_texticontabPeoplegreen_ [l=mi] {Tāngata A-Z}
+_texticontabLanguagegreen_ [l=mi] {Reo}
+_texticontabAcronymgreen_ [l=mi] {Pūtauākī}
+_texticontabPhrasegreen_ [l=mi] {KÄ«waha}
+_texticontabArtistgreen_ [l=mi] {Kaitito}
+_texticontabSourcegreen_ [l=mi] {Ingoa Kōnae}
+_texticontabKeywordgreen_ [l=mi] {Kupu Matua}
+_texticontabVolumegreen_ [l=mi] {Pukapuka}
+_texticontabCaptionsgreen_ [l=mi] {Rerekōrero}
+_texticontabCountriesgreen_ [l=mi] {Whenua}
+
+_texticontext_ [l=mi] {Tirohia te tuhinga}
+_texticonclosedbook_ [l=mi] {whakatūwheratia te tuhinga nei kia pānui ai ngā kōrero}
+_texticonnext_ [l=mi] {titiro ki te whārangi o muri}
+_texticonprev_ [l=mi] {titiro ki te whārangi o mua}
+
+_texticonmidi_ [l=mi] {titiro ki te kōnae MIDI}
+_texticonmsword_ [l=mi] {titiro ki te tuhinga Microsoft Word}
+_texticonpdf_ [l=mi] {titiro ki te tuhinga PDF}
+_texticonps_ [l=mi] {titiro ki te tuhinga Postscript}
+_texticonppt_ [l=mi] {titiro ki te tuhinga PowerPoint}
+_texticonrtf_ [l=mi] {titiro ki te tuhinga RTF}
+_texticonxls_ [l=mi] {Tirohia te kōnae Microsoft Excel}
 
 _page_ [l=mi] {whārangi }
-_pages_ [l=mi] {whārangi}
+_pages_ [l=mi] {ngā whārangi}
+_of_ [l=mi] {i te }
 _vol_ [l=mi] {Pukapuka}
 _num_ [l=mi] {Nama}
-_textmonth01_ [l=mi] {Hanuere}
-_textmonth02_ [l=mi] {Pepuere}
-_textmonth03_ [l=mi] {Maehe}
-_textmonth04_ [l=mi] {Aperira}
-_textmonth05_ [l=mi] {Mei}
-_textmonth06_ [l=mi] {Hune}
-_textmonth07_ [l=mi] {Hurae}
-_textmonth08_ [l=mi] {Akuhata}
-_textmonth09_ [l=mi] {Hepetema}
-_textmonth10_ [l=mi] {Oketopa}
-_textmonth11_ [l=mi] {Noema}
-_textmonth12_ [l=mi] {Tihema}
-_of_ [l=mi] { i te }
-
-
-_texticontabsearchgreen_ [l=mi] {rapu}
-_texticontabseriesgreen_ [l=mi] {whakarārangi niupepa}
-_texticonnext_ [l=mi] {titiro ki te whārangi o muri}
-_texticonprev_ [l=mi] {titiro ki te whārangi o mua}
-_texticontext_ [l=mi] {Tirohia te whārangi}
-
-_textimageSeries_ [l=mi] {Tirohia te whakarārangi taitara}
-_textimageDate_ [l=mi] {Tirohia te whakarārangi wātaka}
-
+
+_textmonth00_ [l=mi] {}
+_textmonth01_ [l=mi] {Kohi-tātea}
+_textmonth02_ [l=mi] {Hui-tanguru}
+_textmonth03_ [l=mi] {Poutū-te-rangi}
+_textmonth04_ [l=mi] {Paenga-whāehā}
+_textmonth05_ [l=mi] {Haratua}
+_textmonth06_ [l=mi] {Pipiri}
+_textmonth07_ [l=mi] {Hōngongoi}
+_textmonth08_ [l=mi] {Here-turi-kōkā}
+_textmonth09_ [l=mi] {Mahuru}
+_textmonth10_ [l=mi] {Whiringa-ā-nuku}
+_textmonth11_ [l=mi] {Whiringa-ā-rangi}
+_textmonth12_ [l=mi] {Hakihea}
+
+_textdocument_ [l=mi] {Tuhinga}
+_textsection_ [l=mi] {Wāhanga}
+_textparagraph_ [l=mi] {Kōwae}
+
+_magazines_ [l=mi] {Pukapuka}
+
+_nzdlpagefooter_ [l=mi] {<p>_iconblankbar_
+<p><a href="http://www.nzdl.org">New Zealand Digital Library Project</a>
+<br><a href="http://www.cs.waikato.ac.nz/cs">Tari Rorohiko</a>, 
+<a href="http://www.waikato.ac.nz">Te Whare Wānanga o Waikato</a>, 
+Aotearoa}
 
 #------------------------------------------------------------
@@ -54 +184 @@
 #------------------------------------------------------------
 
+## "KĀINGA" ## top_nav_button ## chome ##
 _httpiconchomeof_ [l=mi] {_httpimg_/mi/chomeof.gif}
 _httpiconchomeon_ [l=mi] {_httpimg_/mi/chomeon.gif}
 
+## "ĀWHINA" ## top_nav_button ## chelp ##
 _httpiconchelpof_ [l=mi] {_httpimg_/mi/chelpof.gif}
 _httpiconchelpon_ [l=mi] {_httpimg_/mi/chelpon.gif}
 
+## "KŌWHIRINGA" ## top_nav_button ## cpref ##
 _httpiconcprefof_ [l=mi] {_httpimg_/mi/cprefof.gif}
 _httpiconcprefon_ [l=mi] {_httpimg_/mi/cprefon.gif}
 
+## "WHAKAHOKI kŌRERO MAI" ## top_nav_button ## cusab ##
+_httpiconcusabof_ [l=mi] {_httpimg_/mi/cusabof.gif}
+_httpiconcusabon_ [l=mi] {_httpimg_/mi/cusabon.gif}
+
+
+## "āwhina" ## green_title ## h_help ##
+_httpiconhhelp_ [l=mi] {_httpimg_/mi/h\_help.gif}
+_widthhhelp_ [l=mi] {200}
+_heighthhelp_ [l=mi] {57}
+
+## "kaitito a-z" ## nav_bar_button ## tauth ##
+_httpicontauthgr_ [l=mi] {_httpimg_/mi/tauthgr.gif}
+_httpicontauthof_ [l=mi] {_httpimg_/mi/tauthof.gif}
+_httpicontauthon_ [l=mi] {_httpimg_/mi/tauthon.gif}
+_widthtauthx_ [l=mi] {110}
+
+## "Tānga Pukapuka" ## nav_bar_button ## tser ##
 _httpicontsergr_ [l=mi] {_httpimg_/mi/tsergr.gif}
 _httpicontserof_ [l=mi] {_httpimg_/mi/tserof.gif}
 _httpicontseron_ [l=mi] {_httpimg_/mi/tseron.gif}
-_widthtserx_ [l=mi] {114}
-
+_widthtserx_ [l=mi] {87}
+
+## "ngā rā" ## nav_bar_button ## tdate ##
 _httpicontdategr_ [l=mi] {_httpimg_/mi/tdategr.gif}
 _httpicontdateof_ [l=mi] {_httpimg_/mi/tdateof.gif}
 _httpicontdateon_ [l=mi] {_httpimg_/mi/tdateon.gif}
-
+_widthtdatex_ [l=mi] {87}
+
+## "kaupapa" ## nav_bar_button ## tsubj ##
+_httpicontsubjgr_ [l=mi] {_httpimg_/mi/tsubjgr.gif}
+_httpicontsubjon_ [l=mi] {_httpimg_/mi/tsubjon.gif}
+_httpicontsubjof_ [l=mi] {_httpimg_/mi/tsubjof.gif}
+_widthtsubjx_ [l=mi] {87}
+
+## "ki a" ## nav_bar_button ## tto ##
+_httpiconttogr_ [l=mi] {_httpimg_/mi/ttogr.gif}
+_httpiconttoon_ [l=mi] {_httpimg_/mi/ttoon.gif}
+_httpiconttoof_ [l=mi] {_httpimg_/mi/ttoof.gif}
+_widthttox_ [l=mi] {87}
+
+## "nā wai" ## nav_bar_button ## tfrom ##
+_httpicontfromgr_ [l=mi] {_httpimg_/mi/tfromgr.gif}
+_httpicontfromon_ [l=mi] {_httpimg_/mi/tfromon.gif}
+_httpicontfromof_ [l=mi] {_httpimg_/mi/tfromof.gif}
+_widthtfromx_ [l=mi] {87}
+
+## "rōpū" ## nav_bar_button ## torg ##
+_httpicontorggr_ [l=mi] {_httpimg_/mi/torggr.gif}
+_httpicontorgon_ [l=mi] {_httpimg_/mi/torgon.gif}
+_httpicontorgof_ [l=mi] {_httpimg_/mi/torgof.gif}
+_widthtorgx_ [l=mi] {114}
+
+## "pēwhea te" ## nav_bar_button ## thow ##
+_httpiconthowgr_ [l=mi] {_httpimg_/mi/thowgr.gif}
+_httpiconthowon_ [l=mi] {_httpimg_/mi/thowon.gif}
+_httpiconthowof_ [l=mi] {_httpimg_/mi/thowof.gif}
+_widththowx_ [l=mi] {87}
+
+## "kaupapa" ## nav_bar_button ## ttopic ##
+_httpiconttopicgr_ [l=mi] {_httpimg_/mi/ttopicgr.gif}
+_httpiconttopicon_ [l=mi] {_httpimg_/mi/ttopicon.gif}
+_httpiconttopicof_ [l=mi] {_httpimg_/mi/ttopicof.gif}
+_widthttopicx_ [l=mi] {87}
+
+## "tirotiro" ## nav_bar_button ## tbrwse ##
+_httpicontbrwsegr_ [l=mi] {_httpimg_/mi/tbrwsegr.gif}
+_httpicontbrwseon_ [l=mi] {_httpimg_/mi/tbrwseon.gif}
+_httpicontbrwseof_ [l=mi] {_httpimg_/mi/tbrwseof.gif}
+_widthtbrwsex_ [l=mi] {87}
+
+## "kāpunipuni whakaahua" ## nav_bar_button ## tcoll ##
+_httpicontcollgr_ [l=mi] {_httpimg_/mi/tcollgr.gif}
+_httpicontcollof_ [l=mi] {_httpimg_/mi/tcollof.gif}
+_httpicontcollon_ [l=mi] {_httpimg_/mi/tcollon.gif}
+_widthtcollx_ [l=mi] {87}
+
+## "rapu" ## nav_bar_button ## tsrch ##
 _httpicontsrchgr_ [l=mi] {_httpimg_/mi/tsrchgr.gif}
 _httpicontsrchof_ [l=mi] {_httpimg_/mi/tsrchof.gif}
 _httpicontsrchon_ [l=mi] {_httpimg_/mi/tsrchon.gif}
+_widthtsrchx_ [l=mi] {87}
+
+## "taitara a-z" ## nav_bar_button ## ttitl ##
+_httpiconttitlgr_ [l=mi] {_httpimg_/mi/ttitlgr.gif}
+_httpiconttitlof_ [l=mi] {_httpimg_/mi/ttitlof.gif}
+_httpiconttitlon_ [l=mi] {_httpimg_/mi/ttitlon.gif}
+_widthttitlx_ [l=mi] {87}
+
+## "tāngata" ## nav_bar_button ## tpeop ##
+_httpicontpeopgr_ [l=mi] {_httpimg_/mi/tpeopgr.gif}
+_httpicontpeopof_ [l=mi] {_httpimg_/mi/tpeopof.gif}
+_httpicontpeopon_ [l=mi] {_httpimg_/mi/tpeopon.gif}
+_widthtpeopx_ [l=mi] {97}
+
+## "reo" ## nav_bar_button ## tlang ##
+_httpicontlanggr_ [l=mi] {_httpimg_/mi/tlanggr.gif}
+_httpicontlangon_ [l=mi] {_httpimg_/mi/tlangon.gif}
+_httpicontlangof_ [l=mi] {_httpimg_/mi/tlangof.gif}
+_widthtlangx_ [l=mi] {87}
+
+## "pūtauākī" ## nav_bar_button ## tacro ##
+_httpicontacrogr_ [l=mi] {_httpimg_/mi/tacrogr.gif}
+_httpicontacroof_ [l=mi] {_httpimg_/mi/tacroof.gif}
+_httpicontacroon_ [l=mi] {_httpimg_/mi/tacroon.gif}
+_widthtacrox_ [l=mi] {87}
+
+#TODO singular or plural?
+
+## "kīwaha" ## nav_bar_button ## tphrse ##
+_httpicontphrsegr_ [l=mi] {_httpimg_/mi/tphrsegr.gif}
+_httpicontphrseof_ [l=mi] {_httpimg_/mi/tphrseof.gif}
+_httpicontphrseon_ [l=mi] {_httpimg_/mi/tphrseon.gif}
+_widthtphrsex_ [l=mi] {87}
+
+## "kaitito" ## nav_bar_button ## tartst ##
+_httpicontartstgr_ [l=mi] {_httpimg_/mi/tartstgr.gif}
+_httpicontartstof_ [l=mi] {_httpimg_/mi/tartstof.gif}
+_httpicontartston_ [l=mi] {_httpimg_/mi/tartston.gif}
+_widthtartstx_ [l=mi] {87}
+
+## "ingoa kōnae" ## nav_bar_button ## tsrc ##
+_httpicontsrcgr_ [l=mi] {_httpimg_/mi/tsrcgr.gif}
+_httpicontsrcof_ [l=mi] {_httpimg_/mi/tsrcof.gif}
+_httpicontsrcon_ [l=mi] {_httpimg_/mi/tsrcon.gif}
+_widthtsrcx_ [l=mi] {87}
+
+## "kupu matua" ## nav_bar_button ## tkw ##
+_httpicontkwgr_ [l=mi] {_httpimg_/mi/tkwgr.gif}
+_httpicontkwof_ [l=mi] {_httpimg_/mi/tkwof.gif}
+_httpicontkwon_ [l=mi] {_httpimg_/mi/tkwon.gif}
+_widthtkwx_ [l=mi] {87}
+
+## "pukapuka" ## nav_bar_button ## tvol ##
+_httpicontvolgr_ [l=mi] {_httpimg_/mi/tvolgr.gif}
+_httpicontvolof_ [l=mi] {_httpimg_/mi/tvolof.gif}
+_httpicontvolon_ [l=mi] {_httpimg_/mi/tvolon.gif}
+_widthtvolx_ [l=mi] {87}
+
+## "rerekōrero" ## nav_bar_button ## tcapt ##
+_httpicontcaptgr_ [l=mi] {_httpimg_/mi/tcaptgr.gif}
+_httpicontcaptof_ [l=mi] {_httpimg_/mi/tcaptof.gif}
+_httpicontcapton_ [l=mi] {_httpimg_/mi/tcapton.gif}
+_widthtcaptx_ [l=mi] {87}
+
+## "whenua" ## nav_bar_button ## tcount ##
+_httpicontcountgr_ [l=mi] {_httpimg_/mi/tcountgr.gif}
+_httpicontcountof_ [l=mi] {_httpimg_/mi/tcountof.gif}
+_httpicontcounton_ [l=mi] {_httpimg_/mi/tcounton.gif}
+_widthtcountx_ [l=mi] {87}
+
+## "The Translator" ## top_nav_button ## ctrans ##
+_httpiconctransof_ [l=mi] {_httpimg_/mi/ctransof.gif}
+_httpiconctranson_ [l=mi] {_httpimg_/mi/ctranson.gif}
+_widthctrans_ [l=mi] {100}
+
+## "The Librarian Interface" ## top_nav_button ## cgli ##
+_httpiconcgliof_ [l=mi] {_httpimg_/mi/cgliof.gif}
+_httpiconcglion_ [l=mi] {_httpimg_/mi/cglion.gif}
+
 
 
@@ -82 +362 @@
 ######################################################################
 
+
 #------------------------------------------------------------
 # text macros
 #------------------------------------------------------------
 
-_textabcol_ [l=mi] {He kupu whakamārama i te kohikohinga niupepa}
+_textabcol_ [l=mi] {He kupu whakamārama i te kohikohinga nei}
+
+_textsubcols1_ [l=mi] {<p>Kei te kohinga-whānui nei e  _1_ ngā kohinga-whāiti. 
+Ko ngā kohinga-whāiti e wātea ana māu:
+<blockquote>}
+
+_textsubcols2_ [l=mi] {</blockquote>
+Kei te Whārangi Whiringa e taea ana e koe te whakarite ko ēwhea ngā kohinga-whāiti māu.}
 
 
@@ -93 +381 @@
 #------------------------------------------------------------
 
+## "e pā ana" ## green_title ## h_about ##
 _httpiconhabout_ [l=mi] {_httpimg_/mi/h\_about.gif}
-_widthhabout_ [l=mi] {262}
+_widthhabout_ [l=mi] {200}
+_heighthabout_ [l=mi] {57}
+
 
 
@@ -102 +393 @@
 ######################################################################
 
+
 #------------------------------------------------------------
 # text macros
 #------------------------------------------------------------
 
+_texticonhtitle_ [l=mi] {Taitara A-Z}
+_texticonhcoll_ [l=mi] {Kāpunipuni Whakaahua}
+_texticonhauth_ [l=mi] {Kaitito A-Z}
+_texticonhsubj_ [l=mi] {Kaupapa}
+_texticonhto_ [l=mi] {Ki a Wai}
+_texticonhfrom_ [l=mi] {Nā wai}
+_texticonhser_ [l=mi] {Tānga Pukapuka}
+_texticonhdate_ [l=mi] {Ngā Rā}
+_texticonhhow_ [l=mi] {Pēwhea te}
+_texticonhorg_ [l=mi] {Rōpū}
+_texticonhbrwse_ [l=mi] {Tirotiro}
+_texticonhbrows_ [l=mi] {Tirotiro}
+_texticonhpeople_ [l=mi] {Tāngata A-Z}
+_texticonhlanguage_ [l=mi] {Ngā Reo}
+_texticonhacronym_ [l=mi] {Pūtauākī}
+_texticonhphrases_ [l=mi] {KÄ«waha}
+_texticonhartist_ [l=mi] {Kaitito}
+_texticonhsrc_ [l=mi] {Ingoa Kōnae}
+_texticonhkw_ [l=mi] {Kupu Matua}
+_texticonhvol_ [l=mi] {Pukapuka}
+_texticonhcapt_ [l=mi] {Rerekōrero}
+_texticonhcount_ [l=mi] {Whenua}
+
+_texticonopenbookshelf_ [l=mi] {kātia tēnei wāhanga}
+_texticonclosedbookshelf_ [l=mi] {whakatūwhera mai tēnei wāhanga hei tirotiro ai}
+_texticonopenbook_ [l=mi] {kātia tēnei pukapuka}
+_texticonclosedfolder_ [l=mi] {whakatūwhera mai tēnei kōpaki hei tirotiro ai}
+_texticonclosedfolder2_ [l=mi] {whakatūwhera mai te wāhanga iti nei}
+_texticonopenfolder_ [l=mi] {katia tēnei kōpaki}
+_texticonopenfolder2_ [l=mi] {katia tēnei wāhanga-iti}
+_texticonsmalltext_ [l=mi] {Tirohia tēnei wāhanga o ngā kupu tuhituhi}
+_texticonsmalltext2_ [l=mi] {tirohia kupu tuhituhi}
+_texticonpointer_ [l=mi] {wāhanga e tiro ana}
 _texticondetach_ [l=mi] {Huakina mai he matapihi hou kia noho motuhake ai tēnei kōrero}
-_texticonexpandtext_ [l=mi] {Titiro ki ngā kupu katoa o tēnei niupepa}
-_texticoncontracttext_ [l=mi] {Titiro ki ngā kupu o tēnei whārangi anake}
-_texticonopenbookshelf_ [l=mi] {kātia}
-_texticonclosedbookshelf_ [l=mi] {whakatūwhera mai}
-_texticonclosedbook_ [l=mi] {whakatūwhera mai}
-_texticonopenbook_ [l=mi] {kātia}
-_texticonpointer_ [l=mi] {wāhanga e tiro ana}
 _texticonhighlight_ [l=mi] {Kia pūkaha ngā kupu rapu}
-_texticonnohighlight_ [l=mi] {Kia kore he pūkaha}
-_texticonsmalltext_ [l=mi] {He whārangi niupepa}
-_texticonclosedfolder_ [l=mi] {He kōpaki}
+_texticonnohighlight_ [l=mi] {Kia kore-pūkaha ngā kupu rapu}
+_texticoncontracttoc_ [l=mi] {Whakaitihia te whakarārangi kaupapa}
+_texticonexpandtoc_ [l=mi] {Whakanuia te whakarārangi kaupapa}
+_texticonexpandtext_ [l=mi] {Titiro ki ngā kupu katoa}
+_texticoncontracttext_ [l=mi] {Titiro ki ngā kupu anakē o te wāhanga kua kōwhiritia}
+_texticonwarning_ [l=mi] {<b>Kia TÅ«pato: </b>}
+_texticoncont_ [l=mi] {haere tonu?}
+
+_textltwarning_ [l=mi] {<p><center>
+<table cellspacing=0 cellpadding=0 width=_pagewidth_>
+<tr valign=top><td>_iconwarning_Ki te whakanui koe i ngā kupu tuhituhi i konei ka nui rawa ngā kōrero hei whakaatu mai ki runga i te mata o te rorohiko_imagecont_
+</td></tr></table></center>
+}
 
 _textgoto_ [l=mi] {poka noa ki}
+_textintro_ [l=mi] {<i>(kōrero whakataki)</i>}
+
 
 #------------------------------------------------------------
@@ -125 +455 @@
 #------------------------------------------------------------
 
+## "taitara a-z" ## green_title ## h_title ##
+_httpiconhtitle_ [l=mi] {_httpimg_/mi/h\_title.gif}
+_widthhtitle_ [l=mi] {200}
+_heighthtitle_ [l=mi] {57}
+
+## "kaitito a-z" ## green_title ## h_auth ##
+_httpiconhauth_ [l=mi] {_httpimg_/mi/h\_auth.gif}
+_widthhauth_ [l=mi] {200}
+_heighthauth_ [l=mi] {57}
+
+## "kaupapa" ## green_title ## h_subj ##
+_httpiconhsubj_ [l=mi] {_httpimg_/mi/h\_subj.gif}
+_widthhsubj_ [l=mi] {200}
+_heighthsubj_ [l=mi] {57}
+
+## "ki a " ## green_title ## h_to ##
+_httpiconhto_ [l=mi] {_httpimg_/mi/h\_to.gif}
+_widthhto_ [l=mi] {200}
+_heighthto_ [l=mi] {57}
+
+## "nā wai" ## green_title ## h_from ##
+_httpiconhfrom_ [l=mi] {_httpimg_/mi/h\_from.gif}
+_widthhfrom_ [l=mi] {200}
+_heighthfrom_ [l=mi] {57}
+
+## "tānga pukapuka" ## green_title ## h_ser ##
 _httpiconhser_ [l=mi] {_httpimg_/mi/h\_ser.gif}
-_widthhser_ [l=mi] {220}
-
+_widthhser_ [l=mi] {200}
+_heighthser_ [l=mi] {57}
+
+## "ngā rā" ## green_title ## h_date ##
 _httpiconhdate_ [l=mi] {_httpimg_/mi/h\_date.gif}
-
+_widthhdate_ [l=mi] {200}
+_heighthdate_ [l=mi] {57}
+
+## "pēwhea te" ## green_title ## h_how ##
+_httpiconhhow_ [l=mi] {_httpimg_/mi/h\_how.gif}
+_widthhhow_ [l=mi] {200}
+_heighthhow_ [l=mi] {57}
+
+## "kaupapa" ## green_title ## h_topic ##
+_httpiconhtopic_ [l=mi] {_httpimg_/mi/h\_topic.gif}
+_widthhtopic_ [l=mi] {200}
+_heighthtopic_ [l=mi] {57}
+
+## "rōpū" ## green_title ## h_org ##
+_httpiconhorg_ [l=mi] {_httpimg_/mi/h\_org.gif}
+_widthhorg_ [l=mi] {250}
+_heighthorg_ [l=mi] {57}
+
+## "tirotiro" ## green_title ## h_brwse ##
+_httpiconhbrwse_ [l=mi] {_httpimg_/mi/h\_brwse.gif}
+_widthhbrwse_ [l=mi] {200}
+_heighthbrwse_ [l=mi] {57}
+
+## "kāpunipuni whakaahua" ## green_title ## hcoll ##
+_httpiconhcoll_ [l=mi] {_httpimg_/mi/h\_coll.gif}
+_widthhcoll_ [l=mi] {200}
+_heighthcoll_ [l=mi] {57}
+
+## "tāngata" ## green_title ## h_people ##
+_httpiconhpeople_ [l=mi] {_httpimg_/mi/h\_people.gif}
+_widthhpeople_ [l=mi] {200}
+_heighthpeople_ [l=mi] {57}
+
+## "ngā reo" ## green_title ## h_lang ##
+_httpiconhlanguage_ [l=mi] {_httpimg_/mi/h\_lang.gif}
+_widthhlanguage_ [l=mi] {200}
+_heighthlanguage_ [l=mi] {57}
+
+## "pūtauākī" ## green_title ## h_acro ##
+_httpiconhacronym_ [l=mi] {_httpimg_/mi/h\_acro.gif}
+_widthhacronym_ [l=mi] {200}
+_heighthacronym_ [l=mi] {57}
+
+## "kīwaha" ## green_title ## h_phrse ##
+_httpiconhphrse_ [l=mi] {_httpimg_/mi/h\_phrse.gif}
+_widthhphrse_ [l=mi] {200}
+_heighthphrse_ [l=mi] {57}
+
+## "kaitito" ## green_title ## h_artist ##
+_httpiconhartist_ [l=mi] {_httpimg_/mi/h\_artist.gif}
+_widthhartist_ [l=mi] {200}
+_heighthartist_ [l=mi] {57}
+
+## "ingoa kōnae" ## green_title ## h_src ##
+_httpiconhsrc_ [l=mi] {_httpimg_/mi/h\_src.gif}
+_widthhsrc_ [l=mi] {200}
+_heighthsrc_ [l=mi] {57}
+
+## "kupu matua" ## green_title ## h_kw ##
+_httpiconhkw_ [l=mi] {_httpimg_/mi/h\_kw.gif}
+_widthhkw_ [l=mi] {200}
+_heighthkw_ [l=mi] {57}
+
+## "pukapuka" ## green_title ## h_vol ##
+_httpiconhvol_ [l=mi] {_httpimg_/mi/h\_vol.gif}
+_widthhvol_ [l=mi] {200}
+_heighthvol_ [l=mi] {57}
+
+## "whenua" ## green_title ## h_count ##
+_httpiconhcount_ [l=mi] {_httpimg_/mi/h\_count.gif}
+_widthhcount_ [l=mi] {200}
+_heighthcount_ [l=mi] {57}
+
+## "rerekōrero" ## green_title ## h_capt ##
+_httpiconhcapt_ [l=mi] {_httpimg_/mi/h\_capt.gif}
+_widthhcapt_ [l=mi] {200}
+_heighthcapt_ [l=mi] {57}
+
+
+## "HAERE TONU??" ## top_nav_button ## cont ##
+_httpiconcontoff_ [l=mi] {_httpimg_/mi/contof.gif}
+_httpiconconton_ [l=mi] {_httpimg_/mi/conton.gif}
+
+## "WHAKANUI\nKUPU TUHITUHI" ## document_button ## eallt ## 
 _httpiconealltof_ [l=mi] {_httpimg_/mi/ealltof.gif}
 _httpiconeallton_ [l=mi] {_httpimg_/mi/eallton.gif}
 
+## "WHAKAITI\nWHAKARĀRANGI\nKAUPAPA" ## document_button ## econc ##
+_httpiconeconcof_ [l=mi] {_httpimg_/mi/econcof.gif}
+_httpiconeconcon_ [l=mi] {_httpimg_/mi/econcon.gif}
+
+## "WHAKAWEHE" ## document_button ## edtch ##
 _httpiconedtchof_ [l=mi] {_httpimg_/mi/edtchof.gif}
 _httpiconedtchon_ [l=mi] {_httpimg_/mi/edtchon.gif}
 
+## "WHAKANUI\nWHAKARĀRANGI\nKAUPAPA" ## document_button ## eexpc ##
+_httpiconeexpcof_ [l=mi] {_httpimg_/mi/eexpcof.gif}
+_httpiconeexpcon_ [l=mi] {_httpimg_/mi/eexpcon.gif}
+
+## "WHAKAITI\nKUPU TUHITUHI" ## document_button ## etsec ##
 _httpiconetsecof_ [l=mi] {_httpimg_/mi/etsecof.gif}
 _httpiconetsecon_ [l=mi] {_httpimg_/mi/etsecon.gif}
 
+## "PŪKAHA" ## document_button ## ehl ##
 _httpiconehlof_ [l=mi] {_httpimg_/mi/ehlof.gif}
 _httpiconehlon_ [l=mi] {_httpimg_/mi/ehlon.gif}
 
+## "KORE-PŪKAHA" ## document_button ## enhl ##
 _httpiconenhlof_ [l=mi] {_httpimg_/mi/enhlof.gif}
 _httpiconenhlon_ [l=mi] {_httpimg_/mi/enhlon.gif}
@@ -147 +600 @@
 
 ######################################################################
-# 'home' page
-package home
-######################################################################
+# 'search' page
+package query
+######################################################################
+
 
 #------------------------------------------------------------
@@ -155 +609 @@
 #------------------------------------------------------------
 
+# this if statement produces the text 'results n1 - nn for query: querystring' or 
+# 'No matches for query: querystring', depending on whether or not there were
+# any matches
+_textquerytitle_ [l=mi] {_If_(_thislast_,kitenga _thisfirst_ - _thislast_ mō te rapu: _cgiargq_,kāore he kitenga mō: _cgiargq_)}
+_textnoquerytitle_ [l=mi] {Whārangi rapu}
+
+_texticonthispage_ [l=mi] {rapu}
+_textsome_ [l=mi] {ētehi}
+_textall_ [l=mi] {te katoa}
+_textboolean_ [l=mi] {te boolean}
+_textranked_ [l=mi] {ranked}
+_textnatural_ [l=mi] {aunoa}
+#_textsome_ {_If_(_cgiargb_,ranked,some)}
+#_textall_ {_If_(_cgiargb_,boolean,all)}
+#_textformsome_ {_If_(_cgiargb_,ranked,some)}
+#_textformall_ {_If_(_cgiargb_,natural,all)}
+_texticonqueryresultsbar_ [l=mi] {}
+_texticonsearchhistorybar_ [l=mi] {hītori rapu}
+
+#alt text for query buttons
+_textusequery_ [l=mi] {whakamahia tēnei rapunga}
+_textfreqmsg1_ [l=mi] {Kia hia ngā kupu: }
+_textpostprocess_ [l=mi] {_If_(_quotedquery_,<br><i>kua rapu tuaruatia kia puta ko te _quotedquery_</i>
+)}
+_textinvalidquery_ [l=mi] {kua hē te tuhi rapu}
+
+_textmorethan_ [l=mi] {Neke atu i te }
+_textapprox_ [l=mi] {E pā ana}
+_textnodocs_ [l=mi] {kāore he kitenga e pā ana ki āu kupu rapu.}
+_text1doc_ [l=mi] {1 te pukapuka e pā ana ki āu kupu rapu.}
+_textlotsdocs_ [l=mi] {ngā pukapuka e pā ana ki āu kupu rapu.}
+_textmatches_ [l=mi] {Kitenga }
+_textbeginsearch_ [l=mi] {Rapua}
+_textrunquery_ [l=mi] {Tukua te Rapu}
+_textclearform_ [l=mi] {Ūkui ngā kupu}
+
+#these go together in form search:
+#"Word or phrase  (fold, stem)  ... in field"
+_textwordphrase_ [l=mi] {he kupu, he kīwaha rānei}
+_textinfield_ [l=mi] {
 i te āpure}
+_textfoldstem_ [l=mi] {(pūmatua/pūtiti, kūmuri)}
+
+_textadvquery_ [l=mi] {Me tuhi kau noa rānei i ngā kupu rapu:}
+_textallfields_ [l=mi] {ngā āpure katoa}
+_texttextonly_ [l=mi] {kore-whakaahua}
+_textand_ [l=mi] {me te}
+_textor_ [l=mi] {rānei}
+_textandnot_ [l=mi] {me te kore}
+
+# _indexselection_, _jselection_, _nselection_ and _gselection_ are set from 
+# within the server - _indexselection_ is always set, but the others may be 
+# unset
+
+_textsimplesearch_ [l=mi] {Tirohia ki _indexselection_ _If_(_jselection_, of _jselection_) _If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language) mō _querytypeselection_ o ngā kupu}
+
+_textadvancedsearch_ [l=mi] {"Rapu _indexselection_ _If_(_jselection_,of _jselection_ )_If_(_gselection_,ki te _gselection_ level )_If_(_nselection_,in _nselection_ language )ki te _querytypeselection_ query"
+     
+source::query::_textadvquery_   Or enter a query directly:}
+
+_textformsimplesearch_ [l=mi] {Rapu _If_(_jselection_,_jselection_ )_If_(_gformselection_,at _gformselection_ level )_If_(_nselection_,in _nselection_ language )mō _formquerytypeselection_ i te}
+
+_textformadvancedsearch_ [l=mi] {Rapu_If_(_jselection_,_jselection_ )_If_(_gformselection_,at _gformselection_ level )_If_(_nselection_,in _nselection_ language ) whakaatu mai ngā kitenga ki _formquerytypeselection_ order}
+
+
+_textnojsformwarning_ [l=mi] {Warning: Javascript is disabled in your web browser. <br>To use form searching, please enable it.}
+_textdatesearch_ [l=mi] {Kei tēnei kohikohinga e taea ana te rapu i ngā tuhinga i puta mai ai i tētehi wā,i tētehi rā rānei. He āhuatanga tēnei e taea ana te whakaū ki te mahi rapu.}
+_textstartdate_ [l=mi] {Rā (tīmata):}
+_textenddate_ [l=mi] {Rā mutunga}
+_textbc_ [l=mi] {B.C.E.}
+_textad_ [l=mi] {C.E.}
+_textexplaineras_ [l=mi] {E ōrite ana te C.E. me te B.C.E ki te A.D. me te B.C. arā i mua, i muri rānei i te whānau mai o Ihu Karaiti. He pūtauākī mō te "Common Era" me te "Before the Common Era", ā, he mea kore whakararu i tētehi hāhi o te ao.}
+
+_textstemon_ [l=mi] {(hei aha te kūmuri)}
+
+_textsearchhistory_ [l=mi] {HÄ«tori Rapu}
+
+#text macros for search history
+_textnohistory_ [l=mi] {kāore he hītori rapu}
+_texthresult_ [l=mi] {kitenga}
+_texthresults_ [l=mi] {ngā kitenga}
+_texthallwords_ [l=mi] {kupu katoa}
+_texthsomewords_ [l=mi] {ētehi kupu}
+_texthboolean_ [l=mi] {boolean}
+_texthranked_ [l=mi] {ranked}
+_texthcaseon_ [l=mi] {kia tika ngā pū matua me ngā pū iti}
+_texthcaseoff_ [l=mi] {hei aha te pūmatua me te pūiti}
+_texthstemon_ [l=mi] {hei aha te kūmuri}
+_texthstemoff_ [l=mi] {kia tika te kūmuri}
 
 #------------------------------------------------------------
@@ -160 +702 @@
 #------------------------------------------------------------
 
-
-######################################################################
-# 'help' page
+## "rapu" ## green_title ## h_search ##
+_httpiconhsearch_ [l=mi] {_httpimg_/mi/h\_search.gif}
+_widthhsearch_ [l=mi] {200}
+_heighthsearch_ [l=mi] {57}
+
+## "kitenga" ## green_bar_left_aligned ## qryresb ##
+_httpiconqryresb_ [l=mi] {_httpimg_/mi/qryresb.gif}
+_widthqryresb_ [l=mi] {_pagewidth_}
+_heightqryresb_ [l=mi] {17}
+
+## "hītori" ## green_bar_left_aligned ## schhistb ##
+_httpiconsrchhistb_ [l=mi] {_httpimg_/mi/schhistb.gif}
+_widthsrchhistb_ [l=mi] {_pagewidth_}
+_heightsrchhistb_ [l=mi] {17}
+
+
+######################################################################
+# 'preferences' page
+package preferences
+######################################################################
+
+
+#------------------------------------------------------------
+# text macros
+#------------------------------------------------------------
+
+_textprefschanged_ [l=mi] {Kua whakaū ngā kōwhiringa engari kaua kē e whakamahia te pātene
+"back" i tō pūtirotiro (browser) - i te mea ka ngaro aua kōwhiringa! Me pāwhiri kētia tētehi pātene o runga ake nei.
+}
+_textsetprefs_ [l=mi] {whakamaua kōwhiringa}
+_textsearchprefs_ [l=mi] {Kōwhiringa Rapu}
+_textcollectionprefs_ [l=mi] {Kōwhiringa kohikohinga}
+_textpresentationprefs_ [l=mi] {Kōwhiringa Whakaaturanga}
+_textpreferences_ [l=mi] {Kōwhiringa}
+_textcasediffs_ [l=mi] {Pū matua me te pū iti:}
+_textignorecase_ [l=mi] {hei aha te pū matua me te pū iti}
+_textmatchcase_ [l=mi] {me tika te pū matua me te pū iti}
+_textwordends_ [l=mi] {KÅ«muri:}
+_textstem_ [l=mi] {hei aha te kūmuri}
+_textnostem_ [l=mi] {me tika te kūmuri}
+_textprefop_ [l=mi] {Whakahokia mai te _maxdocoption_ kupu, ā, kia _hitsperpageoption_ kupu ki ia whārangi.}
+_textextlink_ [l=mi] {Whakapā atu ki ngā whārangi WWW:}
+_textintlink_ [l=mi] {Kua tikina ngā tuhinga mai i te:}
+_textlanguage_ [l=mi] {reo tauwhiti }
+_textencoding_ [l=mi] {Whakatakotoranga pū: }
+_textformat_ [l=mi] {Whakatakotoranga tauwhiti: }
+_textall_ [l=mi] {katoa}
+_textquerymode_ [l=mi] {TÅ«momo rapu:}
+_textsimplemode_ [l=mi] {te rapu ngāwari}
+_textadvancedmode_ [l=mi] {te rapu matatau (ka taea te whakamahi i ngā pū boolean, 
+pērā i te '!', '&', '|', me te '()' hoki)}
+_textlinkinterm_ [l=mi] {mā tētehi whārangi takawaenga}
+_textlinkdirect_ [l=mi] {haere tōtika ki reira}
+_textdigitlib_ [l=mi] {te whare pukapuka hiko}
+_textweb_ [l=mi] {te web}
+_textgraphical_ [l=mi] {Whakaahua}
+_texttextual_ [l=mi] {kore-whakaahua}
+_textcollectionoption_ [l=mi] {<p>
+Kohikohinga-whāiti hei rauika mai:
+<br>}
+
+_textrelateddocdisplay_ [l=mi] {whakaatu mai ngā tuhinga e hāngai ana}
+_textsearchhistory_ [l=mi] {HÄ«tori rapu:}
+_textnohistory_ [l=mi] {Kāore he hītori rapu}
+_texthistorydisplay_ [l=mi] {whakaatu mai kia _historynumrecords_ ngā rapunga kua tukua}
+_textnohistorydisplay_ [l=mi] {kaua e whakaatu mai i te hītori rapu}
+
+#_texttypesearch_ {Type of search:}
+#_texttextsearch_ {text search}
+_textformsearch_ [l=mi] {Rapu me te āta whakarite:}
+_textplainsearch_ [l=mi] {Rapu ngāwari}
+_textqueryboxsize_ [l=mi] {Te rahi o te pouaka rapu:}
+_textregbox_ [l=mi] {pouaka rapu iti}
+_textbigbox_ [l=mi] {pouaka rapu nui}
+_textformtype_ [l=mi] {TÅ«momo Rapu:}
+_textsimple_ [l=mi] {ngāwari}
+_textadvanced_ [l=mi] {matatau}
+
+# used in "with 4 fields" in the form search box
+_textwith_ [l=mi] {me te}
+_textfields_ [l=mi] {ngā āpure}
+
+
+#------------------------------------------------------------
+# icons
+#------------------------------------------------------------
+
+## "kōwhiringa" ## green_title ## h_pref ##
+_httpiconhpref_ [l=mi] {_httpimg_/mi/h\_pref.gif}
+_widthhpref_ [l=mi] {200}
+_heighthpref_ [l=mi] {57}
+
+#####################################################################
+# 'browse' package for the dynamic browsing interface
+package browse
+#####################################################################
+
+_textsortby_ [l=mi] {Kōmaka tuhinga ki te}
+_textalsoshowing_ [l=mi] {whakaatu mai ana hoki }
+_textwith_ [l=mi] {kaua e rahi ake i te}
+_textdocsperpage_ [l=mi] {tuhinga ki ia whārangi}
+
+_textfilterby_ [l=mi] {Rapua he tuhinga e mau ana i te}
+_textall_ [l=mi] {katoa}
+_textany_ [l=mi] {ētehi}
+_textwords_ [l=mi] {o ngā kupu}
+_textleaveblank_ [l=mi] {waiho tēnei pouaka e wātea ana kia puta mai te katoa o ngā tuhinga}
+
+_browsebuttontext_ [l=mi] {Kōmaka Tuhinga}
+
+_nodata_ [l=mi] {<i>kāore he kōrero</i>}
+_docs_ [l=mi] {tuhinga}
+######################################################################
+# 'help' page -- this is lower priority for translating than the
+# rest of this file
 package help
 ######################################################################
 
+
 #------------------------------------------------------------
 # text macros
 #------------------------------------------------------------
-
-_texttanumbrowseoptions_ [l=mi] {E _numbrowseoptions_ ngā huarahi hei rapu kōrero i te kohikohinga niupepa:}
 
 _textHelp_ [l=mi] {Āwhina}
 _textSearchshort_ [l=mi] {rapua he kupu}
-
-_textSeriesshort_ [l=mi] {tirohia te whakarārangi taitara}
-
-_textDateshort_ [l=mi] {tirohia te whakarārangi e pā ana ki te wā}
-
-
-_textSearchlong_ [l=mi] {
-<p>Ko te whārangi rapu te whārangi <i>e rapu atu ai ngā kupu</i> i roto
-i ngā tuhinga. Kia puta mai ai tēnei whārangi, i a koe e titiro ana ki 
-te kohinga niupepa nei pāwhiritia te pātene <i>rapu</i>.
-}
-
-
-_textSerieslong_ [l=mi] {
-<p>Kia <i>tirohia te whakarārangi taitara</i> pāwhiritia te pātene 
-<i>whakarārangi taitara</i>. Ka puta mai te whakarārangi o ngā
-niupepa e pā ana ki ngā taitara.
+_textSeriesshort_ [l=mi] {tirohia te whakarārangi tānga pukapuka}
+_textDateshort_ [l=mi] {tirohia te whakarārangi e pā ana ki ngā rā}
+_textSubjectshort_ [l=mi] {tirohia te whakarārangi kaupapa}
+_textToshort_ [l=mi] {tirohia te whakarārangi Ki a Wai}
+_textFromshort_ [l=mi] {tirohia te whakarārangi Nā Wai}
+_textTitleshort_ [l=mi] {tirohia te whakarārangi taitara}
+_textBrowseshort_ [l=mi] {tirohia tānga pukapuka}
+_textCreatorshort_ [l=mi] {tirohia whakarārangi kaitito}
+_textOrganizationshort_ [l=mi] {tirohia te whakarārangi rōpū}
+_textHowtoshort_ [l=mi] {triohia te whakarārangi "pēwhea te"}
+_textTopicshort_ [l=mi] {tirohia te whakarārangi kaupapa}
+_textPeopleshort_ [l=mi] {tirohia te whakarārangi tāngata}
+_textLanguageshort_ [l=mi] {tirohia te whakarārangi reo}
+_textAcronymshort_ [l=mi] {tirohia te whakarārangi pūtauākī}
+_textPhraseshort_ [l=mi] {tirotiro ngā kīwaha i ngā tuhinga}
+_textArtistshort_ [l=mi] {tirohia te whakarārangi kaitito}
+_textSourceshort_ [l=mi] {tirohia te whakarārangi ingoa kōnae}
+_textKeywordshort_ [l=mi] {tirohia te whakarārangi kupu matua}
+_textVolumeshort_ [l=mi] {tirohia te whakarārangi pukaupuka}
+_textCountriesshort_ [l=mi] {tirohia whakarārangi whenua}
+_textdefaultshorttext_ [l=mi] {tirohia te whakarārangi kore-mōhio}
+
+_textSearchlong_ [l=mi] {<p>Ko te whārangi rapu te whārangi <i>e rapu atu ai ngā kupu</i> i roto i ngā tuhinga. Ka puta mai ai tēnei whārangi i te tīmatanga, ā, mehemea kua hipa te whārangi rapu pāwhiritia te pātene <i>rapu</i> kia puta mai anō ai.
+}
+
+_textTitlelong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi taitara</i> pāwhiritia te pātene 
+<i>taitara a -z</i>. Ka puta mai te pūrārangi o ngā
+tuhinga e pā ana ki ngā taitara.
+}
+
+_textOrganizationlong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi rōpū</i> pāwhiritia te pātene <i>Rōpū</i>.  Ka puta mai te whakarārangi tuhinga e pā ana ki ngā rōpū.  }
+
+_textHowtolong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi "pēwhea te"</i> pāwhiritia te pātene <i>Pēwhea te</i>.  Ka puta mai he whakarārangi e pā ana ki ngā whakamārama i ngā mahi.  }
+
+_textCreatorlong_ [l=mi] {<p>Kia <i>tirohia ngā tuhinga e pā ana ki te kaitito</i> pāwhiritia te
+pātene <i>kaitito</i>. Ka puta mai he whakarārangi e pā ana ki ngā ingoa kaitito.}
+
+_textTopiclong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi kaupapa</i> pāwhiritia te pātene 
+<i>kaupapa</i>. Ka puta mai te whakarārangi o ngā
+tuhinga e pā ana ki ngā kaupapa.
+}
+
+_textSubjectlong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi kaupapa</i> pāwhiritia te pātene 
+<i>kaupapa</i>. Ka puta mai te whakarārangi o ngā
+tuhinga e pā ana ki ngā kaupapa.
+}
+
+_textTolong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi Ki a Wai</i> pāwhiritia te pātene 
+<i>Ki a Wai</i>. Ka puta mai te whakarārangi o ngā
+tuhinga e pā ana ki ngā kaiwhiwhi tuhinga.
+}
+
+_textFromlong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi kaituku</i> pāwhiritia te pātene <i>Nā wai</i>.  Ka puta mai te whakarārangi tuhinga e pā ana ki ngā kaituku.  }
+
+_textSerieslong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi tānga pukapuka</i> pāwhiritia te pātene 
+<i>tānga pukapuka</i>. Ka puta mai te whakarārangi o ngā
+tuhinga e pā ana ki ngā tānga pukapuka.
 }
 
 _textDatelong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi e pā ana ki te wā</i> pāwhiritia te
-pātene <i>wātaka</i>. Ka puta mai te whakarārangi o ngā niupepa
-e pā ana ki te wā i puta mai ai aua niupepa.
-}
-
-_texthelptopics_ [l=mi] {
-<h2 align=left>Kaupapa</h2>
+pātene <i>wātaka</i>. Ka puta mai te whakarārangi o ngā tuhinga
+e pā ana ki te wā i puta mai ai aua tuhinga. }
+
+_textBrowselong_ [l=mi] {<p>Kia <i>tirohia tānga pukapuka</i> pāwhiritia te pātene
+<i>tirotiro</i>.  }
+
+_textPeoplelong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi tāngata</i> pāwhiritia te pātene <i>Tāngata</i>.  Ka puta mai te whakarārangi tuhinga e pā ana ki ngā ingoa whānau o ngā tāngata.  }
+
+_textLanguagelong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi reo</i> pāwhiritia te pātene <i>Reo</i>.  Ka puta mai te whakarārangi tuhinga e pā ana ki ngā reo.  }
+
+_textAcronymlong_ [l=mi] {<p>Kia <i>tirohia ngā tuhinga e pā ana ki te pūtauākī</i> pāwhiritia te
+pātene <i>pūtauākī</i>. Ka puta mai te whakarārangi o ngā pūtauākī
+me te wāhi e noho mai ai i te tuhinga nei.}
+
+_textPhraselong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi kīwaha</i> pāwhiritia te pātene <i>Kīwaha</i>.  Ka puta mai te whakarārangi tuhinga e pā ana ki ngā kīwaha.  }
+
+_textArtistlong_ [l=mi] {<p>Kia <i>tirohia ngā tuhinga e pā ana ki te kaitito</i> pāwhiritia te
+pātene <i>kaitito</i>. Ka puta mai he whakarārangi e pā ana ki ngā ingoa kaitito.}
+
+_textSourcelong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi ingoa kōnae</i> pāwhiritia te pātene <i>ingoa kōnae</i>. Ka puta mai te whakarārangi o ngā tuhinga e pā ana ki ngā ingoa kōnae.
+}
+
+_textKeywordlong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi kupu matua</i> pāwhiritia te pātene <i>Kupu Matua</i>.  Ka puta mai te whakarārangi tuhinga e pā ana ki ngā kupu matua.  }
+
+_textVolumelong_ [l=mi] {<p>Kia <i>tirohia te whakarārangi pukapuka</i> pāwhiritia te pātene 
+<i>pukapuka</i>. Ka puta mai te whakarārangi o ngā
+pukapuka.
+}
+
+_textCaptionslong_ [l=mi] {<p>Kia <i>tirohia ngā tuhinga e pā ana ki te rerekōrero</i> pāwhiritia te
+pātene <i>rerekōrero</i>. Ka puta mai he whakarārangi e pā ana ki ngā rerekōrero.}
+
+_textCountrieslong_ [l=mi] {<p>Kia <i>tirohia ngā tuhinga e pā ana ki te whenua</i> pāwhiritia te
+pātene <i>whenua</i>. Ka puta mai he whakarārangi e pā ana ki ngā whenua.}
+
+
+_textdefaultlongtext_ [l=mi] {<p>Kia <i>tirohia te whakarārangi pukapuka</i> pāwhiritia te pātene 
+<i>kore-mōhio</i>. Ka puta mai te whakarārangi o ngā
+pukapuka.
+}
+
+_texthelptopics_ [l=mi] {<h2 align=left>Kaupapa</h2>
 <ul>
-  <li><a href="\#finding-information">Ngā huarahi hei rapu kōrero</a>
-  <li><a href="\#reading-books">Te pānui niupepa/kupu whakataki</a>
-  <li><a href="\#searching">Te rapu kupu</a>
+  <li><a href="\#finding-information">_textsimplehelpheading_</a>
+  _topicreadingdocs_
+  <li><a href="\#searching">Ngā Huarahi Rapu Kōrero</a>
 <ul>
-  <li><a href="\#query-terms">Ngā kupu hei rapu</a>
-  <li><a href="\#query-type">Ngā tūmomo rapu</a>
-  <li><a href="\#scope-of-queries">Te whānui o te rapu</a>
-  <li><a href="\#stemming">Ngā pū matua, pū iti me ngā kūmuri hoki</a>
+  <li><a href="\#query-terms">Ngā Kupu Rapu</a>
+  <li><a href="\#query-type">Ngā Tūmomo Rapunga</a>
+  <li><a href="\#scope-of-queries">Te Whānui o te Rapu</a>
+</ul>
+  <li><a href="\#preferences">_textchangeprefs_</a>
+<ul>
+  <li><a href="\#col-prefs">Ngā Kōwhiringa Kohikohinga</a>
+  <li><a href="\#lang-prefs">Ngā Kōwhiringa Reo</a>
+  <li><a href="\#pres-prefs">Ngā Kōwhiringa Whakaaturanga</a>
+  <li><a href="\#search-prefs">Ngā Kōwhiringa Rapu</a>
 </ul>
 </ul>
 }
 
-_texthelpsearching_ [l=mi] {
-<h2>Te rapu kupu</h2>
+# there are 4 versions of this section of the help text.
+# which version is used is currently set within the server
+# (it should probably use the macro language e.g. [type=book])
+# 1 = html (like fao collections) -- section is empty
+# 2 = book (like hdl collection) -- macros beginning with book
+# 3 = bibliographic (like csbib) -- macros beginning with bib
+# 4 = standard (like gberg) -- the default
+
+_topicreadingdocs_ [l=mi] {<li><a href="\#reading-docs">_textreadingdocs_</a>}
+
+_textreadingdocs_ [l=mi] {Ngā huarahi hei pānui tuhinga}
+
+_texthelpreadingdocs_ [l=mi] {<p>_iconblankbar_</p>
+<a name=reading-docs>
+<h2>_textreadingdocs_</h2>
+
+<p>Ka kite atu koe i tētehi taitara, i tētehi whakaahua iti rānei i 
+runga ake ki te taha māui ka mōhio koe kei te pānui tuhinga. I 
+ētehi kohikohinga ka kite atu hoki i te rārangi kaupapa, i ētehi 
+atu kohinga ko ngā pātene haere whakamua (whakamuri) noa 
+iho rānei. I te rārangi kaupapa e pūkaha ana te wāhanga pānui, ā, 
+e taea ana te whakatuwhera, te kāti rānei i ngā kōpaki. 
+Pāwhiritia te whakaahua pukapuka kia kāti ai te tuhinga.</p>
+
+<p>Kei raro ko ngā kupu tuhituhi o taua wāhanga o te tuhinga. 
+Kei raro rā anō ko te pātene haere whakamua i te tuhinga me 
+te pātene haere whakamuri i te tuhinga.</p>
+
+ <p>Kei runga ake ētehi atu pātene whakahaere. Pāwhiritia te
+<i>whakaNUI KUPU TUHITUHI</i> kia kite atu ai i ngā kupu 
+tuhituhi katoa. Kia tūpato, i ētehi wā he nui rawa ēnei kupu! 
+Pāwhiritia te <i>whakaNUI WHAKARĀRANGI KAUPAPA</i> 
+kia kite atu ai i ngā kaupapa me ngā taitara katoa o taua tuhinga. 
+Pāwhiritia te <i>WHAKAWEHE</i> kia puta mai ai ngā kōrero nei
+ki tētehi matapihi hou. (He pai tēnei mō te titiro ki ngā tuhinga e rua 
+i te wā kotahi.) Hei whakamutunga, mehemea ka rapu kupu, ka 
+noho pūkaha aua kupu i roto i te tuhinga. Pāwhiritia te 
+<i>KORE PŪKAHA</i> kia tango ai te pūkaha o aua kupu.</p>
+
+<p>
+<table cellspacing="0" cellpadding="2" border="0">
+<tr><td colspan=2><img src="_httpiconbshelf_" border="0"></td><td>Whakatūwhera mai ēnei pukapuka</td></tr>
+<tr><td><img src="_httpiconopenbook_" border="0"></td><td><img 
+src="_httpiconbook_" border="0"></td><td>Whakatūwhera/Kāti tēnei pukapuka</td></tr>
+<tr><td colspan=2><img src="_httpiconitext_" border="0"></td><td>Tirohia tēnei wāhanga tuhituhi</td></tr>
+<tr><td><img src="_document:httpiconealltof_" border="0"></td><td><img 
+src="_document:httpiconetsecof_" border="0"></td><td>Whakaatu mai ngā kupu tuhituhi katoa, kāore rānei</td></tr>
+<tr><td><img src="_document:httpiconeexpcof_" border="0"></td><td><img
+src="_document:httpiconeconcof_" border="0"></td><td>Whakanuia Whakarārangi Kaupapa, kāore rānei</td></tr>
+<tr><td colspan=2><img src="_document:httpiconedtchof_" border="0"></td><td>Whakatūwhera mai tēnei whārangi ki te matapihi hou</td></tr>
+<tr><td><img src="_document:httpiconehlof_" border="0"></td><td><img
+src="_document:httpiconenhlof_" border="0"></td><td>Pūkaha ngā kupu rapu, kāore rānei</td></tr>
+<tr><td colspan=2><img src="_httpiconmore_" border="0"></td><td>Pāwhiritia tēnei pere kia haere whakamua ...</td></tr>
+<tr><td colspan=2><img src="_httpiconless_" border="0"></td><td>... pāwhiritia tēnei pere kia haere whakamuri</td></tr>
+</table>
+}
+
+_texthelpsearching_ [l=mi] {<h2>Te rapu kupu</h2>
 <p>
   Ko te whārangi rapu te whārangi hei rapu kupu. Ka puta mai taua whārangi ka
-  whai mai ēnei kōkiri kia rapu ai i (t)ētehi kupu:<p>   
+  whai mai ēnei kōkiri kia rapu ai i (t)ētehi kupu:<p> 
 
   <ol><li>Kōwhiritia ko ngā niupepa, ko ngā kupu whakataki rānei, 
-    ko ngā rāpopoto reo Pākehā, ko aua mea e toru rānei
+ ko ngā rāpopoto reo Pākehā, ko aua mea e toru rānei
       <li>Kōwhiritia ko ētehi o ngā kupu rapu, ko te katoa rānei o ngā
           kupu rapu
@@ -260 +1051 @@
 
   <li>Ka rapua te <b>katoa</b> o āu kupu rapu. Ka rapua ngā pukapuka e mau ana i te katoa
-      o ngā kupu rapu kua tuhia e koe. Ka whakaatu mai aua pukapuka e pā ana ki te 
-      whakarārangi-ā-pū.
-
-  <li>Ka rapua <b>ētehi</b> o āu kupu rapu. Nō reira, me tuhi noa he kupu e pā
-      ana ki te kaupapa e hiahia ana koe. Ka whakarārangitia ngā pukapuka e pā ana
-      ki te ritenga ki āu kupu rapu. Arā, ka puta tuatahitia mai ngā pukapuka;    
+<h2>He whakamārama i te mahi Rapu Kupu</h2>
+<p>
+     Ko te whārangi rapu te whārangi hei rapu kupu. Ka puta mai taua whārangi ka
+  whai mai ēnei kōkiri kia rapu ai i (t)ētehi kupu:<p>
+  
+  <ol><li>Whakaritea kia rapua ngā kupu ki whea
+      <li>Whakaritea kia rapua ngā kupu katoa, kia rapua ētehi kupu noa iho rānei
+      <li>Tuhia ngā kupu rapu
+      <li>Pāwhiritia te pātene <i>Rapua</i> 
+  </ol>
+
+<p>Ka tukua te rapu ka puta mai ngā kitenga rua tekau e pā ana ki āu kupu 
+rapu. He pātene kei raro rā o te whārangi hei titiro ai ki ngā kitenga 21 ki te
+40.  Ka pāwhiri anō i taua pātene ka titiro ki ētehi atu kitenga rua tekau. 
+Nō reira, he pātene kei raro rā hei haere whakamua i ngā kitenga, hei haere 
+whakamuri rānei. 
+Pāwhiritia te taitara o te kitenga, .pāwhiritia te whakaahua iti rānei i te taha o 
+te kitenga kia whakatūwhera mai ai taua kitenga.
+
+<p> Ka kore e nuku atu i te 100 o ngā pukapuka ka kitea i tētehi rapunga. Heoi anō
+ka taea te whakarerekē tēnei nama i te pātene  <i>kōwhiringa</i> i runga ake rā.<p>
+
+<p>_iconblankbar_
+<a name=query-terms>
+<h3>Ngā kupu rapu</h3>
+
+<p> Koia nei ngā kupu ka tuhia ki roto i te pouaka rapu. Me noho te 
+mokowā (wāhi wātea) i waenganui i ngā kupu. Ko ngā reta me ngā 
+nama anakē ngā pū ka rapua. Kaua e tuhi ngā tohutuhi (pērā i te "?" me 
+te "/"), ka tangohia aua tohu e te rorohiko nei, ka whakauru ko te mokowā.
+
+<p> tauira, ki te tuhi atu i ēnei kupu rapu; <p>
+    <ul><kbd> huihuinga-a-motu / Whanganui (1860-1885) </kbd></ul>
+      <p>ka rapua kētia e te rorohiko ēnei kupu;<p>
+      <ul><kbd> huihuinga a motu Whanganui 1860 1885 </kbd></ul><p>
+
+<p>_iconblankbar_
+<a name=query-type>
+<h3>Ngā tūmomo rapu</h3>
+
+<p>E rua ngā tūmomo rapu.
+
+<ul>
+  <li> Ka rapua te <b>katoa</b> o āu kupu rapu. Ka rapua ngā 
+pukapuka e mau ana i te katoa o ngā kupu rapu kua tuhia e koe.
+Ka whakarārangitia mai aua kitenga e pā ana ki te pūrārangi. <p>
+
+  <li> Ka rapua <b>ētehi</b> o āu kupu rapu. Nō reira, me tuhi noa he kupu e pā
+      ana ki te kaupapa e hiahia ana koe. Ka whakarārangitia ngā kitenga e pā ana
+      ki te ritenga ki āu kupu rapu. Arā, ka puta tuatahitia mai ngā kitenga;  
+
 
       <p><ul>
@@ -272 +1108 @@
         <li> e iti ana, ka whai mai ko ngā pukapuka nui.
       </ul>
-
-      <p>Me tuhi i te maha o ngā kupu rapu kia arahina te rapu ki tō ake hiahia.
 </ul>
 
-<p>
-<a name=other-options><a name=scope-of-queries>
-_iconblankbar_<br>
-
+<p> Me tuhi i te maha o ngā kupu rapu kia arahina te rapu ki tō ake hiahia.<p>
 _texthelpscope_
-
-<h3 align=left>Ngā pū matua, pū iti me ngā kūmuri hoki</h3>
-
-<p>Patōhia te pātene whiriwhiringa kia puta mai ai te whārangi e pā
-ana ki ngā pū matua, pū iti me ngā kūmuri hoki. Ka hāngai
-te whiriwhiringa tuatahi ki ngā pū matua me ngā pū iti. Āe
-rānei, me tika te pū matua me te pū iti, kāore rānei, hei aha
-te āta titiro ki ngā pū matua me ngā pū iti. Ka hāngai te
-whiriwhiringa tuarua ki ngā kūmuri o te kupu. Āe rānei, me tino
-ōrite te kūmuri, kāore rānei, hei aha te āta titiro ki ngā 
-kūmuri o ngā kupu. Mō ngā kupu Pākehā anakē te 
-whiriwhiringa kūmuri.
+}
+
+_textdatesearch_ [l=mi] {Rapu Rā}
+
+_texthelpdatesearch_ [l=mi] {<h2>_textdatesearch_</h2>
+Ko te rapu rā tētehi rapu e taea ana te mahi motuhake, e taea ana rānei te 
+whakaū ki tētehi rapunga kupu. He huarahi hei rapu tuhinga i puta mai i 
+tētehi tau, i ētehi tau rānei.<p>
+
+<p>_iconblankbar_
+<a name=datesearch-howto>
+<h3>Ngā Huarahi hei Rapu Rā:</h3>
+<ul>
+   <li>Kia rapu ngā tuhinga e pā ana ki tētehi tau:<p>
+   <ul>
+       <li>Tuhia ngā kupu rapu (pēra i te rapu kupu).
+       <li>Tuhia te tau ki te pouaka "Rā (tīmata)".
+       <li>Mehemea i mua tō tau rapu i te whānau mai o 
+             Ihu Karaiti kōwhiritia te "B.C.E" i te rārangi tono
+            e tata ana ki te pouaka.
+       <li>Tukua te rapu.
+   </ul>
+<p><li>Kia rapu ngā tuhinga e pā ana ki tētehi wā, arā ki ētehi tau:<p>
+   <ul>
+       <li> Tuhia ngā kupu rapu (pēra i te rapu kupu).
+       <li> Tuhia te tau tīmata ki te pouaka "Rā (tīmata)".
+       <li> Tuhia te tau mutunga ki te pouaka "Rā mutunga".
+       <li> Mehemea i mua tētehi tau rapu i te whānau mai o 
+             Ihu Karaiti kōwhiritia te "B.C.E" i te rārangi tono
+            e tata ana ki te pouaka.
+       <li>Tukua te rapu.
+   </ul>    
+</ul><p>
+
+<p>_iconblankbar_
+<a name=datesearch-results>
+<h3>He kōrero mō te Rapu Rā</h3>
+
+Mehemea i rapua e koe te tau 1907 ko ngā kitenga he 
+pukapuka kua tuhi kōrero e pā ana ki 1907, kāore he 
+pukapuka i tā ai i te tau 1907. He āhua koi hoki te rapu 
+i te mea ka kitea ngā pukapuka e kōrero ana mō taua 
+wā hoki, hei tauira; ka kitea ngā pukapuka e pā ana ki 
+te wā 1899-1921 (kei roto te 1907 i taua wā), ka kitea 
+hoki ngā pukapuka e pā ana ki te 20th century (kei roto 
+te 1907 i taua wā), ahakoa kāore te tau 1907 i tuhia ake 
+i aua pukapuka.<p>
+}
+
+_textchangeprefs_ [l=mi] {Te whakarerekē ō kōwhiringa}
+
+_texthelppreferences_ [l=mi] {"<h2>_textchangeprefs_</h2>
+
+<p>Ko te pātene <i>kōwhiringa</i> kei runga ake i te whārangi hei 
+whakarerekē ai ngā kōwhiringa e pā ana ki ōu ake hiahia. 
+
+<p>_iconblankbar_
+<a name=col-prefs>
+<h3 align=left>Kōwhiringa Kohikohinga</h3>
+
+Kei roto i ētehi kohikohinga he kohikohinga anō, he kohikohinga-whāiti.  
+E taea te whakarite i te whārangi kōwhiringa, ko ēwhea ngā 
+kohikohinga-whāiti ka tirohia i te mahi rapu kupu, ko ēwhea ngā 
+kohikohinga-whāiti ka kore e tirohia i te mahi rapu.
+
+<p>_iconblankbar_
+<a name=lang-prefs>
+<h3 align=left>Kōwhiringa Reo</h3>
+
+Kei ngā kohikohinga he reo tauwhiti. E taea ana te whakarite 
+kō tēwhea te reo tauwhiti tuatahi ka kite atu ai te kaipānui. 
+E taea ana te whakarerekē hoki i te encoding scheme mehemea 
+kāore e pai ana, kāore e tika ana te puta mai o ngā pū i tō reo.
+E taea ana hoki te whakarite kia kore-whakaahua te puta mai 
+o ngā kōrero, arā kia text anakē, hei āwhina i ngā tāngata e āhua 
+kāpō ana.
+
+<p>_iconblankbar_
+<a name=pres-prefs>
+<h3 align=left>Kōwhiringa Whakaaturanga</h3>
+
+Ka rerekē ngā kōwhiringa whakaaturanga e taea ana te whakarite 
+i ia tūmomo kohikohinga.
+
+<p>Kei ētehi kohikohinga e taea ana te whakangaro ngā pātene
+whakahaere o runga ake, ā ka riro mā ngā pātene whakahaere ake 
+o te pūmanawa tirotiro e tohutoro. Kei ētehi atu kohikohinga e taea 
+ana te rapu kitenga i te ipurangi whānui, me te haere tōtika ki reira,
+
+<p>_iconblankbar_
+<a name=search-prefs>
+<h3 align=left>Kōwhiringa Rapu</h3>
+<p>E rua ngā kōwhiringa hei whakarite ai i te hāngai pū o te kupu
+rapu ki te kupu kite. Ko te kōwhiringa tuatahi ko ngā pū matua me 
+ngā pū iti. Āe rānei, me tika te pū matua me te pū iti, kāore rānei, 
+me rapu noa i te kupu hei aha te āta titiro ki ngā pū matua me ngā pū iti. 
+Ko te kōwhiringa tuarua ko te kūmuri. Āe rānei, me tino ōrite 
+te kūmuri, kāore rānei, hei aha te āta titiro ki ngā kūmuri o ngā 
+kupu. Mō ngā kupu rapu Pākehā anakē te  kōwhiringa kūmuri.
 
 <p>Hei tauira, mehemea ka kōwhiritia te <i>hei aha te pū matua me te pū
@@ -303 +1221 @@
 <p>ka pēnei i te mea, kāore te rapu i te āta titiro mehemea he pū
 matua, he pū iti rānei, ā, ka tangohia ngā kūmuri (pērā
-i te "ing", me te "s") i tēnei whiriwhiringa.
-
-}
+i te "ing", me te "s") i tēnei kōwhiringa.
+
+E taea ana te whakarite te pouaka rapu kia āhua nui kia ngāwari ai
+te tuhi i te maha o ngā kupu, kōwae kōrero rānei. He huarahi tere 
+tēnei mō te rapu kōrero.
+ 
+<p>E taea ana te whakarite i te tūmomo rapu kia matatau, arā 
+kia whakamahia ngā pū Boolean pēra i te  AND (&), OR (|), 
+me te NOT (!). Mehemea ka pēna ka whakawhāiti te nama o ngā 
+kitenga. E taea ana te whakarite i te hītori rapu kia maumahara ai 
+te rorohiko i ngā kupu kua rapua e koe. Ā, e taea ana hoki te 
+whakarite kia hia ngā kitenga ka puta mai ki runga i te mata 
+o tō rorohiko i te wā kotahi.
+"   }
+
+_texttanumbrowseoptions_ [l=mi] {E _numbrowseoptions_ ngā huarahi hei rapu kōrero i te kohikohinga nei:}
 
 _textsimplehelpheading_ [l=mi] {Ngā huarahi hei rapu kōrero}
 
-
-#------------------------------------------------------------
-# icons
-#------------------------------------------------------------
-
-_httpiconhhelp_ [l=mi] {_httpimg_/mi/h\_help.gif}
-
-
-######################################################################
-# 'search' page
-package query
-######################################################################
-
-#------------------------------------------------------------
-# text macros
-#------------------------------------------------------------
-
-_texticonthispage_ [l=mi] {rapu}
-_textsome_ [l=mi]{ētehi}
-_textall_ [l=mi]{te katoa}
-_textboolean_ [l=mi]{te boolean}
-#_textall_ [l=mi] {_If_(_cgiargb_,te boolean,te katoa)}
-_textbeginsearch_ [l=mi] {Rapua}
-_textfreqmsg1_ [l=mi] {Kia hia ngā kupu: }
-_textmorethan_ [l=mi] {Neke atu i te }
-_textnodocs_ [l=mi] {kāore he pukapuka e pā ana ki āu kupu rapu.}
-_text1doc_ [l=mi] {1 te pukapuka e pā ana ki āu kupu rapu.}
-_textlotsdocs_ [l=mi] {ngā pukapuka e pā ana ki āu kupu rapu.}
-_textmatches_ [l=mi] {Kitenga }
-_textstemon_ [l=mi] { (hei aha te kūmuri)}
-
-_textsimplesearch_ [l=mi] {Tirohia ki _indexselection_ _If_(_jselection_, of _jselection_) _If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language) mō _querytypeselection_ o ngā kupu}
-
-_textadvancedsearch_ [l=mi] {Tirohia ki _indexselection_ _If_(_jselection_, of _jselection_) _If_(_gselection_, at _gselection_ level)_If_(_nselection_, in _nselection_ language) mō _querytypeselection_ o ngā kupu}
-
-
-#------------------------------------------------------------
-# icons
-#------------------------------------------------------------
-
-_httpiconhsearch_ [l=mi] {_httpimg_/mi/h\_search.gif}
-
-_httpiconqryresb_ [l=mi] {_httpimg_/mi/qryresb.gif}
-
-
-######################################################################
-# 'preferences' page
-package preferences
-######################################################################
-
-#------------------------------------------------------------
-# text macros
-#------------------------------------------------------------
-
-
-_textsetprefs_ [l=mi] {whakamaua}
-_textsearchprefs_ [l=mi] {Whiriwhiringa Rapu}
-_textpresentationprefs_ [l=mi] {Whiriwhiringa Whakaaturanga}
-_textpreferences_ [l=mi] {Whiriwhiringa}
-_textcasediffs_ [l=mi] {Pū matua me te pū iti:}
-_textignorecase_ [l=mi] { hei aha te pū matua me te pū iti}
-_textmatchcase_ [l=mi] { me tika te pū matua me te pū iti}
-_textwordends_ [l=mi] {KÅ«muri:}
-_textstem_ [l=mi] { hei aha te kūmuri}
-_textnostem_ [l=mi] { me tika te kūmuri}
-_textprefop_ [l=mi] {Whakahokia mai te _maxdocoption_ kupu, ā, kia _hitsperpageoption_ kupu ki ia whārangi.}
-_textlanguage_ [l=mi] {Reo: }
-_textencoding_ [l=mi] {Whakatakotoranga pū: }
-_textformat_ [l=mi] {Whakatakotoranga whārangi: }
-_textquerymode_ [l=mi] {TÅ«momo rapu:}
-_textsimplemode_ [l=mi] {te rapu ngāwari}
-_textadvancedmode_ [l=mi] {te rapu matatau (ka taea te whakamahi i ngā pū boolean, 
-pērā i te '!', '&', '|', me te '()' hoki)}
-_textgraphical_ [l=mi] {Whakaahua}
-_texttextual_ [l=mi] {Kāore he whakaahua}
-
-_textsearchhistory_ [l=mi] {HÄ«tori rapu:}
-_texthistorydisplay_ [l=mi] { whakaatu mai kia _historynumrecords_ ngā rapunga kua tukua}
-_textnohistorydisplay_ [l=mi] { kaua e whakaatu mai i te hītori rapu}
-
-
-_textqueryboxsize_ [l=mi] {Pouaka rapu:}
-_textregbox_ [l=mi] { pouaka rapu iti}
-_textbigbox_ [l=mi] { pouaka rapu nui}
-
-
-
-#------------------------------------------------------------
-# icons
-#------------------------------------------------------------
-
-_httpiconhpref_ [l=mi] {_httpimg_/mi/h\_pref.gif}
-_widthhpref_ [l=mi] {220}
+_texthelpscope_ [l=mi] {<p>_iconblankbar_
+<a name=scope-of-queries>
+<h3 align=left>Ngā Taupū o te Rapu</h3>
+
+<p>
+Kei te nuinga o ngā kohikohinga e taea ana te whiriwhiri ki 
+tēwhea taupū e rapu atu ai ngā kupu. Hei tauira, me rapu 
+ngā kupu i te taupū Kaitito, i te taupū Taitara rānei; me rapu 
+ngā kupu i te taupū wāhanga, i te taupū kōwae rānei. 
+Ahakoa ko tēwhea taupū ka puta mai te katoa o ngā kupu tuhituhi.
+
+<p>Mehemea he pukapuka te kitenga, ka whakatūwhera mai
+ki te wāhi e noho mai ai āu kupu rapu.
+}