Changeset 2613

Timestamp:

2001-06-29T16:12:27+12:00 (23 years ago)

Author:

sjboddie

Message:

No longer use the old _Xmn_ hack that allowed us to switch between macrons
and umlauts when displaying Maori text. The general consensus now is that
using umlauts is never a good idea.

Location:

trunk/gsdl

Files:

• macros/arabic.dm (modified) ( previous)
• macros/dutch.dm (modified) (1 diff)
• macros/french.dm (modified) (1 diff)
• macros/german.dm (modified) (1 diff)
• macros/maori.dm (modified) (12 diffs)
• macros/port.dm (modified) (1 diff)
• macros/spanish.dm (modified) (1 diff)
• src/recpt/receptionist.cpp (modified) (1 diff)

trunk/gsdl/macros/dutch.dm

@@ -568 +568 @@
 _textdigitlib_ [l=nl] {de digitale bibliotheek}
 _textweb_ [l=nl] {Het Web}
-_textlangeng_ [l=nl] {Engelse}
-_textlanggerman_ [l=nl] {Duitse}
-_textlangfrench_ [l=nl] {Franse}
-_textlangspanish_ [l=nl] {Spaanse}
-_textlangmaori_ [l=nl] {M_amn_ori}
-_textlangchinese_ [l=nl] {Chinese}
-_textlangarabic_ [l=nl] {Arabische}
 _textgraphical_ [l=nl] {Grafisch}
 _texttextual_ [l=nl] {Tekst}

trunk/gsdl/macros/french.dm

@@ -450 +450 @@
 _textdigitlib_ [l=fr] {la bibliotheque numerique}
 _textweb_ [l=fr] {l'internet}
-_textlangeng_ [l=fr] {Anglais}
-_textlangmaori_ [l=fr] {M_amn_ori}
-_textlangchinese_ [l=fr] {Chinois}
 _textgraphical_ [l=fr] {Graphique}
 _texttextual_ [l=fr] {Textuel}

trunk/gsdl/macros/german.dm

@@ -497 +497 @@
 _textdigitlib_ [l=de] {die elektronische Bibliothek}
 _textweb_ [l=de] {das Web}
-_textlangeng_ [l=de] {Englisch}
-_textlangmaori_ [l=de] {M_amn_ori}
-_textlangchinese_ [l=de] {Chinesisch}
 _textgraphical_ [l=de] {Graphisch}
 _texttextual_ [l=de] {Textuell}

trunk/gsdl/macros/maori.dm

@@ -15 +15 @@
 #------------------------------------------------------------
 
-# 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}
+_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}
 _textimagesearch_ [l=mi] {rapua he kupu}
-_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}
+_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}
 _vol_ [l=mi] {Pukapuka}
 _num_ [l=mi] {Nama}
@@ -54 +42 @@
 
 _texticontabsearchgreen_ [l=mi] {rapu}
-_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}
+_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}
 
 
@@ -100 +88 @@
 #------------------------------------------------------------
 
-_textabcol_ [l=mi] {He kupu whakam_amn_rama i te kohikohinga niupepa}
+_textabcol_ [l=mi] {He kupu whakamārama i te kohikohinga niupepa}
 
 
@@ -120 +108 @@
 #------------------------------------------------------------
 
-_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}
+_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}
 
 _textgoto_ [l=mi] {poka noa ki}
@@ -184 +172 @@
 #------------------------------------------------------------
 
-_texttanumbrowseoptions_ [l=mi] {E _numbrowseoptions_ ng_amn_ huarahi hei rapu k_omn_rero i te kohikohinga niupepa}
-
-_textHelp_ [l=mi] {_Amn_whina}
+_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_amn_rangi taitara}
-
-_textDateshort_ [l=mi] {tirohia te whakar_amn_rangi e p_amn_ ana ki te w_amn_}
+_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_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>.
+<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_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_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.
+<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.
+}
+
+_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.
 }
 
@@ -215 +203 @@
 <h2 align=left>Kaupapa</h2>
 <ul>
-  <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="\#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>
 <ul>
-  <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>
+  <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>
 </ul>
 </ul>
@@ -230 +218 @@
 <h2>Te rapu kupu</h2>
 <p>
