32 files changed, 155 insertions, 153 deletions

diff --git a/Makefile.am b/Makefile.am
index df3b849..4df696b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,14 +5,12 @@ endif
 SUBDIRS = $(jpeg_DIRS) cut-n-paste bindings src man plugins po help data doc
 
 EXTRA_DIST = 			\
-	HACKING			\
-	mate-doc-utils.make
+	HACKING			
 
 DISTCLEANFILES =                \
         intltool-extract        \
         intltool-merge          \
-        intltool-update         \
-	mate-doc-utils.make
+        intltool-update         
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc
 
diff --git a/autogen.sh b/autogen.sh
index 3bb5509..502f155 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,10 +13,15 @@ PKG_NAME="mate-image-viewer"
 }
 
 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
+} 
+
 REQUIRED_AUTOMAKE_VERSION=1.9
 MATE_DATADIR="$mate_datadir"
 
diff --git a/configure.ac b/configure.ac
index 08660e1..189f4d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,8 @@ AC_SUBST(LDFLAGS)
 # ***************
 
 PKG_PROG_PKG_CONFIG
-MATE_DOC_INIT
+
+YELP_HELP_INIT
 
 # **********
 # MATE Libs
diff --git a/data/eom.desktop.in.in b/data/eom.desktop.in.in
index 9584896..81dd7ff 100644
--- a/data/eom.desktop.in.in
+++ b/data/eom.desktop.in.in
@@ -12,5 +12,5 @@ X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=EOM
 X-MATE-Bugzilla-Component=general
 X-MATE-Bugzilla-Version=@VERSION@
-X-MATE-DocPath=eom/eom.xml
+X-MATE-DocPath=eom/index.docbook
 MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/svg+xml;image/svg+xml-compressed;image/vnd.wap.wbmp;
diff --git a/help/C/eom.xml b/help/C/index.docbook
index 14718aa..c409d0a 100644
--- a/help/C/eom.xml
+++ b/help/C/index.docbook
@@ -209,7 +209,7 @@
     </releaseinfo> 
     <legalnotice> 
       <title>Feedback</title> 
-      <para>To report a bug or make a suggestion regarding the &appname; application or this manual, follow the directions in the <ulink url="ghelp:user-guide?feedback-bugs" type="help">MATE Feedback Page</ulink>. 
+      <para>To report a bug or make a suggestion regarding the &appname; application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">MATE Feedback Page</ulink>. 
       </para>
 <!-- Translators may also add here feedback address for translations -->
     </legalnotice> 
@@ -555,7 +555,7 @@
 			<guimenuitem>Move to Trash</guimenuitem>
 			</menuchoice>.
 			This moves the file to the Trash folder. Multiple images can also be moved to the trash in the same way: select them all first.</para>
-	    <para>To restore an image from the Trash, open the Trash folder in <application>Caja</application> file manager and move the image file to another folder. To delete the image permanently, empty the Trash. To find out more about using the Trash, see the <ulink type="help" url="ghelp:user-guide?caja-trash">User Guide</ulink>.</para>
+	    <para>To restore an image from the Trash, open the Trash folder in <application>Caja</application> file manager and move the image file to another folder. To delete the image permanently, empty the Trash. To find out more about using the Trash, see the <ulink type="help" url="help:user-guide?caja-trash">User Guide</ulink>.</para>
 				
 			<note><para>You can also use the <keycap>Del</keycap> key to move an image to the Trash, in which case you will be asked for confirmation.</para></note>
 			
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 9b3ddbe..8d67539 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,14 +1,12 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = eom
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = 					\
+HELP_ID = eom
+HELP_FILES = index.docbook legal.xml
+HELP_MEDIA = 					\
 	figures/eom_save_as_window.png		\
 	figures/eom_start_window.png		\
 	figures/eom_toolbar_editor_window.png
 
-DOC_LINGUAS = ar ca cs da de el en_GB es eu fi fr it ja ko oc pa pl pt_BR ru sv th uk zh_CN zh_TW
+HELP_LINGUAS = ar ca cs da de el en_GB es eu fi fr it ja ko oc pa pl pt_BR ru sv th uk zh_CN zh_TW
 
 -include $(top_srcdir)/git.mk
diff --git a/help/ar/ar.po b/help/ar/ar.po
index 704a717..679faf0 100644
--- a/help/ar/ar.po
+++ b/help/ar/ar.po
@@ -104,7 +104,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 ""
 
@@ -310,11 +310,11 @@ msgstr "الاقتراحات"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "للتبليغ عن خطأ برمجي أو لإرسال اقتراح بخصوص عارض الصور أو هذا الدليل، اتبع "
-"التعليمات في   <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">MATE "
+"التعليمات في   <ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">MATE "
 "Feedback Page</ulink>."
 
 #: C/eom.xml:217(para)
@@ -1028,13 +1028,13 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "لاستعادة صورة من المهملات، افتح مجلد المهملات في مدير الملفات "
 "<application>نيوتلوس</application> وانقل الصورة إلى مجلد آخر. لحذف الصورة "
 "إلى الأبد، أفرغ سلة المهملات. لإيجاد المزيد حول استخدام المهملات، راجع "
-"<ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">دليل المستخدم</"
+"<ulink type=\"help\" url=\"help:user-guide?caja-trash\">دليل المستخدم</"
 "ulink>."
 
 #: C/eom.xml:560(para)
diff --git a/help/ca/ca.po b/help/ca/ca.po
index 5f62e92..175efc7 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -98,7 +98,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 "
@@ -106,7 +106,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/eom.xml:12(para)
@@ -344,11 +344,11 @@ msgstr "Comentaris"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Per a informar d'un error o fer algun suggeriment sobre el visualitzador "
-"d'imatges o aquest manual, seguiu les indicacions a la <ulink url=\"ghelp:"
+"d'imatges o aquest manual, seguiu les indicacions a la <ulink url=\"help:"
 "user-guide?feedback-bugs\" type=\"help\">pàgina de comentaris del MATE</"
 "ulink>."
 
@@ -1117,14 +1117,14 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "Per a restaurar una imatge de la paperera, obriu la carpeta de la paperera "
 "amb el gestor de fitxers <application>Caja</application> i moveu el "
 "fitxer d'imatge a una altra carpeta. Per a suprimir de manera permanent la "
 "imatge, buideu la paperera. Per a saber més sobre com utilitzar la paperera "
