31 files changed, 126 insertions, 125 deletions

diff --git a/Makefile.am b/Makefile.am
index abe2e10..b11c9fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,6 @@ EXTRA_DIST = 			\
 	ChangeLog.pre-2-23	\
 	ChangeLog.README	\
 	HACKING			\
-	mate-doc-utils.make	\
 	xmldocs.make		\
 	omf.make		\
 	mate-terminal.wrapper   \
@@ -48,7 +47,6 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/mkinstalldirs \
 	$(srcdir)/omf.make \
 	$(srcdir)/xmldocs.make \
-	$(srcdir)/mate-doc-utils.make	\
 	`find "$(srcdir)" -type f -name Makefile.in -print` \
 	$(NULL)
 
diff --git a/autogen.sh b/autogen.sh
index b8682dd..fab5336 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,12 @@ PKG_NAME="mate-terminal"
 }
 
 which mate-autogen || {
-    echo "You need to install mate-common from the MATE Git"
+    echo "You need to install mate-common"
+    exit 1
+}
+
+which yelp-build || {
+    echo "You need to install yelp-tools" 
     exit 1
 }
 
diff --git a/configure.ac b/configure.ac
index 35f314a..d7f720f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,7 @@ AM_CONDITIONAL([ENABLE_SKEY],[test "$enable_skey" = "yes"])
 # Documentation
 # *************
 
-MATE_DOC_INIT
+YELP_HELP_INIT
 
 # ****************************
 
diff --git a/help/C/mate-terminal.xml b/help/C/index.docbook
index 5abed61..7c628b8 100644
--- a/help/C/mate-terminal.xml
+++ b/help/C/index.docbook
@@ -212,7 +212,7 @@ text-based commands through a shell such as Bash.
         </releaseinfo> 
      <legalnotice> 
         <title>Feedback</title> 
-        <para> To report a bug or make a suggestion regarding the &app; application or this manual, follow the directions in the <ulink url="ghelp:user-guide?feedback" type="help">MATE Feedback Page</ulink>. </para>
+        <para> To report a bug or make a suggestion regarding the &app; application or this manual, follow the directions in the <ulink url="help:user-guide?feedback" type="help">MATE Feedback Page</ulink>. </para>
      </legalnotice> 
   </articleinfo> 
   <indexterm> 
@@ -946,7 +946,7 @@ text-based commands through a shell such as Bash.
                 </term> 
              <listitem> 
                 <para>
-                  Select the <guilabel>Use colours from system theme</guilabel> option to use the colors that are specified in the MATE Desktop theme that is selected in the <guilabel>Theme</guilabel> tab of the <ulink type="help" url="ghelp:user-guide?prefs-theme"><application>Appearance</application> preference tool</ulink>.
+                  Select the <guilabel>Use colours from system theme</guilabel> option to use the colors that are specified in the MATE Desktop theme that is selected in the <guilabel>Theme</guilabel> tab of the <ulink type="help" url="help:user-guide?prefs-theme"><application>Appearance</application> preference tool</ulink>.
                 </para>
                 <para>
                   Use the <guilabel>Built-in schemes</guilabel> drop-down list to specify the foreground and background colors for the terminal. <application>&app;</application> supports the following foreground and background color combinations: 
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 29f0726..fe75213 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -6,7 +6,7 @@
            by the Free Software Foundation with no Invariant Sections,
            no Front-Cover Texts, and no Back-Cover Texts.  You can find
            a copy of the GFDL at this <ulink type="help"
-           url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+           url="help:fdl">link</ulink> or in the file COPYING-DOCS
            distributed with this manual.
           </para>
           <para> This manual is part of a collection of MATE manuals
diff --git a/help/Makefile.am b/help/Makefile.am
index 5336a66..6be193f 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,16 +1,14 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = mate-terminal
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES = 
-DOC_FIGURES = figures/mate-terminal-default.png \
-              figures/mate-terminal-tabbed.png 
+HELP_ID = mate-terminal
+HELP_FILES = index.docbook legal.xml
+HELP_MEDIA = figures/mate-terminal-default.png \
+             figures/mate-terminal-tabbed.png 
 #	      figures/terminal-window.png   This image is not used.
 
-DOC_LINGUAS = da de ca cs el en_GB es fr it ko oc pt_BR ru sv uk zh_CN
+HELP_LINGUAS = da de ca cs el en_GB es fr it ko oc pt_BR ru sv uk zh_CN
 
-# Move to DOC_LINGUAS in transition to mate-doc-utils
+# Move to HELP_LINGUAS in transition to mate-doc-utils
 
 SUBDIRS = bg ro ja zh_TW
 
diff --git a/help/bg/legal.xml b/help/bg/legal.xml
index 434cea4..c0382a3 100644
--- a/help/bg/legal.xml
+++ b/help/bg/legal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <legalnotice id="legalnotice">
-         <para>Предоставя се разрешение за копиране, разпространение и/или промяна на този документ, съгласно условията на „Лиценза за свободна документация на GNU“, версия 1.1 или всяка следваща версия, издадена от Фондация „Свободен софтуер“; без „Непроменливи раздели“, „Текстове на предната корица“, както и „Текстове на задната корица“. Копие на лиценза може да бъде намерено <ulink type="help" url="ghelp:fdl">тук</ulink> или във файла COPYING-DOCS, разпространяван с това ръководство.</para>
+         <para>Предоставя се разрешение за копиране, разпространение и/или промяна на този документ, съгласно условията на „Лиценза за свободна документация на GNU“, версия 1.1 или всяка следваща версия, издадена от Фондация „Свободен софтуер“; без „Непроменливи раздели“, „Текстове на предната корица“, както и „Текстове на задната корица“. Копие на лиценза може да бъде намерено <ulink type="help" url="help:fdl">тук</ulink> или във файла COPYING-DOCS, разпространяван с това ръководство.</para>
           <para>Това ръководство е част от колекция ръководства за MATE, разпространявани под GFDL. Ако искате да разпространявате това ръководство отделно, можете да го направите, като включите копие на лиценза към ръководството, както е описано в раздел 6 от лиценза.</para>
  
          <para>Много от имената, използвани от компании, за да отличават собствените си продукти и услуги, са регистрирани търговски марки. Когато такива имена присъстват в която и да е документация за MATE и членовете на проекта за документация на MATE са осведомени за съответните търговски марки, тогава имената са с главни букви или начални главни букви.</para>
