Changeset 949

Timestamp:

2000-02-18T10:35:49+13:00 (24 years ago)

Author:

sjboddie

Message:

made macrons use macros to allow them to be displayed differently
depending on the users preference

Location:

trunk/gsdl/macros

Files:

• english.dm (modified) (1 diff)
• maori.dm (modified) (12 diffs)

trunk/gsdl/macros/english.dm

@@ -1002 +1002 @@
 _textweb_ {the web}
 _textlangeng_ {English}
-_textlangmaori_ {Mäori}
+_textlangmaori_ {M_amn_ori}
 _textlangchinese_ {Chinese}
 _textgraphical_ {Graphical}

trunk/gsdl/macros/maori.dm

@@ -15 +15 @@
 #------------------------------------------------------------
 
-_textimagehelp_ [l=mi] {Te whärangi whakamärama}
-_textimagepref_ [l=mi] {Te whärangi o ngä whiriwhiringa}
-_textimagehome_ [l=mi] {Te whärangi käinga}
+# macron macro defaults (currently default to umlauts)
+_Amn_ {Ä}
+_amn_ {ä}
+_Emn_ {Ë}
+_emn_ {ë}
+_Imn_ {Ï}
+_imn_ {ï}
+_Omn_ {Ö}
+_omn_ {ö}
+_Umn_ {Ü}
+_umn_ {ü}
+
+_textimagehelp_ [l=mi] {Te wh_amn_rangi whakam_amn_rama}
+_textimagepref_ [l=mi] {Te wh_amn_rangi o ng_amn_ whiriwhiringa}
+_textimagehome_ [l=mi] {Te wh_amn_rangi k_amn_inga}
 _textimagesearch_ [l=mi] {rapua he kupu}
-_textimagebrowseseries_ [l=mi] {Tirohia te whakarärangi o ngä niupepa}
-_textimagebrowsedates_ [l=mi] {Tirohia te wä i puta mai ai ngä niupepa}
-
-_page_ [l=mi] {whärangi }
-_pages_ [l=mi] {whärangi}
+_textimagebrowseseries_ [l=mi] {Tirohia te whakar_amn_rangi o ng_amn_ niupepa}
+_textimagebrowsedates_ [l=mi] {Tirohia te w_amn_ i puta mai ai ng_amn_ niupepa}
+
+_page_ [l=mi] {wh_amn_rangi }
+_pages_ [l=mi] {wh_amn_rangi}
 _vol_ [l=mi] {Pukapuka}
 _num_ [l=mi] {Nama}
@@ -42 +54 @@
 
 _texticontabsearchgreen_ [l=mi] {rapu}
-_texticontabdatesgreen_ [l=mi] {wätaka}
-_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}
+_texticontabdatesgreen_ [l=mi] {w_amn_taka}
+_texticontabseriesgreen_ [l=mi] {whakar_amn_rangi niupepa}
+_texticonnext_ [l=mi] {titiro ki te wh_amn_rangi o muri}
+_texticonprev_ [l=mi] {titiro ki te wh_amn_rangi o mua}
+_texticontext_ [l=mi] {Tirohia te wh_amn_rangi}
+
+_textimageSeries_ [l=mi] {Tirohia te whakar_amn_rangi taitara}
+_textimageDate_ [l=mi] {Tirohia te whakar_amn_rangi w_amn_taka}
 
 
@@ -91 +103 @@
 #------------------------------------------------------------
 
-_textabcol_ [l=mi] {He kupu whakamärama i te kohikohinga niupepa}
+_textabcol_ [l=mi] {He kupu whakam_amn_rama i te kohikohinga niupepa}
 
 
@@ -111 +123 @@
 #------------------------------------------------------------
 