-"vegeu la <ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">guia "
+"vegeu la <ulink type=\"help\" url=\"help:user-guide?caja-trash\">guia "
 "d'usuari</ulink>."
 
 #: C/eom.xml:560(para)
diff --git a/help/cs/cs.po b/help/cs/cs.po
index 5dd3a90..319f917 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -103,8 +103,8 @@ msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
 #: C/eom.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/eom.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."
@@ -278,8 +278,8 @@ msgid "Feedback"
 msgstr "Ohlasy"
 
 #: C/eom.xml:212(para)
-msgid "To report a bug or make a suggestion regarding the Image Viewer application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Pokud chcete oznámit chybu nebo navrhnout vylepšení vztahující se k aplikaci Prohlížeč obrázků nebo této příručce, postupujte dle instrukcí na stránce <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">Stránka s ohlasy na MATE</ulink>."
+msgid "To report a bug or make a suggestion regarding the Image Viewer application or this manual, follow the directions in the <ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "Pokud chcete oznámit chybu nebo navrhnout vylepšení vztahující se k aplikaci Prohlížeč obrázků nebo této příručce, postupujte dle instrukcí na stránce <ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">Stránka s ohlasy na MATE</ulink>."
 
 #: C/eom.xml:217(para)
 msgid "User manual for <application>Eye of MATE Image Viewer</application>."
@@ -686,8 +686,8 @@ msgid "To move an image to the Trash, choose <menuchoice><guimenu>Edit</guimenu>
 msgstr "Do koše přesunete obrázek pomocí <menuchoice><guimenu>Upravit</guimenu><guimenuitem>Přesunout do koše</guimenuitem></menuchoice>. Obrázek se umístí do složky koše. Stejným způsobem můžete do koše přesunou i více obrázků naráz, akorát je musíte nejdříve vybrat."
 
 #: C/eom.xml:558(para)
-msgid "To restore an image from the Trash, open the Trash folder in <application>Caja</application> file manager and move the image file to another folder. To delete the image permanently, empty the Trash. To find out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">User Guide</ulink>."
-msgstr "Pokud chcete obrázek z koše obnovit, musíte otevřít složku koše ve správci souborů <application>Caja</application> a přesunout soubor s obrázkem do jiné složky. Trvale obrázek vymažete vyprázdněním koše. Více se o tom, jak se pracuje s košem, dovíte v <ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">Uživatelské příručce</ulink>."
+msgid "To restore an image from the Trash, open the Trash folder in <application>Caja</application> file manager and move the image file to another folder. To delete the image permanently, empty the Trash. To find out more about using the Trash, see the <ulink type=\"help\" url=\"help:user-guide?caja-trash\">User Guide</ulink>."
+msgstr "Pokud chcete obrázek z koše obnovit, musíte otevřít složku koše ve správci souborů <application>Caja</application> a přesunout soubor s obrázkem do jiné složky. Trvale obrázek vymažete vyprázdněním koše. Více se o tom, jak se pracuje s košem, dovíte v <ulink type=\"help\" url=\"help:user-guide?caja-trash\">Uživatelské příručce</ulink>."
 
 #: C/eom.xml:560(para)
 msgid "You can also use the <keycap>Del</keycap> key to move an image to the Trash, in which case you will be asked for confirmation."
diff --git a/help/da/da.po b/help/da/da.po
index c12bd7e..8b37a53 100644
--- a/help/da/da.po
+++ b/help/da/da.po
@@ -102,7 +102,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 ""
 "Tilladelse er givet til at kopiere, distribuere og/eller ændre dette "
@@ -110,7 +110,7 @@ msgstr ""
 "version 1.1 eller andre senere versioner udgivet af Free Software Foundation "
 "med ikke indholdte sektioner, ingen frontomslagstekster, og ingen "
 "bagsideomslagstekster. Du kan finde en kopi af GFDL her <ulink type=\"help\" "
-"url=\"ghelp:fdl\">link</ulink> eller i filen COPYING-DOCS der er "
+"url=\"help:fdl\">link</ulink> eller i filen COPYING-DOCS der er "
 "distribueret med denne manual."
 
 #: C/eom.xml:12(para)
@@ -354,12 +354,12 @@ msgstr "Feedback"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "For at rapportere fejl eller foreslå forbedringer vedrørende Billedfremviser-"
 "programmet eller denne manual, bør du følge instruktionerne på <ulink url="
-"\"ghelp:user-guide?feedback-bugs\" type=\"help\">MATE-Feedbacksiden</ulink>."
+"\"help:user-guide?feedback-bugs\" type=\"help\">MATE-Feedbacksiden</ulink>."
 
 #: C/eom.xml:217(para)
 msgid "User manual for <application>Eye of MATE Image Viewer</application>."
@@ -1113,14 +1113,14 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "Hvis du vil gendanne et billede fra papirkurven skal du åbne papirkurven i "
 "<application>Filhåndtering</application> (<application>Caja</"
 "application>) og flytte billedet til en anden mappe. For at slette billedet "
 "permanent skal du tømme papirkurven. For yderligere information om "
-"papirkurven kan du læse <ulink type=\"help\" url=\"ghelp:user-guide?caja-"
+"papirkurven kan du læse <ulink type=\"help\" url=\"help:user-guide?caja-"
 "trash\">Brugervejledningen</ulink>."
 
 #: C/eom.xml:560(para)
diff --git a/help/de/de.po b/help/de/de.po
index dfde892..75949df 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -94,7 +94,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 ""
 "Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free "
@@ -102,7 +102,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/eom.xml:12(para)
@@ -347,11 +347,11 @@ msgstr "Rückmeldungen"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Wenn Sie Fehler finden oder Vorschläge zur Bildbetrachter-Anwendung oder zu "
-"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-bugs\" type=\"help\">MATE-Seite für Rückmeldungen</"
 "ulink>."
 
@@ -1120,14 +1120,14 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "Um ein in den Müll verschobenes Bild widerherzustellen, öffnen Sie den Müll-"
 "Ordner im <application>Caja</application>-Dateimanager und verschieben "
 "Sie die betreffende Bilddatei in einen anderen Ordner. Um das Bild endgültig "
 "zu löschen, leeren Sie den Müll. Weitere Informationen über die Verwendung "
