29 files changed, 144 insertions, 142 deletions
diff --git a/Makefile.am b/Makefile.am
index 3f8a38f..82d04be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,11 +28,9 @@ EXTRA_DIST = \
 engrampa.spec.in \
 intltool-merge.in \
 intltool-update.in \
- intltool-extract.in \
- mate-doc-utils.make
+ intltool-extract.in
 
 DISTCLEANFILES = \
- mate-doc-utils.make \
 po/.intltool-merge-cache \
 intltool-extract \
 intltool-merge \
diff --git a/autogen.sh b/autogen.sh
index b2c8fbf..7f350db 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,12 @@ PKG_NAME="mate-file-archiver"
 }
 
 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/caja/Makefile.am b/caja/Makefile.am
index 9307094..fb63abd 100644
--- a/caja/Makefile.am
+++ b/caja/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 -DFR_DATADIR=\"$(datadir)\" \
 -DMATELOCALEDIR=\""$(datadir)/locale"\" \
 -I$(top_srcdir) \
diff --git a/configure.ac b/configure.ac
index fd0bf47..7b13aa7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,7 +155,8 @@ fi
 dnl ******************************
 
 PKG_PROG_PKG_CONFIG
-MATE_DOC_INIT
+
+YELP_HELP_INIT
 
 dnl ******************************
 
diff --git a/copy-n-paste/Makefile.am b/copy-n-paste/Makefile.am
index d07144d..f5a2bcb 100644
--- a/copy-n-paste/Makefile.am
+++ b/copy-n-paste/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -DGTK_DISABLE_DEPRECATED \
+AM_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
 -DGDK_DISABLE_DEPRECATED \
 -DG_DISABLE_DEPRECATED \
 -UGETTEXT_PACKAGE
diff --git a/help/C/engrampa.xml b/help/C/index.docbook
index 66dc804..0fdb425 100644
--- a/help/C/engrampa.xml
+++ b/help/C/index.docbook
@@ -193,7 +193,7 @@
 <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:mate-feedback" type="help">MATE Feedback Page</ulink>.
+ <ulink url="help:mate-feedback" type="help">MATE Feedback Page</ulink>.
 </para>
 <!-- Translators may also add here feedback address for translations -->
 </legalnotice>
@@ -459,9 +459,9 @@
 <title>Browsing the Filesystem</title>
 <para>Several &app; dialogs (<guilabel>New</guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) enable you
 to browse files and folders on your computer. Refer to the <ulink type="help" 
- url="ghelp:user-guide?filechooser-open">Desktop User Guide</ulink> to learn more about using the 
+ url="help:user-guide?filechooser-open">Desktop User Guide</ulink> to learn more about using the 
 file browsing dialogs.</para>
- <para>You can also refer to the <ulink type="help" url="ghelp:user-guide?caja-bookmarks">Bookmarks 
+ <para>You can also refer to the <ulink type="help" url="help:user-guide?caja-bookmarks">Bookmarks 
 section</ulink> of the Desktop User Guide to learn how you can use the <guilabel>Places</guilabel> pane 
 to access your favorite locations.</para>
 </sect3>
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 380221a..93fcb38 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 = engrampa
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = \
+HELP_ID = engrampa
+HELP_FILES = index.docbook legal.xml
+HELP_MEDIA = \
 figures/engrampa_home.png \
 figures/engrampa_leftarrow.png \
 figures/engrampa_main_window.png \
 figures/engrampa_rightarrow.png \
 figures/engrampa_uparrow.png
 
-DOC_LINGUAS = bg ca cs de el en_GB es fi fr it ja oc nl ru sv vi uk zh_CN
+HELP_LINGUAS = bg ca cs de el en_GB es fi fr it ja oc nl ru sv vi uk zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/help/bg/bg.po b/help/bg/bg.po
index 1dbbfcf..4a2ca2e 100644
--- a/help/bg/bg.po
+++ b/help/bg/bg.po
@@ -17,7 +17,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 ""
 "Предоставя се разрешение за копиране, разпространение и/или промяна на този "
@@ -25,7 +25,7 @@ msgstr ""
 "версия 1.1 или всяка следваща версия, издадена от Фондация „Свободен "
 "софтуер“; без „Непроменливи раздели“, „Текстове на предната корица“, както и "
 "„Текстове на задната корица“. Копие на лиценза може да бъде намерено <ulink "
-"type=\"help\" url=\"ghelp:fdl\">тук</ulink> или във файла COPYING-DOCS, "
+"type=\"help\" url=\"help:fdl\">тук</ulink> или във файла COPYING-DOCS, "
 "разпространяван с това ръководство."
 
 #: legal.xml:12(para)
@@ -282,11 +282,11 @@ msgstr "Обратна връзка"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Engrampa</"
 "application> application or this manual, follow the directions in the <ulink "
-"url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+"url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "За да докладвате за грешка или да направите предложение относно програмата "
 "за работа с архиви Engrampa или това ръководство, следвайте указанията, "
-"описани в <ulink url=\"ghelp:mate-feedback\" type=\"help\">Страницата за "
+"описани в <ulink url=\"help:mate-feedback\" type=\"help\">Страницата за "
 "обратна връзка на MATE</ulink>."
 
 #: engrampa.xml:152(primary)
diff --git a/help/ca/ca.po b/help/ca/ca.po
index 5370477..7ec7b18 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -133,7 +133,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 "
@@ -141,7 +141,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/engrampa.xml:12(para)
@@ -359,12 +359,12 @@ msgstr "Comentaris"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "Per a informar d'un error o fer algun suggeriment sobre el "
 "<application>gestor d'arxius</application> o aquest manual, seguiu les "
-"indicacions a la <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help"
+"indicacions a la <ulink url=\"help:user-guide?feedback-bugs\" type=\"help"
 "\">pàgina de comentaris del MATE</ulink>."
 
 #: C/engrampa.xml:202(primary)
@@ -897,24 +897,24 @@ msgid ""
 "Several <application>Archive Manager</application> dialogs (<guilabel>New</"
 "guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) "
 "enable you to browse files and folders on your computer. Refer to the <ulink "
-"type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</"
+"type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</"
 "ulink> to learn more about using the file browsing dialogs."
 msgstr ""
 "Diversos diàlegs del <application>gestor d'arxius</application> "
 "(<guilabel>Nou</guilabel>, <guilabel>Obre</guilabel>, <guilabel>Extreu</"
 "guilabel>...) us permeten navegar pels fitxers i les carpetes de "