diff --git a/help/bg/mate-terminal.xml b/help/bg/mate-terminal.xml
index 743e747..2af6950 100644
--- a/help/bg/mate-terminal.xml
+++ b/help/bg/mate-terminal.xml
@@ -151,7 +151,7 @@
      <releaseinfo>Това ръководство описва версия 2.5.90 на Терминал на MATE.</releaseinfo> 
      <legalnotice> 
         <title>Обратна връзка</title> 
-        <para>За да докладвате за грешка или да направите предложение относно MATE Terminal или това ръководство, следвайте указанията, описани в <ulink url="ghelp:mate-feedback" type="help">Страницата за обратна връзка на MATE</ulink>.</para>
+        <para>За да докладвате за грешка или да направите предложение относно MATE Terminal или това ръководство, следвайте указанията, описани в <ulink url="help:mate-feedback" type="help">Страницата за обратна връзка на MATE</ulink>.</para>
      </legalnotice> 
   </articleinfo> 
   <indexterm> 
diff --git a/help/ca/ca.po b/help/ca/ca.po
index 8b949ef..d6631e9 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -92,7 +92,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota "
@@ -100,7 +100,7 @@ msgstr ""
 "qualsevol versió publicada posteriorment per la Free Software Foundation, "
 "sense seccions invariants, sense texts de portada i sense texts de "
 "contraportada. Podeu trobar una còpia de la GFDL en aquest <ulink type=\"help"
-"\" url=\"ghelp:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït "
+"\" url=\"help:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït "
 "amb aquest manual."
 
 #: C/mate-terminal.xml:12(para)
@@ -322,12 +322,12 @@ msgstr "Commentaris"
 #: C/mate-terminal.xml:197(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Per a informar d'un error o fer algun suggeriment quant al "
 "<application>terminal del MATE</application> o aquest manual, seguiu les "
-"indicacions a la <ulink url=\"ghelp:mate-feedback\" type=\"help\">Pàgina de "
+"indicacions a la <ulink url=\"help:mate-feedback\" type=\"help\">Pàgina de "
 "comentaris del MATE</ulink>."
 
 #: C/mate-terminal.xml:201(primary)
@@ -1588,14 +1588,14 @@ msgstr "Primer pla i fons"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:"
+"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs-theme\"><application>Appearance</application> preference "
 "tool</ulink>."
 msgstr ""
 "Seleccioneu l'opció <guilabel>Empra els colors del tema del sistema</"
 "guilabel> per a utilitzar els colors especificats en el tema de l'escriptori "
 "del MATE que s'hagin seleccionat a la pestanya <guilabel>Tema</guilabel> de "
-"l'<ulink type=\"help\" url=\"ghelp:user-guide?prefs-theme\">eina de "
+"l'<ulink type=\"help\" url=\"help:user-guide?prefs-theme\">eina de "
 "preferències <application>Aparença</application></ulink>."
 
 #: C/mate-terminal.xml:924(para)
diff --git a/help/cs/cs.po b/help/cs/cs.po
index 913d4df..7c18981 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -120,14 +120,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU "
 "Free Documentation License (GFDL), verze 1.1 nebo jakékoli další verze "
 "vydané nadací Free Software Foundation; bez neměnných oddílů, bez textů "
 "předních desek a bez textů zadních desek. Kopii licence GFDL naleznete pod "
-"<ulink type=\"help\" url=\"ghelp:fdl\">tímto odkazem</ulink> nebo v souboru "
+"<ulink type=\"help\" url=\"help:fdl\">tímto odkazem</ulink> nebo v souboru "
 "COPYING-DOCS dodávaném s touto příručkou."
 
 #: C/mate-terminal.xml:12(para)
@@ -356,12 +356,12 @@ msgstr "Ohlasy"
 #: C/mate-terminal.xml:215(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Pokud chcete oznámit chybu nebo navrhnout vylepšení vztahující se k aplikaci "
 "Terminál MATE nebo této příručce, postupujte dle instrukcí na stránce "
-"<ulink url=\"ghelp:user-guide?feedback\" type=\"help\">Stránka s ohlasy na "
+"<ulink url=\"help:user-guide?feedback\" type=\"help\">Stránka s ohlasy na "
 "MATE</ulink>."
 
 #: C/mate-terminal.xml:219(primary)
@@ -1596,14 +1596,14 @@ msgstr "Popředí a pozadí"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:"
+"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs-theme\"><application>Appearance</application> preference "
 "tool</ulink>."
 msgstr ""
 "Zaškrtněte volbu <guilabel>Používat barvy systémového motivu</guilabel>, "
 "pokud chcete použít barvy určené motivem prostředí MATE. Nastavení vzhledu "
 "lze provést na kartě <guilabel>Motiv</guilabel> v <ulink type=\"help\" url="
-"\"ghelp:user-guide?prefs-theme\">nástroji <application>Nastavení vzhledu</"
+"\"help:user-guide?prefs-theme\">nástroji <application>Nastavení vzhledu</"
 "application></ulink>."
 
 #: C/mate-terminal.xml:951(para)
diff --git a/help/da/da.po b/help/da/da.po
index a86fc6e..208cc62 100644
--- a/help/da/da.po
+++ b/help/da/da.po
@@ -20,14 +20,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Der gives tilladelse til at kopiere, distribuere og/eller ændre dette "
 "dokument under betingelserne givet i GNU Free Documentation License (GFDL), "
 "version 1.1 eller enhver nyere version udgivet af Free Software Foundation "
 "uden invariante afsnit, uden forsidetekster, og uden bagsidetekster. Du kan "
-"findeen kopi af GFDL'en her: <ulink type=\"help\" url=\"ghelp:fdl\">link</"
+"findeen kopi af GFDL'en her: <ulink type=\"help\" url=\"help:fdl\">link</"
 "ulink>, eller i filen COPYING-DOCS der distribueres med denne manual."
 
 #: ../C/legal.xml:12(para)
@@ -358,10 +358,10 @@ msgstr "Tilbagemelding"
 #: ../C/mate-terminal.xml:215(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
-"Følg vejledningen i <ulink url=\"ghelp:user-guide?feedback\" type=\"help"
+"Følg vejledningen i <ulink url=\"help:user-guide?feedback\" type=\"help"
 "\">MATE-tilbagemeldingssiden</ulink> for at rapportere fejl eller komme med "
 "forslag til programmet MATE-terminal eller denne manual."
 