-"des Mülls finden Sie im <ulink type=\"help\" url=\"ghelp:user-guide?caja-"
+"des Mülls finden Sie im <ulink type=\"help\" url=\"help:user-guide?caja-"
 "trash\">Desktop-Benutzerhandbuch</ulink>."
 
 #: C/eom.xml:560(para)
diff --git a/help/el/el.po b/help/el/el.po
index 1d4360f..3a25173 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -95,14 +95,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 ""
 "Επιτρέπεται η αντιγραφή, η αναδιανομή και/ή η τροποποίηση αυτού του εγγράφου "
 "υπό τους όρους της Ελεύθερης Άδειας Τεκμηρίωσης GPL (GFDL), έκδοση 1.1 ή "
 "νεότερη που εκδόθηκε από το Ίδρυμα Ελεύθερου Λογισμικού χωρίς Αμετάβλητα "
 "Τμήματα, χωρίς Κείμενο Εξωφύλλου και χωρίς Κείμενο Οπισθοφύλλου. Μπορείτε να "
-"βρείτε ένα αντίγραφο της GDFL σ' <ulink type=\"help\" url=\"ghelp:fdl\">αυτό "
+"βρείτε ένα αντίγραφο της GDFL σ' <ulink type=\"help\" url=\"help:fdl\">αυτό "
 "το σύνδεσμο</ulink> ή στο αρχείο COPYING DOCS που διανέμεται μαζί με αυτό το "
 "εγχειρίδιο."
 
@@ -340,11 +340,11 @@ msgstr "Ανάδραση"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Για να αναφέρετε ένα σφάλμα ή να κάνετε μια εισήγηση σχετικά με την Προβολή "
-"εικόνων η με αυτό το έγγραφο, ακολουθήστε τις οδηγίες στη <ulink url=\"ghelp:"
+"εικόνων η με αυτό το έγγραφο, ακολουθήστε τις οδηγίες στη <ulink url=\"help:"
 "user-guide?feedback-bugs\" type=\"help\">Σελίδα ανάδρασης του MATE</ulink>."
 
 #: C/eom.xml:217(para)
@@ -1119,14 +1119,14 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "Για να επαναφέρετε μια εικόνα από τα απορρίμματα, ανοίξτε τον φάκελο "
 "απορριμμάτων στον διαχειριστή αρχείων <application>Ναυτίλο</application> και "
 "μετακινήστε το αρχείο εικόνας σε έναν άλλο φάκελο. Για να διαγράψετε την "
 "εικόνα οριστικά, αδειάστε τα απορρίμματα. Για να μάθετε περισσότερα σχετικά "
-"με την χρήση των απορριμμάτων, δείτε τον <ulink type=\"help\" url=\"ghelp:"
+"με την χρήση των απορριμμάτων, δείτε τον <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">Οδηγό χρήσης</ulink>."
 
 #: C/eom.xml:560(para)
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
index a5e66f7..28aa274 100644
--- a/help/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -100,14 +100,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/eom.xml:12(para)
@@ -345,11 +345,11 @@ msgstr "Feedback"
 #: ../C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 
 #: ../C/eom.xml:217(para)
@@ -1089,14 +1089,14 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "To restore an image from the wastebasket, open the wastebasket folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the wastebasket. To "
 "find out more about using the wastebasket, see the <ulink type=\"help\" url="
-"\"ghelp:user-guide?caja-trash\">User Guide</ulink>."
+"\"help:user-guide?caja-trash\">User Guide</ulink>."
 
 #: ../C/eom.xml:560(para)
 msgid ""
diff --git a/help/es/es.po b/help/es/es.po
index 6941280..2e342ba 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -101,7 +101,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 otorga permiso para copiar, distribuir y/o modificar este documento bajo "
@@ -109,7 +109,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/eom.xml:12(para)
@@ -351,12 +351,12 @@ msgstr "Comentarios"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Para informar de un error o hacer alguna sugerencia respecto de la "
 "aplicación Visor de imágenes o este manual, siga las indicaciones en la "
-"<ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">página de "
+"<ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">página de "
 "contacto de MATE</ulink>."
 
 #: C/eom.xml:217(para)
@@ -1116,13 +1116,13 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "Para restaurar una imagen desde la Papelera, abra la Papelera en "
 "<application>Caja</application> y mueva la imagen a otra carpeta. Para "
 "borrar una imagen permanentemente, vacía la Papelera. Para encontrar más "
-"acerca del uso de la Papelera, vea <ulink type=\"help\" url=\"ghelp:user-"
+"acerca del uso de la Papelera, vea <ulink type=\"help\" url=\"help:user-"
 "guide?caja-trash\">Guía del Usuario</ulink>."
 
 #: C/eom.xml:560(para)
diff --git a/help/eu/eu.po b/help/eu/eu.po
index 60ff9f3..84c2b0e 100644
--- a/help/eu/eu.po
+++ b/help/eu/eu.po
@@ -70,8 +70,8 @@ msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation "
 
 #: C/eom.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 "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko Free Software Foundation-ek argitaratutako GNU Dokumentazio Librearen Lizentziaren 1.1. bertsioan edo berriago batean ezarritako baldintzak betetzen badira; Atal Aldaezinik, Aurreko azaleko testurik eta Atzeko azaleko testurik gabe. GFDL lizentziaren kopia <ulink type=\"help\" url=\"ghelp:fdl\">esteka</ulink> honetan edo eskuliburu honekin batera ematen den COPYING-DOCS fitxategian aurkituko duzu."
+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 "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko Free Software Foundation-ek argitaratutako GNU Dokumentazio Librearen Lizentziaren 1.1. bertsioan edo berriago batean ezarritako baldintzak betetzen badira; Atal Aldaezinik, Aurreko azaleko testurik eta Atzeko azaleko testurik gabe. GFDL lizentziaren kopia <ulink type=\"help\" url=\"help:fdl\">esteka</ulink> honetan edo eskuliburu honekin batera ematen den COPYING-DOCS fitxategian aurkituko duzu."
 
 #: C/eom.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 "Ohar-bidaltzea"
 
 #: C/eom.xml:212(para)