-"l'ordinador. Consulteu la <ulink type=\"help\" url=\"ghelp:user-guide?"
+"l'ordinador. Consulteu la <ulink type=\"help\" url=\"help:user-guide?"
 "filechooser-open\">guia d'usuari</ulink> per a aprendre més sobre com "
 "utilitzar els diàlegs de navegació pels fitxers."
 
 #: C/engrampa.xml:464(para)
 msgid ""
-"You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?"
+"You can also refer to the <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to "
 "learn how you can use the <guilabel>Places</guilabel> pane to access your "
 "favorite locations."
 msgstr ""
-"També podeu consultar la <ulink type=\"help\" url=\"ghelp:user-guide?"
+"També podeu consultar la <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">secció d'adreces d'interès</ulink> de la guia d'usuari "
 "per a aprendre com podeu utilitzar el quadre de <guilabel>Llocs</guilabel> "
 "per a accedir a les vostres ubicacions preferides."
diff --git a/help/cs/cs.po b/help/cs/cs.po
index 5935a1c..5e48ae9 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -121,8 +121,8 @@ msgid "MATE Documentation Project"
 msgstr "Dokumentační projekt MATE"
 
 #: C/engrampa.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 "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU Free Documentation License, 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. Kopie této licence je zahrnuta v oddílu jménem <ulink type=\"help\" url=\"ghelp:fdl\">GNU Free Documentation License</ulink> nebo v souboru COPYING-DOCS dodávaném s touto příručkou."
+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 "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU Free Documentation License, 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. Kopie této licence je zahrnuta v oddílu jménem <ulink type=\"help\" url=\"help:fdl\">GNU Free Documentation License</ulink> nebo v souboru COPYING-DOCS dodávaném s touto příručkou."
 
 #: C/engrampa.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."
@@ -272,8 +272,8 @@ msgid "Feedback"
 msgstr "Ohlasy"
 
 #: C/engrampa.xml:195(para)
-msgid "To report a bug or make a suggestion regarding the <application>Archive Manager</application> application or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Pokud chcete oznámit chybu nebo navrhnout vylepšení vztahující se k aplikaci <application>Správce archivů</application> nebo této příručce, postupujte dle instrukcí na stránce <ulink url=\"ghelp:mate-feedback\" type=\"help\">Stránka s ohlasy na MATE</ulink>."
+msgid "To report a bug or make a suggestion regarding the <application>Archive Manager</application> application or this manual, follow the directions in the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "Pokud chcete oznámit chybu nebo navrhnout vylepšení vztahující se k aplikaci <application>Správce archivů</application> nebo této příručce, postupujte dle instrukcí na stránce <ulink url=\"help:mate-feedback\" type=\"help\">Stránka s ohlasy na MATE</ulink>."
 
 #: C/engrampa.xml:202(primary)
 msgid "Engrampa"
@@ -691,12 +691,12 @@ msgid "Browsing the Filesystem"
 msgstr "Procházení systému souborů"
 
 #: C/engrampa.xml:460(para)
-msgid "Several <application>Archive Manager</application> dialogs (<guilabel>New</guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) enable you to browse files and folders on your computer. Refer to the <ulink type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</ulink> to learn more about using the file browsing dialogs."
-msgstr "Některá dialogová okna ve <application>Správci archivů</application> (<guilabel>Nový</guilabel>, <guilabel>Otevřít</guilabel>, <guilabel>Rozbalit</guilabel>,...) umožňují procházet soubory a složky ve vašem počítači. Jestliže se chcete dovědět víc o dialogových oknech na procházení souborů, odkazujeme vás na <ulink type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Příručku uživatele pracovního prostředí</ulink>."
+msgid "Several <application>Archive Manager</application> dialogs (<guilabel>New</guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) enable you to browse files and folders on your computer. Refer to the <ulink type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</ulink> to learn more about using the file browsing dialogs."
+msgstr "Některá dialogová okna ve <application>Správci archivů</application> (<guilabel>Nový</guilabel>, <guilabel>Otevřít</guilabel>, <guilabel>Rozbalit</guilabel>,...) umožňují procházet soubory a složky ve vašem počítači. Jestliže se chcete dovědět víc o dialogových oknech na procházení souborů, odkazujeme vás na <ulink type=\"help\" url=\"help:user-guide?filechooser-open\">Příručku uživatele pracovního prostředí</ulink>."
 
 #: C/engrampa.xml:464(para)
-msgid "You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to learn how you can use the <guilabel>Places</guilabel> pane to access your favorite locations."
-msgstr "Také vám doporučujeme <ulink type=\"help\" url=\"ghelp:user-guide?caja-bookmarks\">kapitolu Záložky</ulink> v Příručce uživatele pracovního prostředí, kde se můžete naučit, jak využívat panel <guilabel>Místa</guilabel> pro přístup ke svým oblíbeným místům."
+msgid "You can also refer to the <ulink type=\"help\" url=\"help:user-guide?caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to learn how you can use the <guilabel>Places</guilabel> pane to access your favorite locations."
+msgstr "Také vám doporučujeme <ulink type=\"help\" url=\"help:user-guide?caja-bookmarks\">kapitolu Záložky</ulink> v Příručce uživatele pracovního prostředí, kde se můžete naučit, jak využívat panel <guilabel>Místa</guilabel> pro přístup ke svým oblíbeným místům."
 
 #: C/engrampa.xml:476(title)
 msgid "Working With Archives"
diff --git a/help/de/de.po b/help/de/de.po
index 74f04e9..18b3cd1 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -125,7 +125,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 "
@@ -133,7 +133,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/engrampa.xml:12(para)
@@ -356,12 +356,12 @@ msgstr "Rückmeldungen"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "Wenn Sie Fehler finden oder Vorschläge zur <application>Archivmanager</"
 "application>-Anwendung oder diesem Handbuch haben, befolgen Sie bitte die "
-"Anweisungen auf der <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE-"
+"Anweisungen auf der <ulink url=\"help:mate-feedback\" type=\"help\">MATE-"
 "Seite für Rückmeldungen</ulink>."
 
 #: C/engrampa.xml:202(primary)
@@ -906,24 +906,24 @@ msgid ""
 "Several <application>Archive Manager</application> dialogs (<guilabel>New</"
 "guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) "
 "enable you to browse files and folders on your computer. Refer to the <ulink "