-  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_
+  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>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
+      <li>Kōwhiritia ko ētehi o ngā kupu rapu, ko te katoa rānei o ngā
           kupu rapu
-      <li>Tuhia ng_amn_ kupu rapu
-      <li>Pat_omn_hia te p_amn_tene <i>Rapua</i>
+      <li>Tuhia ngā kupu rapu
+      <li>Patōhia te pātene <i>Rapua</i>
   </ol>
-<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>Ka tukua te rapu ka hoki mai ngā pukapuka rua tekau e pā ana ki āu kupu rapu.
+He pātene kei raro rā o te whārangi hei titiro ai ki ngā pukapuka 21 ki te
+40 e pā ana ki āu kupu rapu. Mā ēnei pātene kei raro rā ka taea
+te tirohia te katoa o ngā whārangi e pā ana ki tāu i rapu ai.
+
+<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 whārangi whiriwhiringa.
 
 <p>
@@ -252 +240 @@
 _iconblankbar_<br>
 
-<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;
+<h3>Ngā kupu hei rapu</h3>
+
+<p>Koia nei ngā kupu ka tuhia ki roto i te pouaka rapu. Me tuhi ko ngā reta me ngā
+nama anakē. Kaua e tuhia ngā tohu tō, he uaua te kite i ngā tohu tō i roto 
+i ngā niupepa. Me noho te mokowā (wāhi wātea) i waenganui i ngā kupu.
+Kaua e tuhi ngā tuhutuhi (pērā i te "?" me te "/"), ka tangohia aua tohu e te
+rorohiko nei, ka whakauru ko te mokowā.
+
+<p>Hei tauira, ki te tuku atu i ēnei kupu rapu;
     <ul><kbd>huihuinga-a-motu / Whanganui (1860-1885)</kbd></ul>
-       <p>ka rapua k_emn_tia e te rorohiko _emn_nei kupu;
+       <p>ka rapua kētia e te rorohiko ēnei kupu;
     <ul><kbd>huihuinga a motu Whanganui 1860 1885</kbd></ul><p>
 
@@ -269 +257 @@
 _iconblankbar_<br>
 
-<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;   
+<h3>Ngā Tūmomo Rapu</h3>
+
+<p><ul>E rua ngā tūmomo rapu<p>
+
+  <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;    
 
       <p><ul>
-        <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.
+        <li> e mau ana i te maha o āu kupu rapu;
+        <li> e mau ana i ngā kupu uaua te kite o āu kupu rapu;
+        <li> e iti ana, ka whai mai ko ngā pukapuka nui.
       </ul>
 
-      <p>Me tuhi i te maha o ng_amn_ kupu rapu kia arahina te rapu ki t_omn_ ake hiahia.
+      <p>Me tuhi i te maha o ngā kupu rapu kia arahina te rapu ki tō ake hiahia.
 </ul>
 
@@ -296 +284 @@
 _texthelpscope_
 
-<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;
+<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.
+
+<p>Hei tauira, mehemea ka kōwhiritia te <i>hei aha te pū matua me te pū
+iti</i>, ā, ka kōwhiritia hoki te <i>hei aha te kūmuri o te kupu</i>
+kātahi ka tukua ēnei kupu hei rapu;
 <p>
   <ul><kbd>Aotearoa building</kbd></ul>
-    <p>ka _omn_rite te whakahoki mai o ng_amn_ pukapuka ki _emn_nei kupu rapu
+    <p>ka ōrite te whakahoki mai o ngā pukapuka ki ēnei kupu rapu
   <ul><kbd>aotearoa builds</kbd></ul>
-<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_amn_ huarahi hei rapu k_omn_rero}
+<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.
+
+}
+
+_textsimplehelpheading_ [l=mi] {Ngā huarahi hei rapu kōrero}
 
 _textnextbutton_ [l=mi] {Haere whakamua}
@@ -344 +332 @@
 
 _texticonthispage_ [l=mi] {rapu}
-_textsome_ [l=mi] {_emn_tehi}
+_textsome_ [l=mi] {ētehi}
 _textall_ [l=mi] {_If_(_cgiargb_,te boolean,katoa)}
 _textbeginsearch_ [l=mi] {Rapua}