-msgid "To report a bug or make a suggestion regarding the Image Viewer application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Irudi-ikustailearen aplikazioari buruzko akatsen berri emateko edo oharrak bidaltzeko, <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">MATEra oharrak bidaltzeko orrian</ulink> aurkituko dituzu argibideak."
+msgid "To report a bug or make a suggestion regarding the Image Viewer application or this manual, follow the directions in the <ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "Irudi-ikustailearen aplikazioari buruzko akatsen berri emateko edo oharrak bidaltzeko, <ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">MATEra oharrak bidaltzeko orrian</ulink> aurkituko dituzu argibideak."
 
 #: C/eom.xml:217(para)
 msgid "User manual for <application>Eye of MATE Image Viewer</application>."
@@ -642,8 +642,8 @@ msgid "To move an image to the Trash, choose <menuchoice><guimenu>Edit</guimenu>
 msgstr "Irudi bat Zakarrontzira eramateko, aukeratu <menuchoice><guimenu>Editatu</guimenu><guisubmenu>Eraman Zakarrontzira</guisubmenu></menuchoice>. Fitxategia Zakarrontziaren karpetara eramango da. Irudi bat baino gehiago batera eraman daitezke zakarrontzira: hautatu denak, eraman aurretik."
 
 #: C/eom.xml:558(para)
-msgid "To restore an image from the Trash, open the Trash folder in <application>Caja</application> file manager and move the image file to another folder. To delete the image permanently, empty the Trash. To find out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">User Guide</ulink>."
-msgstr "Irudi bat Zakarrontzitik leheneratzeko, ireki Zakarrontziaren karpeta <application>Caja</application> fitxategi-kudeatzailean, eta eraman irudiaren fitxategia beste karpeta batera. Irudia betiko ezabatzeko, hustu Zakarrontzia. Zakarrontzia erabiltzeari buruz gehiago jakiteko, ikus <ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">Erabiltzailearen gida</ulink>."
+msgid "To restore an image from the Trash, open the Trash folder in <application>Caja</application> file manager and move the image file to another folder. To delete the image permanently, empty the Trash. To find out more about using the Trash, see the <ulink type=\"help\" url=\"help:user-guide?caja-trash\">User Guide</ulink>."
+msgstr "Irudi bat Zakarrontzitik leheneratzeko, ireki Zakarrontziaren karpeta <application>Caja</application> fitxategi-kudeatzailean, eta eraman irudiaren fitxategia beste karpeta batera. Irudia betiko ezabatzeko, hustu Zakarrontzia. Zakarrontzia erabiltzeari buruz gehiago jakiteko, ikus <ulink type=\"help\" url=\"help:user-guide?caja-trash\">Erabiltzailearen gida</ulink>."
 
 #: C/eom.xml:560(para)
 msgid "You can also use the <keycap>Del</keycap> key to move an image to the Trash, in which case you will be asked for confirmation."
diff --git a/help/fi/fi.po b/help/fi/fi.po
index 85c6eca..b39321e 100644
--- a/help/fi/fi.po
+++ b/help/fi/fi.po
@@ -98,14 +98,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 ""
 "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ä "
+"voi nähdä napsauttamalla <ulink type=\"help\" url=\"help:fdl\">tätä "
 "linkkiä</ulink>, tai lukemalla ohjeen mukana toimitetun COPYING-DOCS-nimisen "
 "tiedoston."
 
@@ -342,12 +342,12 @@ msgstr "Palaute"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Voit ilmoittaa vioista tai tehdä ehdotuksia koskien Kuvakatselin-sovellusta "
 "tai tätä käyttöohjetta, seuraamalla ohjeita <ulink "
-"url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">Maten palautesivuilta<"
+"url=\"help:user-guide?feedback-bugs\" type=\"help\">Maten palautesivuilta<"
 "/ulink>."
 
 #: C/eom.xml:217(para)
@@ -1039,11 +1039,11 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "Voit palauttaa kuvan roskakorista avaamalla roskakori-kansion <application>Caja</application>-tiedostonhallinnassa ja siirtämällä kuvan toiseen kansioon. Poista kuva lopullisesti tyhjentämällä roskakori. Lisätietoja roskakorin käytöstä löydät roskakorin <ulink type=\"help\" "
-"url=\"ghelp:user-guide?caja-trash\">käyttöohjeesta</ulink>."
+"url=\"help:user-guide?caja-trash\">käyttöohjeesta</ulink>."
 
 #: C/eom.xml:560(para)
 msgid ""
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 20d3016..fca99f4 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -100,7 +100,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 "
@@ -108,7 +108,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/eom.xml:12(para)
@@ -348,12 +348,12 @@ msgstr "Votre avis"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Pour rapporter une anomalie ou émettre une suggestion concernant le "
 "visionneur d'images ou ce manuel, procédez comme indiqué sur la <ulink url="
-"\"ghelp:user-guide?feedback-bugs\" type=\"help\">page de réactions sur "
+"\"help:user-guide?feedback-bugs\" type=\"help\">page de réactions sur "
 "MATE</ulink>."
 
 #: C/eom.xml:217(para)
@@ -1126,7 +1126,7 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "Pour récupérer une image dans la corbeille, ouvrez le dossier de la "
@@ -1134,7 +1134,7 @@ msgstr ""
 "application> et déplacez le fichier image dans un autre dossier. Pour "
 "supprimer définitivement l'image, videz la corbeille. Pour obtenir plus de "
 "détails sur l'utilisation de la corbeille, consultez le <ulink type=\"help\" "
-"url=\"ghelp:user-guide?caja-trash\">guide de l'utilisateur</ulink>."
+"url=\"help:user-guide?caja-trash\">guide de l'utilisateur</ulink>."
 
 #: C/eom.xml:560(para)
 msgid ""
diff --git a/help/it/it.po b/help/it/it.po
index db3f3a4..603cf71 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -93,7 +93,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 ""
 "Questo documento può essere copiato, distribuito o modificato solo in "
@@ -101,7 +101,7 @@ msgstr ""
 "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 seguendo questo <ulink type=\"help\" url="
-"\"ghelp:fdl\">collegamento</ulink> o nel file COPYING-DOCS distribuito con "
+"\"help:fdl\">collegamento</ulink> o nel file COPYING-DOCS distribuito con "
 "questo manuale."
 
 #: C/eom.xml:12(para)