-"type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</"
+"type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</"
 "ulink> to learn more about using the file browsing dialogs."
 msgstr ""
 "Verschiedene <application>Archivmanager</application>-Dialoge (<guilabel>Neu</"
 "guilabel>, <guilabel>Öffnen</guilabel>, <guilabel>Entpacken</guilabel>,...) "
 "ermöglichen Ihnen, Ihren Computer nach Dateien und Ordnern zu durchsuchen. "
-"Ziehen Sie das <ulink type=\"help\" url=\"ghelp:user-guide?filechooser-open"
+"Ziehen Sie das <ulink type=\"help\" url=\"help:user-guide?filechooser-open"
 "\">Desktop-Benutzerhandbuch</ulink> zu Rate, um mehr über die Benutzung "
 "dieser Datei-Dialoge zu erfahren."
 
 #: C/engrampa.xml:464(para)
 msgid ""
-"You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?"
+"You can also refer to the <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to "
 "learn how you can use the <guilabel>Places</guilabel> pane to access your "
 "favorite locations."
 msgstr ""
-"Sie können auch den Abschnitt <ulink type=\"help\" url=\"ghelp:user-guide?"
+"Sie können auch den Abschnitt <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">Lesezeichen</ulink> des Desktop-Benutzerhandbuchs zu "
 "Rate ziehen, um zu erfahren, wie Sie das <guilabel>Orte</guilabel>-"
 "Seitenfenster verwenden können, um Ihre bevorzugten Orte zu erreichen."
diff --git a/help/el/el.po b/help/el/el.po
index d9a10c6..ae1b9ae 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -134,14 +134,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 (GFDL), Έκδοση 1.1 ή νεότερη "
 "που εκδόθηκε από το Ίδρυμα Ελεύθερου Λογισμικού χωρίς Αμετάβλητα Τμήματα, "
 "χωρίς Κείμενο Εξωφύλλου, και χωρίς Κείμενο Οπισθοφύλλου. Μπορείτε να βρείτε "
-"ένα αντίγραφο της GFDL σ' αυτό το <ulink type=\"help\" url=\"ghelp:fdl"
+"ένα αντίγραφο της GFDL σ' αυτό το <ulink type=\"help\" url=\"help:fdl"
 "\">σύνδεσμο</ulink> ή στο αρχείο COPYING-DOCS που διανέμεται με αυτό το "
 "εγχειρίδιο."
 
@@ -360,12 +360,12 @@ msgstr "Aνάδραση"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "Για να αναφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με τη "
 "μικροεφαρμογή <application>Sticky Notes</application> ή αυτή την τεκμηρίωση, "
-"ακολουθήστε τις οδηγίες στην <ulink url=\"ghelp:mate-feedback\" type=\"help"
+"ακολουθήστε τις οδηγίες στην <ulink url=\"help:mate-feedback\" type=\"help"
 "\">Ιστοσελίδα Ανάδρασης MATE </ulink>."
 
 #: C/engrampa.xml:202(primary)
@@ -922,26 +922,26 @@ msgid ""
 "Several <application>Archive Manager</application> dialogs (<guilabel>New</"
 "guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) "
 "enable you to browse files and folders on your computer. Refer to the <ulink "
-"type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</"
+"type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</"
 "ulink> to learn more about using the file browsing dialogs."
 msgstr ""
 "Αρκετοί διάλογοι του <application>Διαχειριστή συμπιεσμένων αρχείων</"
 "application> (<guilabel>Νέο</guilabel>, <guilabel>Άνοιγμα</guilabel>, "
 "<guilabel>Αποσυμπίεση</guilabel>,...) σας επιτρέπουν να περιηγήστε στα "
 "αρχεία και τους φακέλους του υπολογιστή σας. Αναφερθείτε στον <ulink type="
-"\"help\" url=\"ghelp:user-guide?filechooser-open\">Οδηγό χρήσης επιφάνειας "
+"\"help\" url=\"help:user-guide?filechooser-open\">Οδηγό χρήσης επιφάνειας "
 "εργασίας</ulink> για να μάθετε περισσότερα για τη χρήση των διαλόγων "
 "περιήγησης."
 
 #: C/engrampa.xml:464(para)
 msgid ""
-"You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?"
+"You can also refer to the <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to "
 "learn how you can use the <guilabel>Places</guilabel> pane to access your "
 "favorite locations."
 msgstr ""
 "Μπορείτε επίσης να αναφερθείτε στο τμήμα για τους <ulink type=\"help\" url="
-"\"ghelp:user-guide?caja-bookmarks\">Σελιδοδείκτες</ulink> του Οδηγού "
+"\"help:user-guide?caja-bookmarks\">Σελιδοδείκτες</ulink> του Οδηγού "
 "χρήσης επιφάνειας εργασίας για να μάθετε πώς να χρησιμοποιείτε το πλαίσιο "
 "<guilabel>Τοποθεσίες</guilabel> για να έχετε πρόσβαση στις αγαπημένες σας "
 "τοποθεσίες."
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
index 2733d99..eca5ddc 100644
--- a/help/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -132,14 +132,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/engrampa.xml:12(para)
@@ -357,12 +357,12 @@ msgstr "Feedback"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 
 #: C/engrampa.xml:202(primary)
@@ -884,23 +884,23 @@ msgid ""
 "Several <application>Archive Manager</application> dialogs (<guilabel>New</"
 "guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) "
 "enable you to browse files and folders on your computer. Refer to the <ulink "
-"type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</"
+"type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</"
 "ulink> to learn more about using the file browsing dialogs."
 msgstr ""
 "Several <application>Archive Manager</application> dialogues (<guilabel>New</"
 "guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>, etc.) "
 "enable you to browse files and folders on your computer. Refer to the <ulink "
-"type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</"
+"type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</"
 "ulink> to learn more about using the file browsing dialogues."
 
 #: C/engrampa.xml:460(para)
 msgid ""
-"You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?"
+"You can also refer to the <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to "
 "learn how you can use the <guilabel>Places</guilabel> pane to access your "
 "favorite locations."
 msgstr ""
-"You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?"
+"You can also refer to the <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to "
 "learn how you can use the <guilabel>Places</guilabel> pane to access your "
 "favourite locations."