-_texticondetach_ [l=mi] {Huakina mai he matapihi hou mö 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}
+_texticondetach_ [l=mi] {Huakina mai he matapihi hou m_omn_ t_emn_nei k_omn_rero}
+_texticonexpandtext_ [l=mi] {Titiro ki ng_amn_ kupu katoa o t_emn_nei niupepa}
+_texticoncontracttext_ [l=mi] {Titiro ki ng_amn_ kupu o t_emn_nei wh_amn_rangi anake}
+_texticonopenbookshelf_ [l=mi] {k_amn_tia}
+_texticonclosedbookshelf_ [l=mi] {whakat_umn_whera mai}
+_texticonclosedbook_ [l=mi] {whakat_umn_whera mai}
+_texticonopenbook_ [l=mi] {k_amn_tia}
+_texticonpointer_ [l=mi] {w_amn_hanga e tiro ana}
+_texticonhighlight_ [l=mi] {Kia p_umn_kaha ng_amn_ kupu rapu}
+_texticonnohighlight_ [l=mi] {Kia kore he p_umn_kaha}
+_texticonsmalltext_ [l=mi] {He wh_amn_rangi niupepa}
+_texticonclosedfolder_ [l=mi] {He k_omn_paki}
 
 _textgoto_ [l=mi] {poka noa ki}
@@ -175 +187 @@
 #------------------------------------------------------------
 
-_texttanumbrowseoptions_ [l=mi] {E _numbrowseoptions_ ngä huarahi hei rapu körero i te kohikohinga niupepa}
-
-_textHelp_ [l=mi] {Äwhina}
+_texttanumbrowseoptions_ [l=mi] {E _numbrowseoptions_ ng_amn_ huarahi hei rapu k_omn_rero i te kohikohinga niupepa}
+
+_textHelp_ [l=mi] {_Amn_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ä}
+_textSeriesshort_ [l=mi] {tirohia te whakar_amn_rangi taitara}
+
+_textDateshort_ [l=mi] {tirohia te whakar_amn_rangi e p_amn_ ana ki te w_amn_}
 
 
 _textSearchlong_ [l=mi] {
-<p>Ko te wh&auml;rangi rapu te wh&auml;rangi <i>e rapu atu ai ng&auml; kupu</i> i roto
-i ng&auml; tuhinga. Kia puta mai ai t&euml;nei wh&auml;rangi, i a koe e titiro ana ki 
-te kohinga niupepa nei p&auml;whiritia te p&auml;tene <i>rapu</i>.
+<p>Ko te wh_amn_rangi rapu te wh_amn_rangi <i>e rapu atu ai ng_amn_ kupu</i> i roto
+i ng_amn_ tuhinga. Kia puta mai ai t_emn_nei wh_amn_rangi, i a koe e titiro ana ki 
+te kohinga niupepa nei p_amn_whiritia te p_amn_tene <i>rapu</i>.
 }
 
 
 _textSerieslong_ [l=mi] {
-<p>Kia <i>tirohia te whakar&auml;rangi taitara</i> p&auml;whiritia te p&auml;tene 
-<i>whakar&auml;rangi taitara</i>. Ka puta mai te whakar&auml;rangi o ng&auml;
-niupepa e p&auml; ana ki ng&auml; taitara.
+<p>Kia <i>tirohia te whakar_amn_rangi taitara</i> p_amn_whiritia te p_amn_tene 
+<i>whakar_amn_rangi taitara</i>. Ka puta mai te whakar_amn_rangi o ng_amn_
+niupepa e p_amn_ ana ki ng_amn_ taitara.
 }
 