@@ -342,12 +342,12 @@ msgstr "Commenti"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Per segnalare un problema o inviare suggerimenti sull'applicazione Eye of "
 "MATE o su questo manuale, seguire le istruzioni presenti alla <ulink url="
-"\"ghelp:user-guide?feedback-bugs\" type=\"help\">pagina di commenti su "
+"\"help:user-guide?feedback-bugs\" type=\"help\">pagina di commenti su "
 "MATE</ulink>."
 
 #: C/eom.xml:217(para)
@@ -1138,14 +1138,14 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "Per ripristinare un'immagine dal cestino, aprire la cartella cestino nel "
 "file manager <application>Caja</application> e spostare l'immagine su "
 "un'altra cartella. Per eliminare l'immagine in modo permanente, svuotare il "
 "cestino. Per maggiori informazioni sull'uso del cestino, consultare la "
-"<ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">Guida per "
+"<ulink type=\"help\" url=\"help:user-guide?caja-trash\">Guida per "
 "l'utente</ulink>."
 
 #: C/eom.xml:560(para)
diff --git a/help/ja/ja.po b/help/ja/ja.po
index c7fd60c..2d777bf 100644
--- a/help/ja/ja.po
+++ b/help/ja/ja.po
@@ -127,11 +127,11 @@ msgstr "フィードバック"
 #: eom-C.xml:156(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Eye of MATE application "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
+"or this manual, follow the directions in the <ulink url=\"help:mate-"
 "feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Eye of MATE アプリケーションまたはこのマニュアルに関してバグやご意見をご報告"
-"いただく場合は、<ulink url=\"ghelp:mate-feedback\" type=\"help\">『MATE "
+"いただく場合は、<ulink url=\"help:mate-feedback\" type=\"help\">『MATE "
 "フィードバックページ』</ulink>を参照してください。"
 
 #: eom-C.xml:166(primary)
@@ -751,13 +751,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 Free Documentation License (GFDL) の管理下でこのドキュメント をコピー、配"
 "布、または変更することを許可します。Free Software Foundation から発行された"
 "バージョン 1.1 以降のドキュメントには、 セクションや表紙などがありません。"
-"GFDL のコピーは、<ulink type=\"help\" url=\"ghelp:fdl\">URL</ulink> またはこ"
+"GFDL のコピーは、<ulink type=\"help\" url=\"help:fdl\">URL</ulink> またはこ"
 "のマニュアルと 一緒に配布された COPYING-DOCS を参照してください。"
 
 #: ../C/legal.xml:12(para)
diff --git a/help/ko/ko.po b/help/ko/ko.po
index 7fb2aaa..8be57b8 100644
--- a/help/ko/ko.po
+++ b/help/ko/ko.po
@@ -98,13 +98,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/eom.xml:12(para) ../C/legal.xml:12(para)
@@ -330,11 +330,11 @@ msgstr "피드백"
 #: ../C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "그림 보기 프로그램 또는 이 설명서에 대한 버그를 알려 주시거나 의견을 제시하려"
-"면 <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">그놈 피드백 페"
+"면 <ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">그놈 피드백 페"
 "이지</ulink>에 있는 대로 해 주십시오."
 
 #: ../C/eom.xml:217(para)
@@ -1058,13 +1058,13 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "휴지통에 있는 그림을 복구하려면, <application>노틸러스</application> 파일 관"
 "리자의 휴지통 폴더를 열고 해당 그림을 다른 폴더로 옮기십시오. 그 그림을 완전"
 "히 지우려면, 휴지통을 비우십시오. 휴지통 사용 방법에 대해 좀 더 알고 싶다면, "
-"<ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">사용자 안내서</"
+"<ulink type=\"help\" url=\"help:user-guide?caja-trash\">사용자 안내서</"
 "ulink>를 참고하십시오."
 
 #: ../C/eom.xml:560(para)
diff --git a/help/oc/oc.po b/help/oc/oc.po
index f8539bc..697b3c2 100644
--- a/help/oc/oc.po
+++ b/help/oc/oc.po
@@ -101,7 +101,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 ""
 
@@ -307,7 +307,7 @@ msgstr ""
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 
@@ -882,7 +882,7 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 
diff --git a/help/pa/pa.po b/help/pa/pa.po
index 76d18f0..37a83ad 100644
--- a/help/pa/pa.po
+++ b/help/pa/pa.po
@@ -101,13 +101,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 ""
 "ਇਹ ਡੌਕੂਮੈਂਟ ਨੂੰ ਗਨੂ ਮੁਕਤ ਡੌਕੂਮੈਂਟ ਲਾਈਸੈਂਸ (GFDL), ਵਰਜਨ 1.1 ਜਾਂ ਨਵੇਂ, ਜੋ ਕਿ ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਡੇਸ਼ਨ "
 "ਵਲੋਂ ਬਦਲਵੇਂ ਭਾਗ, ਨਾ ਮੁੱਢਲੇ-ਢੱਕਣ ਪਾਠ ਅਤੇ ਨਾ ਹੀ ਪਿੱਛੇ-ਢੱਕਣ ਪਾਠ ਨਾਲ ਜਾਰੀ ਹੈ, ਦੀਆਂ ਸ਼ਰਤਾਂ ਅਧੀਨ "
 "ਨਕਲ ਕਰਨ, ਵੰਡਣ ਅਤੇ/ਜਾਂ ਸੋਧਣ ਦਾ ਅਧਿਕਾਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਤੁਸੀਂ GFDL ਦੀ ਨਕਲ <ulink type="
-"\"help\" url=\"ghelp:fdl\"> ਸਬੰਧ</ulink> ਉੱਤੇ ਜਾਂ ਇਹ ਡੌਕੂਮੈਂਟ 'ਚ COPYING-DOCS ਫਾਇਲ "
+"\"help\" url=\"help:fdl\"> ਸਬੰਧ</ulink> ਉੱਤੇ ਜਾਂ ਇਹ ਡੌਕੂਮੈਂਟ 'ਚ COPYING-DOCS ਫਾਇਲ "
 "ਵਿੱਚੋਂ ਲੈ ਸਕਦੇ ਹੋ।"
 
 #: C/eom.xml:12(para)