diff --git a/help/es/es.po b/help/es/es.po
index 706404f..bb76145 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -136,7 +136,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 permiso para copiar, distribuir y/o modificar este documento bajo "
@@ -144,7 +144,7 @@ msgstr ""
 "cualquier otra versión posterior publicada por la Free Software Foundation; "
 "sin Secciones Invariantes ni Textos de Cubierta Delantera ni Textos de "
 "Cubierta Trasera. Puede encontrar una copia de la licencia GFDL en este "
-"<ulink type=\"help\" url=\"ghelp:fdl\">enlace</ulink> o en el archivo "
+"<ulink type=\"help\" url=\"help:fdl\">enlace</ulink> o en el archivo "
 "COPYING-DOCS distribuido con este manual."
 
 #: C/engrampa.xml:12(para)
@@ -364,12 +364,12 @@ msgstr "Comentarios"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "Para informar de un defecto o hacer alguna sugerencia sobre respecto al "
 "<application>Gestor de archivadores</application> o el presente manual, siga "
-"las instrucciones que aparecen en la <ulink url=\"ghelp:mate-feedback\" "
+"las instrucciones que aparecen en la <ulink url=\"help:mate-feedback\" "
 "type=\"help\">página de comentarios de Mate</ulink>."
 
 #: C/engrampa.xml:202(primary)
@@ -916,24 +916,24 @@ msgid ""
 "Several <application>Archive Manager</application> dialogs (<guilabel>New</"
 "guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) "
 "enable you to browse files and folders on your computer. Refer to the <ulink "
-"type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</"
+"type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</"
 "ulink> to learn more about using the file browsing dialogs."
 msgstr ""
 "Varios diálogos del <application>Gestor de archivadores</application> "
 "(<guilabel>Nuevo</guilabel>, <guilabel>Abrir</guilabel>, <guilabel>Extraer</"
 "guilabel>, ...) le permiten examinar archivos y carpetas en su equipo. "
-"Consulte la <ulink type=\"help\" url=\"ghelp:user-guide?filechooser-open"
+"Consulte la <ulink type=\"help\" url=\"help:user-guide?filechooser-open"
 "\">Guía del usuario del Escritorio</ulink> para aprender más acerca de cómo "
 "usar los diálogos de examinar."
 
 #: C/engrampa.xml:464(para)
 msgid ""
-"You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?"
+"You can also refer to the <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to "
 "learn how you can use the <guilabel>Places</guilabel> pane to access your "
 "favorite locations."
 msgstr ""
-"También puede consultar la sección <ulink type=\"help\" url=\"ghelp:user-"
+"También puede consultar la sección <ulink type=\"help\" url=\"help:user-"
 "guide?caja-bookmarks\">Marcadores</ulink> de la Guía del usuario del "
 "Escritorio para aprender a usar el panel <guilabel>Lugares</guilabel> para "
 "acceder a sus ubicaciones favoritas."
diff --git a/help/fi/fi.po b/help/fi/fi.po
index 6ce0aec..e0cbe59 100644
--- a/help/fi/fi.po
+++ b/help/fi/fi.po
@@ -108,8 +108,8 @@ msgid "MATE Documentation Project"
 msgstr "MATE Documentation Project"
 
 #: C/engrampa.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 "Tätä asiakirjaa saa kopioida, jakaa edelleen ja/tai muokata Free Software Foundationin julkaiseman GNU Free Documentation Licensen (GFDL) version 1.1 tai valinnaisesti myöhemmän version mukaisesti, ilman vaatimuksia muuttamattomista osioista ja etu- tai takakansiteksteistä. Kopion GFDL:stä voi nähdä napsauttamalla <ulink type=\"help\" url=\"ghelp:fdl\">tätä linkkiä</ulink>, tai lukemalla ohjeen mukana toimitetun COPYING-DOCS-nimisen tiedoston."
+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 "Tätä asiakirjaa saa kopioida, jakaa edelleen ja/tai muokata Free Software Foundationin julkaiseman GNU Free Documentation Licensen (GFDL) version 1.1 tai valinnaisesti myöhemmän version mukaisesti, ilman vaatimuksia muuttamattomista osioista ja etu- tai takakansiteksteistä. Kopion GFDL:stä voi nähdä napsauttamalla <ulink type=\"help\" url=\"help:fdl\">tätä linkkiä</ulink>, tai lukemalla ohjeen mukana toimitetun COPYING-DOCS-nimisen tiedoston."
 
 #: C/engrampa.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."
@@ -239,8 +239,8 @@ msgid "Feedback"
 msgstr "Palaute"
 
 #: C/engrampa.xml:168(para)
-msgid "To report a bug or make a suggestion regarding the <application>Archive Manager</application> application or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Ilmoittaaksesi viasta tai tehdäksesi ehdotuksen <application>Pakettienkäsittelyohjelmaan</application> taikka tähän käyttöohjeeseen liittyen, seuraa ohjeita <ulink url=\"ghelp:mate-feedback\" type=\"help\">Maten palautesivulla</ulink>. Jos haluat antaa palautetta käyttöoppaan tai ohjelman käännöksistä, löydät ohjeet <ulink=\"http://www.mate.fi\">Maten suomentamissivulta</ulink>."
+msgid "To report a bug or make a suggestion regarding the <application>Archive Manager</application> application or this manual, follow the directions in the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "Ilmoittaaksesi viasta tai tehdäksesi ehdotuksen <application>Pakettienkäsittelyohjelmaan</application> taikka tähän käyttöohjeeseen liittyen, seuraa ohjeita <ulink url=\"help:mate-feedback\" type=\"help\">Maten palautesivulla</ulink>. Jos haluat antaa palautetta käyttöoppaan tai ohjelman käännöksistä, löydät ohjeet <ulink=\"http://www.mate.fi\">Maten suomentamissivulta</ulink>."
 
 #: C/engrampa.xml:175(primary)
 msgid "Engrampa"
@@ -650,12 +650,12 @@ msgid "Browsing the Filesystem"
 msgstr "Tiedostojärjestelmän selaus"
 
 #: C/engrampa.xml:429(para)