@@ -1586,14 +1586,14 @@ msgstr "Forgrund og baggrund"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:"
+"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs-theme\"><application>Appearance</application> preference "
 "tool</ulink>."
 msgstr ""
 "Vælg indstillingen <guilabel>Benyt farver fra systemtemaet</guilabel> for at "
 "bruge farver som er angivet i MATE-skrivebordstemaet.  Temaet vælges i "
 "<guilabel>Tema</guilabel>-fanebladet i indstillingsværktøjet <ulink type="
-"\"help\" url=\"ghelp:user-guide?prefs-theme\"><application>Udseende</"
+"\"help\" url=\"help:user-guide?prefs-theme\"><application>Udseende</"
 "application></ulink>."
 
 #: ../C/mate-terminal.xml:951(para)
diff --git a/help/de/de.po b/help/de/de.po
index 5a1fca2..482a763 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -116,7 +116,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or in "
 "the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free "
@@ -124,7 +124,7 @@ msgstr ""
 "Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte "
 "sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt "
 "und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem "
-"<ulink type=\"help\" url=\"ghelp:fdl\">Link</ulink> oder in der mit diesem "
+"<ulink type=\"help\" url=\"help:fdl\">Link</ulink> oder in der mit diesem "
 "Handbuch gelieferten Datei COPYING-DOCS."
 
 #: C/mate-terminal.xml:12(para)
@@ -361,11 +361,11 @@ msgstr "Rückmeldungen"
 #: C/mate-terminal.xml:215(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal application "
-"or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?"
+"or this manual, follow the directions in the <ulink url=\"help:user-guide?"
 "feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Wenn Sie Fehler finden oder Vorschläge zur MATE Terminal-Anwendung oder "
-"diesem Handbuch haben, folgen Sie den Anweisungen auf der <ulink url=\"ghelp:"
+"diesem Handbuch haben, folgen Sie den Anweisungen auf der <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE-Seite für Rückmeldungen</ulink>."
 
 #: C/mate-terminal.xml:219(primary)
@@ -1635,14 +1635,14 @@ msgstr "Vorder- und Hintergrund"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:"
+"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs-theme\"><application>Appearance</application> preference "
 "tool</ulink>."
 msgstr ""
 "Wählen Sie die Option <guilabel>Farben vom Systemthema verwenden</guilabel>, "
 "um die Farben des MATE-Desktop-Themas zu verwenden, die im Reiter "
 "<guilabel>Thema</guilabel> des Einstellungswerkzeugs <ulink type=\"help\" url="
-"\"ghelp:user-guide?prefs-theme\"><application>Erscheinungsbild</application></"
+"\"help:user-guide?prefs-theme\"><application>Erscheinungsbild</application></"
 "ulink> festgelegt sind."
 
 #: C/mate-terminal.xml:951(para)
diff --git a/help/el/el.po b/help/el/el.po
index 3995f31..0ac5152 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -120,7 +120,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Χορηγείται η άδεια για αντιγραφή, διανομή ή/και τροποποίηση αυτού του "
@@ -128,7 +128,7 @@ msgstr ""
 "έκδοσης 1.1 ή οποιαδήποτε άλλης έκδοσης δημοσιευμένης από το "
 "Free·Software·Foundation χωρίς αναλλοίωτα στοιχεία, χωρίς κείμενα Front-"
 "Cover και κείμενα Back-Cover. Μπορείτε να βρείτε ένα αντίγραφο του GFDL σ' "
-"αυτό το <ulink type=\"help\" url=\"ghelp:fdl\">σύνδεσμο</ulink> ή στο αρχείο "
+"αυτό το <ulink type=\"help\" url=\"help:fdl\">σύνδεσμο</ulink> ή στο αρχείο "
 "COPYING-DOCS που διανέμεται με αυτόν τον οδηγό."
 
 #: C/mate-terminal.xml:12(para)
@@ -368,11 +368,11 @@ msgstr "Ανάδραση"
 #: C/mate-terminal.xml:215(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Για να ανεφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με την εφαρμογή "
-"Παρακολούθηση συστήματος, ακολουθήστε τις οδηγίες στο <ulink url=\"ghelp:"
+"Παρακολούθηση συστήματος, ακολουθήστε τις οδηγίες στο <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 
 #: C/mate-terminal.xml:219(primary)
@@ -1649,14 +1649,14 @@ msgstr "Προσκήνιο και παρασκήνιο"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:"
+"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs-theme\"><application>Appearance</application> preference "
 "tool</ulink>."
 msgstr ""
 "Επιλέξτε το <guilabel>Χρήση των χρωμάτων του θέματος συστήματος</guilabel> "
 "για να χρησιμοποιήσετε τα χρώματα που ορίζονται στο θέμα του MATE που έχει "
 "επιλεγεί στην καρτέλα <guilabel>Θέμα</guilabel> στο <ulink type=\"help\" url="
-"\"ghelp:user-guide?prefs-theme\">εργαλείο προτιμήσεων <application>Εμφάνιση</"
+"\"help:user-guide?prefs-theme\">εργαλείο προτιμήσεων <application>Εμφάνιση</"
 "application></ulink>."
 
 #: C/mate-terminal.xml:951(para)
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
index a3aa721..e6b6712 100644
--- a/help/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -115,14 +115,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Permission is granted to copy, distribute and/or modify this document under "
 "the terms of the GNU Free Documentation Licence (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 
 #: C/mate-terminal.xml:12(para)
@@ -354,11 +354,11 @@ msgstr "Feedback"
 #: C/mate-terminal.xml:215(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 
 #: C/mate-terminal.xml:219(primary)
@@ -1589,14 +1589,14 @@ msgstr "Foreground and Background"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:"
+"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs-theme\"><application>Appearance</application> preference "
 "tool</ulink>."
 msgstr ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colours that are specified in the MATE Desktop theme that is selected "
 "in the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url="
-"\"ghelp:user-guide?prefs-theme\"><application>Appearance</application> "
+"\"help:user-guide?prefs-theme\"><application>Appearance</application> "
 "preference tool</ulink>."
 
 #: C/mate-terminal.xml:951(para)