-_textDatelong_ [l=mi] {<p>Kia <i>tirohia te whakar&auml;rangi e p&auml; ana ki te w&auml;</i> p&auml;whiritia te
-p&auml;tene <i>w&auml;taka</i>. Ka puta mai te whakar&auml;rangi o ng&auml; niupepa
-e p&auml; ana ki te w&auml; i puta mai ai aua niupepa.
+_textDatelong_ [l=mi] {<p>Kia <i>tirohia te whakar_amn_rangi e p_amn_ ana ki te w_amn_</i> p_amn_whiritia te
+p_amn_tene <i>w_amn_taka</i>. Ka puta mai te whakar_amn_rangi o ng_amn_ niupepa
+e p_amn_ ana ki te w_amn_ i puta mai ai aua niupepa.
 }
 
@@ -206 +218 @@
 <h2 align=left>Kaupapa</h2>
 <ul>
-  <li><a href="\#finding-information">Ng&auml; huarahi hei rapu k&ouml;rero</a>
-  <li><a href="\#reading-books">Te p&auml;nui niupepa/kupu whakataki</a>
+  <li><a href="\#finding-information">Ng_amn_ huarahi hei rapu k_omn_rero</a>
+  <li><a href="\#reading-books">Te p_amn_nui niupepa/kupu whakataki</a>
   <li><a href="\#searching">Te rapu kupu</a>
 <ul>
-  <li><a href="\#query-terms">Ng&auml; kupu hei rapu</a>
-  <li><a href="\#query-type">Ng&auml; t&uuml;momo rapu</a>
-  <li><a href="\#scope-of-queries">Te wh&auml;nui o te rapu</a>
-  <li><a href="\#stemming">Ng&auml; p&uuml; matua, p&uuml; iti me ng&auml; k&uuml;muri hoki</a>
+  <li><a href="\#query-terms">Ng_amn_ kupu hei rapu</a>
+  <li><a href="\#query-type">Ng_amn_ t_umn_momo rapu</a>
+  <li><a href="\#scope-of-queries">Te wh_amn_nui o te rapu</a>
+  <li><a href="\#stemming">Ng_amn_ p_umn_ matua, p_umn_ iti me ng_amn_ k_umn_muri hoki</a>
 </ul>
 </ul>
@@ -221 +233 @@
 <h2>Te rapu kupu</h2>
 <p>
-  Ko te wh&auml;rangi rapu te wh&auml;rangi hei rapu kupu. Ka puta mai taua wh&auml;rangi ka
-  whai mai &euml;nei k&ouml;kiri kia rapu ai i (t)&euml;tehi kupu:<p>   
-
-  <ol><li>K&ouml;whiritia ko ng&auml; niupepa, ko ng&auml; kupu whakataki r&auml;nei, 
-    ko ng&auml; r&auml;popoto reo P&auml;keh&auml;, ko aua mea e toru r&auml;nei
-      <li>K&ouml;whiritia ko &euml;tehi o ng&auml; kupu rapu, ko te katoa r&auml;nei o ng&auml;
+  Ko te wh_amn_rangi rapu te wh_amn_rangi hei rapu kupu. Ka puta mai taua wh_amn_rangi ka
+  whai mai _emn_nei k_omn_kiri kia rapu ai i (t)_emn_tehi kupu:<p>  
+
+  <ol><li>K_omn_whiritia ko ng_amn_ niupepa, ko ng_amn_ kupu whakataki r_amn_nei, 
+    ko ng_amn_ r_amn_popoto reo P_amn_keh_amn_, ko aua mea e toru r_amn_nei
+      <li>K_omn_whiritia ko _emn_tehi o ng_amn_ kupu rapu, ko te katoa r_amn_nei o ng_amn_
           kupu rapu
-      <li>Tuhia ng&auml; kupu rapu
-      <li>Pat&ouml;hia te p&auml;tene <i>Rapua</i>
+      <li>Tuhia ng_amn_ kupu rapu
+      <li>Pat_omn_hia te p_amn_tene <i>Rapua</i>
   </ol>
-<p>Ka tukua te rapu ka hoki mai ng&auml; pukapuka rua tekau e p&auml; ana ki &auml;u kupu rapu.
-He p&auml;tene kei raro r&auml; o te wh&auml;rangi hei titiro ai ki ng&auml; pukapuka 21 ki te
-40 e p&auml; ana ki &auml;u kupu rapu. M&auml; &euml;nei p&auml;tene kei raro r&auml; ka taea
-te tirohia te katoa o ng&auml; wh&auml;rangi e p&auml; ana ki t&auml;u i rapu ai.
-
-<p>Ka kore e nuku atu i te 100 o ng&auml; pukapuka ka kitea i t&euml;tehi rapunga. Heoi an&auml;
-ka taea te whakarerek&euml; t&euml;nei nama i te wh&auml;rangi whiriwhiringa.
+<p>Ka tukua te rapu ka hoki mai ng_amn_ pukapuka rua tekau e p_amn_ ana ki _amn_u kupu rapu.
+He p_amn_tene kei raro r_amn_ o te wh_amn_rangi hei titiro ai ki ng_amn_ pukapuka 21 ki te
+40 e p_amn_ ana ki _amn_u kupu rapu. M_amn_ _emn_nei p_amn_tene kei raro r_amn_ ka taea
+te tirohia te katoa o ng_amn_ wh_amn_rangi e p_amn_ ana ki t_amn_u i rapu ai.
+
+<p>Ka kore e nuku atu i te 100 o ng_amn_ pukapuka ka kitea i t_emn_tehi rapunga. Heoi an_amn_
+ka taea te whakarerek_emn_ t_emn_nei nama i te wh_amn_rangi whiriwhiringa.
 
 <p>
@@ -243 +255 @@
 _iconblankbar_<br>
 
-<h3>Ng&auml; kupu hei rapu</h3>
-
-<p>Koia nei ng&auml; kupu ka tuhia ki roto i te pouaka rapu. Me tuhi ko ng&auml; reta me ng&auml;
-nama anak&euml;. Kaua e tuhia ng&auml; tohu t&ouml;, he uaua te kite i ng&auml; tohu t&ouml; i roto 
-i ng&auml; niupepa. Me noho te mokow&auml; (w&auml;hi w&auml;tea) i waenganui i ng&auml; kupu.
-Kaua e tuhi ng&auml; tuhutuhi (p&euml;r&auml; i te "?" me te "/"), ka tangohia aua tohu e te
-rorohiko nei, ka whakauru ko te mokow&auml;.
-
-<p>Hei tauira, ki te tuku atu i &euml;nei kupu rapu;
+<h3>Ng_amn_ kupu hei rapu</h3>
+
+<p>Koia nei ng_amn_ kupu ka tuhia ki roto i te pouaka rapu. Me tuhi ko ng_amn_ reta me ng_amn_
+nama anak_emn_. Kaua e tuhia ng_amn_ tohu t_omn_, he uaua te kite i ng_amn_ tohu t_omn_ i roto 
+i ng_amn_ niupepa. Me noho te mokow_amn_ (w_amn_hi w_amn_tea) i waenganui i ng_amn_ kupu.
+Kaua e tuhi ng_amn_ tuhutuhi (p_emn_r_amn_ i te "?" me te "/"), ka tangohia aua tohu e te
+rorohiko nei, ka whakauru ko te mokow_amn_.
+
+<p>Hei tauira, ki te tuku atu i _emn_nei kupu rapu;
     <ul><kbd>huihuinga-a-motu / Whanganui (1860-1885)</kbd></ul>
-       <p>ka rapua k&euml;tia e te rorohiko &euml;nei kupu;
+       <p>ka rapua k_emn_tia e te rorohiko _emn_nei kupu;
     <ul><kbd>huihuinga a motu Whanganui 1860 1885</kbd></ul><p>
 
@@ -260 +272 @@
 _iconblankbar_<br>
 
-<h3>Ng&auml; T&uuml;momo Rapu</h3>
-
-<p><ul>E rua ng&auml; t&uuml;momo rapu<p>
-
-  <li>Ka rapua te <b>katoa</b> o &auml;u kupu rapu. Ka rapua ng&auml; pukapuka e mau ana i te katoa
-      o ng&auml; kupu rapu kua tuhia e koe. Ka whakaatu mai aua pukapuka e p&auml; ana ki te 
-      whakar&auml;rangi-&auml;-p&uuml;.
-
-  <li>Ka rapua <b>&euml;tehi</b> o &auml;u kupu rapu. N&ouml; reira, me tuhi noa he kupu e p&auml;
-      ana ki te kaupapa e hiahia ana koe. Ka whakar&auml;rangitia ng&auml; pukapuka e p&auml; ana
-      ki te ritenga ki &auml;u kupu rapu. Ar&auml;, ka puta tuatahitia mai ng&auml; pukapuka;    
+<h3>Ng_amn_ T_umn_momo Rapu</h3>
+
+<p><ul>E rua ng_amn_ t_umn_momo rapu<p>
+
+  <li>Ka rapua te <b>katoa</b> o _amn_u kupu rapu. Ka rapua ng_amn_ pukapuka e mau ana i te katoa
+      o ng_amn_ kupu rapu kua tuhia e koe. Ka whakaatu mai aua pukapuka e p_amn_ ana ki te 
+      whakar_amn_rangi-_amn_-p_umn_.
+
+  <li>Ka rapua <b>_emn_tehi</b> o _amn_u kupu rapu. N_omn_ reira, me tuhi noa he kupu e p_amn_
+      ana ki te kaupapa e hiahia ana koe. Ka whakar_amn_rangitia ng_amn_ pukapuka e p_amn_ ana
+      ki te ritenga ki _amn_u kupu rapu. Ar_amn_, ka puta tuatahitia mai ng_amn_ pukapuka;   
 
       <p><ul>
-        <li> e mau ana i te maha o &auml;u kupu rapu;
-        <li> e mau ana i ng&auml; kupu uaua te kite o &auml;u kupu rapu;
-        <li> e iti ana, ka whai mai ko ng&auml; pukapuka nui.
+        <li> e mau ana i te maha o _amn_u kupu rapu;
+        <li> e mau ana i ng_amn_ kupu uaua te kite o _amn_u kupu rapu;
+        <li> e iti ana, ka whai mai ko ng_amn_ pukapuka nui.
       </ul>
 
-      <p>Me tuhi i te maha o ng&auml; kupu rapu kia arahina te rapu ki t&ouml; ake hiahia.
+      <p>Me tuhi i te maha o ng_amn_ kupu rapu kia arahina te rapu ki t_omn_ ake hiahia.
 </ul>
 
@@ -287 +299 @@
 _texthelpscope_
 
-<h3 align=left>Ng&auml; p&uuml; matua, p&uuml; iti me ng&auml; k&uuml;muri hoki</h3>
-
-<p>Pat&ouml;hia te p&auml;tene whiriwhiringa kia puta mai ai te wh&auml;rangi e p&auml;
-ana ki ng&auml; p&uuml; matua, p&uuml; iti me ng&auml; k&uuml;muri hoki. Ka h&auml;ngai
-te whiriwhiringa tuatahi ki ng&auml; p&uuml; matua me ng&auml; p&uuml; iti. &Auml;e
-r&auml;nei, me tika te p&uuml; matua me te p&uuml; iti, k&auml;ore r&auml;nei, hei aha
-te &auml;ta titiro ki ng&auml; p&uuml; matua me ng&auml; p&uuml; iti. Ka h&auml;ngai te
-whiriwhiringa tuarua ki ng&auml; k&uuml;muri o te kupu. &Auml;e r&auml;nei, me tino
-&ouml;rite te k&uuml;muri, k&auml;ore r&auml;nei, hei aha te &auml;ta titiro ki ng&auml; 
-k&uuml;muri o ng&auml; kupu. M&ouml; ng&auml; kupu P&auml;keh&auml; anak&euml; te 
-whiriwhiringa k&uuml;muri.
-
-<p>Hei tauira, mehemea ka k&ouml;whiritia te <i>hei aha te p&uuml; matua me te p&uuml;
-iti</i>, &auml;, ka k&ouml;whiritia hoki te <i>hei aha te k&uuml;muri o te kupu</i>
-k&auml;tahi ka tukua &euml;nei kupu hei rapu;
+<h3 align=left>Ng_amn_ p_umn_ matua, p_umn_ iti me ng_amn_ k_umn_muri hoki</h3>
+
+<p>Pat_omn_hia te p_amn_tene whiriwhiringa kia puta mai ai te wh_amn_rangi e p_amn_
+ana ki ng_amn_ p_umn_ matua, p_umn_ iti me ng_amn_ k_umn_muri hoki. Ka h_amn_ngai
+te whiriwhiringa tuatahi ki ng_amn_ p_umn_ matua me ng_amn_ p_umn_ iti. _Amn_e
+r_amn_nei, me tika te p_umn_ matua me te p_umn_ iti, k_amn_ore r_amn_nei, hei aha
+te _amn_ta titiro ki ng_amn_ p_umn_ matua me ng_amn_ p_umn_ iti. Ka h_amn_ngai te
+whiriwhiringa tuarua ki ng_amn_ k_umn_muri o te kupu. _Amn_e r_amn_nei, me tino
+_omn_rite te k_umn_muri, k_amn_ore r_amn_nei, hei aha te _amn_ta titiro ki ng_amn_ 
+k_umn_muri o ng_amn_ kupu. M_omn_ ng_amn_ kupu P_amn_keh_amn_ anak_emn_ te 
+whiriwhiringa k_umn_muri.
+
+<p>Hei tauira, mehemea ka k_omn_whiritia te <i>hei aha te p_umn_ matua me te p_umn_
+iti</i>, _amn_, ka k_omn_whiritia hoki te <i>hei aha te k_umn_muri o te kupu</i>
+k_amn_tahi ka tukua _emn_nei kupu hei rapu;
 <p>
   <ul><kbd>Aotearoa building</kbd></ul>
-    <p>ka &ouml;rite te whakahoki mai o ng&auml; pukapuka ki &euml;nei kupu rapu
+    <p>ka _omn_rite te whakahoki mai o ng_amn_ pukapuka ki _emn_nei kupu rapu
   <ul><kbd>aotearoa builds</kbd></ul>
-<p>ka p&euml;nei i te mea, k&auml;ore te rapu i te &auml;ta titiro mehemea he p&uuml;
-matua, he p&uuml; iti r&auml;nei, &auml, ka tangohia ng&auml; k&uuml;muri (p&euml;r&auml;
-i te "ing", me te "s") i t&euml;nei whiriwhiringa.
+<p>ka p_emn_nei i te mea, k_amn_ore te rapu i te _amn_ta titiro mehemea he p_umn_
+matua, he p_umn_ iti r_amn_nei, _amn_, ka tangohia ng_amn_ k_umn_muri (p_emn_r_amn_
+i te "ing", me te "s") i t_emn_nei whiriwhiringa.
 
 }
 