-msgid "Several <application>Archive Manager</application> dialogs (<guilabel>New</guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) enable you to browse files and folders on your computer. Refer to the <ulink type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</ulink> to learn more about using the file browsing dialogs."
-msgstr "Muutamat <application>Pakettienkäsittelyohjelman</application>-valintaikkunat (<guilabel>Uusi</guilabel>, <guilabel>Avaa</guilabel>, <guilabel>Pura</guilabel>,...) mahdollistavat tietokoneesi tiedostojen ja kansioiden selauksen. Käytä <ulink type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Työpöytäkäyttäjän opasta</ulink> apuna lukeaksesi lisää tiedostonselausvalintaikkunoista."
+msgid "Several <application>Archive Manager</application> dialogs (<guilabel>New</guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) enable you to browse files and folders on your computer. Refer to the <ulink type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</ulink> to learn more about using the file browsing dialogs."
+msgstr "Muutamat <application>Pakettienkäsittelyohjelman</application>-valintaikkunat (<guilabel>Uusi</guilabel>, <guilabel>Avaa</guilabel>, <guilabel>Pura</guilabel>,...) mahdollistavat tietokoneesi tiedostojen ja kansioiden selauksen. Käytä <ulink type=\"help\" url=\"help:user-guide?filechooser-open\">Työpöytäkäyttäjän opasta</ulink> apuna lukeaksesi lisää tiedostonselausvalintaikkunoista."
 
 #: C/engrampa.xml:433(para)
-msgid "You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to learn how you can use the <guilabel>Places</guilabel> pane to access your favorite locations."
-msgstr "Voit myös käyttää Työpöytäkäyttäjän oppaan <ulink type=\"help\" url=\"ghelp:user-guide?caja-bookmarks\">Kirjanmerkit-osiota</ulink> lukeaksesi, kuinka käytät <guilabel>Sijainnit</guilabel>-paneelia päästäksesi suosikkikohteisiisi."
+msgid "You can also refer to the <ulink type=\"help\" url=\"help:user-guide?caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to learn how you can use the <guilabel>Places</guilabel> pane to access your favorite locations."
+msgstr "Voit myös käyttää Työpöytäkäyttäjän oppaan <ulink type=\"help\" url=\"help:user-guide?caja-bookmarks\">Kirjanmerkit-osiota</ulink> lukeaksesi, kuinka käytät <guilabel>Sijainnit</guilabel>-paneelia päästäksesi suosikkikohteisiisi."
 
 #: C/engrampa.xml:445(title)
 msgid "Working With Archives"
diff --git a/help/fr/fr.po b/help/fr/fr.po
index d646eba..f501dc7 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -136,7 +136,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 "
@@ -144,7 +144,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/engrampa.xml:12(para)
@@ -364,12 +364,12 @@ msgstr "Votre avis"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "Pour rapporter une anomalie ou émettre une suggestion concernant le "
 "<application>gestionnaire d'archives</application> ou ce manuel, procédez "
-"comme indiqué sur la <ulink url=\"ghelp:mate-feedback\" type=\"help\">page "
+"comme indiqué sur la <ulink url=\"help:mate-feedback\" type=\"help\">page "
 "de réactions sur MATE</ulink>."
 
 #: C/engrampa.xml:202(primary)
@@ -902,26 +902,26 @@ msgid ""
 "Several <application>Archive Manager</application> dialogs (<guilabel>New</"
 "guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) "
 "enable you to browse files and folders on your computer. Refer to the <ulink "
-"type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</"
+"type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</"
 "ulink> to learn more about using the file browsing dialogs."
 msgstr ""
 "Plusieurs boîtes de dialogue du <application>gestionnaire d'archives</"
 "application> (<guilabel>Nouveau</guilabel>, <guilabel>Ouvrir</guilabel>, "
 "<guilabel>Extraire</guilabel>, ...) vous permettent de naviguer dans vos "
-"fichiers et vos dossiers. Consultez le <ulink type=\"help\" url=\"ghelp:user-"
+"fichiers et vos dossiers. Consultez le <ulink type=\"help\" url=\"help:user-"
 "guide?filechooser-open\">guide d'utilisation du bureau</ulink> pour en "
 "apprendre plus sur l'utilisation des boîtes de dialogue de gestion de "
 "fichiers."
 
 #: C/engrampa.xml:464(para)
 msgid ""
-"You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?"
+"You can also refer to the <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to "
 "learn how you can use the <guilabel>Places</guilabel> pane to access your "
 "favorite locations."
 msgstr ""
 "Vous pouvez aussi consulter la section sur les <ulink type=\"help\" url="
-"\"ghelp:user-guide?caja-bookmarks\">signets</ulink> du guide "
+"\"help:user-guide?caja-bookmarks\">signets</ulink> du guide "
 "d'utilisation du bureau</ulink> pour apprendre comment utiliser le panneau "
 "latéral <guilabel>Raccourcis</guilabel> pour accéder à vos emplacements "
 "préférés."
diff --git a/help/it/it.po b/help/it/it.po
index 52a26dc..b89278f 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -132,14 +132,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 in base ai "
 "termini della GNU Free Documentation License (GFDL), versione 1.1 o di "
 "versioni successive pubblicate dalla Free Software Foundation che siano "
 "prive di sezioni invariabili, frontespizi e retrocopertine. La GFDL è "
-"disponibile accedendo a questo <ulink url=\"ghelp:fdl\" type=\"help\">link</"
+"disponibile accedendo a questo <ulink url=\"help:fdl\" type=\"help\">link</"
 "ulink> o nel file COPYING-DOCS distribuito con questo manuale."
 
 #: C/engrampa.xml:12(para)
@@ -364,12 +364,12 @@ msgstr "Commenti"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "Per segnalare un bug o un suggerimento riguardo <application>Gestore di "
 "archivi</application> o questo manuale, seguire le indicazioni presenti "
-"nella <ulink url=\"ghelp:mate-feedback\" type=\"help\">pagina dei commenti "
+"nella <ulink url=\"help:mate-feedback\" type=\"help\">pagina dei commenti "
 "di MATE</ulink>."
 
 #: C/engrampa.xml:202(primary)
@@ -914,26 +914,26 @@ msgid ""
 "Several <application>Archive Manager</application> dialogs (<guilabel>New</"
 "guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) "
 "enable you to browse files and folders on your computer. Refer to the <ulink "
-"type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</"
+"type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</"
 "ulink> to learn more about using the file browsing dialogs."
 msgstr ""
 "Diversi dialoghi di <application>Gestore di archivi</application> "
 "(<guilabel>Nuovo</guilabel>, <guilabel>Apri</guilabel>, <guilabel>Estrai</"
 "guilabel>,...) consentono di esplorare i file e le cartelle all'interno del "
 "proprio computer. Per maggiori informazioni riguardo l'utilizzo del gestore "