@@ -342,10 +342,10 @@ msgstr "ਸੁਝਾਅ"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
-"ਚਿੱਤਰ ਦਰਸ਼ਕ ਐਪਲੀਕੇਸ਼ਨ ਜਾਂ ਇਹ ਡੌਕੂਮੈਂਟ ਬਾਰੇ ਬੱਗ ਜਾਂ ਸੁਝਾਅ ਦੇਣ ਲਈ <ulink url=\"ghelp:user-"
+"ਚਿੱਤਰ ਦਰਸ਼ਕ ਐਪਲੀਕੇਸ਼ਨ ਜਾਂ ਇਹ ਡੌਕੂਮੈਂਟ ਬਾਰੇ ਬੱਗ ਜਾਂ ਸੁਝਾਅ ਦੇਣ ਲਈ <ulink url=\"help:user-"
 "guide?feedback-bugs\" type=\"help\">ਗਨੋਮ ਸੁਝਾਅ ਸਫ਼ਾ</ulink> ਦੀਆਂ ਹਦਾਇਤਾਂ ਵੇਖੋ।"
 
 #: C/eom.xml:217(para)
@@ -943,7 +943,7 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 
diff --git a/help/pl/pl.po b/help/pl/pl.po
index 3f7fe4f..aea0fc7 100644
--- a/help/pl/pl.po
+++ b/help/pl/pl.po
@@ -93,8 +93,8 @@ msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
 #: C/eom.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 "Udziela się zezwolenia do kopiowania rozpowszechniania i/lub modyfikację tego dokumentu zgodnie z zasadami Licencji GNU Wolnej Dokumentacji w wersji 1.1 lub dowolnej późniejszej opublikowanej przez Free Software Foundation; wraz z zawartymi Sekcjami Niezmiennymi, wraz z Tekstem na Przedniej Okładce i z Tekstem na Tylnej Okładce. Kopia licencji dostępna jest pod adresem <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> oraz w pliku COPYING-DOCS dystrybuowanym z niniejszym podręcznikiem"
+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 "Udziela się zezwolenia do kopiowania rozpowszechniania i/lub modyfikację tego dokumentu zgodnie z zasadami Licencji GNU Wolnej Dokumentacji w wersji 1.1 lub dowolnej późniejszej opublikowanej przez Free Software Foundation; wraz z zawartymi Sekcjami Niezmiennymi, wraz z Tekstem na Przedniej Okładce i z Tekstem na Tylnej Okładce. Kopia licencji dostępna jest pod adresem <ulink type=\"help\" url=\"help:fdl\">link</ulink> oraz w pliku COPYING-DOCS dystrybuowanym z niniejszym podręcznikiem"
 
 #: C/eom.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."
@@ -268,8 +268,8 @@ msgid "Feedback"
 msgstr "Opinie"
 
 #: C/eom.xml:212(para)
-msgid "To report a bug or make a suggestion regarding the Image Viewer application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Aby zgłosić błąd lub sugestię dotyczące programu <application>Przeglądarka obrazów</application> lub niniejszego podręcznika, proszę postępować zgodnie ze wskazówkami opublikowanymi na stronie <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgid "To report a bug or make a suggestion regarding the Image Viewer application or this manual, follow the directions in the <ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "Aby zgłosić błąd lub sugestię dotyczące programu <application>Przeglądarka obrazów</application> lub niniejszego podręcznika, proszę postępować zgodnie ze wskazówkami opublikowanymi na stronie <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 
 #: C/eom.xml:217(para)
 msgid "User manual for <application>Eye of MATE Image Viewer</application>."
@@ -676,8 +676,8 @@ msgid "To move an image to the Trash, choose <menuchoice><guimenu>Edit</guimenu>
 msgstr "W celu przeniesienia obrazu do kosza, należy z menu wybrać polecenie<menuchoice><guimenu>Edycja</guimenu><guimenuitem>Przenieś do kosza</guimenuitem></menuchoice>. W ten sam sposób można usunąć wiele obrazów na raz, wystarczy je wcześniej zaznaczyć."
 
 #: C/eom.xml:558(para)
-msgid "To restore an image from the Trash, open the Trash folder in <application>Caja</application> file manager and move the image file to another folder. To delete the image permanently, empty the Trash. To find out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">User Guide</ulink>."
-msgstr "W celu przywrócenia obrazu z kosza, należy otworzyć Kosz w menedżerze plików <application>Caja</application> i przesunąć obraz do innego katalogu. Aby trwale usunąć obraz wystarczy opróżnić kosz. Więcej informacji o korzystaniu z Kosza znajduje się w <ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">podręczniku użytkownika</ulink>."
+msgid "To restore an image from the Trash, open the Trash folder in <application>Caja</application> file manager and move the image file to another folder. To delete the image permanently, empty the Trash. To find out more about using the Trash, see the <ulink type=\"help\" url=\"help:user-guide?caja-trash\">User Guide</ulink>."
+msgstr "W celu przywrócenia obrazu z kosza, należy otworzyć Kosz w menedżerze plików <application>Caja</application> i przesunąć obraz do innego katalogu. Aby trwale usunąć obraz wystarczy opróżnić kosz. Więcej informacji o korzystaniu z Kosza znajduje się w <ulink type=\"help\" url=\"help:user-guide?caja-trash\">podręczniku użytkownika</ulink>."
 
 #: C/eom.xml:560(para)
 msgid "You can also use the <keycap>Del</keycap> key to move an image to the Trash, in which case you will be asked for confirmation."
diff --git a/help/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po
index 525e68a..11cf8dd 100644
--- a/help/pt_BR/pt_BR.po
+++ b/help/pt_BR/pt_BR.po
@@ -101,14 +101,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 ""
 "Permissão concedida para copiar, distribuir e/ou modificar este documento "
 "dentro dos termos da GNU Free Documentation License (GFDL), Versão 1.1 ou "
 "qualquer versão superior publicada pela Free Software Foundation sem nenhuma "
 "seção imutável, texto de capa e contracapa. Você pode achar uma cópia do "
-"GFDL neste <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> ou no arquivo "
+"GFDL neste <ulink type=\"help\" url=\"help:fdl\">link</ulink> ou no arquivo "
 "COPYING-DOCS distribuído com este manual."
 
 #: C/eom.xml:12(para)
@@ -346,12 +346,12 @@ msgstr "Comentários"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Para relatar um erro ou fazer um sugestão a respeito do aplicativo "
 "Visualizador de Imagens ou desse manual, siga as orientações da <ulink url="