-_textsimplehelpheading_ [l=mi] {Ng&auml; huarahi hei rapu k&ouml;rero}
+_textsimplehelpheading_ [l=mi] {Ng_amn_ huarahi hei rapu k_omn_rero}
 
 _textnextbutton_ [l=mi] {Haere whakamua}
@@ -335 +347 @@
 
 _texticonthispage_ [l=mi] {rapu}
-_textsome_ [l=mi] {&euml;tehi}
+_textsome_ [l=mi] {_emn_tehi}
 _textall_ [l=mi] {_If_(_cgiargb_,te boolean,katoa)}
 _textbeginsearch_ [l=mi] {Rapua}
-_textfreqmsg1_ [l=mi] {Kia hia ng&auml; kupu: }
+_textfreqmsg1_ [l=mi] {Kia hia ng_amn_ kupu: }
 _textmorethan_ [l=mi] {Neke atu i te }
-_textnodocs_ [l=mi] {k&auml;ore he pukapuka e p&auml; ana ki &auml;u kupu rapu.}
-_text1doc_ [l=mi] {1 te pukapuka e p&auml; ana ki &auml;u kupu rapu.}
-_textlotsdocs_ [l=mi] {ng&auml; pukapuka e p&auml; ana ki &auml;u kupu rapu.}
+_textnodocs_ [l=mi] {k_amn_ore he pukapuka e p_amn_ ana ki _amn_u kupu rapu.}
+_text1doc_ [l=mi] {1 te pukapuka e p_amn_ ana ki _amn_u kupu rapu.}
+_textlotsdocs_ [l=mi] {ng_amn_ pukapuka e p_amn_ ana ki _amn_u kupu rapu.}
 _textmatches_ [l=mi] {Kitenga }