diff --git a/help/es/es.po b/help/es/es.po
index 428b0ed..a7ecb24 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -118,7 +118,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Se concede autorización para copiar, distribuir o modificar este documento "
@@ -126,7 +126,7 @@ msgstr ""
 "o cualquier otra versión posterior publicada por Free Software Foundation "
 "sin secciones invariables, textos de portada ni textos de contraportada. "
 "Podrá encontrar una copia de la GFDL en este <ulink type=\"help\" url="
-"\"ghelp:fdl\">enlace</ulink> o en el archivo COPYING-DOCS distribuido con "
+"\"help:fdl\">enlace</ulink> o en el archivo COPYING-DOCS distribuido con "
 "este manual."
 
 #: C/mate-terminal.xml:12(para)
@@ -363,12 +363,12 @@ msgstr "Comentarios"
 #: C/mate-terminal.xml:215(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Para informar de un defecto o hacer alguna sugerencia sobre la aplicación "
 "Terminal de MATE o el presente manual, siga las instrucciones que aparecen "
-"en la <ulink url=\"ghelp:user-guide?feedback\" type=\"help\">Página de "
+"en la <ulink url=\"help:user-guide?feedback\" type=\"help\">Página de "
 "comentarios de MATE</ulink>."
 
 #: C/mate-terminal.xml:219(primary)
@@ -1642,14 +1642,14 @@ msgstr "Primer plano y fondo"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:"
+"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs-theme\"><application>Appearance</application> preference "
 "tool</ulink>."
 msgstr ""
 "Seleccione la opción <guilabel>Usar colores del tema del sistema</guilabel> "
 "para usar los colores especificados en el tema de escritorio de MATE que "
 "esté seleccionado en la solapa <guilabel>Tema</guilabel> de la <ulink type="
-"\"help\" url=\"ghelp:user-guide?prefs-theme\">herramienta de preferencias "
+"\"help\" url=\"help:user-guide?prefs-theme\">herramienta de preferencias "
 "<application>Apariencia</application></ulink>."
 
 #: C/mate-terminal.xml:951(para)
diff --git a/help/fr/fr.po b/help/fr/fr.po
index d1effaf..cfc5a45 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -120,7 +120,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Permission vous est donnée de copier, distribuer et/ou modifier ce document "
@@ -128,7 +128,7 @@ msgstr ""
 "ou ultérieure publiée par la Free Software Foundation sans section "
 "inaltérable, sans texte de première page de couverture ni texte de dernière "
 "page de couverture. Vous trouverez un exemplaire de cette licence en suivant "
-"ce <ulink type=\"help\" url=\"ghelp:fdl\">lien</ulink> ou dans le fichier "
+"ce <ulink type=\"help\" url=\"help:fdl\">lien</ulink> ou dans le fichier "
 "COPYING-DOCS fourni avec le présent manuel."
 
 #: C/mate-terminal.xml:12(para)
@@ -362,12 +362,12 @@ msgstr "Votre avis"
 #: C/mate-terminal.xml:215(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Pour rapporter une anomalie ou émettre une suggestion concernant "
 "l'application Terminal MATE ou ce manuel, procédez comme indiqué sur la "
-"<ulink url=\"ghelp:user-guide?feedback\" type=\"help\">page de réactions sur "
+"<ulink url=\"help:user-guide?feedback\" type=\"help\">page de réactions sur "
 "MATE</ulink>."
 
 #: C/mate-terminal.xml:219(primary)
@@ -1640,13 +1640,13 @@ msgstr "Premier et arrière-plan"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:"
+"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs-theme\"><application>Appearance</application> preference "
 "tool</ulink>."
 msgstr ""
 "Cochez l'option <guilabel>Utiliser les couleurs du thème système</guilabel> "
 "pour utiliser les couleurs indiquées dans le thème MATE sélectionné dans "
-"l'onglet <guilabel>Thème</guilabel> du <ulink type=\"help\" url=\"ghelp:user-"
+"l'onglet <guilabel>Thème</guilabel> du <ulink type=\"help\" url=\"help:user-"
 "guide?prefs-theme\">panneau de préférences <application>Apparence</"
 "application></ulink>."
 
diff --git a/help/it/it.po b/help/it/it.po
index dbb17ee..94d48e7 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -111,14 +111,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Questo documento può essere copiato, distribuito o modificato solo in "
 "conformità con i termini della GNU Free Documentation License (GFDL) "
 "Versione 1.1 o delle versioni successive pubblicate dalla Free Software "
 "Foundation senza sezioni invariabili, frontespizi e testi di copertina. Una "
-"copia della GFDL è disponibile su questo <ulink type=\"help\" url=\"ghelp:fdl"
+"copia della GFDL è disponibile su questo <ulink type=\"help\" url=\"help:fdl"
 "\">collegamento</ulink> o nel file COPYING-DOCS distribuito con questo "
 "manuale."
 
@@ -344,12 +344,12 @@ msgstr "Commenti"
 #: C/mate-terminal.xml:206(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Per segnalare un problema o inviare suggerimenti sull'applicazione Terminale "
 "di MATE o su questo manuale, seguire le istruzioni presenti alla <ulink url="
-"\"ghelp:user-guide?mate-feedback\" type=\"help\">pagina di commenti di "
+"\"help:user-guide?mate-feedback\" type=\"help\">pagina di commenti di "
 "MATE</ulink>."
 
 #: C/mate-terminal.xml:210(primary)
@@ -1618,14 +1618,14 @@ msgstr "Primo piano e sfondo"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:"
+"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs-theme\"><application>Appearance</application> preference "
 "tool</ulink>."
 msgstr ""
 "Selezionare l'opzione <guilabel>Usare i colori del tema di sistema</"
 "guilabel> per usare i colori specificati nel tema del desktop MATE, "
 "selezionato attraverso lo strumento di preferenze <ulink type=\"help\" url="
-"\"ghelp:user-guide?prefs-theme\"><application>Aspetto</application></ulink>."
+"\"help:user-guide?prefs-theme\"><application>Aspetto</application></ulink>."
 
 #: C/mate-terminal.xml:942(para)
 msgid ""
@@ -1964,11 +1964,11 @@ msgstr "Lorenzo Travaglio <[email protected]>, 2006, 2009"
 #~ msgid ""
 #~ "To report a bug or make a suggestion regarding the Sound Recorder "
 #~ "application or this manual, follow the directions in the <ulink url="
-#~ "\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+#~ "\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 #~ msgstr ""
 #~ "Per segnalare un problema o inviare suggerimenti riguardo questa "
 #~ "applicazione o su questo manuale, seguire le istruzioni presenti alla "