-"\"ghelp:user-guide?feedback-bugs\" type=\"help\">Página de Comentários do "
+"\"help:user-guide?feedback-bugs\" type=\"help\">Página de Comentários do "
 "MATE</ulink>."
 
 #: C/eom.xml:217(para)
@@ -1113,14 +1113,14 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "Para restaurar uma imagem da Lixeira, abra a pasta Lixeira no gerenciador de "
 "arquivos <application>Caja</application> e mova os arquivos das imagens "
 "para outra pasta. Para excluir permanentemente, esvazie a Lixeira. Para "
 "saber mais sobre como usar a Lixeira, veja o <ulink type=\"help\" url="
-"\"ghelp:user-guide?caja-trash\">Guia do Usuário</ulink>."
+"\"help:user-guide?caja-trash\">Guia do Usuário</ulink>."
 
 #: C/eom.xml:560(para)
 msgid ""
diff --git a/help/ru/ru.po b/help/ru/ru.po
index 0aaf206..d0e5468 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -82,14 +82,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 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 ""
 "Следующим разрешается копировать и/или модифицировать этот документ при "
 "условии соблюдения GNU Free Documentation License (GFDL), версии 1.1 или "
 "любой более поздней опубликованной ассоциации свободного программного "
 "обеспечения версией без неизменяемых частей, без текстов на обложках. Вы "
-"можете найти копию лицензии по этой <ulink type=\"help\" url=\"ghelp:fdl"
+"можете найти копию лицензии по этой <ulink type=\"help\" url=\"help:fdl"
 "\">ссылке</ulink> или в файле COPYING-DOCS, распространяемом с этим "
 "документом."
 
@@ -324,12 +324,12 @@ msgstr "Обратная связь"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Чтобы сообщить об ошибке или внести предложение касательно программы "
 "просмотра изображений или данного руководства, следуйте указаниям на <ulink "
-"url=\"ghelp:mate-feedback\" type=\"help\">странице обратной связи MATE</"
+"url=\"help:mate-feedback\" type=\"help\">странице обратной связи MATE</"
 "ulink>."
 
 #: C/eom.xml:217(para)
@@ -1093,14 +1093,14 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find out "
-"more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:user-"
+"more about using the Trash, see the <ulink type=\"help\" url=\"help:user-"
 "guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "Чтобы восстановить изображение из корзины, откройте папку корзины в файловом "
 "менеджере <application>Caja</application> и переместите файл изображения "
 "в другую папку. Чтобы навсегда удалить изображение, очистите корзину. "
 "Подробнее об использовании корзины можно узнать в <ulink type=\"help\" url="
-"\"ghelp:user-guide?caja-trash\">руководстве пользователя MATE</ulink>."
+"\"help:user-guide?caja-trash\">руководстве пользователя MATE</ulink>."
 
 #: C/eom.xml:562(para)
 msgid ""
diff --git a/help/sv/sv.po b/help/sv/sv.po
index 79c2ee2..7e27c0d 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -92,8 +92,8 @@ msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
 #: C/eom.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/eom.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."
@@ -267,8 +267,8 @@ msgid "Feedback"
 msgstr "Återkoppling"
 
 #: C/eom.xml:212(para)
-msgid "To report a bug or make a suggestion regarding the Image Viewer application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "För att rapportera ett fel eller komma med ett förslag angående programmet Bildvisare eller denna handbok, följ anvisningarna på <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">MATE:s återkopplingssida</ulink>."
+msgid "To report a bug or make a suggestion regarding the Image Viewer application or this manual, follow the directions in the <ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "För att rapportera ett fel eller komma med ett förslag angående programmet Bildvisare eller denna handbok, följ anvisningarna på <ulink url=\"help:user-guide?feedback-bugs\" type=\"help\">MATE:s återkopplingssida</ulink>."
 
 #: C/eom.xml:217(para)
 msgid "User manual for <application>Eye of MATE Image Viewer</application>."
@@ -675,8 +675,8 @@ msgid "To move an image to the Trash, choose <menuchoice><guimenu>Edit</guimenu>
 msgstr "För att flytta en bild till papperskorgen, välj <menuchoice><guimenu>Redigera</guimenu><guimenuitem>Flytta till papperskorgen</guimenuitem></menuchoice>. Det här flyttar filen till papperskorgens mapp. Flera bilder kan även flyttas till papperskorgen på samma sätt: markera dem alla först."
 
 #: C/eom.xml:558(para)
-msgid "To restore an image from the Trash, open the Trash folder in <application>Caja</application> file manager and move the image file to another folder. To delete the image permanently, empty the Trash. To find out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">User Guide</ulink>."
-msgstr "För att återskapa en bild från papperskorgen kan du öppna papperskorgen i filhanteraren <application>Caja</application> och flytta bildfilen till en annan mapp. För att ta bort bilden permanent, töm papperskorgen. För att få mer information om hur man använder papperskorgen, se <ulink type=\"help\" url=\"ghelp:user-guide?caja-trash\">Användarguiden</ulink>."
+msgid "To restore an image from the Trash, open the Trash folder in <application>Caja</application> file manager and move the image file to another folder. To delete the image permanently, empty the Trash. To find out more about using the Trash, see the <ulink type=\"help\" url=\"help:user-guide?caja-trash\">User Guide</ulink>."
+msgstr "För att återskapa en bild från papperskorgen kan du öppna papperskorgen i filhanteraren <application>Caja</application> och flytta bildfilen till en annan mapp. För att ta bort bilden permanent, töm papperskorgen. För att få mer information om hur man använder papperskorgen, se <ulink type=\"help\" url=\"help:user-guide?caja-trash\">Användarguiden</ulink>."
 
 #: C/eom.xml:560(para)
 msgid "You can also use the <keycap>Del</keycap> key to move an image to the Trash, in which case you will be asked for confirmation."
diff --git a/help/th/th.po b/help/th/th.po
index 3be13fc..2092c25 100644
--- a/help/th/th.po
+++ b/help/th/th.po
@@ -94,14 +94,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) โดยไม่มี \"หัวข้อห้ามเปลี่ยน\" (Invariant Sections), ไม่มี "
 "\"ข้อความปกหน้า\" (Front-Cover Texts) และไม่มี \"ข้อความปกหลัง\" (Back-Cover "