-_textstemon_ [l=mi] { (hei aha te k&uuml;muri)}
-
-_textsimplesearch_ [l=mi] {Tirohia ki _If_(_hselection_, _hselection_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) m&ouml; _querytypeselection_ o ng&auml; kupu}
+_textstemon_ [l=mi] { (hei aha te k_umn_muri)}
+
+_textsimplesearch_ [l=mi] {Tirohia ki _If_(_hselection_, _hselection_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) m_omn_ _querytypeselection_ o ng_amn_ kupu}
 
 _textadvancedsearch_ [l=mi] {Tirohia ki_If_(_hselection_, _hselection_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) 
-m&ouml; _querytypeselection_ o ng&auml; kupu}
+m_omn_ _querytypeselection_ o ng_amn_ kupu}
 
 
@@ -371 +383 @@
 
 _textpreferences_ [l=mi] {Whiriwhiringa}
-_textignorecase_ [l=mi] { hei aha te p&uuml; matua me te p&uuml; iti}
-_textmatchcase_ [l=mi] { me tika te p&uuml; matua me te p&uuml; iti}
-_textstem_ [l=mi] { hei aha te k&uuml;muri}
-_textnostem_ [l=mi] { me tika te k&uuml;muri}
-_textprefop_ [l=mi] {Whakahokia mai te _maxdocoption_ kupu, &auml;, kia _hitsperpageoption_ kupu ki ia wh&auml;rangi.}
+_textignorecase_ [l=mi] { hei aha te p_umn_ matua me te p_umn_ iti}
+_textmatchcase_ [l=mi] { me tika te p_umn_ matua me te p_umn_ iti}
+_textstem_ [l=mi] { hei aha te k_umn_muri}
+_textnostem_ [l=mi] { me tika te k_umn_muri}
+_textprefop_ [l=mi] {Whakahokia mai te _maxdocoption_ kupu, _amn_, kia _hitsperpageoption_ kupu ki ia wh_amn_rangi.}
 _textlanguage_ [l=mi] {Reo: }
-_textencoding_ [l=mi] {Whakatakotoranga p&uuml;: }
-_textformat_ [l=mi] {Whakatakotoranga wh&auml;rangi: }
-_textsimplemode_ [l=mi] {te rapu wh&auml;iti}
-_textadvancedmode_ [l=mi] {te rapu wh&auml;nui (ka taea te whakamahia ng&auml; p&uuml; boolean, 
-p&euml;r&auml; i te !, &, |, me te "()" hoki)}
+_textencoding_ [l=mi] {Whakatakotoranga p_umn_: }
+_textformat_ [l=mi] {Whakatakotoranga wh_amn_rangi: }
+_textsimplemode_ [l=mi] {te rapu wh_amn_iti}
+_textadvancedmode_ [l=mi] {te rapu wh_amn_nui (ka taea te whakamahia ng_amn_ p_umn_ boolean, 
+p_emn_r_amn_ i te !, &, |, me te "()" hoki)}
 _textgraphical_ [l=mi] {Whakaahua}
-_texttextual_ [l=mi] {K&auml;ore he whakaahua}
+_texttextual_ [l=mi] {K_amn_ore he whakaahua}