-"di file, consultare la <ulink type=\"help\" url=\"ghelp:user-guide?"
+"di file, consultare la <ulink type=\"help\" url=\"help:user-guide?"
 "filechooser-open\">guida utente</ulink>."
 
 #: C/engrampa.xml:464(para)
 msgid ""
-"You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?"
+"You can also refer to the <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to "
 "learn how you can use the <guilabel>Places</guilabel> pane to access your "
 "favorite locations."
 msgstr ""
 "Per informazioni su come utilizzare il riquadro <guilabel>Risorse</guilabel> "
 "per accedere alle posizioni preferite, è possibile fare riferimento alla "
-"<ulink type=\"help\" url=\"ghelp:user-guide?caja-bookmarks\">sezione sui "
+"<ulink type=\"help\" url=\"help:user-guide?caja-bookmarks\">sezione sui "
 "segnalibri</ulink> della guida utente."
 
 #: C/engrampa.xml:476(title)
diff --git a/help/ja/ja.po b/help/ja/ja.po
index 903dc55..0dec4b9 100644
--- a/help/ja/ja.po
+++ b/help/ja/ja.po
@@ -133,13 +133,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 ""
 "このドキュメントをフリーソフトウェア財団発行の GNU フリー文書利用許諾契約書 "
 "(バージョン 1.1 かそれ以降から一つを選択) が定める条件の下で複製、頒布、ある"
 "いは改変することを許可する。変更不可部分、表カバーテキスト、裏カバーテキスト"
-"は存在しない。この利用許諾契約書の複製物は<ulink type=\"help\" url=\"ghelp:"
+"は存在しない。この利用許諾契約書の複製物は<ulink type=\"help\" url=\"help:"
 "fdl\">このリンク</ulink>、またはこの文書と共に配布されている "
 "<filename>COPYING-DOCS</filename> というファイルに中に記載されている。"
 
@@ -358,11 +358,11 @@ msgstr "フィードバック"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "<application>書庫マネージャ</application>やこのマニュアルに対してバグの報告や"
-"提案を行うには、<ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE "
+"提案を行うには、<ulink url=\"help:mate-feedback\" type=\"help\">MATE "
 "Feedback Page</ulink>の指示に従ってください。"
 
 #: C/engrampa.xml:202(primary)
@@ -891,24 +891,24 @@ msgid ""
 "Several <application>Archive Manager</application> dialogs (<guilabel>New</"
 "guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) "
 "enable you to browse files and folders on your computer. Refer to the <ulink "
-"type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</"
+"type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</"
 "ulink> to learn more about using the file browsing dialogs."
 msgstr ""
 "<application>書庫マネージャ</application>のダイアログ(<guilabel>新規</"
 "guilabel>、<guilabel>開く</guilabel>、<guilabel>展開</guilabel>、...)のいくつ"
 "かは、お使いのコンピュータのファイルやフォルダをブラウズすることができます。"
-"<ulink type=\"help\" url=\"ghelp:user-guide?filechooser-open\">デスクトップ"
+"<ulink type=\"help\" url=\"help:user-guide?filechooser-open\">デスクトップ"
 "ユーザガイド</ulink>を参照して、ブラウズダイアログの使い方について詳しく学ん"
 "でください。"
 
 #: C/engrampa.xml:464(para)
 msgid ""
-"You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?"
+"You can also refer to the <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to "
 "learn how you can use the <guilabel>Places</guilabel> pane to access your "
 "favorite locations."
 msgstr ""
-"また、デスクトップユーザガイドの<ulink type=\"help\" url=\"ghelp:user-guide?"
+"また、デスクトップユーザガイドの<ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">お気に入りの場所に対してブックマークを活用する</ulink>を"
 "参照して、お気に入りの場所にアクセスするためにどのように<guilabel>場所</"
 "guilabel>ペインを利用できるか学べます。"
diff --git a/help/nl/nl.po b/help/nl/nl.po
index 17d4f3d..0c034cb 100644
--- a/help/nl/nl.po
+++ b/help/nl/nl.po
@@ -97,7 +97,7 @@ msgid "MATE Documentation Project"
 msgstr "MATE Documentatieproject"
 
 #: /tmp/doc-l10n/cvs/engrampa.HEAD/C/engrampa.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."
+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 ""
 
 #: /tmp/doc-l10n/cvs/engrampa.HEAD/C/engrampa.xml:12(para)
@@ -220,8 +220,8 @@ msgid "Feedback"
 msgstr "Reacties"
 
 #: /tmp/doc-l10n/cvs/engrampa.HEAD/C/engrampa.xml:159(para)
-msgid "To report a bug or make a suggestion regarding the <application>Archive Manager</application> application or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Om bugs te melden of een suggestie te maken met betrekking tot het <application>archiefbeheer</application> of de handleiding kunt u de aanwijzingen volgen op de <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Reactiepagina</ulink>"
+msgid "To report a bug or make a suggestion regarding the <application>Archive Manager</application> application or this manual, follow the directions in the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "Om bugs te melden of een suggestie te maken met betrekking tot het <application>archiefbeheer</application> of de handleiding kunt u de aanwijzingen volgen op de <ulink url=\"help:mate-feedback\" type=\"help\">MATE Reactiepagina</ulink>"
 
 #: /tmp/doc-l10n/cvs/engrampa.HEAD/C/engrampa.xml:166(primary)
 msgid "Engrampa"
diff --git a/help/oc/oc.po b/help/oc/oc.po
index 8387b27..5ed2524 100644
--- a/help/oc/oc.po
+++ b/help/oc/oc.po
@@ -117,7 +117,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 ""
 
@@ -275,7 +275,7 @@ msgstr ""
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 
diff --git a/help/ru/ru.po b/help/ru/ru.po
index 563de50..4c0a9ee 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -112,7 +112,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 ""
 "Разрешается копировать, распространять и/или изменять этот документ на "
@@ -120,7 +120,7 @@ msgstr ""
 "License (GFDL)), версии 1.1 или любой более поздней версии, опубликованной "
 "Ассоциацией Свободного Программного Обеспечения без изменения разделов, без "
 "текстов обложки. Вы можете найти копию GFDL по <ulink type=\"help\" url="
-"\"ghelp:fdl\">этому адресу</ulink> или в файле COPYING-DOCS, "
+"\"help:fdl\">этому адресу</ulink> или в файле COPYING-DOCS, "
 "распространяемого вместе с данным руководством."
 
 #: C/engrampa.xml:12(para)