-_textfreqmsg1_ [l=mi] {Kia hia ng_amn_ kupu: }
+_textfreqmsg1_ [l=mi] {Kia hia ngā kupu: }
 _textmorethan_ [l=mi] {Neke atu i te }
-_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.}
+_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_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}
+_textstemon_ [l=mi] { (hei aha te kūmuri)}
+
+_textsimplesearch_ [l=mi] {Tirohia ki _If_(_hselection_, _hselection_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) mō _querytypeselection_ o ngā kupu}
 
 _textadvancedsearch_ [l=mi] {Tirohia ki _If_(_hselection_, _hselection_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) 
-m_omn_ _querytypeselection_ o ng_amn_ kupu}
+mō _querytypeselection_ o ngā kupu}
 
 
@@ -380 +368 @@
 
 _textpreferences_ [l=mi] {Whiriwhiringa}
-_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.}
+_textignorecase_ [l=mi] { hei aha te pū matua me te pū iti}
+_textmatchcase_ [l=mi] { me tika te pū matua me te pū iti}
+_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_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)}
+_textencoding_ [l=mi] {Whakatakotoranga pū: }
+_textformat_ [l=mi] {Whakatakotoranga whārangi: }
+_textsimplemode_ [l=mi] {te rapu whāiti}
+_textadvancedmode_ [l=mi] {te rapu whānui (ka taea te whakamahia ngā pū boolean, 
+pērā i te !, &, |, me te "()" hoki)}
 _textgraphical_ [l=mi] {Whakaahua}
-_texttextual_ [l=mi] {K_amn_ore he whakaahua}
+_texttextual_ [l=mi] {Kāore he whakaahua}
 
 

trunk/gsdl/macros/port.dm

@@ -477 +477 @@
 _textdigitlib_ [l=pt] {a biblioteca digital}
 _textweb_ [l=pt] {a web}
-_textlangeng_ [l=pt] {Inglês}
-_textlanggerman_ [l=pt] {Alemão}
-_textlangmaori_ [l=pt] {M_amn_ori}
-_textlangchinese_ [l=pt] {Chinês}
 _textgraphical_ [l=pt] {Gráfico}
 _texttextual_ [l=pt] {Texto}

trunk/gsdl/macros/spanish.dm

@@ -488 +488 @@
 _textdigitlib_ [l=es] {la biblioteca digital}
 _textweb_ [l=es] {el web}
-_textlangeng_ [l=es] {Inglés}
-_textlanggerman_ [l=es] {Alemán}
-_textlangfrench_ [l=es] {Francés}
-_textlangspanish_ [l=es] {Español}
-_textlangmaori_ [l=es] {M_amn_ori}
-_textlangchinese_ [l=es] {Chino}
 _textgraphical_ [l=es] {Gráfica}
 _texttextual_ [l=es] {Sólo texto}

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1220 +1220 @@
 #endif
 
-  // set macron macros if encoding is utf8 (otherwise they're displayed
-  // using a diaeresis)
-  if (args["w"] == "utf-8") {
-    text_t Amn; Amn.push_back(256); disp.setmacro ("Amn", "Global", Amn);
-    text_t amn; amn.push_back(257); disp.setmacro ("amn", "Global", amn);
-    text_t Emn; Emn.push_back(274); disp.setmacro ("Emn", "Global", Emn);
-    text_t emn; emn.push_back(275); disp.setmacro ("emn", "Global", emn);
-    text_t Imn; Imn.push_back(298); disp.setmacro ("Imn", "Global", Imn);
-    text_t imn; imn.push_back(299); disp.setmacro ("imn", "Global", imn);
-    text_t Omn; Omn.push_back(332); disp.setmacro ("Omn", "Global", Omn);
-    text_t omn; omn.push_back(333); disp.setmacro ("omn", "Global", omn);
-    text_t Umn; Umn.push_back(362); disp.setmacro ("Umn", "Global", Umn);
-    text_t umn; umn.push_back(363); disp.setmacro ("umn", "Global", umn);
-  }
-
   // set _cgiargX_ macros for each cgi argument
   cgiargsclass::const_iterator argshere = args.begin();