-#~ "<ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">pagina di "
+#~ "<ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">pagina di "
 #~ "commenti della guida utente di MATE</ulink>."
 
 #~ msgid "<guilabel>Application</guilabel> menu"
@@ -1991,19 +1991,19 @@ msgstr "Lorenzo Travaglio <[email protected]>, 2006, 2009"
 
 #~ msgid ""
 #~ "To report a bug or make a suggestion regarding this application or this "
-#~ "manual, follow the directions in the <ulink url=\"ghelp:user-guide?"
+#~ "manual, follow the directions in the <ulink url=\"help:user-guide?"
 #~ "feedback-bugs\" type=\"help\">Feedback section of the MATE User Guide</"
 #~ "ulink>."
 #~ msgstr ""
 #~ "Per segnalare un problema o inviare suggerimenti riguardo questa "
 #~ "applicazione o su questo manuale, seguire le istruzioni presenti alla "
-#~ "<ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">pagina di "
+#~ "<ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">pagina di "
 #~ "commenti della guida utente di MATE</ulink>."
 
 #~ msgid ""
 #~ "This program is distributed under the terms of the GNU General Public "
 #~ "license as published by the Free Software Foundation; either version 2 of "
-#~ "the License, or (at your option) any later version. A <ulink url=\"ghelp:"
+#~ "the License, or (at your option) any later version. A <ulink url=\"help:"
 #~ "gpl\" type=\"help\">copy of this license</ulink> is included with this "
 #~ "documentation; another can be found in the file COPYING included with the "
 #~ "source code of this program."
@@ -2011,7 +2011,7 @@ msgstr "Lorenzo Travaglio <[email protected]>, 2006, 2009"
 #~ "Questo programma è distribuito sotto i termini della GNU General Public "
 #~ "License come pubblicata dalla Free Software Foundation; o la versione 2 "
 #~ "della licenza o (a propria scelta) una versione successiva. Una <ulink "
-#~ "url=\"ghelp:gpl\" type=\"help\">copia di questa licenza</ulink> è inclusa "
+#~ "url=\"help:gpl\" type=\"help\">copia di questa licenza</ulink> è inclusa "
 #~ "in questa documentazione; un'altra copia può essere trovata nel file "
 #~ "COPYING incluso con il codice sorgente di questo programma."
 
diff --git a/help/ja/legal.xml b/help/ja/legal.xml
index 8b1f9d2..3e3e45b 100644
--- a/help/ja/legal.xml
+++ b/help/ja/legal.xml
@@ -4,7 +4,7 @@
 	  をコピー、配布、または変更することを許可します。Free Software 
 	  Foundation から発行されたバージョン 1.1 以降のドキュメントには、
 	  セクションや表紙などがありません。GFDL のコピーは、<ulink 
-	  type="help" url="ghelp:fdl">URL</ulink> またはこのマニュアルと
+	  type="help" url="help:fdl">URL</ulink> またはこのマニュアルと
 	  一緒に配布された COPYING-DOCS を参照してください。
          </para>
          <para> このマニュアルは、GFDL から配布された MATE マニュアルの
diff --git a/help/ja/mate-terminal.xml b/help/ja/mate-terminal.xml
index 9a573ea..10d9b48 100644
--- a/help/ja/mate-terminal.xml
+++ b/help/ja/mate-terminal.xml
@@ -127,7 +127,7 @@
      <legalnotice> 
       <title>フィードバック</title>
         <para>&app; アプリケーションまたはこのマニュアルに関してバグやご意見をご報告いただく場合は、<ulink 
-url="ghelp:mate-feedback" type="help">『MATE フィードバックページ』</ulink> を参照してください </para>
+url="help:mate-feedback" type="help">『MATE フィードバックページ』</ulink> を参照してください </para>
      </legalnotice>
   </articleinfo>
   <indexterm> 
diff --git a/help/ko/ko.po b/help/ko/ko.po
index 3f21fa3..aa54df7 100644
--- a/help/ko/ko.po
+++ b/help/ko/ko.po
@@ -93,13 +93,13 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "본 설명서는 프리 소프트웨어 재단(FSF)에서 발행한 GNU 자유 문서 라이센스"
 "(GFDL) 버전 1.1 이상의 조항에 따라 변경 불가 부분, 앞 표지 텍스트 및 뒷 표지 "
 "텍스트를 제외하고 복사, 수정 및/또는 배포할 수 있습니다. GFDL의 사본은 "
-"<ulink type=\"help\" url=\"ghelp:fdl\">링크</ulink> 또는 본 설명서와 함께 배"
+"<ulink type=\"help\" url=\"help:fdl\">링크</ulink> 또는 본 설명서와 함께 배"
 "포된 COPYING-DOCS 파일에서 찾을 수 있습니다."
 
 #: ../C/mate-terminal.xml:12(para) ../C/legal.xml:12(para)
@@ -308,11 +308,11 @@ msgstr "피드백"
 #: ../C/mate-terminal.xml:197(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "그놈 터미널 프로그램 또는 이 설명서에 대한 버그를 알려 주시거나 의견을 제시하"
-"려면 <ulink url=\"ghelp:user-guide?feedback\" type=\"help\">그놈 피드백 페이"
+"려면 <ulink url=\"help:user-guide?feedback\" type=\"help\">그놈 피드백 페이"
 "지</ulink>에 있는 대로 해 주십시오."
 
 #: ../C/mate-terminal.xml:201(primary)
@@ -1507,13 +1507,13 @@ msgstr "글자색과 배경색"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:"
+"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs-theme\"><application>Appearance</application> preference "
 "tool</ulink>."
 msgstr ""
 "<guilabel>시스템 테마 색 사용</guilabel> 옵션을 선택하면 그놈 데스크탑 테마에"
 "서 지정한 색을 사용합니다. 그놈 데스크탑 테마는 <ulink type=\"help\" url="
-"\"ghelp:user-guide?prefs-theme\"><application>모양새</application> 설정 도구"
+"\"help:user-guide?prefs-theme\"><application>모양새</application> 설정 도구"
 "</ulink>의 <guilabel>테마</guilabel> 탭에서 설정합니다."
 
 #: ../C/mate-terminal.xml:924(para)
diff --git a/help/oc/oc.po b/help/oc/oc.po
index 851a7ce..4cd0e6e 100644
--- a/help/oc/oc.po
+++ b/help/oc/oc.po
@@ -96,7 +96,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr ""
 #: C/mate-terminal.xml:197(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 