@@ -307,12 +307,12 @@ msgstr "Обратная связь"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "Чтобы сообщить об ошибке или внести пожелания относительно приложения "
 "<application>Менеджер архивов</application> или этого руководства, следуйте "
-"указаниям на <ulink url=\"ghelp:mate-feedback\" type=\"help\">Странице "
+"указаниям на <ulink url=\"help:mate-feedback\" type=\"help\">Странице "
 "обратной связи MATE</ulink>."
 
 #: C/engrampa.xml:166(primary)
diff --git a/help/sv/sv.po b/help/sv/sv.po
index 521de8e..5e40cb3 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -101,8 +101,8 @@ msgid "MATE Documentation Project"
 msgstr "Dokumentationsprojekt för MATE"
 
 #: C/engrampa.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/engrampa.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."
@@ -232,8 +232,8 @@ msgid "Feedback"
 msgstr "Återkoppling"
 
 #: C/engrampa.xml:168(para)
-msgid "To report a bug or make a suggestion regarding the <application>Archive Manager</application> application or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "För att rapportera ett fel eller komma med ett förslag angående programmet <application>Arkivhanterare</application> eller denna handbok, följ instruktionerna på <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE:s återkopplingssida</ulink>."
+msgid "To report a bug or make a suggestion regarding the <application>Archive Manager</application> application or this manual, follow the directions in the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "För att rapportera ett fel eller komma med ett förslag angående programmet <application>Arkivhanterare</application> eller denna handbok, följ instruktionerna på <ulink url=\"help:mate-feedback\" type=\"help\">MATE:s återkopplingssida</ulink>."
 
 #: C/engrampa.xml:175(primary)
 msgid "Engrampa"
@@ -643,12 +643,12 @@ msgid "Browsing the Filesystem"
 msgstr "Bläddra i filsystemet"
 
 #: C/engrampa.xml:429(para)
-msgid "Several <application>Archive Manager</application> dialogs (<guilabel>New</guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) enable you to browse files and folders on your computer. Refer to the <ulink type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</ulink> to learn more about using the file browsing dialogs."
-msgstr "Ett flertal dialogrutor i <application>Arkivhanterare</application> (<guilabel>Ny</guilabel>, <guilabel>Öppna</guilabel>, <guilabel>Packa upp</guilabel>,...) låter dig bläddra efter filer och mappar på din dator. Referera till <ulink type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Användarguiden för skrivbordet</ulink> för att lära dig mer om hur man använder filväljardialoger."
+msgid "Several <application>Archive Manager</application> dialogs (<guilabel>New</guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) enable you to browse files and folders on your computer. Refer to the <ulink type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</ulink> to learn more about using the file browsing dialogs."
+msgstr "Ett flertal dialogrutor i <application>Arkivhanterare</application> (<guilabel>Ny</guilabel>, <guilabel>Öppna</guilabel>, <guilabel>Packa upp</guilabel>,...) låter dig bläddra efter filer och mappar på din dator. Referera till <ulink type=\"help\" url=\"help:user-guide?filechooser-open\">Användarguiden för skrivbordet</ulink> för att lära dig mer om hur man använder filväljardialoger."
 
 #: C/engrampa.xml:433(para)
-msgid "You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to learn how you can use the <guilabel>Places</guilabel> pane to access your favorite locations."
-msgstr "Du kan även referera till avsnittet <ulink type=\"help\" url=\"ghelp:user-guide?caja-bookmarks\">Bokmärken</ulink> i Användarguide för skrivbordet för att lära dig hur du kan använda panelen <guilabel>Platser</guilabel> för att komma åt dina favoritplatser."
+msgid "You can also refer to the <ulink type=\"help\" url=\"help:user-guide?caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to learn how you can use the <guilabel>Places</guilabel> pane to access your favorite locations."
+msgstr "Du kan även referera till avsnittet <ulink type=\"help\" url=\"help:user-guide?caja-bookmarks\">Bokmärken</ulink> i Användarguide för skrivbordet för att lära dig hur du kan använda panelen <guilabel>Platser</guilabel> för att komma åt dina favoritplatser."
 
 #: C/engrampa.xml:445(title)
 msgid "Working With Archives"
diff --git a/help/uk/uk.po b/help/uk/uk.po
index 86d87ba..84c284d 100644
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
@@ -22,14 +22,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/legal.xml:12(para)
@@ -317,12 +317,12 @@ msgstr "Зворотний зв'язок"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "Щоб сповістити про помилку або внести пропозицію відносно програми "
 "<application>Менеджер архівів</application> чи цієї довідки, слідуйте "
-"інструкціям, наведеним на <ulink url=\"ghelp:mate-feedback\" type=\"help"
+"інструкціям, наведеним на <ulink url=\"help:mate-feedback\" type=\"help"
 "\">Сторінка зворотного зв'язку MATE</ulink>."
 
 #: ../C/engrampa.xml:166(primary)
diff --git a/help/vi/vi.po b/help/vi/vi.po
index df65d9a..1a5862b 100644
--- a/help/vi/vi.po
+++ b/help/vi/vi.po
@@ -101,8 +101,8 @@ msgid "MATE Documentation Project"
 msgstr "Dự án Tài Liệu MATE"
 
 #: C/engrampa.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 "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."
+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 "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."
 
 #: C/engrampa.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."
@@ -232,8 +232,8 @@ msgid "Feedback"
 msgstr "Phản hồi"
 
 #: C/engrampa.xml:168(para)
-msgid "To report a bug or make a suggestion regarding the <application>Archive Manager</application> application or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Để thông báo lỗi hay gợi ý cho <application>Bộ quản lý kho lưu</application>, xin mở <ulink url=\"ghelp:mate-feedback\" type=\"help\">Trang phản hồi cho MATE</ulink>."
+msgid "To report a bug or make a suggestion regarding the <application>Archive Manager</application> application or this manual, follow the directions in the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "Để thông báo lỗi hay gợi ý cho <application>Bộ quản lý kho lưu</application>, xin mở <ulink url=\"help:mate-feedback\" type=\"help\">Trang phản hồi cho MATE</ulink>."
 
 #: C/engrampa.xml:175(primary)
 msgid "Engrampa"