-"Texts) คุณสามารถอ่านสำเนาของ GFDL ได้จาก <ulink type=\"help\" url=\"ghelp:fdl"
+"Texts) คุณสามารถอ่านสำเนาของ GFDL ได้จาก <ulink type=\"help\" url=\"help:fdl"
 "\">ลิงก์นี้</ulink> หรือในแฟ้ม COPYING-DOCS ที่เผยแพร่มาพร้อมกับคู่มือนี้"
 
 #: C/eom.xml:12(para)
@@ -332,11 +332,11 @@ msgstr "ข้อเสนอแนะ"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "หากพบปัญหาหรือมีข้อเสนอแนะสำหรับโปรแกรมแสดงรูป หรือเกี่ยวกับคู่มือนี้ กรุณาแจ้งให้เราทราบ "
-"ตามขั้นตอนใน <ulink url=\"ghelp:mate-feedback\" type=\"help\">หน้าเสนอแนะ "
+"ตามขั้นตอนใน <ulink url=\"help:mate-feedback\" type=\"help\">หน้าเสนอแนะ "
 "MATE</ulink>"
 
 #: C/eom.xml:217(para)
@@ -929,7 +929,7 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 
diff --git a/help/uk/uk.po b/help/uk/uk.po
index b16ec02..eed74dc 100644
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
@@ -96,14 +96,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/eom.xml:12(para)
@@ -341,12 +341,12 @@ msgstr "Зворотний зв'язок"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Щоб сповістити про помилку або внести пропозицію відносно програми перегляду "
 "зображень чи цієї довідки, слідуйте інструкціям, наведеним на <ulink url="
-"\"ghelp:user-guide?feedback-bugs\" type=\"help\">Сторінці зворотного зв'язку "
+"\"help:user-guide?feedback-bugs\" type=\"help\">Сторінці зворотного зв'язку "
 "MATE</ulink>."
 
 #: C/eom.xml:217(para)
@@ -1101,13 +1101,13 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "Щоб відновити зображення зі смітника, відкрийте теку смітника у файловому "
 "менеджері <application>Caja</application> та перетягніть файл зображення "
 "у іншу теку. Щоб остаточно видалити зображення, очистіть смітник. Докладніше "
-"про використання смітника можна дізнатись у <ulink type=\"help\" url=\"ghelp:"
+"про використання смітника можна дізнатись у <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">посібнику з використання MATE</ulink>."
 
 #: C/eom.xml:560(para)
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index aa74936..c4cfdfe 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -95,12 +95,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 的副"
 "本。"
 
@@ -325,11 +325,11 @@ msgstr "反馈"
 #: C/eom.xml:212(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Image Viewer 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-bugs\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "要报告关于 MATE 之眼 应用程序或本手册的错误或提出建议，请遵循 <ulink url="
-"\"ghelp:mate-feedback\" type=\"help\">MATE 反馈页</ulink>中的指导。"
+"\"help:mate-feedback\" type=\"help\">MATE 反馈页</ulink>中的指导。"
 
 #: C/eom.xml:217(para)
 msgid "User manual for <application>Eye of MATE Image Viewer</application>."
@@ -1023,12 +1023,12 @@ msgid ""
 "To restore an image from the Trash, open the Trash folder in "
 "<application>Caja</application> file manager and move the image file to "
 "another folder. To delete the image permanently, empty the Trash. To find "
-"out more about using the Trash, see the <ulink type=\"help\" url=\"ghelp:"
+"out more about using the Trash, see the <ulink type=\"help\" url=\"help:"
 "user-guide?caja-trash\">User Guide</ulink>."
 msgstr ""
 "要从回收站中还原图像，在<application>Caja</application>文件浏览器中打开回"
 "收站文件夹，将图片移到其他文件夹即可。 要彻底删除图像， 请清空回收站。 要了解"
-"更多关于回收站的信息，参见<ulink type=\"help\" url=\"ghelp:user-guide?"
+"更多关于回收站的信息，参见<ulink type=\"help\" url=\"help:user-guide?"
 "caja-trash\">用户指南</ulink>。"
 
 #: C/eom.xml:560(para)
diff --git a/help/zh_TW/zh_TW.po b/help/zh_TW/zh_TW.po
index be8cc3d..53a7880 100644
--- a/help/zh_TW/zh_TW.po
+++ b/help/zh_TW/zh_TW.po
@@ -127,11 +127,11 @@ msgstr "回饋"
 #: eom-C.xml:156(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Eye of MATE application "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
+"or this manual, follow the directions in the <ulink url=\"help:mate-"
 "feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "關於本 Eye of MATE 應用程式或手冊，如果要報告錯誤或提出建議，請遵照 <ulink "
-"url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink> 的指"
+"url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink> 的指"
 "示。"
 
 #: eom-C.xml:166(primary)
@@ -733,13 +733,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 ""
 "根據自由軟體基金會 (Free Software Foundation) 所發佈 的 GNU 自由文件授權 "
 "(GNU Free Documentation License, GFDL) 1.1 (含) 以後版本， 使用者可以複製、散"
 "佈，或修改本文件，但不得增刪章節，不得加上封面文字， 亦不得加上封底文字。 如"
-"要取得 GFDL 的副本，請參閱 此<ulink type=\"help\" url=\"ghelp:fdl\">連結</"
+"要取得 GFDL 的副本，請參閱 此<ulink type=\"help\" url=\"help:fdl\">連結</"
 "ulink>，或是參閱與本手冊一同隨附的 COPYING-DOCS 檔案。"
 
 #: ../C/legal.xml:12(para)
diff --git a/src/eom-util.c b/src/eom-util.c
index 0c4e197..07d0115 100644
--- a/src/eom-util.c
+++ b/src/eom-util.c
@@ -51,9 +51,9 @@ eom_util_show_help (const gchar *section, GtkWindow *parent)
 	gchar *uri = NULL;
 
 	if (section)
-		uri = g_strdup_printf ("ghelp:eom?%s", section);
+		uri = g_strdup_printf ("help:eom?%s", section);
 
-	gtk_show_uri (NULL, ((uri != NULL) ? uri : "ghelp:eom"),
+	gtk_show_uri (NULL, ((uri != NULL) ? uri : "help:eom"),
 		      gtk_get_current_event_time (), &error);
 
 	g_free (uri);