@@ -1269,7 +1269,7 @@ msgstr ""
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <ulink type=\"help\" url=\"ghelp:user-guide?prefs-theme"
+"the <ulink type=\"help\" url=\"help:user-guide?prefs-theme"
 "\"><application>Theme</application> preference tool</ulink>."
 msgstr ""
 
diff --git a/help/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po
index 703ffcd..97290e1 100644
--- a/help/pt_BR/pt_BR.po
+++ b/help/pt_BR/pt_BR.po
@@ -111,8 +111,8 @@ msgid "MATE Documentation Project"
 msgstr "Projeto de Documentação do MATE"
 
 #: C/mate-terminal.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "É garantida a permissão para copiar, distribuir e/ou modificar este documento sob os termos da Licença de Documentação Livre GNU (GNU Free Documentation License), Versão 1.1 ou qualquer versão posterior publicada pela Free Software Foundation; sem Seções Invariantes, Textos de Capa Frontal, e sem Textos de Quarta Capa. Você pode encontrar uma cópia da licença GFDL no link <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> ou no arquivo COPYING-DOCS distribuído com este manual."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "É garantida a permissão para copiar, distribuir e/ou modificar este documento sob os termos da Licença de Documentação Livre GNU (GNU Free Documentation License), Versão 1.1 ou qualquer versão posterior publicada pela Free Software Foundation; sem Seções Invariantes, Textos de Capa Frontal, e sem Textos de Quarta Capa. Você pode encontrar uma cópia da licença GFDL no link <ulink type=\"help\" url=\"help:fdl\">link</ulink> ou no arquivo COPYING-DOCS distribuído com este manual."
 
 #: C/mate-terminal.xml:12(para)
 msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
@@ -266,8 +266,8 @@ msgid "Feedback"
 msgstr "Feedback"
 
 #: C/mate-terminal.xml:206(para)
-msgid "To report a bug or make a suggestion regarding the MATE Terminal application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Para relatar um erro ou fazer alguma sugestão sobre o aplicativo Terminal do MATE ou seu manual, siga as instruções no link <ulink url=\"ghelp:user-guide?feedback\" type=\"help\">Página de Feedback do MATE</ulink>."
+msgid "To report a bug or make a suggestion regarding the MATE Terminal application or this manual, follow the directions in the <ulink url=\"help:user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "Para relatar um erro ou fazer alguma sugestão sobre o aplicativo Terminal do MATE ou seu manual, siga as instruções no link <ulink url=\"help:user-guide?feedback\" type=\"help\">Página de Feedback do MATE</ulink>."
 
 #: C/mate-terminal.xml:210(primary)
 msgid "MATE Terminal"
@@ -979,8 +979,8 @@ msgid "Foreground and Background"
 msgstr "Texto e fundo"
 
 #: C/mate-terminal.xml:939(para)
-msgid "Select the <guilabel>Use colours from system theme</guilabel> option to use the colors that are specified in the MATE Desktop theme that is selected in the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:user-guide?prefs-theme\"><application>Appearance</application> preference tool</ulink>."
-msgstr "Selecione a opção <guilabel>Usar cores do tema do sistema</guilabel> para usar as cores que são especificadas no tema MATE que é selecionado na aba <guilabel>Tema</guilabel> da <ulink type=\"help\" url=\"ghelp:user-guide?prefs-theme\">ferramenta de preferências <application>Aparência</application></ulink>."
+msgid "Select the <guilabel>Use colours from system theme</guilabel> option to use the colors that are specified in the MATE Desktop theme that is selected in the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:user-guide?prefs-theme\"><application>Appearance</application> preference tool</ulink>."
+msgstr "Selecione a opção <guilabel>Usar cores do tema do sistema</guilabel> para usar as cores que são especificadas no tema MATE que é selecionado na aba <guilabel>Tema</guilabel> da <ulink type=\"help\" url=\"help:user-guide?prefs-theme\">ferramenta de preferências <application>Aparência</application></ulink>."
 
 #: C/mate-terminal.xml:942(para)
 msgid "Use the <guilabel>Built-in schemes</guilabel> drop-down list to specify the foreground and background colors for the terminal. <application>MATE Terminal</application> supports the following foreground and background color combinations:"
diff --git a/help/ro/legal.xml b/help/ro/legal.xml
index 2d5e239..3dd20f5 100644
--- a/help/ro/legal.xml
+++ b/help/ro/legal.xml
@@ -5,7 +5,7 @@
 	   (GFDL), versiunea 1.1 sau orice versiune ulterioară publicată de
 	   către Fundaţia pentru Software Liber, dar fără Secţiuni invariante,
 	   şi fără texte de copertă. Puteţi găsi o copie a GFDL la <ulink type="help"
-	   url="ghelp:fdl">această legătură</ulink> sau în fişierul COPYING-DOCS
+	   url="help:fdl">această legătură</ulink> sau în fişierul COPYING-DOCS
 	   distribuit cu acest manual.
           </para>
           <para> Acest manual este o parte a colecţiei de manuale MATE
diff --git a/help/ro/mate-terminal.xml b/help/ro/mate-terminal.xml
index 1f33cdf..fd09c15 100644
--- a/help/ro/mate-terminal.xml
+++ b/help/ro/mate-terminal.xml
@@ -104,7 +104,7 @@
 		<title>Comentarii</title>
 		<para>Pentru a raporta un bug sau pentru a face o sugestie referitoare la aplicaţia
 		 &app;  sau la acest manual, urmăriţi instrucţiunile de la
-		<ulink url="ghelp:mate-feedback" type="help">Pagina de sugestii MATE</ulink>.
+		<ulink url="help:mate-feedback" type="help">Pagina de sugestii MATE</ulink>.
       </para>
      </legalnotice> 
   </articleinfo> 