@@ -643,12 +643,12 @@ msgid "Browsing the Filesystem"
 msgstr "Duyệt hệ tập tin"
 
 #: C/engrampa.xml:429(para)
-msgid "Several <application>Archive Manager</application> dialogs (<guilabel>New</guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) enable you to browse files and folders on your computer. Refer to the <ulink type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</ulink> to learn more about using the file browsing dialogs."
-msgstr "Một vài hộp thoại trong <application>Bộ quản lý kho lưu</application> (<guilabel>Mở</guilabel>, <guilabel>Mới</guilabel>, <guilabel>Giải nén</guilabel>,...) cho phép ta duyệt các tập tin và thư mục trên máy. Xin xem phần <ulink type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Hướng dẫn về môi trường làm việc</ulink> để biết thêm về cách dùng các hộp thoại này."
+msgid "Several <application>Archive Manager</application> dialogs (<guilabel>New</guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) enable you to browse files and folders on your computer. Refer to the <ulink type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</ulink> to learn more about using the file browsing dialogs."
+msgstr "Một vài hộp thoại trong <application>Bộ quản lý kho lưu</application> (<guilabel>Mở</guilabel>, <guilabel>Mới</guilabel>, <guilabel>Giải nén</guilabel>,...) cho phép ta duyệt các tập tin và thư mục trên máy. Xin xem phần <ulink type=\"help\" url=\"help:user-guide?filechooser-open\">Hướng dẫn về môi trường làm việc</ulink> để biết thêm về cách dùng các hộp thoại này."
 
 #: C/engrampa.xml:433(para)
-msgid "You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to learn how you can use the <guilabel>Places</guilabel> pane to access your favorite locations."
-msgstr "Bạn cũng có thể xem phần <ulink type=\"help\" url=\"ghelp:user-guide?caja-bookmarks\">Liên kết lưu</ulink> trong Hướng dẫn về môi trường làm việc để biết cách dùng ô <guilabel>Nơi</guilabel> để truy cập các vị trí hay dùng trên đĩa."
+msgid "You can also refer to the <ulink type=\"help\" url=\"help:user-guide?caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to learn how you can use the <guilabel>Places</guilabel> pane to access your favorite locations."
+msgstr "Bạn cũng có thể xem phần <ulink type=\"help\" url=\"help:user-guide?caja-bookmarks\">Liên kết lưu</ulink> trong Hướng dẫn về môi trường làm việc để biết cách dùng ô <guilabel>Nơi</guilabel> để truy cập các vị trí hay dùng trên đĩa."
 
 #: C/engrampa.xml:445(title)
 msgid "Working With Archives"
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 156cf4e..4727a6d 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -132,12 +132,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\">链接</ulink>上或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副"
 "本。"
 
@@ -342,11 +342,11 @@ msgstr "反馈"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "对 <application>归档管理器</application>程序或本手册报告错误或提供建议，请遵"
-"从<ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE 反馈页面</ulink> 上"
+"从<ulink url=\"help:mate-feedback\" type=\"help\">MATE 反馈页面</ulink> 上"
 "的指导。"
 
 #: C/engrampa.xml:202(primary)
@@ -861,23 +861,23 @@ msgid ""
 "Several <application>Archive Manager</application> dialogs (<guilabel>New</"
 "guilabel>, <guilabel>Open</guilabel>, <guilabel>Extract</guilabel>,...) "
 "enable you to browse files and folders on your computer. Refer to the <ulink "
-"type=\"help\" url=\"ghelp:user-guide?filechooser-open\">Desktop User Guide</"
+"type=\"help\" url=\"help:user-guide?filechooser-open\">Desktop User Guide</"
 "ulink> to learn more about using the file browsing dialogs."
 msgstr ""
 "一些 <application>归档管理器</application> 对话框(<guilabel>新建</"
 "guilabel>、 <guilabel>打开</guilabel>、<guilabel>解压</guilabel>，等等)，允许"
 "您浏览计算机中的文件和文件夹。使用浏览对话框的更多相关信息，请访问： <ulink "
-"type=\"help\" url=\"ghelp:user-guide?filechooser-open\">桌面用户指南</"
+"type=\"help\" url=\"help:user-guide?filechooser-open\">桌面用户指南</"
 "ulink>。"
 
 #: C/engrampa.xml:464(para)
 msgid ""
-"You can also refer to the <ulink type=\"help\" url=\"ghelp:user-guide?"
+"You can also refer to the <ulink type=\"help\" url=\"help:user-guide?"
 "caja-bookmarks\">Bookmarks section</ulink> of the Desktop User Guide to "
 "learn how you can use the <guilabel>Places</guilabel> pane to access your "
 "favorite locations."
 msgstr ""
-"您也可以参考用户指南的 <ulink type=\"help\" url=\"ghelp:user-guide?caja-"
+"您也可以参考用户指南的 <ulink type=\"help\" url=\"help:user-guide?caja-"
 "bookmarks\">书签章节</ulink> 学习如何使用 <guilabel>位置</guilabel> 面板来访"
 "问常用的位置。"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5722e2d..321a0d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@ privexecdir = $(libexecdir)/engrampa/
 shdir = $(libexecdir)/engrampa/
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_srcdir)/copy-n-paste/ \
 -I$(top_srcdir) \
 -I$(top_builddir) \
diff --git a/src/commands/Makefile.am b/src/commands/Makefile.am
index b51c338..9228238 100644
--- a/src/commands/Makefile.am
+++ b/src/commands/Makefile.am
@@ -1,7 +1,7 @@
 privexecdir = $(libexecdir)/$(PACKAGE)
 privexec_PROGRAMS = rpm2cpio
 
-INCLUDES = $(DISABLE_DEPRECATED) $(FR_CFLAGS)
+AM_CPPFLAGS = $(DISABLE_DEPRECATED) $(FR_CFLAGS)
 
 rpm2cpio_SOURCES = rpm2cpio.c
 rpm2cpio_LDADD = $(FR_LIBS)
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index 99251d8..5e7fff4 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -766,7 +766,7 @@ show_help_dialog (GtkWindow *parent,
 char *uri;
 GError *error = NULL;
 
- uri = g_strconcat ("ghelp:engrampa", section ? "?" : NULL, section, NULL);
+ uri = g_strconcat ("help:engrampa", section ? "?" : NULL, section, NULL);
 if (! show_uri (gtk_window_get_screen (parent), uri, GDK_CURRENT_TIME, &error)) {
 GtkWidget *dialog;