diff --git a/help/ru/ru.po b/help/ru/ru.po
index f6d2433..b48725f 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -68,8 +68,8 @@ msgid "MATE Documentation Project"
 msgstr "Проект документации MATE"
 
 #: C/mate-terminal.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "Следующим разрешается копировать и/или модифицировать этот документ при условии соблюдения GNU Free Documentation License (GFDL), версии 1.1 или любой более поздней опубликованной Фондом свободного программного обеспечения версией без неизменяемых частей, без текстов на обложках. Вы можете найти копию лицензии по этой <ulink type=\"help\" url=\"ghelp:fdl\">ссылке</ulink> или в файле COPYING-DOCS, распространяемом с этим документом."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Следующим разрешается копировать и/или модифицировать этот документ при условии соблюдения GNU Free Documentation License (GFDL), версии 1.1 или любой более поздней опубликованной Фондом свободного программного обеспечения версией без неизменяемых частей, без текстов на обложках. Вы можете найти копию лицензии по этой <ulink type=\"help\" url=\"help:fdl\">ссылке</ulink> или в файле COPYING-DOCS, распространяемом с этим документом."
 
 #: C/mate-terminal.xml:12(para)
 msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
@@ -212,8 +212,8 @@ msgid "Feedback"
 msgstr "Обратная связь"
 
 #: C/mate-terminal.xml:197(para)
-msgid "To report a bug or make a suggestion regarding the MATE Terminal application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Чтобы сообщить об ошибке или внести предложение относительно Терминала среды MATE или данного руководства следуйте ссылке <ulink url=\"ghelp:user-guide?feedback\" type=\"help\"> Обратная связь с MATE</ulink>."
+msgid "To report a bug or make a suggestion regarding the MATE Terminal application or this manual, follow the directions in the <ulink url=\"help:user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "Чтобы сообщить об ошибке или внести предложение относительно Терминала среды MATE или данного руководства следуйте ссылке <ulink url=\"help:user-guide?feedback\" type=\"help\"> Обратная связь с MATE</ulink>."
 
 #: C/mate-terminal.xml:201(primary)
 msgid "MATE Terminal"
@@ -932,8 +932,8 @@ msgid "Foreground and Background"
 msgstr "Текст и фон"
 
 #: C/mate-terminal.xml:939(para)
-msgid "Select the <guilabel>Use colours from system theme</guilabel> option to use the colors that are specified in the MATE Desktop theme that is selected in the <ulink type=\"help\" url=\"ghelp:user-guide?prefs-theme\"><application>Theme</application> preference tool</ulink>."
-msgstr "Выберите параметр <guilabel>Использовать цвета из системной темы</guilabel> чтобы использовать цвета, определённые в теме рабочего стола MATE, которая выбрана в <ulink type=\"help\" url=\"ghelp:user-guide?prefs-theme\">настройках <application>Тема</application></ulink>."
+msgid "Select the <guilabel>Use colours from system theme</guilabel> option to use the colors that are specified in the MATE Desktop theme that is selected in the <ulink type=\"help\" url=\"help:user-guide?prefs-theme\"><application>Theme</application> preference tool</ulink>."
+msgstr "Выберите параметр <guilabel>Использовать цвета из системной темы</guilabel> чтобы использовать цвета, определённые в теме рабочего стола MATE, которая выбрана в <ulink type=\"help\" url=\"help:user-guide?prefs-theme\">настройках <application>Тема</application></ulink>."
 
 #: C/mate-terminal.xml:942(para)
 msgid "Use the <guilabel>Built-in schemes</guilabel> drop-down list to specify the foreground and background colors for the terminal. <application>MATE Terminal</application> supports the following foreground and background color combinations:"
diff --git a/help/sv/sv.po b/help/sv/sv.po
index 1562652..8c6544a 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -84,8 +84,8 @@ msgid "MATE Documentation Project"
 msgstr "Dokumentationsprojekt för MATE"
 
 #: C/mate-terminal.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan standardavsnitt och omslagstexter.  En kopia av GFDL finns att hämta på denna <ulink type=\"help\" url=\"ghelp:fdl\">länk</ulink> eller i filen COPYING-DOCS som medföljer denna handbok."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan standardavsnitt och omslagstexter.  En kopia av GFDL finns att hämta på denna <ulink type=\"help\" url=\"help:fdl\">länk</ulink> eller i filen COPYING-DOCS som medföljer denna handbok."
 
 #: C/mate-terminal.xml:12(para)
 msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
@@ -238,8 +238,8 @@ msgid "Feedback"
 msgstr "Återkoppling"
 
 #: C/mate-terminal.xml:197(para)
-msgid "To report a bug or make a suggestion regarding the MATE Terminal application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "För att rapportera ett fel eller komma med ett förslag angående programmet <application>MATE-terminal</application> eller denna handbok, följ instruktionerna på <ulink url=\"ghelp:user-guide?feedback\" type=\"help\">MATE:s återkopplingssida</ulink>."
+msgid "To report a bug or make a suggestion regarding the MATE Terminal application or this manual, follow the directions in the <ulink url=\"help:user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "För att rapportera ett fel eller komma med ett förslag angående programmet <application>MATE-terminal</application> eller denna handbok, följ instruktionerna på <ulink url=\"help:user-guide?feedback\" type=\"help\">MATE:s återkopplingssida</ulink>."
 
 #: C/mate-terminal.xml:201(primary)
 msgid "MATE Terminal"
@@ -945,8 +945,8 @@ msgid "Foreground and Background"
 msgstr "Förgrund och bakgrund"
 
 #: C/mate-terminal.xml:921(para)
-msgid "Select the <guilabel>Use colours from system theme</guilabel> option to use the colors that are specified in the MATE Desktop theme that is selected in the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:user-guide?prefs-theme\"><application>Appearance</application> preference tool</ulink>."
-msgstr "Välj alternativet <guilabel>Använd färger från systemtemat</guilabel> för att använda färger som är angivna i temat för MATE-skrivbordet, som har valts under fliken <guilabel>Tema</guilabel> i <ulink type=\"help\" url=\"ghelp:user-guide?prefs-theme\">inställningsverktyget <application>Utseende</application></ulink>."
+msgid "Select the <guilabel>Use colours from system theme</guilabel> option to use the colors that are specified in the MATE Desktop theme that is selected in the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:user-guide?prefs-theme\"><application>Appearance</application> preference tool</ulink>."
+msgstr "Välj alternativet <guilabel>Använd färger från systemtemat</guilabel> för att använda färger som är angivna i temat för MATE-skrivbordet, som har valts under fliken <guilabel>Tema</guilabel> i <ulink type=\"help\" url=\"help:user-guide?prefs-theme\">inställningsverktyget <application>Utseende</application></ulink>."
 
 #: C/mate-terminal.xml:924(para)
 msgid "Use the <guilabel>Built-in schemes</guilabel> drop-down list to specify the foreground and background colors for the terminal. <application>MATE Terminal</application> supports the following foreground and background color combinations:"
diff --git a/help/uk/uk.po b/help/uk/uk.po
index ba47d81..e38ac4a 100644
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
@@ -92,14 +92,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Дозволяється копіювати, розповсюджувати та/або змінювати цей документ на "
 "умовах ліцензії GNU Free Documentation License (GFDL), версії 1.1 або будь-"
 "якої старшої версії, що опублікована Free Software Foundation без "
 "інваріантних розділів, тексту титульної сторінки, та тексту фінальної "
-"сторінки. Копію GFDL можна знайти <ulink type=\"help\" url=\"ghelp:fdl\">за "
+"сторінки. Копію GFDL можна знайти <ulink type=\"help\" url=\"help:fdl\">за "
 "адресою</ulink> або у файлі COPYING-DOCS, що постачається з цією довідкою."
 
 #: C/mate-terminal.xml:12(para)
@@ -320,11 +320,11 @@ msgstr "Зворотній зв'язок"
 #: C/mate-terminal.xml:197(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Щоб сповістити про помилку або внести пропозицію відносно аплету MATE "
-"Terminal або цієї довідки, дотримуйтесь інструкцій на сторінці <ulink url=\"ghelp:"
+"Terminal або цієї довідки, дотримуйтесь інструкцій на сторінці <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">Сторінка зворотного зв'язку MATE</"
 "ulink>."
 
@@ -1564,13 +1564,13 @@ msgstr "Текст та тло"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <ulink type=\"help\" url=\"ghelp:user-guide?prefs-theme"
+"the <ulink type=\"help\" url=\"help:user-guide?prefs-theme"
 "\"><application>Theme</application> preference tool</ulink>."
 msgstr ""
 "Відмітьте параметр <guilabel>Використовувати кольори системної теми</"
 "guilabel>, щоб використовувались кольори, вказані у системній темі "
 "середовища MATE. Ці кольори вибираються  "
-"<ulink type=\"help\" url=\"ghelp:user-guide?prefs-theme"
+"<ulink type=\"help\" url=\"help:user-guide?prefs-theme"
 "\">програмою налаштовування <application>Тема</application></ulink>."
 
 #: C/mate-terminal.xml:942(para)
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 5f34348..ef05e4f 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -116,12 +116,12 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software "
 "Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.1 或更高版本，该许可证没"
-"有固定的部分、没有封面和背页文本。您可以在 <ulink type=\"help\" url=\"ghelp:"
+"有固定的部分、没有封面和背页文本。您可以在 <ulink type=\"help\" url=\"help:"
 "fdl\">link</ulink> 或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副"
 "本。"
 
@@ -341,11 +341,11 @@ msgstr "反馈"
 #: C/mate-terminal.xml:215(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE Terminal "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "user-guide?feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "要向 MATE 终端程序或本手册报告 bug 或提出建议，跟随这个链接<ulink url="
-"\"ghelp:user-guide?feedback\" type=\"help\">MATE 反馈网页</ulink>"
+"\"help:user-guide?feedback\" type=\"help\">MATE 反馈网页</ulink>"
 
 #: C/mate-terminal.xml:219(primary)
 msgid "MATE Terminal"
@@ -1496,12 +1496,12 @@ msgstr "前景和背景"
 msgid ""
 "Select the <guilabel>Use colours from system theme</guilabel> option to use "
 "the colors that are specified in the MATE Desktop theme that is selected in "
-"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"ghelp:"
+"the <guilabel>Theme</guilabel> tab of the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs-theme\"><application>Appearance</application> preference "
 "tool</ulink>."
 msgstr ""
 "选择<guilabel>使用系统主题中的颜色</guilabel>选项，使用 MATE 桌面主题指定的"
-"颜色，其是在<ulink type=\"help\" url=\"ghelp:user-guide?prefs-theme"
+"颜色，其是在<ulink type=\"help\" url=\"help:user-guide?prefs-theme"
 "\"><application>外观</application>首选项工具</ulink>的<guilabel>主题</"
 "guilabel>标签选择的。"
 
diff --git a/help/zh_TW/legal.xml b/help/zh_TW/legal.xml
index d129c98..3fa7b1c 100644
--- a/help/zh_TW/legal.xml
+++ b/help/zh_TW/legal.xml
@@ -6,7 +6,7 @@
 	  亦不得加上封底文字。
 	  如要取得 GFDL 的副本，請參閱
 	  此<ulink type="help"
-	  url="ghelp:fdl">連結</ulink>，或是參閱與本手冊一同隨附的 COPYING-DOCS
+	  url="help:fdl">連結</ulink>，或是參閱與本手冊一同隨附的 COPYING-DOCS
 	  檔案。
          </para>
          <para> 本手冊是屬於依 GFDL 授權所發佈之 MATE 手冊集中的一部份。
diff --git a/help/zh_TW/mate-terminal.xml b/help/zh_TW/mate-terminal.xml
index 9465ff4..e4df57d 100644
--- a/help/zh_TW/mate-terminal.xml
+++ b/help/zh_TW/mate-terminal.xml
@@ -127,7 +127,7 @@
         </releaseinfo>
      <legalnotice> 
         <title>回饋</title>
-        <para>關於 &app; 應用程式或本手冊，如果要報告錯誤或提出建議，請遵照<ulink url="ghelp:mate-feedback" type="help">MATE Feedback Page</ulink> 的指示。 </para>
+        <para>關於 &app; 應用程式或本手冊，如果要報告錯誤或提出建議，請遵照<ulink url="help:mate-feedback" type="help">MATE Feedback Page</ulink> 的指示。 </para>
      </legalnotice>
   </articleinfo>
   <indexterm> 
diff --git a/src/terminal-util.c b/src/terminal-util.c
index 0384366..63a4859 100644
--- a/src/terminal-util.c
+++ b/src/terminal-util.c
@@ -178,11 +178,11 @@ terminal_util_show_help (const char *topic,
 
 	if (topic)
 	{
-		url = g_strdup_printf ("ghelp://%s?%s", uri, topic);
+		url = g_strdup_printf ("help://%s?%s", uri, topic);
 	}
 	else
 	{
-		url = g_strdup_printf ("ghelp://%s", uri);
+		url = g_strdup_printf ("help://%s", uri);
 	}
 
 	if (!open_url (GTK_WINDOW (parent), url, gtk_get_current_event_time (), &error))