Merge pull request #89 from infirit/yelp

user-guide: change ghelp: to help:

32 files changed, 1152 insertions, 1152 deletions

diff --git a/user-guide/C/goscustdesk.xml b/user-guide/C/goscustdesk.xml
index 31b94de..f7aa40d 100644
--- a/user-guide/C/goscustdesk.xml
+++ b/user-guide/C/goscustdesk.xml
@@ -271,7 +271,7 @@ commands to run (<option>-x</option> for <application>mate-terminal</application
                 </para>
               </entry>
               <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option to run the command as soon as your session begins. For more accessibility options, see <ulink type="help" url="ghelp:mate-access-guide?index"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>.</para>
+                <para>Select this option to run the command as soon as your session begins. For more accessibility options, see <ulink type="help" url="help:mate-access-guide?index"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>.</para>
               </entry>
             </row>
           </tbody>
@@ -1621,7 +1621,7 @@ test area to test the effect of your settings.</para>
 	      <varlistentry>
 	        <term><guilabel>Selected Layouts</guilabel></term>
 	        <listitem><para>You can switch between selected layouts to change the characters your keyboard produces when you type. To add a layout, click <guibutton>Add</guibutton>. You can have up to four layouts. To remove a layout, select it and press <guibutton>Remove</guibutton>.</para>
-	        <para>To switch between keyboard layouts, use the <ulink type="help" url="ghelp:gswitchit"><application>Keyboard Indicator</application> panel applet</ulink>. <!-- better link to the specific page, but not yet suitable for a direct link: ghelp:gswitchit?gswitchit-applet-switching --></para>
+	        <para>To switch between keyboard layouts, use the <ulink type="help" url="help:gswitchit"><application>Keyboard Indicator</application> panel applet</ulink>. <!-- better link to the specific page, but not yet suitable for a direct link: help:gswitchit?gswitchit-applet-switching --></para>
                  <para>To add a layout to the list of selected layouts, click the <guibutton>Add</guibutton> button. It opens a layout chooser dialog, which lets you select a layout by country or by language.</para> 
 	        </listitem>
 	      </varlistentry>
@@ -1704,8 +1704,8 @@ test area to test the effect of your settings.</para>
                   <para>A <firstterm>third level</firstterm> key allows you to obtain a third character from a key, in the same way that pressing <keycap>Shift</keycap> with a key produces a different character to pressing the key alone.</para>
                   <para>Use this group to select a key you want to act as a third level modifier key.</para>
                   <para>Pressing the third-level key and <keycap>Shift</keycap> produces a fourth character from a key.</para>
-                  <para>The third and fourth level characters for your keyboard layout are shown in the <ulink type="help" url="ghelp:gswitchit"><application>Keyboard Indicator</application></ulink> Layout View Window.</para>
-                  <!-- better link, pending CVS commit of gswitchit docs: "ghelp:gswitchit?layout-view" -->
+                  <para>The third and fourth level characters for your keyboard layout are shown in the <ulink type="help" url="help:gswitchit"><application>Keyboard Indicator</application></ulink> Layout View Window.</para>
+                  <!-- better link, pending CVS commit of gswitchit docs: "help:gswitchit?layout-view" -->
                 </listitem>
         </varlistentry>
         <varlistentry>
@@ -1747,7 +1747,7 @@ accessibility options</secondary>
       <anchor id="goscustaccess-9"/>
       <para>The <guilabel>Accessibility</guilabel> tabbed section allows you to set  options such as filtering out accidental keypresses and using shortcut keys without having to hold down several keys at once. These features are also known as AccessX.</para>
 
-       <para>This section describes each of the preferences you can set. For a more task-oriented description of keyboard accessibility, see the <ulink type="help" url="ghelp:mate-access-guide?index"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>.</para>
+       <para>This section describes each of the preferences you can set. For a more task-oriented description of keyboard accessibility, see the <ulink type="help" url="help:mate-access-guide?index"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>.</para>
 
       <para><xref linkend="goscustdesk-TBL-85"/> lists the accessibility preferences
  that you can modify.</para>
@@ -2013,7 +2013,7 @@ of your settings.</para>
                 </indexterm>
               </entry>
               <entry valign="top">
-               <para>Select this option to make the numeric keypad emulate mouse actions. The list of keys and their equivalences is in the <citetitle>MATE Desktop Accessibility Guide</citetitle> under the heading <ulink type="help" url="ghelp:mate-access-guide?dtconfig-14"><citetitle>To Enable the Keyboard to Emulate the Mouse</citetitle></ulink>.</para>
+               <para>Select this option to make the numeric keypad emulate mouse actions. The list of keys and their equivalences is in the <citetitle>MATE Desktop Accessibility Guide</citetitle> under the heading <ulink type="help" url="help:mate-access-guide?dtconfig-14"><citetitle>To Enable the Keyboard to Emulate the Mouse</citetitle></ulink>.</para>
               </entry>
             </row>
             <row>
@@ -2831,7 +2831,7 @@ sound output preferences that you can modify.</para>
 
   <sect2 id="prefs-multimedia">
     <title>Multimedia Systems Selector</title>
-    <para>See the <ulink type="help" url="ghelp:gstreamer-properties">GStreamer Properties Manual</ulink>.</para>
+    <para>See the <ulink type="help" url="help:gstreamer-properties">GStreamer Properties Manual</ulink>.</para>
   </sect2>
 
   <sect2 id="prefs-sessions">
diff --git a/user-guide/C/goseditmainmenu.xml b/user-guide/C/goseditmainmenu.xml
index 079cb69..b521753 100644
--- a/user-guide/C/goseditmainmenu.xml
+++ b/user-guide/C/goseditmainmenu.xml
@@ -67,7 +67,7 @@
                    
     <itemizedlist>          
       <listitem><para><guimenuitem>Connect to Server</guimenuitem> lets you choose a server on your network. For more on this, see <xref linkend="caja-server-connect"/>.</para></listitem>
-      <listitem><para><guimenuitem>Search for Files</guimenuitem> lets you search for files on your computer. For more on this, see the <ulink type="help" url="ghelp:mate-search-tool">Search for Files Manual</ulink>.</para></listitem>     
+      <listitem><para><guimenuitem>Search for Files</guimenuitem> lets you search for files on your computer. For more on this, see the <ulink type="help" url="help:mate-search-tool">Search for Files Manual</ulink>.</para></listitem>
       <listitem><para>The <guimenuitem>Recent Documents</guimenuitem> submenu lists the documents you have recently opened. The last entry in the submenu clears the list.</para></listitem>                  
     </itemizedlist>                
   </section>
@@ -115,6 +115,6 @@
     <para>The <guilabel>Menu Layout</guilabel> window lists the menus in the left pane. Click on the expander arrows to show or hide submenus. Choose a menu in the left pane to see its items listed in the right pane.</para>
     <para>To remove an item from a menu, deselect it in the list. The item can be added back to the menu by selecting it once again.</para>
 
-    <note><para>The <ulink type="help" url="ghelp:system-admin-guide?menustructure-0">System Administration Guide</ulink> has more information on how MATE implements menus and how administrators can customize them.</para></note>
+    <note><para>The <ulink type="help" url="help:system-admin-guide?menustructure-0">System Administration Guide</ulink> has more information on how MATE implements menus and how administrators can customize them.</para></note>
   </section>
 </chapter>
diff --git a/user-guide/C/gosoverview.xml b/user-guide/C/gosoverview.xml
index ac4fa56..56a4b20 100644
--- a/user-guide/C/gosoverview.xml
+++ b/user-guide/C/gosoverview.xml
@@ -416,13 +416,13 @@ specify the number of workspaces that you require.</para>
     <para>The applications that are part of MATE include the following:</para>
     
     <itemizedlist>
-      <listitem><para><ulink type="help" url="ghelp:pluma"><application>Pluma Text Editor</application></ulink> can read, create, or modify any kind of simple text without any formatting.</para></listitem>
-      <listitem><para><ulink type="help" url="ghelp:mate-dictionary"><application>Dictionary</application></ulink> allows you to look up definitions of a word. </para></listitem>
-      <listitem><para><ulink type="help" url="ghelp:eom"><application>Image Viewer</application></ulink> can display single image files, as well as large image collections.</para></listitem>
-      <listitem><para><ulink type="help" url="ghelp:gcalctool"><application>Calculator</application></ulink> performs basic, financial, and scientific calculations.</para></listitem>
-      <listitem><para><ulink type="help" url="ghelp:gucharmap"><application>Character Map</application></ulink> lets you choose letters and symbols from the <firstterm>Unicode</firstterm> character set and paste them into any application. If you are writing in several languages, not all of the characters you need will be on your keyboard.</para></listitem>
+      <listitem><para><ulink type="help" url="help:pluma"><application>Pluma Text Editor</application></ulink> can read, create, or modify any kind of simple text without any formatting.</para></listitem>
+      <listitem><para><ulink type="help" url="help:mate-dictionary"><application>Dictionary</application></ulink> allows you to look up definitions of a word. </para></listitem>
+      <listitem><para><ulink type="help" url="help:eom"><application>Image Viewer</application></ulink> can display single image files, as well as large image collections.</para></listitem>
+      <listitem><para><ulink type="help" url="help:gcalctool"><application>Calculator</application></ulink> performs basic, financial, and scientific calculations.</para></listitem>
+      <listitem><para><ulink type="help" url="help:gucharmap"><application>Character Map</application></ulink> lets you choose letters and symbols from the <firstterm>Unicode</firstterm> character set and paste them into any application. If you are writing in several languages, not all of the characters you need will be on your keyboard.</para></listitem>
       <listitem><para><link linkend="caja"><application>Caja File Manager</application></link> displays your folders and their contents. Use this to copy, move and classify your files, and to access CDs, USB flash drives, and any other removable media. When you choose an item from the <link linkend="places-menu"><guimenu>Places</guimenu> menu</link>, a <application>Caja File Manager</application> window opens showing that location.</para></listitem>
-      <listitem><para><ulink type="help" url="ghelp:mate-terminal"><application>Terminal</application></ulink> gives you access to the system command line.</para></listitem>
+      <listitem><para><ulink type="help" url="help:mate-terminal"><application>Terminal</application></ulink> gives you access to the system command line.</para></listitem>
     </itemizedlist>
 
     <para>Further standard MATE applications include games, music and video players, a web browser, software accessibility tools, and utilities to manage your system. Your distributor or vendor may have added other applications, such as a word processor and a graphics editor. They may also provide you with a way to install further applications.</para>
@@ -505,7 +505,7 @@ specify the number of workspaces that you require.</para>
       
       <section id="filechooser-open-folder">
         <title>Choosing a folder</title> 
-        <para>You might sometimes need to choose a folder to work with rather than open a file. For example, if you use <ulink type="help" url="ghelp:file-roller"><application>Archive Manager</application></ulink> to extract files from an archive, you need to choose a folder to place the files into. In this case, the files in the current location are greyed out, and pressing <guibutton>Open</guibutton> when a folder is selected will choose that folder.</para>
+        <para>You might sometimes need to choose a folder to work with rather than open a file. For example, if you use <ulink type="help" url="help:file-roller"><application>Archive Manager</application></ulink> to extract files from an archive, you need to choose a folder to place the files into. In this case, the files in the current location are greyed out, and pressing <guibutton>Open</guibutton> when a folder is selected will choose that folder.</para>
       </section>      
            
       <section id="filechooser-open-location">
diff --git a/user-guide/C/gospanel.xml b/user-guide/C/gospanel.xml
index ad726b9..cac05e1 100644
--- a/user-guide/C/gospanel.xml
+++ b/user-guide/C/gospanel.xml
@@ -64,12 +64,12 @@ these panels.</para>
         <varlistentry>
           <term><application>Clock</application> applet</term>
           <listitem><para>The <application>Clock</application> shows the current
-      time. Click on the time to open a small calendar. You can also view a world map by clicking the <guilabel>Locations</guilabel> expansion label. For more on this, see the <ulink type="help" url="ghelp:clock">Clock Applet Manual</ulink>.</para></listitem>
+      time. Click on the time to open a small calendar. You can also view a world map by clicking the <guilabel>Locations</guilabel> expansion label. For more on this, see the <ulink type="help" url="help:clock">Clock Applet Manual</ulink>.</para></listitem>
         </varlistentry>
         <varlistentry>
           <term><application>Volume Control</application>
       applet</term>
-          <listitem><para>The <application>Volume Control</application> enables you to control the volume of the speakers on your system. For more on this, see the <ulink type="help" url="ghelp:mate-volume-control">Volume Control Manual</ulink>.</para></listitem>
+          <listitem><para>The <application>Volume Control</application> enables you to control the volume of the speakers on your system. For more on this, see the <ulink type="help" url="help:mate-volume-control">Volume Control Manual</ulink>.</para></listitem>
         </varlistentry>
         <varlistentry>
           <term>
@@ -1227,7 +1227,7 @@ on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then c
       <para>To open the <application>Search Tool</application>, click on
 the <guibutton>Search</guibutton> button. </para>
       <para>For more information on the <application>Search Tool</application>,
-see the <ulink type="help" url="ghelp:mate-search-tool">Search Tool Manual</ulink>.</para>
+see the <ulink type="help" url="help:mate-search-tool">Search Tool Manual</ulink>.</para>
     </section>
     <section id="gospanel-564">
       <title>Show Desktop Button</title>
diff --git a/user-guide/C/gosstartsession.xml b/user-guide/C/gosstartsession.xml
index 50f8059..cfa9239 100644
--- a/user-guide/C/gosstartsession.xml
+++ b/user-guide/C/gosstartsession.xml
@@ -120,7 +120,7 @@ on the login screen, then press <keycap>Return</keycap>.</para>
         <para>When you log in to a session in a different language, you are changing 
 the language for the user interface but are not changing the keyboard layout. 
 To choose a different keyboard layout, use the 
-<ulink type="help" url="ghelp:gswitchit"><application>Keyboard Indicator</application></ulink> applet.</para>
+<ulink type="help" url="help:gswitchit"><application>Keyboard Indicator</application></ulink> applet.</para>
       </note>
       <tip>
         <para>Your system distributor or vendor may have altered the login 
diff --git a/user-guide/C/gostools.xml b/user-guide/C/gostools.xml
index c98170e..d2dae0e 100644
--- a/user-guide/C/gostools.xml
+++ b/user-guide/C/gostools.xml
@@ -941,19 +941,19 @@ a screenshot of the entire screen.</para>
           </varlistentry>
 
           <varlistentry>
-            <term><option>ghelp:</option> or
+            <term><option>help:</option> or
             <option>mate-help:</option></term>
 
             <listitem>
               <para>Use this URI when you want to access MATE help documents,
               which are typically written in DocBook format.</para>
 
-              <screen><userinput>yelp ghelp:gcalctool</userinput></screen>
+              <screen><userinput>yelp help:gcalctool</userinput></screen>
 
               <para>If you want to open the help document at a particular section,
               append a question mark to the end of the URI, followed by the section id.</para>
               
-              <screen><userinput>yelp ghelp:user-guide?yelp-advanced-cmdline</userinput></screen>
+              <screen><userinput>yelp help:user-guide?yelp-advanced-cmdline</userinput></screen>
             </listitem>
           </varlistentry>
 
@@ -1038,8 +1038,8 @@ a screenshot of the entire screen.</para>
             <para>Perform conversion from DocBook format to a format suitable
             for display.</para>
           </listitem>
-        </itemizedlist><application>Yelp Help Browser</application> relies on <ulink url="ghelp:mate-doc-xslt">MATE XSLT
-      Stylesheets</ulink> to perform conversion from DocBook to HTML.  <ulink url="ghelp:mate-doc-make">MATE Documentation 
+        </itemizedlist><application>Yelp Help Browser</application> relies on <ulink url="help:mate-doc-xslt">MATE XSLT
+      Stylesheets</ulink> to perform conversion from DocBook to HTML.  <ulink url="help:mate-doc-make">MATE Documentation
       Build Utilities</ulink> are relied upon by application authors to install and register documentation within the help system.</para>
     </section>
 
diff --git a/user-guide/C/legal.xml b/user-guide/C/legal.xml
index acb0b40..9c4e248 100644
--- a/user-guide/C/legal.xml
+++ b/user-guide/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/user-guide/ar/ar.po b/user-guide/ar/ar.po
index 5fcb0eb..87c406d 100644
--- a/user-guide/ar/ar.po
+++ b/user-guide/ar/ar.po
@@ -1438,7 +1438,7 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr ""
 
 #: C/gostools.xml:916(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
 msgstr ""
 
 #: C/gostools.xml:920(para)
@@ -1449,7 +1449,7 @@ msgstr ""
 
 #: C/gostools.xml:923(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
 msgstr ""
 
 #: C/gostools.xml:925(para)
@@ -1460,7 +1460,7 @@ msgstr ""
 
 #: C/gostools.xml:928(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
 msgstr ""
 
 #: C/gostools.xml:933(option)
@@ -1569,8 +1569,8 @@ msgstr ""
 #: C/gostools.xml:998(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
@@ -1760,7 +1760,7 @@ msgid ""
 "When you log in to a session in a different language, you choose the "
 "language for the user interface. You do not specify a keyboard layout for "
 "the session. To choose a keyboard layout, use the <ulink type=\"help\" url="
-"\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> "
+"\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> "
 "applet."
 msgstr ""
 
@@ -2269,7 +2269,7 @@ msgstr ""
 msgid ""
 "<application>Clock</application> shows the current time. Click on the time "
 "to open a small calendar. For more on this, see the <ulink type=\"help\" url="
-"\"ghelp:clock\">Clock Applet Manual</ulink>."
+"\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 
 #: C/gospanel.xml:99(term)
@@ -2280,7 +2280,7 @@ msgstr ""
 msgid ""
 "<application>Volume Control</application> enables you to control the volume "
 "of the speaker on your system. For more on this, see the <ulink type=\"help"
-"\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 
 #: C/gospanel.xml:104(term)
@@ -2330,7 +2330,7 @@ msgstr ""
 msgid ""
 "Displays a button for each window that is open. <application>Window List</"
 "application> enables you to minimize and restore windows. For more on this, "
-"see the <ulink type=\"help\" url=\"ghelp:window-list\">Window List manual</"
+"see the <ulink type=\"help\" url=\"help:window-list\">Window List manual</"
 "ulink>."
 msgstr ""
 
@@ -3837,7 +3837,7 @@ msgstr ""
 #: C/gospanel.xml:1399(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 
@@ -4964,7 +4964,7 @@ msgstr ""
 
 #: C/gosoverview.xml:400(para)
 msgid ""
-"For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"For more on this, see the <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">Workspace Switcher Applet Manual</ulink>."
 msgstr ""
 
@@ -4995,33 +4995,33 @@ msgstr ""
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
 
 #: C/gosoverview.xml:424(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all the characters "
@@ -5040,7 +5040,7 @@ msgstr ""
 
 #: C/gosoverview.xml:426(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
 
@@ -5312,7 +5312,7 @@ msgstr ""
 #: C/gosoverview.xml:530(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -9292,7 +9292,7 @@ msgid ""
 "To format a floppy disk, right-click on the object that represents the "
 "floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-"type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+"type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 "documentation for more details."
 msgstr ""
 
@@ -10704,7 +10704,7 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 
@@ -10816,7 +10816,7 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:119(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
@@ -11598,7 +11598,7 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 
@@ -11792,7 +11792,7 @@ msgstr ""
 #: C/goscustdesk.xml:1052(para)
 msgid ""
 "For more information on configuring keyboard accessibility preferences, see "
-"the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"the <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 msgstr ""
 
@@ -11906,7 +11906,7 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 
@@ -12091,7 +12091,7 @@ msgstr ""
 
 #: C/goscustdesk.xml:1212(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
@@ -12261,7 +12261,7 @@ msgstr ""
 #: C/goscustdesk.xml:1299(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 
@@ -12713,7 +12713,7 @@ msgstr ""
 
 #: C/goscustdesk.xml:1709(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
 
@@ -15267,7 +15267,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 ""
 
@@ -15515,7 +15515,7 @@ msgstr ""
 #: C/user-guide.xml:210(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE desktop or this "
-"manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" "
+"manual, follow the directions in the <ulink url=\"help:mate-feedback\" "
 "type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 
diff --git a/user-guide/bg/bg.po b/user-guide/bg/bg.po
index 4f5b19c..787cee1 100644
--- a/user-guide/bg/bg.po
+++ b/user-guide/bg/bg.po
@@ -310,7 +310,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 ""
 
@@ -1607,8 +1607,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: ../C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> или <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> или <option>mate-help:</option>"
 
 #: ../C/gostools.xml:948(para)
 msgid ""
@@ -1620,8 +1620,8 @@ msgstr ""
 
 #: ../C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: ../C/gostools.xml:953(para)
 msgid ""
@@ -1633,8 +1633,8 @@ msgstr ""
 
 #: ../C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: ../C/gostools.xml:961(option)
 msgid "man:"
@@ -1766,15 +1766,15 @@ msgstr ""
 #: ../C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/><application>Yelp преглед на помощни документи</application> "
-"разчита на <ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</"
-"ulink> за извършване на преобразуване от DocBook в HTML. <ulink url=\"ghelp:"
+"разчита на <ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</"
+"ulink> за извършване на преобразуване от DocBook в HTML. <ulink url=\"help:"
 "mate-doc-make\">Помощни програми за изграждане на документация на MATE</"
 "ulink> разчита на авторите на програмата за инсталиране и регистриране на "
 "документацията с помощната система."
@@ -2019,12 +2019,12 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "Когато влезете в сесия на различен език, ще се промени езика за "
 "потребителския интерфейс, но не и клавиатурната подредба. За да изберете "
-"клавиатурна подредба, използвайте аплета <ulink type=\"help\" url=\"ghelp:"
+"клавиатурна подредба, използвайте аплета <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Клавиатурна подредба</application></ulink>."
 
 #: ../C/gosstartsession.xml:126(para)
@@ -2708,12 +2708,12 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "<application>Часовникът</application> показва текущия час. Натиснете върху "
 "часа, за да се отвори малък календар. Също можете да видите световна карта "
 "като натиснете етикета <guilabel>Местоположения</guilabel>. За повече "
-"информация, вижте <ulink type=\"help\" url=\"ghelp:clock\">Ръководството на "
+"информация, вижте <ulink type=\"help\" url=\"help:clock\">Ръководството на "
 "аплета Часовник</ulink>."
 
 #: ../C/gospanel.xml:70(term)
@@ -2724,11 +2724,11 @@ msgstr "Аплет <application>Сила на звука</application>"
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "<application>Силата на звука</application> ви позволява да регулирате силата "
 "на звука на високоговорителите на вашата система. За повече информация, "
-"вижте <ulink type=\"help\" url=\"ghelp:mate-volume-control\">Ръководство на "
+"вижте <ulink type=\"help\" url=\"help:mate-volume-control\">Ръководство на "
 "Сила на звука</ulink>."
 
 #: ../C/gospanel.xml:75(term)
@@ -4509,11 +4509,11 @@ msgstr ""
 #: ../C/gospanel.xml:1230(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "За повече информация за <application>Търсене за файлове</application>, вижте "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Ръководство на Търсене "
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Ръководство на Търсене "
 "за файлове</ulink>."
 
 #: ../C/gospanel.xml:1234(title)
@@ -6298,49 +6298,49 @@ msgstr "Програми включени в MATE:"
 
 #: ../C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Текстов редактор</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Текстов редактор</"
 "application></ulink> може да чете, да създава или да променя всеки тип прост "
 "текст във всеки формат."
 
 #: ../C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Речник</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Речник</"
 "application></ulink> ви позволява да намерите различно значение на дума."
 
 #: ../C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Преглед на изображения</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Преглед на изображения</"
 "application></ulink> може да показва единичен файл с изображение, както и "
 "големи колекции от изображения."
 
 #: ../C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Калкулатор</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Калкулатор</"
 "application></ulink> извършва основни, финансови и научни изчисления."
 
 #: ../C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
 "characters you need will be on your keyboard."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Карта на знаци</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Карта на знаци</"
 "application></ulink> ви позволява да избирате букви и символи от "
 "<firstterm>Уникод</firstterm> набор от знаци и да ги поставяте във всяка "
 "програма. Ако пишете на няколко езика, не всички знаци, които ви трябват ще "
@@ -6365,10 +6365,10 @@ msgstr ""
 
 #: ../C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Терминал</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Терминал</"
 "application></ulink> ви дава достъп до системния команден ред."
 
 #: ../C/gosoverview.xml:428(para)
@@ -6682,7 +6682,7 @@ msgstr "Избиране на папка"
 #: ../C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -6690,7 +6690,7 @@ msgid ""
 "folder."
 msgstr ""
 "Понякога може да е нужно да изберете папка преди да отворите файл. Примерно, "
-"ако използвате <ulink type=\"help\" url=\"ghelp:file-roller"
+"ако използвате <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Мениджър на архиви</application></ulink>, за да извлечете "
 "файлове от архив, трябва да изберете папка, в която да се извлекат "
 "файловете. В такъв случай, файловете в текущото местоположение се осветяват "
@@ -14055,12 +14055,12 @@ msgstr ""
 #: ../C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>Търсене за файлове</guimenuitem> ви позволява да търсите за "
 "файлове на вашия компютър. За повече информация, вижте <ulink type=\"help\" "
-"url=\"ghelp:mate-search-tool\">Ръководство за Търсене за файлове</ulink>."
+"url=\"help:mate-search-tool\">Ръководство за Търсене за файлове</ulink>."
 
 #: ../C/goseditmainmenu.xml:71(para)
 msgid ""
@@ -14184,11 +14184,11 @@ msgstr ""
 
 #: ../C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"<ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">Ръководство за администриране на системата</ulink> има повече информация "
 "как MATE обработва менютата и как администраторите могат да ги "
 "персонализират."
@@ -14696,13 +14696,13 @@ msgstr "Изпълнение в началото на сесията (Само �
 #: ../C/goscustdesk.xml:274(para)
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
 "Изберете тази опция, за изпълнение на командата възможно най-скоро след като "
 "вашата сесия започне. За повече опции за достъпност, вижте <ulink type=\"help"
-"\" url=\"ghelp:mate-access-guide?index\"><citetitle>Ръководство за "
+"\" url=\"help:mate-access-guide?index\"><citetitle>Ръководство за "
 "достъпност в работната среда MATE</citetitle></ulink>."
 
 #: ../C/goscustdesk.xml:286(title)
@@ -16855,12 +16855,12 @@ msgstr ""
 
 #: ../C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
 "За да превключите между подредбите, използвайте аплета <ulink type=\"help\" "
-"url=\"ghelp:gswitchit\"><application>Клавиатурна подредба</application></"
+"url=\"help:gswitchit\"><application>Клавиатурна подредба</application></"
 "ulink>."
 
 #: ../C/goscustdesk.xml:1625(para)
@@ -17074,11 +17074,11 @@ msgstr ""
 #: ../C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 
 #: ../C/goscustdesk.xml:1712(guilabel)
@@ -17143,12 +17143,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Този раздел описва всяка настройка, която можете да зададете. За по задачо-"
 "ориентирано описание на достъпност на клавиатурата, вижте <ulink type=\"help"
-"\" url=\"ghelp:mate-access-guide?index\"><citetitle>Ръководство за "
+"\" url=\"help:mate-access-guide?index\"><citetitle>Ръководство за "
 "достъпност до работната среда MATE</citetitle></ulink>."
 
 #: ../C/goscustdesk.xml:1752(para)
@@ -17395,13 +17395,13 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "Изберете тази опция, за да използвате цифровата клавиатура за емулиране на "
 "действията на мишката. Списък на клавишите и техните еквиваленти можете да "
 "намерите в <citetitle>Ръководство за достъпност в работната среда MATE</"
-"citetitle> под заглавието <ulink type=\"help\" url=\"ghelp:mate-access-"
+"citetitle> под заглавието <ulink type=\"help\" url=\"help:mate-access-"
 "guide?dtconfig-14\"><citetitle>Включване на клавиатурата за емулация на "
 "мишката</citetitle></ulink>."
 
@@ -18299,10 +18299,10 @@ msgstr "Избор на мултимедийни системи"
 
 #: ../C/goscustdesk.xml:2876(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"Вижте <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">Ръководство за "
+"Вижте <ulink type=\"help\" url=\"help:gstreamer-properties\">Ръководство за "
 "Свойства на GStreamer</ulink>."
 
 #: ../C/goscustdesk.xml:2880(title)
diff --git a/user-guide/cs/cs.po b/user-guide/cs/cs.po
index d835285..f009416 100644
--- a/user-guide/cs/cs.po
+++ b/user-guide/cs/cs.po
@@ -1757,8 +1757,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> nebo <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> nebo <option>mate-help:</option>"
 
 #: C/gostools.xml:948(para)
 msgid ""
@@ -1770,8 +1770,8 @@ msgstr ""
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:953(para)
 msgid ""
@@ -1783,8 +1783,8 @@ msgstr ""
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:961(option)
 msgid "man:"
@@ -1914,15 +1914,15 @@ msgstr "Provádí konverzi z formátu DocBook do formátu vhodného pro zobrazen
 #: C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/><application>Prohlížeč nápovědy Yelp</application> spoléhá "
-"na <ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> v "
-"konverzi z formátu DocBook do formátu HTML. <ulink url=\"ghelp:mate-doc-make"
+"na <ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> v "
+"konverzi z formátu DocBook do formátu HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> jsou nástroje, které "
 "používají autoři aplikací k instalaci a registraci dokumentace do systému "
 "nápověd."
@@ -2163,12 +2163,12 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "Pokud se přihlásíte do sezení s jiným jazykem, změní se pouze lokalizace "
 "aplikací, nikoliv klávesnice. Pokud chcete vybrat jinou klávesnici, použijte "
-"applet <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Indikátor "
+"applet <ulink type=\"help\" url=\"help:gswitchit\"><application>Indikátor "
 "klávesnice</application></ulink>."
 
 # I thin it should be like "...the option to change language may be found by clicking the <guilabel>Other</guilabel> icon."
@@ -2815,12 +2815,12 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "<application>Hodiny</application> zobrazují aktuální čas. Pokud na čas "
 "klepnete, zobrazí se malý kalendář. Pokud rozbalíte nadpis "
 "<guilabel>Umístění</guilabel>, zobrazí se mapa světa. Další informace o "
-"tomto appletu obsahuje <ulink type=\"help\" url=\"ghelp:clock\">Příručka "
+"tomto appletu obsahuje <ulink type=\"help\" url=\"help:clock\">Příručka "
 "appletu Hodin</ulink>."
 
 #: C/gospanel.xml:70(term)
@@ -2831,11 +2831,11 @@ msgstr "Applet <application>Ovládání hlasitosti</application>"
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "Applet <application>Ovládání hlasitosti</application> vám umožňuje ovládat "
 "hlasitost ozvučení systému. Další informace o tomto appletu popisuje <ulink "
-"type=\"help\" url=\"ghelp:mate-volume-control\">Příručka Ovládání "
+"type=\"help\" url=\"help:mate-volume-control\">Příručka Ovládání "
 "hlasitosti</ulink>."
 
 #: C/gospanel.xml:75(term)
@@ -4333,7 +4333,7 @@ msgstr ""
 #: C/gospanel.xml:1230(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 
@@ -5715,33 +5715,33 @@ msgstr ""
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
@@ -5760,7 +5760,7 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
 
@@ -5993,7 +5993,7 @@ msgstr ""
 #: C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -12467,7 +12467,7 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 
@@ -12574,7 +12574,7 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
@@ -12961,7 +12961,7 @@ msgstr ""
 #: C/goscustdesk.xml:274(para)
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
@@ -14679,7 +14679,7 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
@@ -14853,7 +14853,7 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 
@@ -14910,7 +14910,7 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 
@@ -15122,7 +15122,7 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 
@@ -15941,7 +15941,7 @@ msgstr ""
 
 #: C/goscustdesk.xml:2834(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
 
@@ -17156,14 +17156,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU "
 "Free Documentation License (GFDL), verze 1.1 nebo jakékoli další verze "
 "vydané nadací Free Software Foundation; bez neměnných oddílů, bez textů "
 "předních desek a bez textů zadních desek. Kopii licence GFDL naleznete pod "
-"<ulink type=\"help\" url=\"ghelp:fdl\">tímto odkazem</ulink> nebo v souboru "
+"<ulink type=\"help\" url=\"help:fdl\">tímto odkazem</ulink> nebo v souboru "
 "COPYING-DOCS dodávaném s touto příručkou."
 
 #: C/user-guide.xml:12(para)
@@ -17467,7 +17467,7 @@ msgid ""
 msgstr ""
 "Pokud chcete oznámit chybu nebo navrhnout vylepšení vztahující se k "
 "Pracovnímu prostředí MATE nebo této příručce, postupujte dle instrukcí na "
-"stránce <ulink url=\"ghelp:mate-feedback\" type=\"help\">Zpětná vazba "
+"stránce <ulink url=\"help:mate-feedback\" type=\"help\">Zpětná vazba "
 "MATE</ulink>."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
diff --git a/user-guide/de/de.po b/user-guide/de/de.po
index 92da50d..736e3b3 100644
--- a/user-guide/de/de.po
+++ b/user-guide/de/de.po
@@ -1815,8 +1815,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> oder <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> oder <option>mate-help:</option>"
 
 #: C/gostools.xml:948(para)
 msgid ""
@@ -1828,8 +1828,8 @@ msgstr ""
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:953(para)
 msgid ""
@@ -1842,8 +1842,8 @@ msgstr ""
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:961(option)
 msgid "man:"
@@ -1975,16 +1975,16 @@ msgstr "Wandelt das DocBook-Format in ein anzeigetaugliches Format um."
 #: C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/><application>Yelp-Hilfebrowser</application> ist für die "
-"Umwandlung von DocBook nach HTML abhängig von <ulink url=\"ghelp:mate-doc-"
+"Umwandlung von DocBook nach HTML abhängig von <ulink url=\"help:mate-doc-"
 "xslt\">MATE XSLT Stylesheets</ulink>, um die Umwandlung von DocBook in HTML "
-"auszuführen. Die <ulink url=\"ghelp:mate-doc-make\">MATE Documentation "
+"auszuführen. Die <ulink url=\"help:mate-doc-make\">MATE Documentation "
 "Build Utilities</ulink> benötigen Anwendungsentwickler, um die Dokumentation "
 "in das Hilfesystem zu integrieren und dort zu registrieren."
 
@@ -2233,12 +2233,12 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "Wenn Sie sich in einer anderen Sprache anmelden, gilt dies nur für die "
 "Benutzeroberfläche, nicht für die Tastaturbelegung. Um die Tastaturbelegung "
-"zu ändern, verwenden Sie das <ulink type=\"help\" url=\"ghelp:gswitchit"
+"zu ändern, verwenden Sie das <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>Tastaturindikator</application></ulink>-Applet."
 
 #: C/gosstartsession.xml:126(para)
@@ -2914,12 +2914,12 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "Die <application>Uhr</application> zeigt die aktuelle Zeit an. Klicken sie "
 "auf die Zeitanzeige, um einen kleinen Kalender zu öffnen. Durch Ausklappen "
 "des Feldes <guilabel>Orte</guilabel> können Sie eine Weltkarte anzeigen. "
-"Weitere Informationen finden Sie im <ulink type=\"help\" url=\"ghelp:clock"
+"Weitere Informationen finden Sie im <ulink type=\"help\" url=\"help:clock"
 "\">Uhren-Handbuch</ulink>."
 
 #: C/gospanel.xml:70(term)
@@ -2930,11 +2930,11 @@ msgstr "Applet <application>Lautstärkeregler</application>"
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "Der <application>Lautstärkeregler</application> erlaubt Ihnen, die "
 "Lautstärke der Lautsprecher Ihres Systems einzustellen. Weitere "
-"Informationen finden Sie im <ulink type=\"help\" url=\"ghelp:mate-volume-"
+"Informationen finden Sie im <ulink type=\"help\" url=\"help:mate-volume-"
 "control\">Lautstärkeregler-Handbuch</ulink>."
 
 #: C/gospanel.xml:75(term)
@@ -4745,11 +4745,11 @@ msgstr ""
 #: C/gospanel.xml:1229(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "Weitere Informationen über die <application>Suche nach Dateien</application> "
-"finden Sie im <ulink type=\"help\" url=\"ghelp:mate-search-tool"
+"finden Sie im <ulink type=\"help\" url=\"help:mate-search-tool"
 "\">Dateisuche-Handbuch</ulink>."
 
 #: C/gospanel.xml:1233(title)
@@ -6596,51 +6596,51 @@ msgstr "Die folgenden Anwendungen sind Teil von MATE:"
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"Der <ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Texteditor</"
+"Der <ulink type=\"help\" url=\"help:pluma\"><application>Pluma Texteditor</"
 "application></ulink> liest, erzeugt und verändert jeglichen unformatierten "
 "Text."
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"Das <ulink type=\"help\" url=\"ghelp:mate-dictionary"
+"Das <ulink type=\"help\" url=\"help:mate-dictionary"
 "\"><application>Wörterbuch</application></ulink> hilft Ihnen bei der Suche "
 "nach der Definition eines Wortes."
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"Der <ulink type=\"help\" url=\"ghelp:eom\"><application>Bildbetrachter</"
+"Der <ulink type=\"help\" url=\"help:eom\"><application>Bildbetrachter</"
 "application></ulink> stellt sowohl einzelne Bilddateien als auch ganze "
 "Bildersammlungen dar."
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"Der <ulink type=\"help\" url=\"ghelp:gcalctool"
+"Der <ulink type=\"help\" url=\"help:gcalctool"
 "\"><application>Taschenrechner</application></ulink> führt grundlegende, "
 "finanztechnische und wissenschaftliche Berechnungen aus."
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
 "characters you need will be on your keyboard."
 msgstr ""
-"Die <ulink type=\"help\" url=\"ghelp:gucharmap"
+"Die <ulink type=\"help\" url=\"help:gucharmap"
 "\"><application>Zeichenpalette</application></ulink> bietet Zeichen aus dem "
 "<firstterm>Unicode</firstterm>-Zeichensatz zur Auswahl und zum Einfügen in "
 "eine beliebige Anwendung an. Wenn Sie in verschiedenen Sprachen schreiben, "
@@ -6665,10 +6665,10 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"Über das <ulink type=\"help\" url=\"ghelp:mate-terminal"
+"Über das <ulink type=\"help\" url=\"help:mate-terminal"
 "\"><application>Terminal</application></ulink> erhalten Sie Zugriff auf eine "
 "Befehlszeile."
 
@@ -6987,7 +6987,7 @@ msgstr "Auswählen eines Ordners"
 #: C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -6995,7 +6995,7 @@ msgid ""
 "folder."
 msgstr ""
 "Manchmal ist es nötig, einen Ordner auszuwählen, ohne dass Sie eine Datei "
-"öffnen wollen. Wenn Sie beispielsweise den <ulink type=\"help\" url=\"ghelp:"
+"öffnen wollen. Wenn Sie beispielsweise den <ulink type=\"help\" url=\"help:"
 "file-roller\"><application>Archivmanager</application></ulink> benutzen, um "
 "Dateien aus einem Archiv zu entpacken, benötigen Sie einen Ordner, um die "
 "Dateien abzulegen. In diesem Fall werden die Dateien in dem aktuellen Ordner "
@@ -14295,12 +14295,12 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>Nach Dateien suchen</guimenuitem> erlaubt Ihnen, auf Ihrem "
 "Rechner nach Dateien zu suchen. Weitere Informationen finden Sie im <ulink "
-"type=\"help\" url=\"ghelp:mate-search-tool\">Dateisuche-Handbuch</ulink>."
+"type=\"help\" url=\"help:mate-search-tool\">Dateisuche-Handbuch</ulink>."
 
 #: C/goseditmainmenu.xml:71(para)
 msgid ""
@@ -14442,11 +14442,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"Das <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"Das <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">Systemverwaltungs-Handbuch</ulink> bietet mehr Informationen über die "
 "Einbindung von Menüs in MATE, und wie diese vom Systemverwalter angepasst "
 "werden können."
@@ -14958,13 +14958,13 @@ msgstr "Beim Starten ausführen (nur Barrierefreiheit)"
 #: C/goscustdesk.xml:274(para)
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
 "Wählen Sie diese Option, wenn Sie diesen Befehl direkt nach dem Start Ihrer "
 "Sitzung ausführen wollen. Weitere Optionen hinsichtlich Barrierefreiheit "
-"finden Sie im <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"finden Sie im <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>MATE Barrierefreiheits-Handbuch</citetitle></ulink>."
 
 #: C/goscustdesk.xml:286(title)
@@ -17190,12 +17190,12 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
 "Um zwischen den verschiedenen Tastaturbelegungen zu wechseln, verwenden Sie "
-"das <ulink type=\"help\" url=\"ghelp:gswitchit"
+"das <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>Tastaturindikator</application>-Applet</ulink>."
 
 #: C/goscustdesk.xml:1625(para)
@@ -17422,11 +17422,11 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 "Die Zeichen der dritten und vierten Ebene Ihrer Tastaturbelegung werden im "
-"Ansichtsfenster des <ulink type=\"help\" url=\"ghelp:gswitchit"
+"Ansichtsfenster des <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>Tastaturindikators</application></ulink> angezeigt."
 
 #: C/goscustdesk.xml:1712(guilabel)
@@ -17491,12 +17491,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Dieser Abschnitt beschreibt jede der möglichen Einstellungen. Eine mehr an "
 "speziellen Aufgaben orientierte Beschreibung des Tastaturzugriffs finden Sie "
-"im <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"im <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>MATE-Barrierefreiheits-Handbuch</citetitle></ulink>."
 
 #: C/goscustdesk.xml:1752(para)
@@ -17751,13 +17751,13 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "Wählen Sie diese Option, wenn Sie mit dem Ziffernblock der Tastatur "
 "Mausaktionen ausführen möchten. Eine Liste der Tasten und deren Aktionen "
 "befindet sich im <citetitle>MATE-Barrierefreiheits-Handbuch</citetitle> "
-"unter dem Thema <ulink type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-"
+"unter dem Thema <ulink type=\"help\" url=\"help:mate-access-guide?dtconfig-"
 "14\"><citetitle>So verwenden Sie die Tastatur, um die Maus zu emulieren</"
 "citetitle></ulink>."
 
@@ -18746,10 +18746,10 @@ msgstr "Multimedia-System"
 
 #: C/goscustdesk.xml:2834(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"Weitere Informationen finden Sie im <ulink type=\"help\" url=\"ghelp:"
+"Weitere Informationen finden Sie im <ulink type=\"help\" url=\"help:"
 "gstreamer-properties\">Multimedia-System-Handbuch</ulink>."
 
 #: C/goscustdesk.xml:2838(title)
@@ -20193,7 +20193,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 "
@@ -20201,7 +20201,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/user-guide.xml:12(para)
@@ -20578,10 +20578,10 @@ msgstr ""
 #~ msgstr "Erstellt ein Foto des Fensters unter dem Mauszeiger."
 
 #~ msgid ""
-#~ "For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-"
+#~ "For more on this, see the <ulink type=\"help\" url=\"help:workspace-"
 #~ "switcher\">Workspace Switcher Applet Manual</ulink>."
 #~ msgstr ""
-#~ "Weitere Informationen finden Sie im <ulink type=\"help\" url=\"ghelp:"
+#~ "Weitere Informationen finden Sie im <ulink type=\"help\" url=\"help:"
 #~ "workspace-switcher\">Arbeitsflächenumschalter-Handbuch</ulink>."
 
 #~ msgid ""
@@ -21061,14 +21061,14 @@ msgstr ""
 #~ "To format a floppy disk, right-click on the object that represents the "
 #~ "floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 #~ "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-#~ "type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+#~ "type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 #~ "documentation for more details."
 #~ msgstr ""
 #~ "Um eine Diskette zu formatieren, klicken Sie mit der rechten Maustaste "
 #~ "auf das Objekt auf dem Desktop, welches das Diskettenlaufwerk "
 #~ "repräsentiert. Dann wählen Sie <guimenuitem>Formatieren</guimenuitem>. "
 #~ "Ein <guilabel>Diskettenformatierer</guilabel>-Dialog wird angezeigt. "
-#~ "Weitere Informationen finden Sie im <ulink type=\"help\" url=\"ghelp:"
+#~ "Weitere Informationen finden Sie im <ulink type=\"help\" url=\"help:"
 #~ "gfloppy?usage\">Diskettenformatierer-Handbuch</ulink>."
 
 #~ msgid "Eject the diskette from the drive."
@@ -21327,11 +21327,11 @@ msgstr ""
 
 #~ msgid ""
 #~ "For more information on configuring keyboard accessibility preferences, "
-#~ "see the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+#~ "see the <ulink type=\"help\" url=\"help:mate-access-guide?index"
 #~ "\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 #~ msgstr ""
 #~ "Weitere Informationen über Einstellungen des Tastaturzugriffs finden sie "
-#~ "im <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+#~ "im <ulink type=\"help\" url=\"help:mate-access-guide?index"
 #~ "\"><citetitle>MATE-Barrierefreiheits-Handbuch</citetitle></ulink>."
 
 #~ msgid "Filter Preferences"
diff --git a/user-guide/el/el.po b/user-guide/el/el.po
index f639613..17b44a0 100644
--- a/user-guide/el/el.po
+++ b/user-guide/el/el.po
@@ -1219,8 +1219,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> ή <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> ή <option>mate-help:</option>"
 
 #: C/gostools.xml:948(para)
 msgid "Use this URI when you want to access MATE help documents, which are typically written in DocBook format."
@@ -1228,8 +1228,8 @@ msgstr "Χρησιμοποιείστε αυτό το URI όταν επιθυμε
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:953(para)
 msgid "If you want to open the help document at a particular section, append a question mark to the end of the URI, followed by the section id."
@@ -1237,8 +1237,8 @@ msgstr "Αν θέλετε να ανοίξετε το έγγραφο βοήθει
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:961(option)
 msgid "man:"
@@ -1325,8 +1325,8 @@ msgid "Perform conversion from DocBook format to a format suitable for display."
 msgstr "Μετατρέπουν από τον τύπο DocBook σε έναν τύπο κατάλληλο για προβολή."
 
 #: C/gostools.xml:1026(para)
-msgid "<placeholder-1/><application>Yelp Help Browser</application> relies on <ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make\">MATE Documentation Build Utilities</ulink> are relied upon by application authors to install and register documentation within the help system."
-msgstr "<placeholder-1/>Ο <application>Περιηγητής βοήθειας Yelp</application> βασίζεται στα <ulink url=\"ghelp:mate-doc-xslt\">φύλλα στυλ MATE XSLT</ulink> για να εκτελεί μετατροπές από μορφή DocBook σε HTML. Οι <ulink url=\"ghelp:mate-doc-make\">Εφαρμογές χτισίματος τεκμηρίωσης MATE</ulink> χρησιμοποιούνται από τους συντάκτες εφαρμογών για την εγκατάσταση και την καταγραφή τεκμηρίωσης στα πλαίσια του συστήματος βοήθειας."
+msgid "<placeholder-1/><application>Yelp Help Browser</application> relies on <ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make\">MATE Documentation Build Utilities</ulink> are relied upon by application authors to install and register documentation within the help system."
+msgstr "<placeholder-1/>Ο <application>Περιηγητής βοήθειας Yelp</application> βασίζεται στα <ulink url=\"help:mate-doc-xslt\">φύλλα στυλ MATE XSLT</ulink> για να εκτελεί μετατροπές από μορφή DocBook σε HTML. Οι <ulink url=\"help:mate-doc-make\">Εφαρμογές χτισίματος τεκμηρίωσης MATE</ulink> χρησιμοποιούνται από τους συντάκτες εφαρμογών για την εγκατάσταση και την καταγραφή τεκμηρίωσης στα πλαίσια του συστήματος βοήθειας."
 
 #: C/gostools.xml:1047(title)
 msgid "Homepage and Mailing List"
@@ -1483,8 +1483,8 @@ msgid "On the login screen, click on the <guilabel>Language</guilabel> icon. Cho
 msgstr "Στην οθόνη σύνδεσης, πατήστε στο εικονίδιο <guilabel>Γλώσσα</guilabel>. Επιλέξτε τη γλώσσα που επιθυμείτε από τη λίστα των διαθέσιμων γλωσσών."
 
 #: C/gosstartsession.xml:120(para)
-msgid "When you log in to a session in a different language, you are changing the language for the user interface but are not changing the keyboard layout. To choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
-msgstr "Όταν συνδέεστε σε μία συνεδρία σε διαφορετική γλώσσα, αλλάζετε τη γλώσσα για τη διεπαφή χρήστη, αλλά δεν αλλάζετε τη διάταξη πληκτρολογίου. Για να επιλέξετε μία διάταξη πληκτρολογίου, χρησιμοποιείστε τη μικροεφαρμογή <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Ένδειξη διάταξης πληκτρολογίου</application></ulink>."
+msgid "When you log in to a session in a different language, you are changing the language for the user interface but are not changing the keyboard layout. To choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
+msgstr "Όταν συνδέεστε σε μία συνεδρία σε διαφορετική γλώσσα, αλλάζετε τη γλώσσα για τη διεπαφή χρήστη, αλλά δεν αλλάζετε τη διάταξη πληκτρολογίου. Για να επιλέξετε μία διάταξη πληκτρολογίου, χρησιμοποιείστε τη μικροεφαρμογή <ulink type=\"help\" url=\"help:gswitchit\"><application>Ένδειξη διάταξης πληκτρολογίου</application></ulink>."
 
 #: C/gosstartsession.xml:126(para)
 msgid "Your system distributor or vendor may have altered the login screen so that it no longer has a <guilabel>Language</guilabel> icon. In this case, the option to change the session's language may be found by clicking the <guilabel>Other</guilabel> icon."
@@ -1901,16 +1901,16 @@ msgid "<application>Clock</application> applet"
 msgstr "Μικροεφαρμογή <application>Ρολόι</application>"
 
 #: C/gospanel.xml:66(para)
-msgid "The <application>Clock</application> shows the current time. Click on the time to open a small calendar. You can also view a world map by clicking the <guilabel>Locations</guilabel> expansion label. For more on this, see the <ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
-msgstr "Το <application>Ρολόι</application> δείχνει την τρέχουσα ώρα. Πατήστε στην ώρα για να ανοίξετε ένα μικρό ημερολόγιο. Μπορείτε επίσην να δείτε ένα παγκόσμιο χάρτη πατώντας στην ετικέτα επέκτασης <guilabel>Τοποθεσίες</guilabel>. Για περισσότερες πληροφορίες πάνω σε αυτό, δείτε το <ulink type=\"help\" url=\"ghelp:clock\">Εγχειρίδιο μικροεφαρμογής ρολογιού</ulink>."
+msgid "The <application>Clock</application> shows the current time. Click on the time to open a small calendar. You can also view a world map by clicking the <guilabel>Locations</guilabel> expansion label. For more on this, see the <ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
+msgstr "Το <application>Ρολόι</application> δείχνει την τρέχουσα ώρα. Πατήστε στην ώρα για να ανοίξετε ένα μικρό ημερολόγιο. Μπορείτε επίσην να δείτε ένα παγκόσμιο χάρτη πατώντας στην ετικέτα επέκτασης <guilabel>Τοποθεσίες</guilabel>. Για περισσότερες πληροφορίες πάνω σε αυτό, δείτε το <ulink type=\"help\" url=\"help:clock\">Εγχειρίδιο μικροεφαρμογής ρολογιού</ulink>."
 
 #: C/gospanel.xml:70(term)
 msgid "<application>Volume Control</application> applet"
 msgstr "Μικροεφαρμογή <application>Έντασης ήχου</application>"
 
 #: C/gospanel.xml:72(para)
-msgid "The <application>Volume Control</application> enables you to control the volume of the speakers on your system. For more on this, see the <ulink type=\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
-msgstr "Ο <application>Έλεγχος έντασης ήχου</application> σας δίνει τη δυνατότητα να ελέγχετε την ένταση των ηχείων του συστήματός σας. Για περισσότερα πάνω σε αυτό, συμβουλευτείτε το <ulink type=\"help\" url=\"ghelp:mate-volume-control\">Εγχειρίδιο ελέγχου έντασης ήχου</ulink>."
+msgid "The <application>Volume Control</application> enables you to control the volume of the speakers on your system. For more on this, see the <ulink type=\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
+msgstr "Ο <application>Έλεγχος έντασης ήχου</application> σας δίνει τη δυνατότητα να ελέγχετε την ένταση των ηχείων του συστήματός σας. Για περισσότερα πάνω σε αυτό, συμβουλευτείτε το <ulink type=\"help\" url=\"help:mate-volume-control\">Εγχειρίδιο ελέγχου έντασης ήχου</ulink>."
 
 #: C/gospanel.xml:75(term)
 msgid "<indexterm><primary>top edge panel</primary><secondary>window list icon</secondary></indexterm><application>Window Selector</application> icon"
@@ -3164,8 +3164,8 @@ msgid "To open the <application>Search Tool</application>, click on the <guibutt
 msgstr "Για να ανοίξετε το <application>Εργαλείο αναζήτησης</application>, πατήστε το κουμπί <guibutton>Αναζήτηση για αρχεία...</guibutton>."
 
 #: C/gospanel.xml:1230(para)
-msgid "For more information on the <application>Search Tool</application>, see the <ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</ulink>."
-msgstr "Για περισσότερες πληροφορίες πάνω στο <application>Εργαλείο αναζήτησης</application>, δείτε το <ulink type=\"help\" url=\"ghelp:mate-search-tool\">Εγχειρίδιο εργαλείου αναζήτησης</ulink>."
+msgid "For more information on the <application>Search Tool</application>, see the <ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</ulink>."
+msgstr "Για περισσότερες πληροφορίες πάνω στο <application>Εργαλείο αναζήτησης</application>, δείτε το <ulink type=\"help\" url=\"help:mate-search-tool\">Εγχειρίδιο εργαλείου αναζήτησης</ulink>."
 
 #: C/gospanel.xml:1234(title)
 msgid "Show Desktop Button"
@@ -4099,32 +4099,32 @@ msgid "The applications that are part of MATE include the following:"
 msgstr "Οι εφαρμογές που αποτελούν μέρος του MATE περιλαμβάνουν τα παρακάτω:"
 
 #: C/gosoverview.xml:419(para)
-msgid "<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</application></ulink> can read, create, or modify any kind of simple text without any formatting."
-msgstr "Ο <ulink type=\"help\" url=\"ghelp:pluma\"><application>Επεξεργαστής κειμένου Pluma</application></ulink> μπορεί να διαβάσει, να δημιουργήσει, ή να τροποποιήσει οποιοδήποτε τύπο απλού κειμένου χωρίς μορφοποίηση."
+msgid "<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</application></ulink> can read, create, or modify any kind of simple text without any formatting."
+msgstr "Ο <ulink type=\"help\" url=\"help:pluma\"><application>Επεξεργαστής κειμένου Pluma</application></ulink> μπορεί να διαβάσει, να δημιουργήσει, ή να τροποποιήσει οποιοδήποτε τύπο απλού κειμένου χωρίς μορφοποίηση."
 
 #: C/gosoverview.xml:420(para)
-msgid "<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</application></ulink> allows you to look up definitions of a word."
-msgstr "Το <ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Λεξικό</application></ulink> σας δίνει τη δυνατότητα να αναζητάτε ορισμούς λέξεων."
+msgid "<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</application></ulink> allows you to look up definitions of a word."
+msgstr "Το <ulink type=\"help\" url=\"help:mate-dictionary\"><application>Λεξικό</application></ulink> σας δίνει τη δυνατότητα να αναζητάτε ορισμούς λέξεων."
 
 #: C/gosoverview.xml:421(para)
-msgid "<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</application></ulink> can display single image files, as well as large image collections."
-msgstr "Ο <ulink type=\"help\" url=\"ghelp:eom\"><application>Προβολέας εικόνων</application></ulink> μπορεί να παρουσιάσει ξεχωριστά αρχεία εικόνων, όπως επίσης και μεγάλες συλλογές εικόνων."
+msgid "<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</application></ulink> can display single image files, as well as large image collections."
+msgstr "Ο <ulink type=\"help\" url=\"help:eom\"><application>Προβολέας εικόνων</application></ulink> μπορεί να παρουσιάσει ξεχωριστά αρχεία εικόνων, όπως επίσης και μεγάλες συλλογές εικόνων."
 
 #: C/gosoverview.xml:422(para)
-msgid "<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</application></ulink> performs basic, financial, and scientific calculations."
-msgstr "Η <ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Αριθμομηχανή</application></ulink> εκτελεί βασικές, οικονομικές ή επιστημονικές πράξεις."
+msgid "<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</application></ulink> performs basic, financial, and scientific calculations."
+msgstr "Η <ulink type=\"help\" url=\"help:gcalctool\"><application>Αριθμομηχανή</application></ulink> εκτελεί βασικές, οικονομικές ή επιστημονικές πράξεις."
 
 #: C/gosoverview.xml:423(para)
-msgid "<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</application></ulink> lets you choose letters and symbols from the <firstterm>Unicode</firstterm> character set and paste them into any application. If you are writing in several languages, not all of the characters you need will be on your keyboard."
-msgstr "Ο <ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Χάρτης χαρακτήρων</application></ulink> σας επιτρέπει να επιλέγετε χαρακτήρες και σύμβολα από το σύνολο χαρακτήρων <firstterm>Unicode</firstterm> και να τους επικολλάτε σε οποιαδήποτε εφαρμογή. Αν γράφετε σε πολλές γλώσσες, δε θα βρείτε στο πληκτρολόγιό σας όλους τους χαρακτήρες που χρειάζεστε."
+msgid "<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</application></ulink> lets you choose letters and symbols from the <firstterm>Unicode</firstterm> character set and paste them into any application. If you are writing in several languages, not all of the characters you need will be on your keyboard."
+msgstr "Ο <ulink type=\"help\" url=\"help:gucharmap\"><application>Χάρτης χαρακτήρων</application></ulink> σας επιτρέπει να επιλέγετε χαρακτήρες και σύμβολα από το σύνολο χαρακτήρων <firstterm>Unicode</firstterm> και να τους επικολλάτε σε οποιαδήποτε εφαρμογή. Αν γράφετε σε πολλές γλώσσες, δε θα βρείτε στο πληκτρολόγιό σας όλους τους χαρακτήρες που χρειάζεστε."
 
 #: C/gosoverview.xml:424(para)
 msgid "<link linkend=\"caja\"><application>Caja File Manager</application></link> displays your folders and their contents. Use this to copy, move and classify your files, and to access CDs, USB flash drives, and any other removable media. When you choose an item from the <link linkend=\"places-menu\"><guimenu>Places</guimenu> menu</link>, a <application>Caja File Manager</application> window opens showing that location."
 msgstr "Ο <link linkend=\"caja\"><application>Διαχειριστής αρχείων Ναυτίλος</application></link> παρουσιάζει τους φακέλους και τα περιεχόμενά τους. Χρησιμοποιείστε τον για αντιγραφή, μετακίνηση, ή ταξινόμηση των αρχείων σας, και πρόσβαση σε CD, οδηγούς USB flash, ή κάθε αφαιρούμενο μέσο. Όταν επιλέγετε ένα αντικείμενο από το <link linkend=\"places-menu\">μενού <guimenu>Τοποθεσίες</guimenu></link>, ένα παράθυρο του <application>διαχειριστή αρχείων Ναυτίλου</application> ανοίγει για να σας εμφανίσει την τοποθεσία του."
 
 #: C/gosoverview.xml:425(para)
-msgid "<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</application></ulink> gives you access to the system command line."
-msgstr "Το <ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Τερματικό</application></ulink> σας δίνει πρόσβαση στη γραμμή εντολών του συστήματος."
+msgid "<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</application></ulink> gives you access to the system command line."
+msgstr "Το <ulink type=\"help\" url=\"help:mate-terminal\"><application>Τερματικό</application></ulink> σας δίνει πρόσβαση στη γραμμή εντολών του συστήματος."
 
 #: C/gosoverview.xml:428(para)
 msgid "Further standard MATE applications include games, music and video players, a web browser, software accessibility tools, and utilities to manage your system. Your distributor or vendor may have added other applications, such as a word processor and a graphics editor. They may also provide you with a way to install further applications."
@@ -4275,8 +4275,8 @@ msgid "Choosing a folder"
 msgstr "Επιλογή φακέλου"
 
 #: C/gosoverview.xml:508(para)
-msgid "You might sometimes need to choose a folder to work with rather than open a file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller\"><application>Archive Manager</application></ulink> to extract files from an archive, you need to choose a folder to place the files into. In this case, the files in the current location are greyed out, and pressing <guibutton>Open</guibutton> when a folder is selected will choose that folder."
-msgstr "Μπορεί μερικές φορές να χρειαστεί να επιλέξετε ένα φάκελο για να εργαστείτε αντί να ανοίξετε ένα αρχείο. Για παράδειγμα, αν χρησιμοποιείτε τον <ulink type=\"help\" url=\"ghelp:file-roller\"><application>Διαχειριστή συμπιεσμένων αρχείων</application></ulink> για να εξάγετε αρχεία από ένα συμπιεσμένο αρχείο, θα χρειαστεί να επιλέξετε ένα φάκελο για να τοποθετήσετε μέσα σε αυτόν τα αρχεία. Σε αυτήν την περίπτωση, τα αρχεία στην τρέχουσα τοποθεσία θα εμφανιστούν με ξεθωριασμένο χρώμα, και πιέζοντας <guibutton>Άνοιγμα</guibutton> όταν ο φάκελος έχει επιλεγεί θα εξαχθούν σε αυτόν το φάκελο."
+msgid "You might sometimes need to choose a folder to work with rather than open a file. For example, if you use <ulink type=\"help\" url=\"help:file-roller\"><application>Archive Manager</application></ulink> to extract files from an archive, you need to choose a folder to place the files into. In this case, the files in the current location are greyed out, and pressing <guibutton>Open</guibutton> when a folder is selected will choose that folder."
+msgstr "Μπορεί μερικές φορές να χρειαστεί να επιλέξετε ένα φάκελο για να εργαστείτε αντί να ανοίξετε ένα αρχείο. Για παράδειγμα, αν χρησιμοποιείτε τον <ulink type=\"help\" url=\"help:file-roller\"><application>Διαχειριστή συμπιεσμένων αρχείων</application></ulink> για να εξάγετε αρχεία από ένα συμπιεσμένο αρχείο, θα χρειαστεί να επιλέξετε ένα φάκελο για να τοποθετήσετε μέσα σε αυτόν τα αρχεία. Σε αυτήν την περίπτωση, τα αρχεία στην τρέχουσα τοποθεσία θα εμφανιστούν με ξεθωριασμένο χρώμα, και πιέζοντας <guibutton>Άνοιγμα</guibutton> όταν ο φάκελος έχει επιλεγεί θα εξαχθούν σε αυτόν το φάκελο."
 
 # #-#-#-#-#  yelp.HEAD.el.po (el)  #-#-#-#-#
 #: C/gosoverview.xml:512(title)
@@ -8712,8 +8712,8 @@ msgid "<guimenuitem>Connect to Server</guimenuitem> lets you choose a server on
 msgstr "Η <guimenuitem>Σύνδεση σε εξυπηρετητή</guimenuitem> σας επιτρέπει να επιλέξετε έναν εξυπηρετητή στο δίκτυό σας. Για περισσότερα πάνω σε αυτό, δείτε <xref linkend=\"caja-server-connect\"/>."
 
 #: C/goseditmainmenu.xml:70(para)
-msgid "<guimenuitem>Search for Files</guimenuitem> lets you search for files on your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search for Files Manual</ulink>."
-msgstr "Η <guimenuitem>Αναζήτηση για αρχεία</guimenuitem> σας επιτρέπει να αναζήτείτε αρχεία στον υπολογιστή σας. Για περισσότερα πάνω σε αυτό, δείτε το <ulink type=\"help\" url=\"ghelp:mate-search-tool\">Εγχειρίδιο αναζήτησης αρχείων</ulink>."
+msgid "<guimenuitem>Search for Files</guimenuitem> lets you search for files on your computer. For more on this, see the <ulink type=\"help\" url=\"help:mate-search-tool\">Search for Files Manual</ulink>."
+msgstr "Η <guimenuitem>Αναζήτηση για αρχεία</guimenuitem> σας επιτρέπει να αναζήτείτε αρχεία στον υπολογιστή σας. Για περισσότερα πάνω σε αυτό, δείτε το <ulink type=\"help\" url=\"help:mate-search-tool\">Εγχειρίδιο αναζήτησης αρχείων</ulink>."
 
 #: C/goseditmainmenu.xml:71(para)
 msgid "The <guimenuitem>Recent Documents</guimenuitem> submenu lists the documents you have recently opened. The last entry in the submenu clears the list."
@@ -8789,8 +8789,8 @@ msgid "To remove an item from a menu, deselect it in the list. The item can be a
 msgstr "Για αφαίρεση ενός αντικειμένου από ένα μενού, αναιρέστε την επιλογή του μέσα στη λίστα. Το αντικείμενο μπορεί να προστεθεί πάλι πίσω στο μενού, επιλέγοντάς το εκ νέου."
 
 #: C/goseditmainmenu.xml:118(para)
-msgid "The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0\">System Administration Guide</ulink> has more information on how MATE implements menus and how administrators can customize them."
-msgstr "Ο <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0\">Οδηγός Διαχειριστή Συστήματος</ulink> διαθέτει περισσότερες πληροφορίες πάνω στον τρόπο με τον οποίο το MATE έχει σχεδιασμένα τα μενού και τον τρόπο με τον οποίον διαχειριστές μπορούν να τα προσαρμόσουν."
+msgid "The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0\">System Administration Guide</ulink> has more information on how MATE implements menus and how administrators can customize them."
+msgstr "Ο <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0\">Οδηγός Διαχειριστή Συστήματος</ulink> διαθέτει περισσότερες πληροφορίες πάνω στον τρόπο με τον οποίο το MATE έχει σχεδιασμένα τα μενού και τον τρόπο με τον οποίον διαχειριστές μπορούν να τα προσαρμόσουν."
 
 #: C/goscustdesk.xml:2(title)
 msgid "Configuring Your Desktop"
@@ -9076,8 +9076,8 @@ msgid "Run at start (Accessibility only)"
 msgstr "Εκτέλεση στην εκκίνηση (Μόνο για την προσιτότητα)"
 
 #: C/goscustdesk.xml:274(para)
-msgid "Select this option to run the command as soon as your session begins. For more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
-msgstr "Επιλέξτε αυτή την επιλογή για να εκτελείται η εντολή μόλις ξεκινά η συνεδρία σας. Για περισσότερες επιλογές προσιτότητας, δείτε τον <ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>Οδηγό προσιτότητας επιφάνειας εργασίας MATE</citetitle></ulink>."
+msgid "Select this option to run the command as soon as your session begins. For more accessibility options, see <ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
+msgstr "Επιλέξτε αυτή την επιλογή για να εκτελείται η εντολή μόλις ξεκινά η συνεδρία σας. Για περισσότερες επιλογές προσιτότητας, δείτε τον <ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>Οδηγό προσιτότητας επιφάνειας εργασίας MATE</citetitle></ulink>."
 
 #: C/goscustdesk.xml:286(title)
 msgid "Look and Feel"
@@ -10414,8 +10414,8 @@ msgid "You can switch between selected layouts to change the characters your key
 msgstr "Μπορείτε να εναλλάσσεστε ανάμεσα σε επιλεγμένες διατάξεις για να αλλάζετε τους χαρακτήρες που παράγει το πληκτρολόγιό σας όταν πληκτρολογείτε. Για να προσθέσετε μία διάταξη, πατήστε το κουμπί <guibutton>Προσθήκη</guibutton>. Μπορείτε να έχετε μέχρι τέσσερις διατάξεις. Για να απομακρύνετε μία διάταξη, επιλέξτε την και πιέστε <guibutton>Αφαίρεση</guibutton>."
 
 #: C/goscustdesk.xml:1624(para)
-msgid "To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard Indicator</application> panel applet</ulink>."
-msgstr "Για εναλλαγή μεταξύ διατάξεων πληκτρολογίου, χρησιμοποιείστε τη <ulink type=\"help\" url=\"ghelp:gswitchit\">μικροεφαρμογή πίνακα εφαρμογών <application>Ένδειξη γλώσσας πληκτρολογίου</application></ulink>."
+msgid "To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard Indicator</application> panel applet</ulink>."
+msgstr "Για εναλλαγή μεταξύ διατάξεων πληκτρολογίου, χρησιμοποιείστε τη <ulink type=\"help\" url=\"help:gswitchit\">μικροεφαρμογή πίνακα εφαρμογών <application>Ένδειξη γλώσσας πληκτρολογίου</application></ulink>."
 
 #: C/goscustdesk.xml:1625(para)
 msgid "To add a layout to the list of selected layouts, click the <guibutton>Add</guibutton> button. It opens a layout chooser dialog, which lets you select a layout by country or by language."
@@ -10534,8 +10534,8 @@ msgid "Pressing the third-level key and <keycap>Shift</keycap> produces a fourth
 msgstr "Πιέζοντας το πλήκτρο τροποποιητή τρίτου επιπέδου και το <keycap>Shift</keycap> παράγει έναν τέταρτο χαρακτήρα από ένα πλήκτρο."
 
 #: C/goscustdesk.xml:1707(para)
-msgid "The third and fourth level characters for your keyboard layout are shown in the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> Layout View Window."
-msgstr "Οι χαρακτήρες τρίτου και τέταρτου επιπέδου για τη διάταξη πληκτρολογίου σας εμφανίζονται στο <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Εμφάνιση διάταξης πληκτρολογίου</application></ulink> παράθυρο προβολής διάταξης πληκτρολογίου."
+msgid "The third and fourth level characters for your keyboard layout are shown in the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> Layout View Window."
+msgstr "Οι χαρακτήρες τρίτου και τέταρτου επιπέδου για τη διάταξη πληκτρολογίου σας εμφανίζονται στο <ulink type=\"help\" url=\"help:gswitchit\"><application>Εμφάνιση διάταξης πληκτρολογίου</application></ulink> παράθυρο προβολής διάταξης πληκτρολογίου."
 
 #: C/goscustdesk.xml:1712(guilabel)
 msgid "Use keyboard LED to show alternative group."
@@ -10578,8 +10578,8 @@ msgid "The <guilabel>Accessibility</guilabel> tabbed section allows you to set o
 msgstr "Η καρτέλα <application>Προσιτότητα</application> σας επιτρέπει να καθορίσετε επιλογές όπως φίλτρα για άθελες πληκτρολογήσεις και πλήκτρα συντόμευσης χωρίς την απαίτηση συνεχούς κρατήματος πλήκτρων τη μία φορά. Τα χαρακτηριστικά αυτά είναι επίσης γνωστά και ως AccessX."
 
 #: C/goscustdesk.xml:1750(para)
-msgid "This section describes each of the preferences you can set. For a more task-oriented description of keyboard accessibility, see the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
-msgstr "Αυτή η ενότητα περιγράφει όλες τις προτιμήσεις που μπορείτε να ρυθμίσετε. Για μία περιγραφή πιο κατάλληλη για την κάθε εργασία προσιτότητας πληκτρολογίου, δείτε τον <ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>Οδηγό προσιτότητας MATE</citetitle></ulink>."
+msgid "This section describes each of the preferences you can set. For a more task-oriented description of keyboard accessibility, see the <ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
+msgstr "Αυτή η ενότητα περιγράφει όλες τις προτιμήσεις που μπορείτε να ρυθμίσετε. Για μία περιγραφή πιο κατάλληλη για την κάθε εργασία προσιτότητας πληκτρολογίου, δείτε τον <ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>Οδηγό προσιτότητας MATE</citetitle></ulink>."
 
 #: C/goscustdesk.xml:1752(para)
 msgid "<xref linkend=\"goscustdesk-TBL-85\"/> lists the accessibility preferences that you can modify."
@@ -10748,8 +10748,8 @@ msgid "mouse keys"
 msgstr "πλήκτρα ποντικιού"
 
 #: C/goscustdesk.xml:2016(para)
-msgid "Select this option to make the numeric keypad emulate mouse actions. The list of keys and their equivalences is in the <citetitle>MATE Desktop Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard to Emulate the Mouse</citetitle></ulink>."
-msgstr "Επιλέξτε αυτήν την επιλογή για να προσομοιώσετε το αριθμητικό πληκτρολόγιο με ενέργειες ποντικιού. Η λίστα πλήκτρων και οι ισοδύναμες ενέργειες μπορούν να βρεθούν στον <citetitle>Οδηγό προσιτότητας επιφάνειας εργασίας MATE</citetitle> κάτω από την κεφαλίδα <ulink type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>Ενεργοποίηση πληκτρολογίου για την προσομοίωση ποντικιού</citetitle></ulink>."
+msgid "Select this option to make the numeric keypad emulate mouse actions. The list of keys and their equivalences is in the <citetitle>MATE Desktop Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url=\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard to Emulate the Mouse</citetitle></ulink>."
+msgstr "Επιλέξτε αυτήν την επιλογή για να προσομοιώσετε το αριθμητικό πληκτρολόγιο με ενέργειες ποντικιού. Η λίστα πλήκτρων και οι ισοδύναμες ενέργειες μπορούν να βρεθούν στον <citetitle>Οδηγό προσιτότητας επιφάνειας εργασίας MATE</citetitle> κάτω από την κεφαλίδα <ulink type=\"help\" url=\"help:mate-access-guide?dtconfig-14\"><citetitle>Ενεργοποίηση πληκτρολογίου για την προσομοίωση ποντικιού</citetitle></ulink>."
 
 #: C/goscustdesk.xml:2022(guilabel)
 #: C/goscustdesk.xml:2228(guilabel)
@@ -11374,8 +11374,8 @@ msgid "Multimedia Systems Selector"
 msgstr "Επιλογέας Συστημάτων Πολυμέσων"
 
 #: C/goscustdesk.xml:2834(para)
-msgid "See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer Properties Manual</ulink>."
-msgstr "Δείτε το <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">Εγχειρίδιο ιδιοτήτων GStreamer</ulink>."
+msgid "See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer Properties Manual</ulink>."
+msgstr "Δείτε το <ulink type=\"help\" url=\"help:gstreamer-properties\">Εγχειρίδιο ιδιοτήτων GStreamer</ulink>."
 
 #: C/goscustdesk.xml:2838(title)
 msgid "Sessions Preferences"
@@ -12334,8 +12334,8 @@ msgid "MATE Documentation Project"
 msgstr "Έργο Τεκμηρίωσης MATE"
 
 #: C/user-guide.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "Δίνεται άδεια για αντιγραφή, διανομή και/ή τροποποίηση του εγγράφου υπό τους όρους της Ελεύθερης Άδειας Τεκμηρίωσης GNU (GFDL), Έκδοση 1.1 ή μεταγενέστερη εκδιδόμενη από το Ίδρυμα Ελεύθερου Λογισμικού χωρίς Σταθερά Εδάφια, χωρίς Εξώφυλλα Κειμένου, και χωρίς Οπισθόφυλλα Κειμένου. Μπορείτε να βρείτε ένα αντίγραφο της GFDL σε αυτόν τον <ulink type=\"help\" url=\"ghelp:fdl\">σύνδεσμο</ulink> ή στο αρχείο COPYING-DOCS που διανεμήθηκε με αυτόν τον οδηγό."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Δίνεται άδεια για αντιγραφή, διανομή και/ή τροποποίηση του εγγράφου υπό τους όρους της Ελεύθερης Άδειας Τεκμηρίωσης GNU (GFDL), Έκδοση 1.1 ή μεταγενέστερη εκδιδόμενη από το Ίδρυμα Ελεύθερου Λογισμικού χωρίς Σταθερά Εδάφια, χωρίς Εξώφυλλα Κειμένου, και χωρίς Οπισθόφυλλα Κειμένου. Μπορείτε να βρείτε ένα αντίγραφο της GFDL σε αυτόν τον <ulink type=\"help\" url=\"help:fdl\">σύνδεσμο</ulink> ή στο αρχείο COPYING-DOCS που διανεμήθηκε με αυτόν τον οδηγό."
 
 #: C/user-guide.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."
@@ -12642,11 +12642,11 @@ msgstr ""
 #~ msgstr "Λήψη στιγμιότυπου του παραθύρου στο οποίο υποδείχνει το ποντίκι."
 
 #~ msgid ""
-#~ "For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-"
+#~ "For more on this, see the <ulink type=\"help\" url=\"help:workspace-"
 #~ "switcher\">Workspace Switcher Applet Manual</ulink>."
 #~ msgstr ""
 #~ "Για περισσότερα σχετικά με αυτό, δείτε το <ulink type=\"help\" url="
-#~ "\"ghelp:workspace-switcher\">Εγχειρίδιο μικροεφαρμογής εναλλαγής χώρων "
+#~ "\"help:workspace-switcher\">Εγχειρίδιο μικροεφαρμογής εναλλαγής χώρων "
 #~ "εργασίας</ulink>."
 
 #~ msgid ""
diff --git a/user-guide/es/es.po b/user-guide/es/es.po
index 4ffae82..fb793fb 100644
--- a/user-guide/es/es.po
+++ b/user-guide/es/es.po
@@ -1802,8 +1802,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> o <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> o <option>mate-help:</option>"
 
 #: C/gostools.xml:948(para)
 msgid ""
@@ -1815,8 +1815,8 @@ msgstr ""
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:953(para)
 msgid ""
@@ -1828,8 +1828,8 @@ msgstr ""
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:961(option)
 msgid "man:"
@@ -1961,15 +1961,15 @@ msgstr ""
 #: C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/>El <application>Visor de ayuda Yelp</application> se basa en "
-"las <ulink url=\"ghelp:mate-doc-xslt\">hojas de estilo MATE XSLT </ulink> "
-"para realizar la conversión de DocBook a HTML. Las <ulink url=\"ghelp:mate-"
+"las <ulink url=\"help:mate-doc-xslt\">hojas de estilo MATE XSLT </ulink> "
+"para realizar la conversión de DocBook a HTML. Las <ulink url=\"help:mate-"
 "doc-make\">Utilidades de Construcción de Documentación de MATE</ulink> se "
 "basan en que por cada aplicación los autores instalan y registran "
 "documentación dentro del sistema de ayuda."
@@ -2214,13 +2214,13 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "Cuando entre en una sesión en un idioma diferente, puede cambiar el idioma "
 "para la interfaz de teclado pero no se cambia la distribución de teclado. "
 "Para elegir una distribución de teclado, use la miniaplicación <ulink type="
-"\"help\" url=\"ghelp:gswitchit\"><application>Indicador de teclado</"
+"\"help\" url=\"help:gswitchit\"><application>Indicador de teclado</"
 "application></ulink>."
 
 #: C/gosstartsession.xml:126(para)
@@ -2903,13 +2903,13 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "El <application>Reloj</application> muestra la hora actual. Pulse en la hora "
 "para abrir un pequeño calendario. También puede ver un mapa del mundo "
 "pulsando la etiqueta de expansión <guilabel>Ubicaciones</guilabel>. Para "
 "obtener más información acerca de esto consulte el <ulink type=\"help\" url="
-"\"ghelp:clock\">Manual de la miniaplicación del Reloj</ulink>."
+"\"help:clock\">Manual de la miniaplicación del Reloj</ulink>."
 
 #: C/gospanel.xml:70(term)
 msgid "<application>Volume Control</application> applet"
@@ -2919,11 +2919,11 @@ msgstr "Miniaplicación <application>Control del volumen</application>"
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "El <application>Control de volumen</application> le permite controlar el "
 "volumen de los altavoces de su sistema. Para obtener más información acerca "
-"de esto consulte el <ulink type=\"help\" url=\"ghelp:mate-volume-control"
+"de esto consulte el <ulink type=\"help\" url=\"help:mate-volume-control"
 "\">Manual del Control del volumen</ulink>."
 
 #: C/gospanel.xml:75(term)
@@ -4721,11 +4721,11 @@ msgstr ""
 #: C/gospanel.xml:1229(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "Para más información acerca de la <application>Herramienta de búsqueda</"
-"application>, vea el <ulink type=\"help\" url=\"ghelp:mate-search-tool"
+"application>, vea el <ulink type=\"help\" url=\"help:mate-search-tool"
 "\">Manual de la herramienta de búsqueda</ulink>."
 
 #: C/gospanel.xml:1233(title)
@@ -6540,50 +6540,50 @@ msgstr "Las aplicaciones que son parte de MATE incluyen las siguientes:"
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"El <ulink type=\"help\" url=\"ghelp:pluma\"><application>Editor de texto "
+"El <ulink type=\"help\" url=\"help:pluma\"><application>Editor de texto "
 "Pluma</application></ulink> puede leer, crear o modificar cualquier clase de "
 "texto simple sin ningún formato."
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"El <ulink type=\"help\" url=\"ghelp:mate-dictionary"
+"El <ulink type=\"help\" url=\"help:mate-dictionary"
 "\"><application>Diccionario</application></ulink> le permite buscar "
 "definiciones de una palabra."
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"El <ulink type=\"help\" url=\"ghelp:eom\"><application>Visor de imágenes</"
+"El <ulink type=\"help\" url=\"help:eom\"><application>Visor de imágenes</"
 "application></ulink> puede mostrar archivos de imágenes simples, así como "
 "grandes colecciones de imágenes."
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"La <ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculadora</"
+"La <ulink type=\"help\" url=\"help:gcalctool\"><application>Calculadora</"
 "application></ulink> realiza cálculos básicos, financieros y científicos."
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
 "characters you need will be on your keyboard."
 msgstr ""
-"El <ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Mapa de "
+"El <ulink type=\"help\" url=\"help:gucharmap\"><application>Mapa de "
 "caracteres</application></ulink> le permite elegir letras y símbolos desde "
 "el conjunto de caracteres <firstterm>Unicode</firstterm> y pegarlos en "
 "cualquier aplicación. Si está escribiendo en varios idiomas, no todos los "
@@ -6608,10 +6608,10 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"El <ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"El <ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> le da acceso a la línea de comandos del sistema."
 
 #: C/gosoverview.xml:428(para)
@@ -6930,7 +6930,7 @@ msgstr "Elegir una carpeta"
 #: C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -6938,7 +6938,7 @@ msgid ""
 "folder."
 msgstr ""
 "Quizá necesite algunas veces elegir una carpeta para trabajar en vez de "
-"abrir un archivo. Por ejemplo, si usa el <ulink type=\"help\" url=\"ghelp:"
+"abrir un archivo. Por ejemplo, si usa el <ulink type=\"help\" url=\"help:"
 "file-roller\"><application>Gestor de archivadores</application></ulink> para "
 "extraer archivos de un archivador, necesita elegir una carpeta donde colocar "
 "los archivos. En este caso, los archivos en el lugar actual se ponen en "
@@ -14169,11 +14169,11 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>Buscar archivos</guimenuitem> le permite buscar archivos en su "
-"equipo. Para más acerca de'ésto, vea el <ulink type=\"help\" url=\"ghelp:"
+"equipo. Para más acerca de'ésto, vea el <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Manual de búsqueda de archivos</ulink>."
 
 #: C/goseditmainmenu.xml:71(para)
@@ -14315,11 +14315,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"La <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"La <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">Guía de administración del sistema</ulink> tiene más información acerca "
 "de cómo MATE implementa los menús y cómo los administradores pueden "
 "personalizarlos."
@@ -14831,13 +14831,13 @@ msgstr "Ejecutar al inicio (sólo para accesibilidad)"
 #: C/goscustdesk.xml:274(para)
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
 "Seleccione esta opción para ejecutar el comando tan pronto como inicie su "
 "sesión. Para obtener más información acerca de la accesibilidad consulte la "
-"<ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>Guía "
+"<ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>Guía "
 "de Accesibilidad del Escritorio MATE</citetitle></ulink>."
 
 #: C/goscustdesk.xml:286(title)
@@ -17019,12 +17019,12 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
 "Para cambiar entre distribuciones de teclas, use la miniaplicación del panel "
-"<ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Indicador de "
+"<ulink type=\"help\" url=\"help:gswitchit\"><application>Indicador de "
 "teclado</application></ulink>."
 
 #: C/goscustdesk.xml:1625(para)
@@ -17245,11 +17245,11 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 "Los caracteres de tercer y cuarto nivel para su distribución de teclado se "
-"muestran en el <ulink type=\"help\" url=\"ghelp:gswitchit"
+"muestran en el <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>Indicador de teclado</application></ulink> de la ventana de "
 "la vista de distribución."
 
@@ -17316,12 +17316,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Esta sección describe cada una de las preferencias que puede establecer. "
 "Para una descripción más orientada a las tareas de l accesibilidad del "
-"teclado, vea la <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"teclado, vea la <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>Guía de accesibilidad del escritorio MATE </citetitle></"
 "ulink>."
 
@@ -17578,13 +17578,13 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "Seleccione esta opción para hacer que el teclado numérico emule las acciones "
 "del ratón. La lista de teclas y sus equivalencias está en la <citetitle>Guía "
 "de accesibilidad del Escritorio MATE</citetitle> bajo la cabecera <ulink "
-"type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>Para "
+"type=\"help\" url=\"help:mate-access-guide?dtconfig-14\"><citetitle>Para "
 "activar el teclado para que emule el ratón</citetitle></ulink>."
 
 #: C/goscustdesk.xml:2022(guilabel) C/goscustdesk.xml:2228(guilabel)
@@ -18565,10 +18565,10 @@ msgstr "Selector de sistemas multimedia"
 
 #: C/goscustdesk.xml:2834(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"Vea el <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">Manual de "
+"Vea el <ulink type=\"help\" url=\"help:gstreamer-properties\">Manual de "
 "propiedades de GStreamer</ulink>."
 
 #: C/goscustdesk.xml:2838(title)
@@ -20006,14 +20006,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 ""
 "Se concede permiso para copiar, distribuir o modificar este documento según "
 "las condiciones de la GNU Free Documentation License (GFDL), Versión 1.1 o "
 "cualquier versión posterior publicada por la Free Software Foundation sin "
 "Secciones invariantes, Textos de portada y Textos de contraportada. "
-"Encontrará una copia de la GFDL en este <ulink type=\"help\" url=\"ghelp:fdl"
+"Encontrará una copia de la GFDL en este <ulink type=\"help\" url=\"help:fdl"
 "\">enlace</ulink> o en el archivo COPYING-DOCS distribuido con este manual."
 
 #: C/user-guide.xml:12(para)
diff --git a/user-guide/eu/eu.po b/user-guide/eu/eu.po
index 781ffa8..0729fdf 100644
--- a/user-guide/eu/eu.po
+++ b/user-guide/eu/eu.po
@@ -1723,8 +1723,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:904(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> edo <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> edo <option>mate-help:</option>"
 
 #: C/gostools.xml:908(para)
 msgid ""
@@ -1736,8 +1736,8 @@ msgstr ""
 
 #: C/gostools.xml:911(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:913(para)
 msgid ""
@@ -1749,8 +1749,8 @@ msgstr ""
 
 #: C/gostools.xml:916(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:921(option)
 msgid "man:"
@@ -1879,15 +1879,15 @@ msgstr "DocBook formatua bistaratzeko egokia den formatu batera bihurtzen du."
 #: C/gostools.xml:986(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/><application>Yelp laguntza-arakatzailea</application> <ulink "
-"url=\"ghelp:mate-doc-xslt\">MATE XSLT estilo-orrietan</ulink> oinarritzen "
-"da DocBook formatutik HTML formatura bihurtzeko. <ulink url=\"ghelp:mate-"
+"url=\"help:mate-doc-xslt\">MATE XSLT estilo-orrietan</ulink> oinarritzen "
+"da DocBook formatutik HTML formatura bihurtzeko. <ulink url=\"help:mate-"
 "doc-make\">MATE Dokumentazioa prestatzeko utilitateak</ulink> aplikazio-"
 "egileen araberakoak dira, laguntza-sistemako dokumentazioa instalatzeko eta "
 "erregistratzeko."
@@ -2118,12 +2118,12 @@ msgid ""
 "When you log in to a session in a different language, you choose the "
 "language for the user interface. You do not specify a keyboard layout for "
 "the session. To choose a keyboard layout, use the <ulink type=\"help\" url="
-"\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> "
+"\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> "
 "applet."
 msgstr ""
 "Saioa beste hizkuntza batean hasten duzunean, erabiltzaile-interfazearen "
 "hizkuntza aukeratzen duzu. Ez duzu zehazten saioaren teklatu-diseinua. "
-"Teklatu-diseinu bat aukeratzeko, erabili <ulink type=\"help\" url=\"ghelp:"
+"Teklatu-diseinu bat aukeratzeko, erabili <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Teklatu-adierazlea</application></ulink> "
 "miniaplikazioa."
 
@@ -2752,11 +2752,11 @@ msgstr "<application>Erlojua</application> miniaplikazioa"
 msgid ""
 "<application>Clock</application> shows the current time. Click on the time "
 "to open a small calendar. For more on this, see the <ulink type=\"help\" url="
-"\"ghelp:clock\">Clock Applet Manual</ulink>."
+"\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "<application>Erlojuak</application> uneko ordua erakusten du. Egin klik "
 "orduan egutegi txiki bat irekitzeko. Honi buruz gehiago jakiteko, ikusi "
-"<ulink type=\"help\" url=\"ghelp:clock\">Erlojuaren miniaplikazioaren "
+"<ulink type=\"help\" url=\"help:clock\">Erlojuaren miniaplikazioaren "
 "eskuliburua</ulink>."
 
 #: C/gospanel.xml:99(term)
@@ -2767,11 +2767,11 @@ msgstr "<application>Bolumen-kontrola</application> miniaplikazioa"
 msgid ""
 "<application>Volume Control</application> enables you to control the volume "
 "of the speaker on your system. For more on this, see the <ulink type=\"help"
-"\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "<application>Bolumen-kontrola</application>ren bidez sistemako "
 "bozgorailuaren bolumena kontrola dezakezu. Honi buruz gehiago jakiteko, "
-"ikusi <ulink type=\"help\" url=\"ghelp:mate-volume-control\">Bolumen-"
+"ikusi <ulink type=\"help\" url=\"help:mate-volume-control\">Bolumen-"
 "kontrolaren eskuliburua</ulink>."
 
 #: C/gospanel.xml:104(term)
@@ -4695,11 +4695,11 @@ msgstr ""
 #: C/gospanel.xml:1398(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "Informazio gehiago nahi izanez gero <application>Bilaketa-tresna</"
-"application>ri buruz, ikusi <ulink type=\"help\" url=\"ghelp:mate-search-"
+"application>ri buruz, ikusi <ulink type=\"help\" url=\"help:mate-search-"
 "tool\">Bilaketa-tresnaren eskuliburua</ulink>."
 
 #: C/gospanel.xml:1402(title)
@@ -6517,10 +6517,10 @@ msgstr ""
 
 #: C/gosoverview.xml:399(para)
 msgid ""
-"For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"For more on this, see the <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">Workspace Switcher Applet Manual</ulink>."
 msgstr ""
-"Honi buruz gehiago jakiteko, ikusi <ulink type=\"help\" url=\"ghelp:"
+"Honi buruz gehiago jakiteko, ikusi <ulink type=\"help\" url=\"help:"
 "workspace-switcher\">Laneko arearen aldatzailea miniapliazioaren "
 "eskuliburua</ulink>."
 
@@ -6561,50 +6561,50 @@ msgstr "MATEren aplikazioetan hauek aurkituko dituzu:"
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma testu-editorea</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma testu-editorea</"
 "application></ulink> formaturik gabeko testu soilak irakurtzeko, sortzeko "
 "edo aldatzeko erabil dezakezu."
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Hiztegia</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Hiztegia</"
 "application></ulink> hitzen definizioak bilatzeko erabil dezakezu."
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Irudi-ikustailea</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Irudi-ikustailea</"
 "application></ulink> banakako irudi-fitxategiak nahiz irudi-bilduma handiak "
 "ikusteko erabil dezakezu."
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Kalkulagailua</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Kalkulagailua</"
 "application></ulink> oinarrizko kalkuluak, finantzarioak nahiz zientifikoak "
 "egiteko erabil dezakezu."
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all the characters "
 "you need will be on your keyboard."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Karaktere-mapa</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Karaktere-mapa</"
 "application></ulink> <firstterm>Unicode</firstterm> karaktere-jokotik letrak "
 "eta ikurrak aukeratzeko eta edozein aplikaziotan itsasteko erabil dezakezu. "
 "Hainbat hizkuntzatan idazten ari bazara, ez dituzu karaktere guztiak edukiko "
@@ -6629,10 +6629,10 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminala</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminala</"
 "application></ulink> sistemaren komando-lerroan sartzeko erabil dezakezu."
 
 #: C/gosoverview.xml:428(para)
@@ -7007,7 +7007,7 @@ msgstr "Karpeta bat aukeratzea"
 #: C/gosoverview.xml:529(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -7015,7 +7015,7 @@ msgid ""
 "folder."
 msgstr ""
 "Batzuetan beharbada karpeta bat aukeratu nahiko duzu lanerako, fitxategi bat "
-"ireki beharrean. Adibidez, <ulink type=\"help\" url=\"ghelp:file-roller"
+"ireki beharrean. Adibidez, <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Artxibo-kudeatzailea</application></ulink> erabiltzen baduzu "
 "fitxategiak erauzteko artxibo batetik, karpeta bat hautatu behar duzu "
 "fitxategiak bertan kokatzeko. Kasu horretan, uneko kokalekuko fitxategiak "
@@ -12272,14 +12272,14 @@ msgid ""
 "To format a floppy disk, right-click on the object that represents the "
 "floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-"type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+"type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 "documentation for more details."
 msgstr ""
 "Diskete bat formateatzeko, egin klik eskuineko botoiarekin mahaigainean "
 "disketea iruditzen duen objektuan, eta ondoren hautatu "
 "<guimenuitem>Formateatu</guimenuitem>. <guilabel>Diskete-formateatzailea</"
 "guilabel> izeneko elkarrizketa-koadro bat bistaratuko da. Informazio gehiago "
-"nahi izanez gero, ikusi <ulink type=\"help\" url=\"ghelp:gfloppy?usage"
+"nahi izanez gero, ikusi <ulink type=\"help\" url=\"help:gfloppy?usage"
 "\">Diskete-formateatzailea</ulink>ren dokumentazioa."
 
 #: C/goscaja.xml:3006(title)
@@ -14080,12 +14080,12 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>Bilatu fitxategiak</guimenuitem> aukerak ordenagailuan "
 "fitxategiak bilatzeko aukera ematen dizu. Honi buruz gehiago jakiteko, ikusi "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Fitxategiak bilatzeko "
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Fitxategiak bilatzeko "
 "eskuliburua</ulink>."
 
 #: C/goseditmainmenu.xml:71(para)
@@ -14225,11 +14225,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"<ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">Sistema-administratzailearen gida</ulink>k informazio gehiago dauka "
 "MATEn menuak inplementatzeari buruz, eta administratzaileek nola "
 "pertsonaliza ditzaketen ere azaltzen du."
@@ -14489,12 +14489,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Ezar dezakezun hobespen bakoitza azaltzen da atal honetan. Atazei "
 "zuzendutako azalpenak ikusteko teklatuaren erabilerraztasunari buruz, ikusi "
-"<ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>MATE "
+"<ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>MATE "
 "mahaigaineko erabilerraztasunaren gida</citetitle></ulink>."
 
 #: C/goscustdesk.xml:162(para)
@@ -14731,11 +14731,11 @@ msgstr ""
 #: C/goscustdesk.xml:563(para)
 msgid ""
 "For more information on configuring keyboard accessibility preferences, see "
-"the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"the <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Teklatuaren erabilerraztasun-hobespenak konfiguratzeari buruz informazio "
-"gehiago lortzeko, ikusi <ulink type=\"help\" url=\"ghelp:mate-access-guide?"
+"gehiago lortzeko, ikusi <ulink type=\"help\" url=\"help:mate-access-guide?"
 "index\"><citetitle>MATE 2.2ren mahaigaineko erabilerraztasunaren gida</"
 "citetitle></ulink>."
 
@@ -14874,13 +14874,13 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "Hautatu aukera hori zenbakizko teklatuak saguaren ekintzak emulatzeko. "
 "Teklen zerrenda eta tekla horien baliokideak <citetitle>MATE mahaigaineko "
 "erabilerraztasunaren gidan</citetitle> aurkituko dituzu, <ulink type=\"help"
-"\" url=\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>Teklatua "
+"\" url=\"help:mate-access-guide?dtconfig-14\"><citetitle>Teklatua "
 "gaitzeko, sagua emulatzeko</citetitle></ulink> izenburupean."
 
 #: C/goscustdesk.xml:529(para)
@@ -17429,11 +17429,11 @@ msgstr ""
 
 #: C/goscustdesk.xml:2165(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
-"Teklatu-diseinuen artean aldatzeko, erabili <ulink type=\"help\" url=\"ghelp:"
+"Teklatu-diseinuen artean aldatzeko, erabili <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Teklatu-adierazlea</application> paneleko "
 "miniaplikazioa</ulink>."
 
@@ -17651,11 +17651,11 @@ msgstr ""
 #: C/goscustdesk.xml:2252(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 "Teklatu-diseinurako hirugarren eta laugarren mailako karaktereak <ulink type="
-"\"help\" url=\"ghelp:gswitchit\"><application>Teklatu-adierazlea</"
+"\"help\" url=\"help:gswitchit\"><application>Teklatu-adierazlea</"
 "application></ulink>ren Diseinu ikuspegiaren leihoan ikus daitezke."
 
 #: C/goscustdesk.xml:2257(guilabel)
@@ -18320,10 +18320,10 @@ msgstr "Multimedia-sistemaren hautatzailea"
 
 #: C/goscustdesk.xml:2890(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"Ikusi <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">Gstreamer-en "
+"Ikusi <ulink type=\"help\" url=\"help:gstreamer-properties\">Gstreamer-en "
 "hobespenen eskuliburua</ulink>."
 
 #: C/goscustdesk.xml:2894(title)
@@ -19926,7 +19926,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 ""
 "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko Free "
@@ -19934,7 +19934,7 @@ msgstr ""
 "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 "
+"\"help:fdl\">esteka</ulink> honetan edo eskuliburu honekin batera ematen "
 "den COPYING-DOCS fitxategian aurkituko duzu."
 
 #: C/user-guide.xml:12(para)
@@ -20254,7 +20254,7 @@ msgid ""
 "Feedback Page</link>."
 msgstr ""
 "MATE mahaigainari edo eskuliburu honi buruzko akatsen berri emateko edo "
-"oharrak bidaltzeko, <ulink url=\"ghelp:mate-feedback\" type=\"help"
+"oharrak bidaltzeko, <ulink url=\"help:mate-feedback\" type=\"help"
 "\">MATEra oharrak bidaltzeko orria</ulink>n aurkituko dituzu argibideak."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
diff --git a/user-guide/fi/fi.po b/user-guide/fi/fi.po
index 2df9ab8..dab490b 100644
--- a/user-guide/fi/fi.po
+++ b/user-guide/fi/fi.po
@@ -1740,7 +1740,7 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr ""
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
 msgstr ""
 
 #: C/gostools.xml:948(para)
@@ -1751,7 +1751,7 @@ msgstr ""
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
 msgstr ""
 
 #: C/gostools.xml:953(para)
@@ -1762,7 +1762,7 @@ msgstr ""
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
 msgstr ""
 
 #: C/gostools.xml:961(option)
@@ -1872,8 +1872,8 @@ msgstr ""
 #: C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
@@ -2124,7 +2124,7 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 
@@ -2714,7 +2714,7 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 
 #: C/gospanel.xml:70(term)
@@ -2728,11 +2728,11 @@ msgstr "<application>Äänenvoimakkuuden säädin</application> -sovelma"
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "<application>Äänenvoimakkuuden säädin</application> mahdollistaa "
 "järjestelmän kaiuttimien äänenvoimakkuuden säätämisen. Lisätietoja "
-"aiheesta <ulink type=\"help\" url=\"ghelp:mate-volume-control\">"
+"aiheesta <ulink type=\"help\" url=\"help:mate-volume-control\">"
 "Äänenvoimakkuuden säätimen ohjekirjassa</ulink>."
 
 #: C/gospanel.xml:75(term)
@@ -4227,7 +4227,7 @@ msgstr ""
 #: C/gospanel.xml:1230(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 
@@ -5808,55 +5808,55 @@ msgstr "Mateen kuuluvia sovelluksia ovat muun muassa:"
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma-tekstieditori</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma-tekstieditori</"
 "application></ulink> yksinkertaisten, muotoilemattomien tekstien lukemiseen, "
 "luomiseen tai muokkaamiseen."
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Sanakirja</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Sanakirja</"
 "application></ulink> sanamääritelmien etsimiseen."
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Kuvakatselin</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Kuvakatselin</"
 "application></ulink> kuvien tai kuvakokoelmien katseluun."
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Laskin</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Laskin</"
 "application></ulink> yksinkertaisten, talousaiheisten tai tieteellisten "
 "laskujen suorittamiseen."
 
 #: C/gosoverview.xml:423(para)
 #| msgid ""
-#| "<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+#| "<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 #| "application></ulink> lets you choose letters and symbols from the "
 #| "<firstterm>Unicode</firstterm> character set and paste them into any "
 #| "application. If you are writing in several languages, not all the "
 #| "characters you need will be on your keyboard."
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
 "characters you need will be on your keyboard."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Merkkikartta</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Merkkikartta</"
 "application></ulink> kirjaimien ja symboleiden valitsemiseen "
 "<firstterm>Unicode</firstterm>-merkistöstä ja niiden liittämiseen mihin "
 "tahansa sovellukseen. Jos kirjoitetaan useilla eri kielillä, kaikki "
@@ -5888,7 +5888,7 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
 
@@ -6162,7 +6162,7 @@ msgstr ""
 #: C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -11896,7 +11896,7 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 
@@ -12003,7 +12003,7 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
@@ -12453,12 +12453,12 @@ msgstr "Suorita käynnistettäessä (vain esteettömyystoiminto)"
 #: C/goscustdesk.xml:274(para)
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
 "Valitse tämä suorittaaksesi komennon heti istunnon alkaessa. Lisää "
-"esteettömyysvalintoja ohjeessa <ulink type=\"help\" url=\"ghelp:mate-"
+"esteettömyysvalintoja ohjeessa <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>Mate-työpöydän esteettömyysohje</"
 "citetitle></ulink>."
 
@@ -14209,7 +14209,7 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
@@ -14383,7 +14383,7 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 
@@ -14440,12 +14440,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Tämä osio kuvaa jokaisen asetettavissa olevan asetuksen. Parempi kuvaus "
 "tiettyihin tehtäviin sopivista esteettömyystoimintojen käytöstä löytyy "
-"<ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>"
+"<ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>"
 "Mate-työpöydän esteettömyysohjeesta</citetitle></ulink>."
 
 #: C/goscustdesk.xml:1752(para)
@@ -14661,7 +14661,7 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 
@@ -15462,10 +15462,10 @@ msgstr "Multimediajärjestelmien valitsin"
 
 #: C/goscustdesk.xml:2876(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"Katso <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer-"
+"Katso <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer-"
 "asetusten ohjekirja</ulink>."
 
 #: C/goscustdesk.xml:2880(title)
@@ -16848,7 +16848,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 ""
 
@@ -17128,7 +17128,7 @@ msgstr "Tämä ohjekirja kertoo Mate-työpöydän versiosta 2.14."
 #: C/user-guide.xml:228(para)
 #| msgid ""
 #| "To report a bug or make a suggestion regarding the MATE desktop or this "
-#| "manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" "
+#| "manual, follow the directions in the <ulink url=\"help:mate-feedback\" "
 #| "type=\"help\">MATE Feedback Page</ulink>."
 msgid ""
 "To report a bug or make a suggestion regarding the MATE desktop or this "
@@ -17203,10 +17203,10 @@ msgstr "Timo Jyrinki <[email protected]>, 2007-2009."
 #~ "määrä <application>Valikkopalkki</application>-kohteita."
 
 #~ msgid ""
-#~ "For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-"
+#~ "For more on this, see the <ulink type=\"help\" url=\"help:workspace-"
 #~ "switcher\">Workspace Switcher Applet Manual</ulink>."
 #~ msgstr ""
-#~ "Lisätietoja aiheesta <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+#~ "Lisätietoja aiheesta <ulink type=\"help\" url=\"help:workspace-switcher"
 #~ "\">Työtilanvaihdin-sovelman ohjekirjassa</ulink>."
 
 #~ msgid "<placeholder-1/> preference tool"
diff --git a/user-guide/fr/fr.po b/user-guide/fr/fr.po
index 49223a7..dec97c3 100644
--- a/user-guide/fr/fr.po
+++ b/user-guide/fr/fr.po
@@ -1813,8 +1813,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/fr/gcalctool.xml"
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> ou <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> ou <option>mate-help:</option>"
 
 #: C/gostools.xml:948(para)
 msgid ""
@@ -1826,8 +1826,8 @@ msgstr ""
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:953(para)
 msgid ""
@@ -1840,8 +1840,8 @@ msgstr ""
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:961(option)
 msgid "man:"
@@ -1974,16 +1974,16 @@ msgstr ""
 #: C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/>Le <application>navigateur d'aide Yelp</application> "
-"s'appuie sur les <ulink url=\"ghelp:mate-doc-xslt\">feuilles de style XSLT "
+"s'appuie sur les <ulink url=\"help:mate-doc-xslt\">feuilles de style XSLT "
 "MATE</ulink> pour effectuer la conversion de DocBook vers le HTML. Les "
-"<ulink url=\"ghelp:mate-doc-make\">utilitaires pour la construction de la "
+"<ulink url=\"help:mate-doc-make\">utilitaires pour la construction de la "
 "documentation MATE</ulink> sont indispensables aux auteurs d'applications "
 "pour installer et enregistrer la documentation dans le système d'aide."
 
@@ -2231,13 +2231,13 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "En vous connectant dans une session avec une autre langue, vous choisissez "
 "la langue de l'interface utilisateur mais vous ne modifiez pas l'agencement "
 "du clavier. Pour choisir un agencement de clavier différent, utilisez "
-"l'applet <ulink type=\"help\" url=\"ghelp:gswitchit"
+"l'applet <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>Indicateur de claviers</application></ulink>."
 
 #: C/gosstartsession.xml:126(para)
@@ -2932,13 +2932,13 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "L'<application>Horloge</application> affiche l'heure actuelle. Cliquez sur "
 "l'heure pour ouvrir un petit calendrier. Vous pouvez également afficher une "
 "carte du monde en cliquant sur le texte expansif <guilabel>Emplacements</"
 "guilabel>. Pour en savoir plus, consultez le <ulink type=\"help\" url="
-"\"ghelp:clock\">manuel de l'applet Horloge</ulink>."
+"\"help:clock\">manuel de l'applet Horloge</ulink>."
 
 #: C/gospanel.xml:70(term)
 msgid "<application>Volume Control</application> applet"
@@ -2948,11 +2948,11 @@ msgstr "Applet <application>Contrôleur de volume</application>"
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "Le <application>Contrôleur de volume</application> permet de régler le "
 "volume des haut-parleurs du système. Pour en savoir plus, consultez le "
-"<ulink type=\"help\" url=\"ghelp:mate-volume-control\">manuel du Contrôleur "
+"<ulink type=\"help\" url=\"help:mate-volume-control\">manuel du Contrôleur "
 "de volume</ulink>."
 
 #: C/gospanel.xml:75(term)
@@ -4776,11 +4776,11 @@ msgstr ""
 #: C/gospanel.xml:1229(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "Pour plus d'informations sur l'<application>Outil de recherche</"
-"application>, consultez le <ulink type=\"help\" url=\"ghelp:mate-search-tool"
+"application>, consultez le <ulink type=\"help\" url=\"help:mate-search-tool"
 "\">manuel de la recherche de fichiers</ulink>."
 
 #: C/gospanel.xml:1233(title)
@@ -6617,51 +6617,51 @@ msgstr "Les applications faisant partie de MATE comprennent notamment :"
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"L'<ulink type=\"help\" url=\"ghelp:pluma\"><application>Éditeur de texte "
+"L'<ulink type=\"help\" url=\"help:pluma\"><application>Éditeur de texte "
 "Pluma</application></ulink> permet de lire, de créer ou de modifier du texte "
 "simple sans mise en forme."
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"Le <ulink type=\"help\" url=\"ghelp:mate-dictionary"
+"Le <ulink type=\"help\" url=\"help:mate-dictionary"
 "\"><application>Dictionnaire</application></ulink> permet de consulter les "
 "définitions d'un mot."
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"Le <ulink type=\"help\" url=\"ghelp:eom\"><application>Visionneur d'images</"
+"Le <ulink type=\"help\" url=\"help:eom\"><application>Visionneur d'images</"
 "application></ulink> permet d'afficher de simples fichiers image ou "
 "d'importantes collections d'images."
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"La <ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculatrice</"
+"La <ulink type=\"help\" url=\"help:gcalctool\"><application>Calculatrice</"
 "application></ulink> effectue des calculs basiques, financiers et "
 "scientifiques."
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
 "characters you need will be on your keyboard."
 msgstr ""
-"La <ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Table de "
+"La <ulink type=\"help\" url=\"help:gucharmap\"><application>Table de "
 "caractères</application></ulink> permet de choisir des lettres et des "
 "symboles à partir d'un jeu de caractères <firstterm>Unicode</firstterm> et "
 "de les coller dans n'importe quelle application. Si vous écrivez dans "
@@ -6687,10 +6687,10 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"Le <ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"Le <ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> permet d'accéder au système par une ligne de commande."
 
 #: C/gosoverview.xml:428(para)
@@ -7013,7 +7013,7 @@ msgstr "Choix d'un dossier"
 #: C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -7022,7 +7022,7 @@ msgid ""
 msgstr ""
 "Il est parfois nécessaire de choisir un dossier à ouvrir plutôt qu'un "
 "fichier. Par exemple, pour extraire des fichiers d'archives à l'aide du "
-"<ulink type=\"help\" url=\"ghelp:file-roller\"><application>Gestionnaire "
+"<ulink type=\"help\" url=\"help:file-roller\"><application>Gestionnaire "
 "d'archives</application></ulink>, il s'agit de choisir un dossier où placer "
 "les fichiers. Dans ce cas, les fichiers de l'emplacement actuel sont grisés, "
 "et le dossier sélectionné est choisi quand on clique sur <guibutton>Ouvrir</"
@@ -14343,12 +14343,12 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>Rechercher des fichiers</guimenuitem> permet de chercher des "
 "fichiers dans l'ordinateur. Pour en savoir plus, consultez le <ulink type="
-"\"help\" url=\"ghelp:mate-search-tool\">manuel de la recherche de fichiers</"
+"\"help\" url=\"help:mate-search-tool\">manuel de la recherche de fichiers</"
 "ulink>."
 
 #: C/goseditmainmenu.xml:71(para)
@@ -14489,11 +14489,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"Le <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"Le <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">Guide d'administration système</ulink> dispose d'informations "
 "supplémentaires sur la manière dont MATE conçoit les menus et comment les "
 "administrateurs peuvent les personnaliser."
@@ -15001,13 +15001,13 @@ msgstr "Exécuter à l'ouverture de session (Accessibilité seulement)"
 #: C/goscustdesk.xml:274(para)
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
 "Sélectionnez cette option pour que la commande soit lancée dès le démarrage "
 "de la session. Pour plus d'informations sur les options d'accessibilité, "
-"consultez le <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"consultez le <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>Guide d'accessibilité du bureau MATE</citetitle></ulink>."
 
 #: C/goscustdesk.xml:286(title)
@@ -17197,12 +17197,12 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
 "Pour passer d'un agencement à un autre, utilisez l'<ulink type=\"help\" url="
-"\"ghelp:gswitchit\">applet de tableau de bord <application>Indicateur de "
+"\"help:gswitchit\">applet de tableau de bord <application>Indicateur de "
 "claviers</application></ulink>."
 
 #: C/goscustdesk.xml:1625(para)
@@ -17428,12 +17428,12 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 "Les caractères de troisième et de quatrième niveau de votre clavier peuvent "
 "être affichés par la fenêtre Vue de l'agencement de l'<ulink type=\"help\" "
-"url=\"ghelp:gswitchit\"><application>Indicateur de claviers</application></"
+"url=\"help:gswitchit\"><application>Indicateur de claviers</application></"
 "ulink>."
 
 #: C/goscustdesk.xml:1712(guilabel)
@@ -17500,12 +17500,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Cette section décrit chaque préférence configurable. Pour une description "
 "plus orientée procédure de l'accessibilité du clavier, consultez le <ulink "
-"type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>Guide "
+"type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>Guide "
 "d'accessibilité du bureau MATE</citetitle></ulink>."
 
 #: C/goscustdesk.xml:1752(para)
@@ -17763,13 +17763,13 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "Cochez cette option pour que le pavé numérique simule les actions de la "
 "souris. La liste des touches et de leur signification se trouve dans le "
 "<citetitle>Guide d'accessibilité du bureau MATE</citetitle>, dans la "
-"section <ulink type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-14"
+"section <ulink type=\"help\" url=\"help:mate-access-guide?dtconfig-14"
 "\"><citetitle>Activation de l'émulation de la souris avec le clavier</"
 "citetitle></ulink>."
 
@@ -18753,10 +18753,10 @@ msgstr "Sélecteur de systèmes multimédias"
 
 #: C/goscustdesk.xml:2834(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"Consultez le <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">manuel "
+"Consultez le <ulink type=\"help\" url=\"help:gstreamer-properties\">manuel "
 "des propriétés de GStreamer</ulink>."
 
 #: C/goscustdesk.xml:2838(title)
@@ -20202,7 +20202,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 "
@@ -20210,7 +20210,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/user-guide.xml:12(para)
diff --git a/user-guide/gl/gl.po b/user-guide/gl/gl.po
index 7a6963e..36170e5 100644
--- a/user-guide/gl/gl.po
+++ b/user-guide/gl/gl.po
@@ -1460,7 +1460,7 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr ""
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
 msgstr ""
 
 #: C/gostools.xml:948(para)
@@ -1471,7 +1471,7 @@ msgstr ""
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
 msgstr ""
 
 #: C/gostools.xml:953(para)
@@ -1482,7 +1482,7 @@ msgstr ""
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
 msgstr ""
 
 #: C/gostools.xml:961(option)
@@ -1594,8 +1594,8 @@ msgstr ""
 #: C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
@@ -1793,7 +1793,7 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 
@@ -2326,7 +2326,7 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 
 #: C/gospanel.xml:70(term)
@@ -2337,7 +2337,7 @@ msgstr ""
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 
 #: C/gospanel.xml:75(term)
@@ -4836,7 +4836,7 @@ msgstr ""
 #: C/gospanel.xml:1229(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 
@@ -6207,33 +6207,33 @@ msgstr ""
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
@@ -6252,7 +6252,7 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
 
@@ -6485,7 +6485,7 @@ msgstr ""
 #: C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -13054,7 +13054,7 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 
@@ -13162,7 +13162,7 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
@@ -13640,7 +13640,7 @@ msgstr ""
 #: C/goscustdesk.xml:274(para)
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
@@ -16093,7 +16093,7 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
@@ -16262,7 +16262,7 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 
@@ -16319,7 +16319,7 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 
@@ -16532,7 +16532,7 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 
@@ -17339,7 +17339,7 @@ msgstr "Selector de sistemas multimedia"
 
 #: C/goscustdesk.xml:2834(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
 
@@ -18633,7 +18633,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 ""
 
diff --git a/user-guide/hu/hu.po b/user-guide/hu/hu.po
index a2a7056..8f23262 100644
--- a/user-guide/hu/hu.po
+++ b/user-guide/hu/hu.po
@@ -1710,8 +1710,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:904(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> vagy <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> vagy <option>mate-help:</option>"
 
 #: C/gostools.xml:908(para)
 msgid ""
@@ -1723,8 +1723,8 @@ msgstr ""
 
 #: C/gostools.xml:911(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:913(para)
 msgid ""
@@ -1736,8 +1736,8 @@ msgstr ""
 
 #: C/gostools.xml:916(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:921(option)
 msgid "man:"
@@ -1866,16 +1866,16 @@ msgstr "A DocBook formátum megjelenítésre alkalmassá alakítása."
 #: C/gostools.xml:986(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/>A <application>Yelp súgóböngésző</application> a <ulink url="
-"\"ghelp:mate-doc-xslt\">MATE XSLT stíluslapokra</ulink> támaszkodik, "
+"\"help:mate-doc-xslt\">MATE XSLT stíluslapokra</ulink> támaszkodik, "
 "melyek a DocBook dokumentumokat HTML formátumba alakítják. A <ulink url="
-"\"ghelp:mate-doc-make\">MATE dokumentációt összeállító segédprogramok</"
+"\"help:mate-doc-make\">MATE dokumentációt összeállító segédprogramok</"
 "ulink> pedig az alkalmazások íróit segítik a dokumentációk telepítésében és "
 "bejegyzésében a súgórendszerbe."
 
@@ -2104,12 +2104,12 @@ msgid ""
 "When you log in to a session in a different language, you choose the "
 "language for the user interface. You do not specify a keyboard layout for "
 "the session. To choose a keyboard layout, use the <ulink type=\"help\" url="
-"\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> "
+"\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> "
 "applet."
 msgstr ""
 "Amennyiben más nyelven jelentkezik be egy munkamenetbe, a felhasználói "
 "felület nyelvét változtatja meg, de a billentyűzetkiosztást nem. Ennek "
-"megváltoztatásához használja a <ulink type=\"help\" url=\"ghelp:gswitchit"
+"megváltoztatásához használja a <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>Billentyűzet jelző</application></ulink> kisalkalmazást."
 
 #: C/gosstartsession.xml:120(title)
@@ -2709,7 +2709,7 @@ msgstr "<application>Óra</application> kisalkalmazás"
 msgid ""
 "<application>Clock</application> shows the current time. Click on the time "
 "to open a small calendar. For more on this, see the <ulink type=\"help\" url="
-"\"ghelp:clock\">Clock Applet Manual</ulink>."
+"\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 
 #: C/gospanel.xml:99(term)
@@ -2720,7 +2720,7 @@ msgstr "<application>Hangerőszabályzó</application> kisalkalmazás"
 msgid ""
 "<application>Volume Control</application> enables you to control the volume "
 "of the speaker on your system. For more on this, see the <ulink type=\"help"
-"\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 
 #: C/gospanel.xml:104(term)
@@ -4323,7 +4323,7 @@ msgstr ""
 #: C/gospanel.xml:1350(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 
@@ -5858,7 +5858,7 @@ msgstr ""
 
 #: C/gosoverview.xml:399(para)
 msgid ""
-"For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"For more on this, see the <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">Workspace Switcher Applet Manual</ulink>."
 msgstr ""
 
@@ -5889,33 +5889,33 @@ msgstr ""
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all the characters "
@@ -5934,7 +5934,7 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
 
@@ -6223,7 +6223,7 @@ msgstr ""
 #: C/gosoverview.xml:529(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -10642,7 +10642,7 @@ msgid ""
 "To format a floppy disk, right-click on the object that represents the "
 "floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-"type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+"type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 "documentation for more details."
 msgstr ""
 
@@ -12179,12 +12179,12 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "A <guimenuitem>Fájlok keresése...</guimenuitem> elem segítségével a "
 "számítógépen található fájlok között kereshet. További információkat a "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Keresési útmutatóban</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Keresési útmutatóban</"
 "ulink> talál."
 
 #: C/goseditmainmenu.xml:71(para)
@@ -12323,11 +12323,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"A <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"A <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">Rendszeradminisztrációs kézikönyv</ulink> további információkat tartalmaz "
 "a MATE menük megvalósításáról és arról, hogy a rendszergazdák hogyan "
 "szabhatják személyre azokat."
@@ -12590,12 +12590,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Ez a rész a különböző beállításokat írja le. A billentyűzet "
 "akadálymentesítésének sokkal feladatközpontúbb leírásához tekintse meg a "
-"<ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>MATE "
+"<ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>MATE "
 "asztali környezet akadálymentesítési kézikönyvet</citetitle></ulink>."
 
 #: C/goscustdesk.xml:162(para)
@@ -12835,11 +12835,11 @@ msgstr ""
 #: C/goscustdesk.xml:563(para)
 msgid ""
 "For more information on configuring keyboard accessibility preferences, see "
-"the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"the <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "A billentyűzet akadálymentesítési beállításaival kapcsolatos további "
-"információkért tekintse meg a <ulink type=\"help\" url=\"ghelp:mate-access-"
+"információkért tekintse meg a <ulink type=\"help\" url=\"help:mate-access-"
 "guide?index\"><citetitle>MATE asztali környezet akadálymentesítési "
 "kézikönyvét</citetitle></ulink>."
 
@@ -12980,13 +12980,13 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "Válassza ki ezt a beállítást az egér emulálásához a numerikus "
 "billentyűzettel. A billentyűk felsorolása, és az azzal egyenértékű funkciók "
 "megtekinthetők a <citetitle>MATE asztali környezet akadálymentesítési "
-"kézikönyvben</citetitle>, azon belül a <ulink type=\"help\" url=\"ghelp:"
+"kézikönyvben</citetitle>, azon belül a <ulink type=\"help\" url=\"help:"
 "mate-access-guide?dtconfig-14\"><citetitle>Az az egér emulálásának "
 "engedélyezése a billentyűzetnek</citetitle> alfejezetben."
 
@@ -15293,7 +15293,7 @@ msgstr ""
 
 #: C/goscustdesk.xml:2165(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
@@ -15463,7 +15463,7 @@ msgstr ""
 #: C/goscustdesk.xml:2252(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 
@@ -16060,7 +16060,7 @@ msgstr ""
 
 #: C/goscustdesk.xml:2890(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
 
@@ -17507,14 +17507,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 ""
 "Jelen dokumentum szabadon másolható, terjeszthető és/vagy módosítható a GNU "
 "Free Documentation License (GFDL) 1.1-es verziója vagy a Free Software "
 "Foundation által kiadott ennél frissebb verziója alatt, a \"Nem "
 "változtatható szakaszok\", \"Címlapszövegek\" és a \"Hátlapszövegek\" "
-"kivételével. A GFDL leírása <ulink type=\"help\" url=\"ghelp:fdl\">ezen az "
+"kivételével. A GFDL leírása <ulink type=\"help\" url=\"help:fdl\">ezen az "
 "oldalon</ulink> érhető el, vagy a jelen dokumentációban található COPYING-"
 "DOCS fájlban."
 
@@ -17832,7 +17832,7 @@ msgid ""
 "Feedback Page</link>."
 msgstr ""
 "A MATE asztali környezettel vagy annak dokumentációjával kapcsolatos hibák "
-"bejelentéséhez és javaslatok tételéhez használja a <ulink url=\"ghelp:mate-"
+"bejelentéséhez és javaslatok tételéhez használja a <ulink url=\"help:mate-"
 "feedback\" type=\"help\">MATE visszajelzés</ulink> oldalt."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
diff --git a/user-guide/id/id.po b/user-guide/id/id.po
index 1a9cd9b..24ee9cb 100644
--- a/user-guide/id/id.po
+++ b/user-guide/id/id.po
@@ -1539,7 +1539,7 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr ""
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
 msgstr ""
 
 #: C/gostools.xml:948(para)
@@ -1550,7 +1550,7 @@ msgstr ""
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
 msgstr ""
 
 #: C/gostools.xml:953(para)
@@ -1561,7 +1561,7 @@ msgstr ""
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
 msgstr ""
 
 #: C/gostools.xml:961(option)
@@ -1672,8 +1672,8 @@ msgstr ""
 #: C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
@@ -1870,7 +1870,7 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 
@@ -2412,7 +2412,7 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 
 #: C/gospanel.xml:70(term)
@@ -2424,7 +2424,7 @@ msgstr " - Aplet Kendali Volume MATE"
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 
 #: C/gospanel.xml:75(term)
@@ -3933,7 +3933,7 @@ msgstr ""
 #: C/gospanel.xml:1229(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 
@@ -5321,33 +5321,33 @@ msgstr ""
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
@@ -5366,7 +5366,7 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
 
@@ -5609,7 +5609,7 @@ msgstr "Folder tidak dapat dibaca: %s"
 #: C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -11478,7 +11478,7 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 
@@ -11585,7 +11585,7 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
@@ -11987,7 +11987,7 @@ msgstr ""
 #: C/goscustdesk.xml:274(para)
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
@@ -13738,7 +13738,7 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
@@ -13906,7 +13906,7 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 
@@ -13965,7 +13965,7 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 
@@ -14197,7 +14197,7 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 
@@ -15004,7 +15004,7 @@ msgstr "Pemilih Sistem Multimedia"
 
 #: C/goscustdesk.xml:2834(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
 
@@ -16184,7 +16184,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 ""
 "Hak diberikan untuk menyalin, mendistribusikan, dan/atau mengubah dokumen "
@@ -16192,7 +16192,7 @@ msgstr ""
 "Dokumentasi Bebas GNU), Versi 1.1 atau sebarang versi setelahnya yang "
 "dipublikasikan oleh Free Software Foundation tanpa Invariant Section, tanpa "
 "Front-Cover Texts, dan tanpa Back-Cover Texts. Anda dapat menemukan salinan "
-"dari GFDL pada <ulink type=\"help\" url=\"ghelp:fdl\">taut</ulink> ini atau "
+"dari GFDL pada <ulink type=\"help\" url=\"help:fdl\">taut</ulink> ini atau "
 "di dalam berkas COPYING-DOCS yang didistribusikan bersama manual ini."
 
 #: C/user-guide.xml:12(para)
diff --git a/user-guide/it/it.po b/user-guide/it/it.po
index abeea89..391387e 100644
--- a/user-guide/it/it.po
+++ b/user-guide/it/it.po
@@ -1821,8 +1821,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/it/gcalctool.xml"
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> o <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> o <option>mate-help:</option>"
 
 #: C/gostools.xml:948(para)
 msgid ""
@@ -1834,8 +1834,8 @@ msgstr ""
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:953(para)
 msgid ""
@@ -1847,8 +1847,8 @@ msgstr ""
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:961(option)
 msgid "man:"
@@ -1982,16 +1982,16 @@ msgstr ""
 #: C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/><application>Yelp</application> si avvale dei fogli di stile "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT</ulink> per la conversione da "
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT</ulink> per la conversione da "
 "DocBook a HTML. Gli autori delle applicazioni fanno affidamento sulle <ulink "
-"url=\"ghelp:mate-doc-make\">MATE Documentation Build Utilities</ulink> per "
+"url=\"help:mate-doc-make\">MATE Documentation Build Utilities</ulink> per "
 "installare e registrare la documentazione all'interno del sistema di aiuto."
 
 #: C/gostools.xml:1047(title)
@@ -2248,13 +2248,13 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "Quando si esegue l'acceso una sessione in una lingua diversa, si sta "
 "cambiando la lingua usata per l'interfaccia utente, ma non la disposizione "
 "di tastiera. Per scegliere una diversa disposizione per la tastiera, usare "
-"l'applet <ulink type=\"help\" url=\"ghelp:gswitchit"
+"l'applet <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>Indicatore tastiera</application></ulink>."
 
 # MATE-2-26
@@ -2975,12 +2975,12 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "<application>Orologio</application> mostra l'ora corrente. Fare clic "
 "sull'orario per aprire un piccolo calendario. È possibile visualizzare una "
 "mappa mondiale facendo clic sull'espansore <guilabel>Località</guilabel>. "
-"Per maggiori informazioni, consultare il <ulink type=\"help\" url=\"ghelp:"
+"Per maggiori informazioni, consultare il <ulink type=\"help\" url=\"help:"
 "clock\">manuale dell'applet Orologio</ulink>."
 
 #: C/gospanel.xml:70(term)
@@ -2991,11 +2991,11 @@ msgstr "Applet <application>Volume</application>"
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "<application>Volume</application> consente di regolare il volume degli "
 "altoparlanti del sistema. Per maggiori informazioni, consultare il  <ulink "
-"type=\"help\" url=\"ghelp:mate-volume-control\">manuale dell'applet Volume</"
+"type=\"help\" url=\"help:mate-volume-control\">manuale dell'applet Volume</"
 "ulink>."
 
 #: C/gospanel.xml:75(term)
@@ -4833,11 +4833,11 @@ msgstr ""
 #: C/gospanel.xml:1230(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "Per maggiori informazioni sull'applicazione <application>Cerca file</"
-"application>, consultare il <ulink type=\"help\" url=\"ghelp:mate-search-"
+"application>, consultare il <ulink type=\"help\" url=\"help:mate-search-"
 "tool\">manuale di Cerca file</ulink>."
 
 #: C/gospanel.xml:1234(title)
@@ -6693,49 +6693,49 @@ msgstr "Tra le applicazioni che fanno parte di MATE, abbiamo:"
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Editor di testo Pluma</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Editor di testo Pluma</"
 "application></ulink> per leggere, creare o modificare ogni tipo di testo "
 "semplice senza formattazione."
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dizionario</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dizionario</"
 "application></ulink> per consultare la definizione di una parola."
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Visualizzatore di "
+"<ulink type=\"help\" url=\"help:eom\"><application>Visualizzatore di "
 "immagini</application></ulink> per mostrare sia singoli file di immagine, "
 "sia estese raccolte di immagini."
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calcolatrice</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calcolatrice</"
 "application></ulink> per eseguire calcoli semplice, finanziari e scientifici."
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
 "characters you need will be on your keyboard."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Tabella caratteri</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Tabella caratteri</"
 "application></ulink> per scegliere lettere e simboli dal set di caratteri "
 "<firstterm>Unicode</firstterm> e incollarli in ogni applicazione. Se si "
 "scrive in diverse lingue infatti, non tutti i caratteri necessari sono "
@@ -6761,10 +6761,10 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminale</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminale</"
 "application></ulink> per accedere alla riga di comando di sistema."
 
 #: C/gosoverview.xml:428(para)
@@ -7097,7 +7097,7 @@ msgstr "Scegliere una cartella"
 #: C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -7106,7 +7106,7 @@ msgid ""
 msgstr ""
 "Talvolta potrebbe essere necessario scegliere una cartella con cui lavorare "
 "invece che aprire un file. Ad esempio, se si usa <ulink type=\"help\" url="
-"\"ghelp:file-roller\"><application>Gestore di archivi</application></ulink> "
+"\"help:file-roller\"><application>Gestore di archivi</application></ulink> "
 "per estrarre file da un archivio, è necessario scegliere una cartella in cui "
 "collare i file. In questo caso, i file nella posizione attuale sono "
 "ingrigiti e premendo <guibutton>Apri</guibutton> quando è selezionata una "
@@ -14417,12 +14417,12 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>Cerca file</guimenuitem> consente di cercare file sul computer "
 "in uso. Per maggiori informazioni, consultare il <ulink type=\"help\" url="
-"\"ghelp:mate-search-tool\">manuale di Cerca file</ulink>."
+"\"help:mate-search-tool\">manuale di Cerca file</ulink>."
 
 #: C/goseditmainmenu.xml:71(para)
 msgid ""
@@ -14565,11 +14565,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"La <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"La <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">Guida per l'amministrazione di sistema</ulink> presenta maggiori "
 "informazioni su come sono implementati i menù in MATE e come gli "
 "amministratori possano personalizzarli."
@@ -15086,13 +15086,13 @@ msgstr "Eseguire all'avvio (solo accessibilità)"
 #, fuzzy
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
 "Per maggiori informazioni sulla configurazione delle impostazioni per "
 "l'accessibilità della tastiera, consultare la <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?index\"><citetitle>Guida per l'accessibilità "
+"\"help:mate-access-guide?index\"><citetitle>Guida per l'accessibilità "
 "dello MATE Desktop</citetitle></ulink>."
 
 #: C/goscustdesk.xml:286(title)
@@ -17327,12 +17327,12 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
 "Per passare da una disposizione di tastiera a un'altra, usare <ulink type="
-"\"help\" url=\"ghelp:gswitchit\">l'applet da pannello "
+"\"help\" url=\"help:gswitchit\">l'applet da pannello "
 "<application>Indicatore tastiera</application></ulink>."
 
 #: C/goscustdesk.xml:1625(para)
@@ -17558,12 +17558,12 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 "I caratteri di terzo e quarto livello per la propria disposizione di "
 "tastiera sono mostrati nella finestra di visualizzazione della disposizione "
-"di <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Indicatore "
+"di <ulink type=\"help\" url=\"help:gswitchit\"><application>Indicatore "
 "tastiera</application></ulink>."
 
 #: C/goscustdesk.xml:1712(guilabel)
@@ -17632,12 +17632,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Questa sezione descrive le preferenze che è possibile impostare. Per una "
 "descrizione più orientata all'uso pratico dell'accessibilità della tastiera, "
-"consultare <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"consultare <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>Guida per l'accessibilità dello MATE Desktop</citetitle></"
 "ulink>."
 
@@ -17901,13 +17901,13 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "Selezionare questa opzione per fare in modo che il tastierino numerico emuli "
 "le azioni del mouse. L'elenco dei tasti e dei loro equivalenti è presente "
 "nella <citetitle>Guida per l'accessibilità dello MATE Desktop</citetitle> "
-"nel capitolo <ulink type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-14"
+"nel capitolo <ulink type=\"help\" url=\"help:mate-access-guide?dtconfig-14"
 "\"><citetitle>Abilitare l'emulazione del mouse da tastiera</citetitle></"
 "ulink>."
 
@@ -18901,10 +18901,10 @@ msgstr "Selettore sistemi multimediali"
 # DA RIVEDERE: sembra inesistente
 #: C/goscustdesk.xml:2876(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"Consultare <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"Consultare <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 
 #: C/goscustdesk.xml:2880(title)
@@ -20372,14 +20372,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 e/o modificato solo in "
 "conformità con i termini della GNU Free Documentation License (GFDL) "
 "Versione 1.1 o delle versioni successive pubblicate dalla Free Software "
 "Foundation senza sezioni invariabili, frontespizi e testi di copertina. Una "
-"copia della GFDL è disponibile su questo <ulink type=\"help\" url=\"ghelp:fdl"
+"copia della GFDL è disponibile su questo <ulink type=\"help\" url=\"help:fdl"
 "\">collegamento</ulink> o nel file COPYING-DOCS distribuito con questo "
 "manuale."
 
@@ -20713,10 +20713,10 @@ msgstr ""
 #~ msgstr "Cattura un'istantanea della finestra a cui punta il mouse."
 
 #~ msgid ""
-#~ "For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-"
+#~ "For more on this, see the <ulink type=\"help\" url=\"help:workspace-"
 #~ "switcher\">Workspace Switcher Applet Manual</ulink>."
 #~ msgstr ""
-#~ "Per maggiori informazioni, consultare il <ulink type=\"help\" url=\"ghelp:"
+#~ "Per maggiori informazioni, consultare il <ulink type=\"help\" url=\"help:"
 #~ "workspace-switcher\">Manuale dell'applet Selettore spazio di lavoro</"
 #~ "ulink>."
 
diff --git a/user-guide/ja/ja.po b/user-guide/ja/ja.po
index 1ce6a15..a1ccd53 100644
--- a/user-guide/ja/ja.po
+++ b/user-guide/ja/ja.po
@@ -1799,8 +1799,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> または <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> または <option>mate-help:</option>"
 
 #: C/gostools.xml:948(para)
 msgid ""
@@ -1812,8 +1812,8 @@ msgstr ""
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:953(para)
 msgid ""
@@ -1826,8 +1826,8 @@ msgstr ""
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:961(option)
 msgid "man:"
@@ -1956,16 +1956,16 @@ msgstr "DocBook 形式から表示に適した形式に変換するため"
 #: C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/><application>Yelp ヘルプ・ブラウザ</application>はドキュメン"
-"トを DocBook 形式から HTML 形式に変換する際に「<ulink url=\"ghelp:mate-doc-"
+"トを DocBook 形式から HTML 形式に変換する際に「<ulink url=\"help:mate-doc-"
 "xslt\">MATE XSLT スタイルシート</ulink>」を利用しています。「<ulink url="
-"\"ghelp:mate-doc-make\">MATE ドキュメントのビルド・ユーティリティ</ulink>」"
+"\"help:mate-doc-make\">MATE ドキュメントのビルド・ユーティリティ</ulink>」"
 "は、アプリケーションの開発者が自分のドキュメントを MATE のヘルプ・システムに"
 "インストールしたり登録するために必要なツールです。"
 
@@ -2208,12 +2208,12 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "他の言語でセッションにログインすると、ユーザ・インタフェースの言語は変更され"
 "ますが、キーボードのレイアウトは変更されません。他のキーボードのレイアウトを"
-"選択するには、「<ulink type=\"help\" url=\"ghelp:gswitchit\"><application>"
+"選択するには、「<ulink type=\"help\" url=\"help:gswitchit\"><application>"
 "キーボード表示器</application></ulink>」というアプレットを利用してください。"
 
 #: C/gosstartsession.xml:126(para)
@@ -2881,12 +2881,12 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "<application>時計</application>は現在の時刻を表示します。時刻が表示されている"
 "部分をクリックすると、小さなカレンダが表示されます。<guilabel>場所</guilabel>"
 "という展開式ラベルをクリックすると世界地図を見ることもできます。詳細は、"
-"「<ulink type=\"help\" url=\"ghelp:clock\">時計マニュアル</ulink>」をご覧くだ"
+"「<ulink type=\"help\" url=\"help:clock\">時計マニュアル</ulink>」をご覧くだ"
 "さい。"
 
 #: C/gospanel.xml:70(term)
@@ -2897,11 +2897,11 @@ msgstr "<application>音量調節</application>アプレット"
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "<application>音量調節</application>アプレットを利用すると、お使いのシステムに"
 "あるスピーカーの音量を調節することができます。詳細は「<ulink type=\"help\" "
-"url=\"ghelp:mate-volume-control\">音量調節のマニュアル</ulink>」をご覧くださ"
+"url=\"help:mate-volume-control\">音量調節のマニュアル</ulink>」をご覧くださ"
 "い。"
 
 #: C/gospanel.xml:75(term)
@@ -4660,11 +4660,11 @@ msgstr ""
 #: C/gospanel.xml:1229(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "<application>ファイルの検索</application>の詳細は、<ulink type=\"help\" url="
-"\"ghelp:mate-search-tool\">ファイルの検索マニュアル</ulink>を参照してくださ"
+"\"help:mate-search-tool\">ファイルの検索マニュアル</ulink>を参照してくださ"
 "い。"
 
 #: C/gospanel.xml:1233(title)
@@ -6457,49 +6457,49 @@ msgstr "次は、MATE デスクトップに含まれているアプリケーシ�
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma テキスト・エディ"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma テキスト・エディ"
 "タ</application></ulink>は特定の書式に依存しない文章 (テキスト) を読み込んだ"
 "り作成したり、あるいは変更することができます。"
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>辞書</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>辞書</"
 "application></ulink>を利用すると、単語の意味や定義を検索できます。"
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>画像ビューア</"
+"<ulink type=\"help\" url=\"help:eom\"><application>画像ビューア</"
 "application></ulink>は1個の画像を表示する以外に、複数の画像を集めたコレクショ"
 "ンも表示できます。"
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>関数電卓</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>関数電卓</"
 "application></ulink>は基本的な算術計算の他に、科学計算や財務計算を行えます。"
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
 "characters you need will be on your keyboard."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>文字マップ</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>文字マップ</"
 "application></ulink>を使って <firstterm>Unicode</firstterm> の文字集合から任"
 "意の文字や記号を選択して他のアプリケーションに貼り付けることができます。もし"
 "複数の言語で何かドキュメントを記述しているような場合、お使いのキーボードに必"
@@ -6524,10 +6524,10 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>端末</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>端末</"
 "application></ulink>によってシステムのコマンド・ラインを利用できます。"
 
 #: C/gosoverview.xml:428(para)
@@ -6840,7 +6840,7 @@ msgstr "フォルダの選択"
 #: C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -6848,7 +6848,7 @@ msgid ""
 "folder."
 msgstr ""
 "時々、ファイルを開くのではなくフォルダを選択する必要があるかもしれません。例"
-"えば、<ulink type=\"help\" url=\"ghelp:file-roller\"><application>書庫マネー"
+"えば、<ulink type=\"help\" url=\"help:file-roller\"><application>書庫マネー"
 "ジャ</application></ulink>を使って書庫からファイルを展開する場合、展開した"
 "ファイルを格納するフォルダを選択する必要があります。このような場合、現在の場"
 "所にあるファイルが灰色で表示されますので選択したいフォルダの中身が表示されて"
@@ -13896,11 +13896,11 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>ファイルの検索</guimenuitem>を使うとコンピュータ上のファイルを検"
-"索することができる (詳細は「<ulink type=\"help\" url=\"ghelp:mate-search-"
+"索することができる (詳細は「<ulink type=\"help\" url=\"help:mate-search-"
 "tool\">Search for Files Manual</ulink>」を参照のこと)"
 
 #: C/goseditmainmenu.xml:71(para)
@@ -14043,11 +14043,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0\">システ"
+"<ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0\">システ"
 "ム管理ガイド</ulink>には MATE がどのようにメニューを実装しているか、そしてそ"
 "れらをどのように管理者がカスタマイズできるのかについて詳細な情報が記載されて"
 "います。"
@@ -14513,12 +14513,12 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
 "キーボードの操作性の設定に関する詳細な情報については「<ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE デスクトップのアクセ"
+"url=\"help:mate-access-guide?index\"><citetitle>MATE デスクトップのアクセ"
 "シビリティ・ガイド</citetitle></ulink>」をご覧ください。"
 
 #: C/goscustdesk.xml:286(title)
@@ -16696,11 +16696,11 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
-"キーボードのレイアウトを切り換える際は<ulink type=\"help\" url=\"ghelp:"
+"キーボードのレイアウトを切り換える際は<ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>キーボード表示器</application>というパネル・アプレッ"
 "トも利用できます</ulink>。"
 
@@ -16925,10 +16925,10 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
-"3rdと4thレベルで入力できる文字は<ulink type=\"help\" url=\"ghelp:gswitchit"
+"3rdと4thレベルで入力できる文字は<ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>キーボード表示器</application></ulink>というアプレットのレイ"
 "アウトの表示ウィンドウで確認できます。"
 
@@ -16998,12 +16998,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "この節では、このツールと使って指定できる項目について説明します。このキーボー"
 "ドの操作性とアクセシビリティに課せられた目的について詳細は「<ulink type="
-"\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>MATE デスクトップ"
+"\"help\" url=\"help:mate-access-guide?index\"><citetitle>MATE デスクトップ"
 "のアクセシビリティ・ガイド</citetitle></ulink>」をご覧ください。"
 
 #: C/goscustdesk.xml:1752(para)
@@ -17264,12 +17264,12 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "テンキーを使ってマウスの操作を模擬する際に指定する (キーの一覧とそれに相当す"
 "るものが「<citetitle>MATE デスクトップのアクセシビリティ・ガイド</"
-"citetitle>」の「<ulink type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-"
+"citetitle>」の「<ulink type=\"help\" url=\"help:mate-access-guide?dtconfig-"
 "14\"><citetitle>To Enable the Keyboard to Emulate the Mouse</citetitle></"
 "ulink>」に記されている)"
 
@@ -18181,10 +18181,10 @@ msgstr "マルチメディア・システムのセレクタに関して"
 
 #: C/goscustdesk.xml:2834(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer のプロパ"
+"<ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer のプロパ"
 "ティに関するマニュアル</ulink>をご覧ください。"
 
 #: C/goscustdesk.xml:2838(title)
@@ -19597,13 +19597,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> というファイルに中に記載されている。"
 
@@ -20519,10 +20519,10 @@ msgstr ""
 #~ msgstr "スピン・ボックスを利用して、アプレットの最大サイズを指定します。"
 
 #~ msgid ""
-#~ "For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-"
+#~ "For more on this, see the <ulink type=\"help\" url=\"help:workspace-"
 #~ "switcher\">Workspace Switcher Applet Manual</ulink>."
 #~ msgstr ""
-#~ "このアプレットについて詳細は<ulink type=\"help\" url=\"ghelp:workspace-"
+#~ "このアプレットについて詳細は<ulink type=\"help\" url=\"help:workspace-"
 #~ "switcher\">ワークスペース切り替え器のマニュアル</ulink>をご覧ください。"
 
 #~ msgid ""
@@ -20731,13 +20731,13 @@ msgstr ""
 #~ "To format a floppy disk, right-click on the object that represents the "
 #~ "floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 #~ "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-#~ "type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+#~ "type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 #~ "documentation for more details."
 #~ msgstr ""
 #~ "フロッピー・ディスクをフォーマットする場合はフロッピーを表すオブジェクトの"
 #~ "上で右クリックし、<guimenuitem>フォーマット</guimenuitem>を選択します。す"
 #~ "ると、<guilabel>フロッピー初期化ツール</guilabel>のダイアログが表示されま"
-#~ "す。詳細は<ulink type=\"help\" url=\"ghelp:gfloppy?usage\">フロッピー初期"
+#~ "す。詳細は<ulink type=\"help\" url=\"help:gfloppy?usage\">フロッピー初期"
 #~ "化ツール</ulink>のドキュメントをご覧ください。"
 
 #~ msgid "Eject the diskette from the drive."
diff --git a/user-guide/ko/ko.po b/user-guide/ko/ko.po
index 39556b9..77b54fc 100644
--- a/user-guide/ko/ko.po
+++ b/user-guide/ko/ko.po
@@ -1876,11 +1876,11 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "이 섹션에서는 설정할 수 있는 사항에 대해서 설명합니다. 키보드 접근성에 대해 "
-"좀 더 작업 위주의 설명을 보려면 <ulink type=\"help\" url=\"ghelp:mate-"
+"좀 더 작업 위주의 설명을 보려면 <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE 데스크탑 접근성 안내서</citetitle></"
 "ulink>를 참고하십시오."
 
@@ -2109,11 +2109,11 @@ msgstr ""
 #: ../C/goscustdesk.xml:563(para)
 msgid ""
 "For more information on configuring keyboard accessibility preferences, see "
-"the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"the <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "키보드 접근성 설정에 대해 좀 더 알고 싶으시면, <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?index\"><citetitle>그놈 데스크탑 접근성 안내서</"
+"\"help:mate-access-guide?index\"><citetitle>그놈 데스크탑 접근성 안내서</"
 "citetitle></ulink>를 참고하십시오."
 
 #: ../C/goscustdesk.xml:360(title) ../C/goscustdesk.xml:364(title)
@@ -2245,12 +2245,12 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "이 옵션을 사용하면 숫자 키패드로 마우스 동작을 대신할 수 있습니다. 마우스 키"
 "에 사용하는 키와 그 키의 기능은 <citetitle>그놈 데스크탑 접근성 안내서</"
-"citetitle>의 <ulink type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-14"
+"citetitle>의 <ulink type=\"help\" url=\"help:mate-access-guide?dtconfig-14"
 "\"><citetitle>키보드를 마우스 대신 사용하려면</citetitle></ulink> 제목에 설명"
 "되어 있습니다."
 
@@ -4745,11 +4745,11 @@ msgstr "선택한 키보드 배치를 바꿔가면서 키보드를 누를 때 �
 
 #: ../C/goscustdesk.xml:2165(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
-"다른 키보드 배치를 사용하려면, <ulink type=\"help\" url=\"ghelp:gswitchit"
+"다른 키보드 배치를 사용하려면, <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>키보드 표시</application> 패널 애플릿</ulink>을 사용하십시오."
 
 #: ../C/goscustdesk.xml:2169(guilabel)
@@ -4957,10 +4957,10 @@ msgstr ""
 #: ../C/goscustdesk.xml:2252(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
-"키보드 배치의 세 번째와 네 번째 문자는 <ulink type=\"help\" url=\"ghelp:"
+"키보드 배치의 세 번째와 네 번째 문자는 <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>키보드 표시</application></ulink> 배치 보기 창에 표"
 "시됩니다."
 
@@ -5587,10 +5587,10 @@ msgstr "멀티미디어 시스템 선택"
 
 #: ../C/goscustdesk.xml:2890(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer 속성 설명서"
+"<ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer 속성 설명서"
 "</ulink>를 참고하십시오."
 
 #: ../C/goscustdesk.xml:2894(title)
@@ -6180,11 +6180,11 @@ msgstr ""
 #: ../C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>파일 찾기</guimenuitem>는 컴퓨터에 있는 파일을 찾습니다. 좀 더 "
-"자세히 알고 싶으시면, <ulink type=\"help\" url=\"ghelp:mate-search-tool"
+"자세히 알고 싶으시면, <ulink type=\"help\" url=\"help:mate-search-tool"
 "\">Search for Files Manual</ulink> 부분을 참고하십시오."
 
 #: ../C/goseditmainmenu.xml:71(para)
@@ -6320,11 +6320,11 @@ msgstr ""
 
 #: ../C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0\">시스템 "
+"<ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0\">시스템 "
 "관리 안내서</ulink>에 그놈 메뉴의 구현 방식 및 관리자가 그놈 메뉴를 설정하는 "
 "방법에 대해 설명해 놓았습니다."
 
@@ -11182,13 +11182,13 @@ msgid ""
 "To format a floppy disk, right-click on the object that represents the "
 "floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-"type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+"type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 "documentation for more details."
 msgstr ""
 "플로피 디스크를 포맷하려면, 바탕 화면의 플로피에 해당하는 오브젝트에 마우스 "
 "오른쪽 단추를 누르고, <guimenuitem>포맷</guimenuitem>을 누르십시오. "
 "<guilabel>플로피 포맷</guilabel> 대화 창이 나타납니다. 더 자세히 알고 싶으시"
-"면 <ulink type=\"help\" url=\"ghelp:gfloppy?usage\">플로피 포맷</ulink> 문서"
+"면 <ulink type=\"help\" url=\"help:gfloppy?usage\">플로피 포맷</ulink> 문서"
 "를 보십시오."
 
 #: ../C/goscaja.xml:3006(title)
@@ -13686,10 +13686,10 @@ msgstr "그놈 데스크탑에 작업 공간을 추가하려면, <application>�
 
 #: ../C/gosoverview.xml:399(para)
 msgid ""
-"For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"For more on this, see the <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">Workspace Switcher Applet Manual</ulink>."
 msgstr ""
-"더 자세히 알고 싶으시면, <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"더 자세히 알고 싶으시면, <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">작업 공간 바꾸기 애플릿 설명서</ulink>를 참고하십시오."
 
 #: ../C/gosoverview.xml:404(title)
@@ -13727,48 +13727,48 @@ msgstr "그놈에 포함된 응용 프로그램은 다음과 같은 프로그램
 
 #: ../C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>pluma 텍스트 편집기</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>pluma 텍스트 편집기</"
 "application></ulink>로 형식이 없는 모든 종류의 간단한 텍스트 파일을 읽고 만들"
 "고 고칠 수 있습니다."
 
 #: ../C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>사전</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>사전</"
 "application></ulink>으로 어떤 단어의 의미를 찾아볼 수 있습니다."
 
 #: ../C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>그림 보기</application></"
+"<ulink type=\"help\" url=\"help:eom\"><application>그림 보기</application></"
 "ulink>를 사용해 그림 파일 및 여러 개 그림으로 된 그림 모음을 표시합니다."
 
 #: ../C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>계산기</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>계산기</"
 "application></ulink>로 기본, 재무, 공학 모드에서 계산을 할 수 있습니다."
 
 #: ../C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all the characters "
 "you need will be on your keyboard."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>글자 표</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>글자 표</"
 "application></ulink>를 사용해 <firstterm>유니코드</firstterm> 문자세트에서 글"
 "자와 기호를 골라서 다른 응용 프로그램에 붙여 넣을 수 있습니다. 여러 개의 언어"
 "를 사용한다면, 필요한 글자 중에 키보드에 없는 글자가 있을 수도 있습니다."
@@ -13791,10 +13791,10 @@ msgstr ""
 
 #: ../C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>터미널</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>터미널</"
 "application></ulink>을 사용해 시스템 명령 행을 사용합니다."
 
 #: ../C/gosoverview.xml:428(para)
@@ -14140,7 +14140,7 @@ msgstr "폴더 선택하기"
 #: ../C/gosoverview.xml:529(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -14148,7 +14148,7 @@ msgid ""
 "folder."
 msgstr ""
 "어떤 경우에는 파일을 열지 않고 폴더를 선택해야 하는 경우도 있습니다. 예를 들"
-"어 <ulink type=\"help\" url=\"ghelp:file-roller\"><application>압축 관리자</"
+"어 <ulink type=\"help\" url=\"help:file-roller\"><application>압축 관리자</"
 "application></ulink>를 사용해 압축 파일에서 파일을 푸는 경우, 풀 파일을 놓을 "
 "폴더를 선택해야 합니다. 이러한 경우, 현재 위치의 파일은 회색으로 표시되고, 폴"
 "더를 선택했을 때 <guibutton>열기</guibutton>를 누르면 그 폴더를 선택하게 됩니"
@@ -14621,11 +14621,11 @@ msgstr "<application>시계</application> 애플릿"
 msgid ""
 "<application>Clock</application> shows the current time. Click on the time "
 "to open a small calendar. For more on this, see the <ulink type=\"help\" url="
-"\"ghelp:clock\">Clock Applet Manual</ulink>."
+"\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "<application>시계</application>는 현재 시각을 표시합니다. 시각을 누르면 작은 "
 "달력이 열립니다. 여기에 대해 좀 더 알고 싶으시면, <ulink type=\"help\" url="
-"\"ghelp:clock\">시계 애플릿 설명서</ulink>를 참고하십시오."
+"\"help:clock\">시계 애플릿 설명서</ulink>를 참고하십시오."
 
 #: ../C/gospanel.xml:99(term)
 msgid "<application>Volume Control</application> applet"
@@ -14635,10 +14635,10 @@ msgstr "<application>볼륨 조정</application> 애플릿"
 msgid ""
 "<application>Volume Control</application> enables you to control the volume "
 "of the speaker on your system. For more on this, see the <ulink type=\"help"
-"\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "<application>볼륨 조정</application>으로 시스템의 스피커 볼륨을 조정합니다. "
-"좀 더 알고 싶으시면, <ulink type=\"help\" url=\"ghelp:mate-volume-control\">"
+"좀 더 알고 싶으시면, <ulink type=\"help\" url=\"help:mate-volume-control\">"
 "볼륨 조정 설명서</ulink>를 참고하십시오."
 
 #: ../C/gospanel.xml:104(term)
@@ -16395,11 +16395,11 @@ msgstr ""
 #: ../C/gospanel.xml:1398(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "<application>찾기 도구</application>에 대해 좀 더 알고 싶으시면, <ulink type="
-"\"help\" url=\"ghelp:mate-search-tool\">찾기 도구 설명서</ulink>를 참고하십"
+"\"help\" url=\"help:mate-search-tool\">찾기 도구 설명서</ulink>를 참고하십"
 "시오."
 
 #: ../C/gospanel.xml:1402(title)
@@ -17340,9 +17340,9 @@ msgid ""
 "When you log in to a session in a different language, you choose the "
 "language for the user interface. You do not specify a keyboard layout for "
 "the session. To choose a keyboard layout, use the <ulink type=\"help\" url="
-"\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> "
+"\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> "
 "applet."
-msgstr "다른 언어로 세션에 로그인하면, 사용자 인터페이스에 그 언어를 사용하게 됩니다. 세션에 사용할 키보드 배치는 여기서 지정하지 않습니다. 키보드 배치를 지정하려면, <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>키보드 표시</application></ulink> 애플릿에을 사용하십시오."
+msgstr "다른 언어로 세션에 로그인하면, 사용자 인터페이스에 그 언어를 사용하게 됩니다. 세션에 사용할 키보드 배치는 여기서 지정하지 않습니다. 키보드 배치를 지정하려면, <ulink type=\"help\" url=\"help:gswitchit\"><application>키보드 표시</application></ulink> 애플릿에을 사용하십시오."
 
 #: ../C/gosstartsession.xml:120(title)
 msgid "Locking Your Screen"
@@ -18752,8 +18752,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: ../C/gostools.xml:904(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> 또는 <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> 또는 <option>mate-help:</option>"
 
 #: ../C/gostools.xml:908(para)
 msgid ""
@@ -18765,8 +18765,8 @@ msgstr ""
 
 #: ../C/gostools.xml:911(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: ../C/gostools.xml:913(para)
 msgid ""
@@ -18778,8 +18778,8 @@ msgstr ""
 
 #: ../C/gostools.xml:916(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: ../C/gostools.xml:921(option)
 msgid "man:"
@@ -18905,15 +18905,15 @@ msgstr "DocBook 형식에서 표시하는 데 좋은 형식으로 변환합니�
 #: ../C/gostools.xml:986(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/><application>옐프 도움말 보기 프로그램</application>은 "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT 스타일시트</ulink>를 이용해 "
-"DocBook을 HTML로 변환합니다. <ulink url=\"ghelp:mate-doc-make\">그놈 문서 빌"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT 스타일시트</ulink>를 이용해 "
+"DocBook을 HTML로 변환합니다. <ulink url=\"help:mate-doc-make\">그놈 문서 빌"
 "드 유틸리티</ulink>는 도움말 시스템에 맞게 문서를 설치하고 등록한 경우에만 동"
 "작합니다."
 
@@ -19137,13 +19137,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/legal.xml:12(para)
@@ -19366,7 +19366,7 @@ msgstr "류창우 <cwryu at debian dot org>, 2007"
 #~ "see <citetitle>MATE 2.2 Desktop Accessibility Guide</citetitle>."
 #~ msgstr ""
 #~ "키보드 접근성 설정에 대해 좀 더 알고 싶으시면, <ulink type=\"help\" url="
-#~ "\"ghelp:mate-access-guide?index\"><citetitle>그놈 데스크탑 접근성 안내서"
+#~ "\"help:mate-access-guide?index\"><citetitle>그놈 데스크탑 접근성 안내서"
 #~ "</citetitle></ulink>를 참고하십시오."
 
 #~ msgid "Filter Settings"
@@ -20725,7 +20725,7 @@ msgstr "류창우 <cwryu at debian dot org>, 2007"
 #~ "Feedback Page</link>."
 #~ msgstr ""
 #~ "그놈 데스크탑 혹은 이 설명서에 대한 버그를 알려 주시거나 의견을 제시하려"
-#~ "면, <ulink url=\"ghelp:mate-feedback\" type=\"help\">그놈 피드백 페이지</"
+#~ "면, <ulink url=\"help:mate-feedback\" type=\"help\">그놈 피드백 페이지</"
 #~ "ulink>에 있는 대로 해 주십시오."
 
 #~ msgid "Web Browser Launcher"
diff --git a/user-guide/nl/nl.po b/user-guide/nl/nl.po
index f5e872b..31046de 100644
--- a/user-guide/nl/nl.po
+++ b/user-guide/nl/nl.po
@@ -524,7 +524,7 @@ msgid "On the login screen, click on the <guilabel>Language</guilabel> icon. Cho
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/gosstartsession.xml:113(para)
-msgid "When you log in to a session in a different language, you choose the language for the user interface. You do not specify a keyboard layout for the session. To choose a keyboard layout, use the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
+msgid "When you log in to a session in a different language, you choose the language for the user interface. You do not specify a keyboard layout for the session. To choose a keyboard layout, use the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/gosstartsession.xml:120(title)
@@ -970,7 +970,7 @@ msgid "<application>Clock</application> applet"
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/gospanel.xml:95(para)
-msgid "<application>Clock</application> shows the current time. Click on the time to open a small calendar. For more on this, see the <ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+msgid "<application>Clock</application> shows the current time. Click on the time to open a small calendar. For more on this, see the <ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/gospanel.xml:99(term)
@@ -978,7 +978,7 @@ msgid "<application>Volume Control</application> applet"
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/gospanel.xml:101(para)
-msgid "<application>Volume Control</application> enables you to control the volume of the speaker on your system. For more on this, see the <ulink type=\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+msgid "<application>Volume Control</application> enables you to control the volume of the speaker on your system. For more on this, see the <ulink type=\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/gospanel.xml:104(term)
@@ -1021,7 +1021,7 @@ msgid "<application>Window List</application> applet"
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/gospanel.xml:142(para)
-msgid "Displays a button for each window that is open. <application>Window List</application> enables you to minimize and restore windows. For more on this, see the <ulink type=\"help\" url=\"ghelp:window-list\">Window List manual</ulink>."
+msgid "Displays a button for each window that is open. <application>Window List</application> enables you to minimize and restore windows. For more on this, see the <ulink type=\"help\" url=\"help:window-list\">Window List manual</ulink>."
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/gospanel.xml:145(term)
@@ -6443,7 +6443,7 @@ msgid "When you format, you destroy all files on your floppy disk. Do not format
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/goscaja.xml:3742(para)
-msgid "To format a floppy disk, right-click on the object that represents the floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A <guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> documentation for more details."
+msgid "To format a floppy disk, right-click on the object that represents the floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A <guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> documentation for more details."
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/goscaja.xml:3748(title)
@@ -7821,7 +7821,7 @@ msgid "The <application>Keyboard Accessibility</application> preference tool all
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/goscustdesk.xml:660(para)
-msgid "This section describes each of the preferences you can set. For a more task-oriented description of keyboard accessibility, see the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
+msgid "This section describes each of the preferences you can set. For a more task-oriented description of keyboard accessibility, see the <ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/goscustdesk.xml:661(para)
@@ -7976,7 +7976,7 @@ msgstr ""
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/goscustdesk.xml:855(para)
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/goscustdesk.xml:980(para)
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/goscustdesk.xml:1062(para)
-msgid "For more information on configuring keyboard accessibility preferences, see the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
+msgid "For more information on configuring keyboard accessibility preferences, see the <ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/goscustdesk.xml:859(title)
@@ -8064,7 +8064,7 @@ msgid "mouse keys"
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/goscustdesk.xml:1027(para)
-msgid "Select this option to make the numeric keypad emulate mouse actions. The list of keys and their equivalences is in the <citetitle>MATE Desktop Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard to Emulate the Mouse</citetitle></ulink>."
+msgid "Select this option to make the numeric keypad emulate mouse actions. The list of keys and their equivalences is in the <citetitle>MATE Desktop Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url=\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/goscustdesk.xml:1028(para)
@@ -10430,7 +10430,7 @@ msgid "MATE Documentation Project"
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/user-guide.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/mate-user-guide.HEAD/C/user-guide.xml:12(para)
@@ -10603,7 +10603,7 @@ msgid "Feedback"
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/mate-user-guide.HEAD/C/user-guide.xml:186(para)
-msgid "To report a bug or make a suggestion regarding the MATE desktop or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgid "To report a bug or make a suggestion regarding the MATE desktop or this manual, follow the directions in the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
diff --git a/user-guide/oc/oc.po b/user-guide/oc/oc.po
index 4334ebd..9fa9d51 100644
--- a/user-guide/oc/oc.po
+++ b/user-guide/oc/oc.po
@@ -1436,7 +1436,7 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr ""
 
 #: ../C/gostools.xml:904(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
 msgstr ""
 
 #: ../C/gostools.xml:908(para)
@@ -1447,7 +1447,7 @@ msgstr ""
 
 #: ../C/gostools.xml:911(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
 msgstr ""
 
 #: ../C/gostools.xml:913(para)
@@ -1458,7 +1458,7 @@ msgstr ""
 
 #: ../C/gostools.xml:916(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
 msgstr ""
 
 #: ../C/gostools.xml:921(option)
@@ -1568,8 +1568,8 @@ msgstr ""
 #: ../C/gostools.xml:986(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
@@ -1761,7 +1761,7 @@ msgid ""
 "When you log in to a session in a different language, you choose the "
 "language for the user interface. You do not specify a keyboard layout for "
 "the session. To choose a keyboard layout, use the <ulink type=\"help\" url="
-"\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> "
+"\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> "
 "applet."
 msgstr ""
 
@@ -2293,7 +2293,7 @@ msgstr ""
 msgid ""
 "<application>Clock</application> shows the current time. Click on the time "
 "to open a small calendar. For more on this, see the <ulink type=\"help\" url="
-"\"ghelp:clock\">Clock Applet Manual</ulink>."
+"\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 
 #: ../C/gospanel.xml:99(term)
@@ -2304,7 +2304,7 @@ msgstr ""
 msgid ""
 "<application>Volume Control</application> enables you to control the volume "
 "of the speaker on your system. For more on this, see the <ulink type=\"help"
-"\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 
 #: ../C/gospanel.xml:104(term)
@@ -3863,7 +3863,7 @@ msgstr ""
 #: ../C/gospanel.xml:1398(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 
@@ -5237,7 +5237,7 @@ msgstr ""
 
 #: ../C/gosoverview.xml:399(para)
 msgid ""
-"For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"For more on this, see the <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">Workspace Switcher Applet Manual</ulink>."
 msgstr ""
 
@@ -5268,33 +5268,33 @@ msgstr ""
 
 #: ../C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
 
 #: ../C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
 
 #: ../C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
 
 #: ../C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
 
 #: ../C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all the characters "
@@ -5313,7 +5313,7 @@ msgstr ""
 
 #: ../C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
 
@@ -5586,7 +5586,7 @@ msgstr "Causir un repertòri"
 #: ../C/gosoverview.xml:529(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -9830,7 +9830,7 @@ msgid ""
 "To format a floppy disk, right-click on the object that represents the "
 "floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-"type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+"type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 "documentation for more details."
 msgstr ""
 
@@ -11254,7 +11254,7 @@ msgstr ""
 #: ../C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 
@@ -11361,7 +11361,7 @@ msgstr ""
 
 #: ../C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
@@ -11570,7 +11570,7 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 
@@ -11764,7 +11764,7 @@ msgstr ""
 #: ../C/goscustdesk.xml:566(para)
 msgid ""
 "For more information on configuring keyboard accessibility preferences, see "
-"the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"the <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 msgstr ""
 
@@ -11878,7 +11878,7 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 
@@ -13892,7 +13892,7 @@ msgstr ""
 
 #: ../C/goscustdesk.xml:2165(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
@@ -14064,7 +14064,7 @@ msgstr ""
 #: ../C/goscustdesk.xml:2252(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 
@@ -14611,7 +14611,7 @@ msgstr ""
 
 #: ../C/goscustdesk.xml:2890(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
 
@@ -15924,7 +15924,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 ""
 
@@ -16204,7 +16204,7 @@ msgstr ""
 #: ../C/user-guide.xml:226(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE desktop or this "
-"manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" "
+"manual, follow the directions in the <ulink url=\"help:mate-feedback\" "
 "type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 
diff --git a/user-guide/pa/pa.po b/user-guide/pa/pa.po
index 33035c6..638a028 100644
--- a/user-guide/pa/pa.po
+++ b/user-guide/pa/pa.po
@@ -1639,8 +1639,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:924(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> ਜਾਂ <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> ਜਾਂ <option>mate-help:</option>"
 
 #: C/gostools.xml:928(para)
 msgid ""
@@ -1652,8 +1652,8 @@ msgstr ""
 
 #: C/gostools.xml:931(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:933(para)
 msgid ""
@@ -1665,8 +1665,8 @@ msgstr ""
 
 #: C/gostools.xml:936(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:941(option)
 msgid "man:"
@@ -1789,15 +1789,15 @@ msgstr "DocBook ਫਾਰਮੈਟ ਤੋਂ ਵੇਖਾਉਣ ਲਈ ਹੋਰ
 #: C/gostools.xml:1006(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/><application>ਯੈਲਪ ਸਹਾਇਤਾ ਝਲਕਾਰਾ</application> DocBook ਤੋਂ HTML "
-"ਬਦਲਣ ਲਈ <ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT ਸਟਾਇਲਸ਼ੀਟ</ulink> ਉੱਤੇ "
-"ਨਿਰਭਰ ਕਰਦਾ ਹੈ। <ulink url=\"ghelp:mate-doc-make\">ਗਨੋਮ ਦਸਤਾਵੇਜ਼ ਬਲਿਡ ਸਹੂਲਤਾਂ</"
+"ਬਦਲਣ ਲਈ <ulink url=\"help:mate-doc-xslt\">MATE XSLT ਸਟਾਇਲਸ਼ੀਟ</ulink> ਉੱਤੇ "
+"ਨਿਰਭਰ ਕਰਦਾ ਹੈ। <ulink url=\"help:mate-doc-make\">ਗਨੋਮ ਦਸਤਾਵੇਜ਼ ਬਲਿਡ ਸਹੂਲਤਾਂ</"
 "ulink> ਇੰਸਟਾਲ ਹੋਣ ਅਤੇ ਸਹਾਇਤਾ ਸਿਸਟਮ ਨਾਲ ਦਸਤਾਵੇਜ਼ ਰਜਿਸਟਰ ਕਰਨ ਲਈ ਕਾਰਜ ਲੇਖਕਾਂ ਉੱਤੇ ਨਿਰਭਰ "
 "ਕਰਦਾ ਹੈ।"
 
@@ -2043,17 +2043,17 @@ msgstr ""
 #| "When you log in to a session in a different language, you choose the "
 #| "language for the user interface. You do not specify a keyboard layout for "
 #| "the session. To choose a keyboard layout, use the <ulink type=\"help\" "
-#| "url=\"ghelp:gswitchit\"><application>Keyboard Indicator</application></"
+#| "url=\"help:gswitchit\"><application>Keyboard Indicator</application></"
 #| "ulink> applet."
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਇੱਕ ਵੱਖਰੀ ਭਾਸ਼ਾ ਨਾਲ ਲਾਗਇਨ ਕਰਦੇ ਹੋ ਤਾਂ, ਤੁਸੀਂ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲਈ ਹੀ ਇੱਕ "
 "ਭਾਸ਼ਾ ਚੁਣਦੇ ਹੋ। ਤੁਸੀਂ ਸ਼ੈਸ਼ਨ ਲਈ ਇੱਕ ਕੀ-ਬੋਰਡ ਲੇਆਉਟ ਹਾਲੇ ਨਹੀਂ ਦਿੱਤਾ ਹੈ। ਇੱਕ ਕੀ-ਬੋਰਡ ਲੇਆਉਟ ਚੁਣਨ ਲਈ, "
-"<ulink type=\"help\" url=\"ghelp:gswitchit\"><application>ਕੀ-ਬੋਰਡ ਇੰਡੀਕੇਟਰ</application></ulink> ਐਪਲਿਟ ਵਰਤੋਂ।"
+"<ulink type=\"help\" url=\"help:gswitchit\"><application>ਕੀ-ਬੋਰਡ ਇੰਡੀਕੇਟਰ</application></ulink> ਐਪਲਿਟ ਵਰਤੋਂ।"
 
 #: C/gosstartsession.xml:126(para)
 msgid ""
@@ -2670,15 +2670,15 @@ msgstr "<application>ਘੜੀ</application> ਐਪਲਿਟ"
 #| msgid ""
 #| "<application>Clock</application> shows the current time. Click on the "
 #| "time to open a small calendar. For more on this, see the <ulink type="
-#| "\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+#| "\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "<application>ਘੜੀ</application> ਮੌਜੂਦਾ ਸਮਾਂ ਵੇਖਾਉਦੀ ਹੈ। ਛੋਟਾ ਜੇਹਾ ਕੈਲੰਡਰ ਵੇਖਣ ਲਈ ਸਮੇਂ ਉੱਤੇ "
-"ਦੱਬੋ। ਤੁਸੀਂ ਸੰਸਾਰ ਨਕਸ਼ਾ ਵੀ <guilabel>ਟਿਕਾਣੇ</guilabel> ਫੈਲਾ ਲੇਬਲ ਨੂੰ ਕਲਿੱਕ ਕਰਕੇ ਵੇਖ ਸਕਦੇ ਹੋ। ਇਸ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ <ulink type=\"help\" url=\"ghelp:clock\">ਘੜੀ ਐਪਲਿਟ "
+"ਦੱਬੋ। ਤੁਸੀਂ ਸੰਸਾਰ ਨਕਸ਼ਾ ਵੀ <guilabel>ਟਿਕਾਣੇ</guilabel> ਫੈਲਾ ਲੇਬਲ ਨੂੰ ਕਲਿੱਕ ਕਰਕੇ ਵੇਖ ਸਕਦੇ ਹੋ। ਇਸ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ <ulink type=\"help\" url=\"help:clock\">ਘੜੀ ਐਪਲਿਟ "
 "ਦਸਤਾਵੇਜ਼</ulink> ਵੇਖੋ।"
 
 #: C/gospanel.xml:70(term)
@@ -2689,15 +2689,15 @@ msgstr "<application>ਆਵਾਜ਼ ਕੰਟਰੋਲ</application> ਐਪਲ�
 #| msgid ""
 #| "<application>Volume Control</application> enables you to control the "
 #| "volume of the speaker on your system. For more on this, see the <ulink "
-#| "type=\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</"
+#| "type=\"help\" url=\"help:mate-volume-control\">Volume Control Manual</"
 #| "ulink>."
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "<application>ਵਾਲੀਅਮ ਕੰਟਰੋਲ</application> ਤੁਹਾਨੂੰ ਆਪਣੇ ਸਿਸਟਮ ਉੱਤੇ ਸਪੀਕਰ ਦੀ ਆਵਾਜ਼ ਠੀਕ "
-"ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ। ਇਸ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ <ulink type=\"help\" url=\"ghelp:mate-"
+"ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ। ਇਸ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ <ulink type=\"help\" url=\"help:mate-"
 "volume-control\">ਵਾਲੀਅਮ ਕੰਟਰੋਲ ਮੈਨੁਅਲ</ulink> ਵੇਖੋ।"
 
 #: C/gospanel.xml:75(term)
@@ -4533,11 +4533,11 @@ msgstr ""
 #: C/gospanel.xml:1230(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "<application>ਖੋਜ ਸੰਦ</application> ਉੱਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਵੇਖਣ ਲਈ, <ulink type=\"help\" "
-"url=\"ghelp:mate-search-tool\">ਖੋਜ ਸੰਦ ਦਸਤਾਵੇਜ਼</ulink> ਵੇਖੋ।"
+"url=\"help:mate-search-tool\">ਖੋਜ ਸੰਦ ਦਸਤਾਵੇਜ਼</ulink> ਵੇਖੋ।"
 
 #: C/gospanel.xml:1234(title)
 msgid "Show Desktop Button"
@@ -6229,10 +6229,10 @@ msgstr ""
 
 #: C/gosoverview.xml:400(para)
 msgid ""
-"For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"For more on this, see the <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">Workspace Switcher Applet Manual</ulink>."
 msgstr ""
-"ਇਸ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"ਇਸ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">ਵਰਕਸਪੇਸ ਸਵਿੱਚਰ ਐਪਲਿਟ ਦਸਤਾਵੇਜ਼</ulink> ਵੇਖੋ।"
 
 #: C/gosoverview.xml:405(title)
@@ -6264,35 +6264,35 @@ msgstr "ਕਾਰਜ, ਜੋ ਕਿ ਗਨੋਮ ਦਾ ਭਾਗ ਹਨ, ਵਿ
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\">ਡਿਕਸ਼ਨਰੀ<application></"
+"<ulink type=\"help\" url=\"help:mate-dictionary\">ਡਿਕਸ਼ਨਰੀ<application></"
 "application> ਤੁਹਾਨੂੰ ਇੱਕ ਸ਼ਬਦ ਦੇ ਅਰਥ ਵੇਖਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
 
 #: C/gosoverview.xml:424(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
@@ -6311,10 +6311,10 @@ msgstr ""
 
 #: C/gosoverview.xml:426(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>ਟਰਮੀਨਲ</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>ਟਰਮੀਨਲ</"
 "application></ulink> ਤੁਹਾਨੂੰ ਸਿਸਟਮ ਕਮਾਂਡ ਲਾਇਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
 #: C/gosoverview.xml:429(para)
@@ -6599,7 +6599,7 @@ msgstr "ਇੱਕ ਫੋਲਡਰ ਚੁਣੋ"
 #: C/gosoverview.xml:509(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -12498,7 +12498,7 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 
@@ -12608,11 +12608,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0\">ਸਿਸਟਮ "
+"<ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0\">ਸਿਸਟਮ "
 "ਪਰਸ਼ਾਸ਼ਨ ਗਾਈਡ</ulink> ਵਿੱਚ ਗਨੋਮ ਮੇਨੂ ਸਥਾਪਤ ਕਰਨ ਅਤੇ ਉਨ੍ਹਾਂ ਨੂੰ ਪਸੰਦੀਦਾ ਰੂਪ ਵਿੱਚ ਪਰਸ਼ਾਸ਼ਿਤ ਕਰਨ "
 "ਬਾਰੇ ਜਾਣਕਾਰੀ ਹੈ।"
 
@@ -13041,16 +13041,16 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "For more information on configuring keyboard accessibility preferences, "
-#| "see the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+#| "see the <ulink type=\"help\" url=\"help:mate-access-guide?index"
 #| "\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
 "ਕੀ-ਬੋਰਡ ਸੁਲੱਭਤਾ ਪਸੰਦ ਦੀ ਸੰਰਚਨਾ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?index\">ਗਨੋਮ ਡੈਸਕਟਾਪ ਸੁਲੱਭਤਾ ਗਾਈਡ<citetitle></"
+"\"help:mate-access-guide?index\">ਗਨੋਮ ਡੈਸਕਟਾਪ ਸੁਲੱਭਤਾ ਗਾਈਡ<citetitle></"
 "citetitle> ਵੇਖੋ।"
 
 #: C/goscustdesk.xml:286(title)
@@ -14800,7 +14800,7 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
@@ -14972,7 +14972,7 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 
@@ -15029,7 +15029,7 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 
@@ -15271,7 +15271,7 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 
@@ -16069,10 +16069,10 @@ msgstr "ਮਲਟੀਮੀਡਿਆ ਸਿਸਟਮ ਚੋਣਕਾਰ"
 
 #: C/goscustdesk.xml:2884(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gstreamer-properties\">ਜੀਸਟਰੀਮਰ ਵਿਸ਼ੇਸ਼ਤਾ "
+"<ulink type=\"help\" url=\"help:gstreamer-properties\">ਜੀਸਟਰੀਮਰ ਵਿਸ਼ੇਸ਼ਤਾ "
 "ਦਸਤਾਵੇਜ਼</ulink> ਵੇਖੋ।"
 
 #: C/goscustdesk.xml:2888(title)
@@ -17413,13 +17413,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 "
+"type=\"help\" url=\"help:fdl\"> ਸਬੰਧ</ulink> ਉੱਤੇ ਜਾਂ ਇਹ ਦਸਤਾਵੇਜ਼ 'ਚ COPYING-DOCS "
 "ਫਾਇਲ ਵਿੱਚੋਂ ਲੈ ਸਕਦੇ ਹੋ।"
 
 #: C/user-guide.xml:12(para)
@@ -17728,7 +17728,7 @@ msgstr "ਇਸ ਦਸਤਾਵੇਜ਼ ਵਿੱਚ ਗਨੋਮ ਡੈਸਕ�
 #: C/user-guide.xml:225(para)
 #| msgid ""
 #| "To report a bug or make a suggestion regarding the MATE desktop or this "
-#| "manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" "
+#| "manual, follow the directions in the <ulink url=\"help:mate-feedback\" "
 #| "type=\"help\">MATE Feedback Page</ulink>."
 msgid ""
 "To report a bug or make a suggestion regarding the MATE desktop or this "
diff --git a/user-guide/pt/pt.po b/user-guide/pt/pt.po
index 56b2907..6e0c52f 100644
--- a/user-guide/pt/pt.po
+++ b/user-guide/pt/pt.po
@@ -1750,8 +1750,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:904(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> ou <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> ou <option>mate-help:</option>"
 
 #: C/gostools.xml:908(para)
 msgid ""
@@ -1763,8 +1763,8 @@ msgstr ""
 
 #: C/gostools.xml:911(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:913(para)
 msgid ""
@@ -1776,8 +1776,8 @@ msgstr ""
 
 #: C/gostools.xml:916(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:921(option)
 msgid "man:"
@@ -1910,16 +1910,16 @@ msgstr ""
 #: C/gostools.xml:986(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/>O <application>Navegador de Ajuda Yelp</application> baseia-"
-"se nas <ulink url=\"ghelp:mate-doc-xslt\">Folhas de Estilo XSLT do MATE</"
+"se nas <ulink url=\"help:mate-doc-xslt\">Folhas de Estilo XSLT do MATE</"
 "ulink> para realizar a conversão de DocBook em HTML. Os autores das "
-"aplicações confiam nos <ulink url=\"ghelp:mate-doc-make\">Utilitários de "
+"aplicações confiam nos <ulink url=\"help:mate-doc-make\">Utilitários de "
 "Criação de Documentação do MATE</ulink> para que instalem e registem a "
 "documentação no sistema de ajuda."
 
@@ -2153,13 +2153,13 @@ msgid ""
 "When you log in to a session in a different language, you choose the "
 "language for the user interface. You do not specify a keyboard layout for "
 "the session. To choose a keyboard layout, use the <ulink type=\"help\" url="
-"\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> "
+"\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> "
 "applet."
 msgstr ""
 "Ao iniciar uma sessão num idioma diferente, selecciona o idioma do interface "
 "de utilizador. Não especifica uma disposição de teclado para a sessão. Para "
 "seleccionar uma disposição de teclado, utilize a applet de <ulink type=\"help"
-"\" url=\"ghelp:gswitchit\"><application>Indicador de Teclado</application></"
+"\" url=\"help:gswitchit\"><application>Indicador de Teclado</application></"
 "ulink>."
 
 #: C/gosstartsession.xml:120(title)
@@ -2794,11 +2794,11 @@ msgstr "Applet de <application>Relógio</application>"
 msgid ""
 "<application>Clock</application> shows the current time. Click on the time "
 "to open a small calendar. For more on this, see the <ulink type=\"help\" url="
-"\"ghelp:clock\">Clock Applet Manual</ulink>."
+"\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "O <application>Relógio</application> apresenta a hora actual. Clique na hora "
 "para abrir um pequeno calendário. Para mais sobre isto, consulte o <ulink "
-"type=\"help\" url=\"ghelp:clock\">Manual da Applet de Relógio</ulink>."
+"type=\"help\" url=\"help:clock\">Manual da Applet de Relógio</ulink>."
 
 #: C/gospanel.xml:99(term)
 msgid "<application>Volume Control</application> applet"
@@ -2808,11 +2808,11 @@ msgstr "Applet de <application>Controlo de Volume</application>"
 msgid ""
 "<application>Volume Control</application> enables you to control the volume "
 "of the speaker on your system. For more on this, see the <ulink type=\"help"
-"\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "O <application>Controlo de Volume</application> permite-lhe controlar o "
 "volume das saídas de som do seu sistema. Para mais sobre isto, consulte o "
-"<ulink type=\"help\" url=\"ghelp:mate-volume-control\">Manual do Controlo "
+"<ulink type=\"help\" url=\"help:mate-volume-control\">Manual do Controlo "
 "de Volume</ulink>."
 
 #: C/gospanel.xml:104(term)
@@ -4747,11 +4747,11 @@ msgstr ""
 #: C/gospanel.xml:1398(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "Para mais informação sobre a <application>Ferramenta de Procurar</"
-"application>, consulte o <ulink type=\"help\" url=\"ghelp:mate-search-tool"
+"application>, consulte o <ulink type=\"help\" url=\"help:mate-search-tool"
 "\">Manual da Ferramenta de Procurar</ulink>."
 
 #: C/gospanel.xml:1402(title)
@@ -6602,10 +6602,10 @@ msgstr ""
 
 #: C/gosoverview.xml:399(para)
 msgid ""
-"For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"For more on this, see the <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">Workspace Switcher Applet Manual</ulink>."
 msgstr ""
-"Pra mais informações, consulte o <ulink type=\"help\" url=\"ghelp:workspace-"
+"Pra mais informações, consulte o <ulink type=\"help\" url=\"help:workspace-"
 "switcher\">Manual da Applet de Alternador de Áreas de Trabalho</ulink>."
 
 #: C/gosoverview.xml:404(title)
@@ -6644,49 +6644,49 @@ msgstr "As aplicações que fazem parte do MATE incluem o seguinte:"
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Editor de Texto Pluma</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Editor de Texto Pluma</"
 "application></ulink> pode ler, criar, ou alterar qualquer tipo de texto "
 "simples sem qualquer tipo de formatação."
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dicionário</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dicionário</"
 "application></ulink> permite-lhe procurar definições de palavras."
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Visualizador de Imagens</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Visualizador de Imagens</"
 "application></ulink> pode apresentar ficheiros isolados de imagens bem como "
 "grandes colecções de imagens."
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculadora</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculadora</"
 "application></ulink> realiza cálculos simples, financeiros, e científicos."
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all the characters "
 "you need will be on your keyboard."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Mapa de "
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Mapa de "
 "Caracteres</application></ulink> permite-lhe copiar letras e símbolos do "
 "conjunto de caracteres <firstterm>Unicode</firstterm> e colá-los em qualquer "
 "aplicação. Caso esteja a escrever em vários idiomas, nem todos os caracteres "
@@ -6711,10 +6711,10 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Consola</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Consola</"
 "application></ulink> dá-lhe acesso à linha de comando do sistema."
 
 #: C/gosoverview.xml:428(para)
@@ -7089,7 +7089,7 @@ msgstr "Seleccionar uma pasta"
 #: C/gosoverview.xml:529(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -7098,7 +7098,7 @@ msgid ""
 msgstr ""
 "Por vezes poderá ter de seleccionar uma pasta para trabalhar, em vez de "
 "abrir um ficheiro. Por exemplo, se utilizar o <ulink type=\"help\" url="
-"\"ghelp:file-roller\"><application>Gestor de Arquivos</application></ulink> "
+"\"help:file-roller\"><application>Gestor de Arquivos</application></ulink> "
 "para extrair ficheiros de um arquivo, tem de seleccionar uma pasta onde "
 "colocar os ficheiros. Neste caso, os ficheiros na localização actual estão "
 "acinzentados, e premir <guibutton>Abrir</guibutton> quando uma pasta está "
@@ -12443,14 +12443,14 @@ msgid ""
 "To format a floppy disk, right-click on the object that represents the "
 "floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-"type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+"type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 "documentation for more details."
 msgstr ""
 "Para formatar uma disquete, clique com o botão direito sobre o objecto que "
 "representa o leitor de disquetes na área de trabalho, depois seleccione "
 "<guimenuitem>Formatar</guimenuitem>. É aberta uma janela de diálogo de "
 "<guilabel>Formatador de Disquetes</guilabel>. Consulte a documentação do "
-"<ulink type=\"help\" url=\"ghelp:gfloppy?usage\">Formatador de Disquetes</"
+"<ulink type=\"help\" url=\"help:gfloppy?usage\">Formatador de Disquetes</"
 "ulink> para mais detalhes."
 
 #: C/goscaja.xml:3006(title)
@@ -14282,12 +14282,12 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>Procurar Ficheiros</guimenuitem> permite-lhe procurar ficheiros "
 "no seu computador. Para mais informações sobre isto, consulte o <ulink type="
-"\"help\" url=\"ghelp:mate-search-tool\">Manual de Procura de Ficheiros</"
+"\"help\" url=\"help:mate-search-tool\">Manual de Procura de Ficheiros</"
 "ulink>."
 
 #: C/goseditmainmenu.xml:71(para)
@@ -14428,11 +14428,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"O <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0\">Guia "
+"O <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0\">Guia "
 "de Administração do Sistema</ulink> contém mais informações sobre como o "
 "MATE implementa menus e como os administradores os podem personalizar."
 
@@ -14698,12 +14698,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Esta secção descreve cada uma das preferências que pode definir. Para uma "
 "descrição mais orientada para tarefas da acessibilidade de teclado, consulte "
-"o <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"o <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>Guia de Acessibilidade do Ambiente de Trabalho MATE</"
 "citetitle></ulink>."
 
@@ -14943,11 +14943,11 @@ msgstr ""
 #: C/goscustdesk.xml:566(para)
 msgid ""
 "For more information on configuring keyboard accessibility preferences, see "
-"the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"the <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Para mais informações sobre a configuração de preferências de acessibilidade "
-"do teclado, consulte o <ulink type=\"help\" url=\"ghelp:mate-access-guide?"
+"do teclado, consulte o <ulink type=\"help\" url=\"help:mate-access-guide?"
 "index\"><citetitle>Guia de Acessibilidade do Ambiente de Trabalho MATE</"
 "citetitle></ulink>."
 
@@ -15087,13 +15087,13 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "Seleccione esta opção para que o teclado numérico possa emular as acções do "
 "rato. A lista de teclas e suas equivalências encontra-se no <citetitle>Guia "
 "de Acessibilidade do Ambiente de Trabalho MATE</citetitle> na secção <ulink "
-"type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>Para "
+"type=\"help\" url=\"help:mate-access-guide?dtconfig-14\"><citetitle>Para "
 "Activar a Emulação do Rato Através do Teclado</citetitle></ulink>."
 
 #: C/goscustdesk.xml:532(para)
@@ -17669,12 +17669,12 @@ msgstr ""
 
 #: C/goscustdesk.xml:2165(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
 "Para alternar entre disposições de teclado, utilize a <ulink type=\"help\" "
-"url=\"ghelp:gswitchit\">applet de painel <application>Indicador de Teclado</"
+"url=\"help:gswitchit\">applet de painel <application>Indicador de Teclado</"
 "application></ulink>."
 
 #: C/goscustdesk.xml:2169(guilabel)
@@ -17898,12 +17898,12 @@ msgstr ""
 #: C/goscustdesk.xml:2252(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 "Os caracteres de terceiro e quarto níveis da disposição do seu teclado são "
 "apresentados na Janela de Vista de Disposição do <ulink type=\"help\" url="
-"\"ghelp:gswitchit\"><application>Indicador de Teclado</application></ulink>."
+"\"help:gswitchit\"><application>Indicador de Teclado</application></ulink>."
 
 #: C/goscustdesk.xml:2257(guilabel)
 msgid "Use keyboard LED to show alternative group."
@@ -18585,10 +18585,10 @@ msgstr "Selector de Sistemas Multimédia"
 
 #: C/goscustdesk.xml:2890(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"Consulte o <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">Manual de "
+"Consulte o <ulink type=\"help\" url=\"help:gstreamer-properties\">Manual de "
 "Propriedades do GStreamer</ulink>."
 
 #: C/goscustdesk.xml:2894(title)
@@ -20209,7 +20209,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 ""
 "É dada permissão para copiar, distribuir e/ou alterar este documento sob os "
@@ -20217,7 +20217,7 @@ msgstr ""
 "outra posteriormente publicada pela Free Software Foundation sem quaisquer "
 "Secções Invariantes, Textos de Capa ou Prefácios, e sem Textos Finais ou "
 "Posfácios. Poderá encontrar uma cópia da GFDL neste <ulink type=\"help\" url="
-"\"ghelp:fdl\">endereço</ulink> ou no ficheiro COPYING-DOCS distribuído com "
+"\"help:fdl\">endereço</ulink> ou no ficheiro COPYING-DOCS distribuído com "
 "este manual."
 
 #: C/user-guide.xml:12(para)
@@ -20532,11 +20532,11 @@ msgstr "Este manual descreve a versão 2.14 do ambiente de trabalho MATE."
 #: C/user-guide.xml:226(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE desktop or this "
-"manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" "
+"manual, follow the directions in the <ulink url=\"help:mate-feedback\" "
 "type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Para relatar um erro ou propor uma sugestão relativa ao Ambiente de Trabalho "
-"MATE ou este manual, siga as instruções existentes na <ulink url=\"ghelp:"
+"MATE ou este manual, siga as instruções existentes na <ulink url=\"help:"
 "mate-feedback\" type=\"help\">Página de Comentários do MATE</ulink>."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
diff --git a/user-guide/pt_BR/pt_BR.po b/user-guide/pt_BR/pt_BR.po
index b6603b7..7c2f851 100644
--- a/user-guide/pt_BR/pt_BR.po
+++ b/user-guide/pt_BR/pt_BR.po
@@ -1742,8 +1742,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:904(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> ou <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> ou <option>mate-help:</option>"
 
 #: C/gostools.xml:908(para)
 msgid ""
@@ -1755,8 +1755,8 @@ msgstr ""
 
 #: C/gostools.xml:911(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:913(para)
 msgid ""
@@ -1769,8 +1769,8 @@ msgstr ""
 
 #: C/gostools.xml:916(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:921(option)
 msgid "man:"
@@ -1901,16 +1901,16 @@ msgstr "Converter do formato DocBook para um formato apropriado para exibição.
 #: C/gostools.xml:986(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/>O <application>Navegador de Ajuda Yelp</application> conta "
-"com a <ulink url=\"ghelp:mate-doc-xslt\">Folha de Estilos MATE XSLT</"
+"com a <ulink url=\"help:mate-doc-xslt\">Folha de Estilos MATE XSLT</"
 "ulink> para fazer conversões de DocBook para HTML. Os autores de aplicativos "
-"contam com os <ulink url=\"ghelp:mate-doc-make\">Utilitários de Construção "
+"contam com os <ulink url=\"help:mate-doc-make\">Utilitários de Construção "
 "de Documentação do MATE</ulink> para instalar e registrar documentações no "
 "sistema de ajuda."
 
@@ -2143,13 +2143,13 @@ msgid ""
 "When you log in to a session in a different language, you choose the "
 "language for the user interface. You do not specify a keyboard layout for "
 "the session. To choose a keyboard layout, use the <ulink type=\"help\" url="
-"\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> "
+"\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> "
 "applet."
 msgstr ""
 "Quando você inicia uma sessão com um idioma diferente, você escolhe o idioma "
 "da interface de usuário, mas não uma disposição de teclado. Para escolher "
 "uma disposição de teclado, use o miniaplicativo <ulink type=\"help\" url="
-"\"ghelp:gswitchit\"><application>Indicador do teclado</application></ulink>."
+"\"help:gswitchit\"><application>Indicador do teclado</application></ulink>."
 
 #: C/gosstartsession.xml:120(title)
 msgid "Locking Your Screen"
@@ -2788,11 +2788,11 @@ msgstr "Miniaplicativo <application>Relógio</application>"
 msgid ""
 "<application>Clock</application> shows the current time. Click on the time "
 "to open a small calendar. For more on this, see the <ulink type=\"help\" url="
-"\"ghelp:clock\">Clock Applet Manual</ulink>."
+"\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "O <application>Relógio</application> mostra a hora corrente. Clique na hora "
 "para abrir um pequeno calendário. Para mais informações, veja o <ulink type="
-"\"help\" url=\"ghelp:clock\">Manual do Miniaplicativo de Relógio</ulink>."
+"\"help\" url=\"help:clock\">Manual do Miniaplicativo de Relógio</ulink>."
 
 #: C/gospanel.xml:99(term)
 msgid "<application>Volume Control</application> applet"
@@ -2802,11 +2802,11 @@ msgstr "Miniaplicativo <application>Controle de volume</application>"
 msgid ""
 "<application>Volume Control</application> enables you to control the volume "
 "of the speaker on your system. For more on this, see the <ulink type=\"help"
-"\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "O <application>Controle de volume</application> lhe permite controlar o "
 "volume do alto-falante do sistema. Para mais informações, veja o <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Manual do Controle de Volume</"
+"\"help\" url=\"help:mate-volume-control\">Manual do Controle de Volume</"
 "ulink>."
 
 #: C/gospanel.xml:104(term)
@@ -4694,11 +4694,11 @@ msgstr ""
 #: C/gospanel.xml:1350(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "Para mais informações sobre a ferramenta <application>Pesquisar arquivos</"
-"application>, veja o <ulink type=\"help\" url=\"ghelp:mate-search-tool"
+"application>, veja o <ulink type=\"help\" url=\"help:mate-search-tool"
 "\">Manual da Ferramenta Pesquisar por Arquivos</ulink>."
 
 #: C/gospanel.xml:1354(title)
@@ -6530,10 +6530,10 @@ msgstr ""
 
 #: C/gosoverview.xml:399(para)
 msgid ""
-"For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"For more on this, see the <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">Workspace Switcher Applet Manual</ulink>."
 msgstr ""
-"Para mais informações, veja o <ulink type=\"help\" url=\"ghelp:workspace-"
+"Para mais informações, veja o <ulink type=\"help\" url=\"help:workspace-"
 "switcher\">Manual do miniaplicativo Alternador de Espaços de Trabalho</"
 "ulink>."
 
@@ -6573,50 +6573,50 @@ msgstr "Os aplicativos que integram o MATE incluem:"
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"O <ulink type=\"help\" url=\"ghelp:pluma\"><application>editor de textos "
+"O <ulink type=\"help\" url=\"help:pluma\"><application>editor de textos "
 "Pluma</application></ulink> pode ler, criar ou modificar qualquer tipo de "
 "texto simples, sem formatação."
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"O <ulink type=\"help\" url=\"ghelp:mate-dictionary"
+"O <ulink type=\"help\" url=\"help:mate-dictionary"
 "\"><application>Dicionário</application></ulink> permite que você procure "
 "por definições de palavras."
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"O <ulink type=\"help\" url=\"ghelp:eom\"><application>Visualizador de "
+"O <ulink type=\"help\" url=\"help:eom\"><application>Visualizador de "
 "Imagens</application></ulink> pode exibir imagens, tanto arquivos únicos "
 "quanto grandes coleções."
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"A <ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculadora</"
+"A <ulink type=\"help\" url=\"help:gcalctool\"><application>Calculadora</"
 "application></ulink> executa cálculos básicos, financeiros e científicos."
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all the characters "
 "you need will be on your keyboard."
 msgstr ""
-"O <ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Mapa de "
+"O <ulink type=\"help\" url=\"help:gucharmap\"><application>Mapa de "
 "Caracteres</application></ulink> permite que você escolha letras e símbolos "
 "a partir do conjunto de caracteres <firstterm>Unicode</firstterm> para então "
 "colá-los em seu aplicativo. Isso é importante porque nem todos os caracteres "
@@ -6642,10 +6642,10 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"O <ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"O <ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> fornece acesso à linha de comando."
 
 #: C/gosoverview.xml:428(para)
@@ -7016,7 +7016,7 @@ msgstr "Escolhendo uma pasta"
 #: C/gosoverview.xml:529(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -7024,7 +7024,7 @@ msgid ""
 "folder."
 msgstr ""
 "Às vezes você pode precisar escolher uma pasta para trabalhar, ao invés de "
-"um arquivo. Por exemplo, se você usar o <ulink type=\"help\" url=\"ghelp:"
+"um arquivo. Por exemplo, se você usar o <ulink type=\"help\" url=\"help:"
 "file-roller\"><application>Compactador de arquivos</application></ulink> "
 "para extrair arquivos de um pacote, precisa escolher uma pasta onde colocar "
 "os arquivos. Nesse caso, os arquivos na localização atual estarão "
@@ -12340,13 +12340,13 @@ msgid ""
 "To format a floppy disk, right-click on the object that represents the "
 "floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-"type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+"type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 "documentation for more details."
 msgstr ""
 "Para formatar um disquete, clique botão direito no objeto que o representa "
 "na área de trabalho, e então escolha <guimenuitem>Formatar</guimenuitem>. Um "
 "diálogo <guilabel>Formatador de Disquetes</guilabel> será exibido. Veja a "
-"documentação do <ulink type=\"help\" url=\"ghelp:gfloppy?usage\">Formatador "
+"documentação do <ulink type=\"help\" url=\"help:gfloppy?usage\">Formatador "
 "de Disquetes</ulink> para mais detalhes."
 
 #: C/goscaja.xml:3006(title)
@@ -14185,12 +14185,12 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>Pesquisar por Arquivos</guimenuitem> permite que você pesquise "
 "por arquivos no seu computador. Para mais detalhes, veja o <ulink type=\"help"
-"\" url=\"ghelp:mate-search-tool\">Manual do Pesquisar por Arquivos</ulink>."
+"\" url=\"help:mate-search-tool\">Manual do Pesquisar por Arquivos</ulink>."
 
 #: C/goseditmainmenu.xml:71(para)
 msgid ""
@@ -14328,11 +14328,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"O <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0\">Guia "
+"O <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0\">Guia "
 "do Administrador do Sistema</ulink> tem mais informações sobre como o MATE "
 "implementa os menus e como os administradores podem personalizá-los."
 
@@ -14596,12 +14596,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Esta seção descreve cada uma das preferências que você pode configurar. Para "
 "uma descrição de acessibilidade de teclado mais orientada a tarefas, veja o "
-"<ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>Guia "
+"<ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>Guia "
 "de Acessibilidade do MATE</citetitle></ulink>."
 
 #: C/goscustdesk.xml:162(para)
@@ -14840,11 +14840,11 @@ msgstr ""
 #: C/goscustdesk.xml:563(para)
 msgid ""
 "For more information on configuring keyboard accessibility preferences, see "
-"the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"the <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Para mais informações sobre como configurar as preferências de "
-"acessibilidade do teclado, veja o <ulink type=\"help\" url=\"ghelp:mate-"
+"acessibilidade do teclado, veja o <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>Guia de Acessibilidade do MATE</citetitle></"
 "ulink>."
 
@@ -14983,13 +14983,13 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "Selecione esta opção para fazer com que o teclado numérico emule as ações do "
 "mouse. A lista de teclas e suas equivalências estão no <citetitle>Guia de "
 "Acessibilidade do MATE</citetitle> sob o título <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>Habilitar o Teclado a "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>Habilitar o Teclado a "
 "Emular o Mouse</citetitle></ulink>."
 
 #: C/goscustdesk.xml:529(para)
@@ -17571,12 +17571,12 @@ msgstr ""
 
 #: C/goscustdesk.xml:2165(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
 "Para alternar entre as disposições de teclado, use o miniaplicativo do "
-"painel <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Indicador "
+"painel <ulink type=\"help\" url=\"help:gswitchit\"><application>Indicador "
 "do Teclado</application></ulink>."
 
 #: C/goscustdesk.xml:2169(guilabel)
@@ -17796,12 +17796,12 @@ msgstr ""
 #: C/goscustdesk.xml:2252(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 "Os caracteres de terceiro e quarto nível para a disposição de seu teclado "
 "são mostradas na Janela de Visualização de Exibição <ulink type=\"help\" url="
-"\"ghelp:gswitchit\"><application>Indicador do Teclado</application></ulink>."
+"\"help:gswitchit\"><application>Indicador do Teclado</application></ulink>."
 
 #: C/goscustdesk.xml:2257(guilabel)
 msgid "Use keyboard LED to show alternative group."
@@ -18476,10 +18476,10 @@ msgstr "Seletor de Sistemas Multimídias"
 
 #: C/goscustdesk.xml:2890(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"Veja o <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">Manual de "
+"Veja o <ulink type=\"help\" url=\"help:gstreamer-properties\">Manual de "
 "Propriedades do GStreamer</ulink>."
 
 #: C/goscustdesk.xml:2894(title)
@@ -20094,7 +20094,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 ""
 "Permissão concedida para copiar, distribuir e/ou modificar este documento "
@@ -20102,7 +20102,7 @@ msgstr ""
 "Documentation License), Versão 1.1 ou qualquer versão posterior publicada "
 "pela Free Software Foundation; sem nenhuma Seção Imutável, Texto de Capa ou "
 "de Contra-Capa. Uma cópia da licença se encontra na seção <ulink type=\"help"
-"\" url=\"ghelp:fdl\">\"GNU Free Documentation License\"</ulink> ou no "
+"\" url=\"help:fdl\">\"GNU Free Documentation License\"</ulink> ou no "
 "arquivo COPYING-DOCS distribuído com esse manual."
 
 #: C/user-guide.xml:12(para)
diff --git a/user-guide/ru/ru.po b/user-guide/ru/ru.po
index 1227eba..8bd5478 100644
--- a/user-guide/ru/ru.po
+++ b/user-guide/ru/ru.po
@@ -1714,8 +1714,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/ru/gcalctool.xml"
 
 #: C/gostools.xml:904(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> или <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> или <option>mate-help:</option>"
 
 #: C/gostools.xml:908(para)
 msgid ""
@@ -1727,8 +1727,8 @@ msgstr ""
 
 #: C/gostools.xml:911(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:913(para)
 msgid ""
@@ -1740,8 +1740,8 @@ msgstr ""
 
 #: C/gostools.xml:916(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:921(option)
 msgid "man:"
@@ -1871,15 +1871,15 @@ msgstr "Преобразование из формата DocBook в подход
 #: C/gostools.xml:986(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on <ulink "
-"url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to perform "
-"conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make\">MATE "
+"url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to perform "
+"conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make\">MATE "
 "Documentation Build Utilities</ulink> are relied upon by application authors "
 "to install and register documentation within the help system."
 msgstr ""
 "<placeholder-1/>Программа просмотра справки <application>Yelp</application> "
-"опирается на таблицы стилей <ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT "
+"опирается на таблицы стилей <ulink url=\"help:mate-doc-xslt\">MATE XSLT "
 "Stylesheets</ulink> для преобразования документации формата DocBook в HTML. "
-"<ulink url=\"ghelp:mate-doc-make\">Утилиты сборки документации MATE</ulink> "
+"<ulink url=\"help:mate-doc-make\">Утилиты сборки документации MATE</ulink> "
 "обеспечивают разработчикам приложений возможность устанавливать и "
 "регистрировать документацию в системе справки."
 
@@ -2105,12 +2105,12 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you choose the language "
 "for the user interface. You do not specify a keyboard layout for the session. "
-"To choose a keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"To choose a keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "Язык, выбранный при входе в систему, используется в пользовательском "
 "интерфейсе. При этом не изменяется раскладка клавиатуры в сеансе. Для выбора "
-"раскладки используйте апплет <ulink type=\"help\" url=\"ghelp:gswitchit"
+"раскладки используйте апплет <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>Индикатор раскладок клавиатуры</application></ulink>."
 
 #: C/gosstartsession.xml:120(title)
@@ -2728,11 +2728,11 @@ msgstr "Апплет <application>Часы</application>"
 msgid ""
 "<application>Clock</application> shows the current time. Click on the time to "
 "open a small calendar. For more on this, see the <ulink type=\"help\" url="
-"\"ghelp:clock\">Clock Applet Manual</ulink>."
+"\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "<application>Часы</application> показывают текущее время. Щёлкните на них, "
 "чтобы открыть маленький календарь. Подробнее об этом смотрите <ulink type="
-"\"help\" url=\"ghelp:clock\">руководство к апплету Часы</ulink>."
+"\"help\" url=\"help:clock\">руководство к апплету Часы</ulink>."
 
 #: C/gospanel.xml:99(term)
 msgid "<application>Volume Control</application> applet"
@@ -2742,11 +2742,11 @@ msgstr "Апплет <application>Регулятор громкости</applica
 msgid ""
 "<application>Volume Control</application> enables you to control the volume "
 "of the speaker on your system. For more on this, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "<application>Регулятор громкости</application> позволяет изменять громкость "
 "динамиков вашего компьютера. Подробнее об этом смотрите <ulink type=\"help\" "
-"url=\"ghelp:mate-volume-control\">руководство по регулятору громкости</"
+"url=\"help:mate-volume-control\">руководство по регулятору громкости</"
 "ulink>."
 
 #: C/gospanel.xml:104(term)
@@ -4648,11 +4648,11 @@ msgstr ""
 #: C/gospanel.xml:1398(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "Подробнее о <application>Средстве поиска файлов</application> смотрите <ulink "
-"type=\"help\" url=\"ghelp:mate-search-tool\">соответствующее руководство</"
+"type=\"help\" url=\"help:mate-search-tool\">соответствующее руководство</"
 "ulink>."
 
 #: C/gospanel.xml:1402(title)
@@ -6448,10 +6448,10 @@ msgstr ""
 
 #: C/gosoverview.xml:399(para)
 msgid ""
-"For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"For more on this, see the <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">Workspace Switcher Applet Manual</ulink>."
 msgstr ""
-"Подробнее об этом смотрите в <ulink type=\"help\" url=\"ghelp:workspace-"
+"Подробнее об этом смотрите в <ulink type=\"help\" url=\"help:workspace-"
 "switcher\">руководстве по апплету переключателя рабочих мест</ulink>."
 
 #: C/gosoverview.xml:404(title)
@@ -6491,49 +6491,49 @@ msgstr "Вот некоторые из приложений, входящих в
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Текстовый редактор "
+"<ulink type=\"help\" url=\"help:pluma\"><application>Текстовый редактор "
 "pluma</application></ulink> позволяет просматривать, создавать или изменять "
 "любой простой (не форматированный) текст."
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Словарь</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Словарь</"
 "application></ulink> позволяет находить определения слов."
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Программа просмотра "
+"<ulink type=\"help\" url=\"help:eom\"><application>Программа просмотра "
 "изображений</application></ulink> способна показывать как отдельные "
 "изображения, так и большие коллекции."
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Калькулятор</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Калькулятор</"
 "application></ulink> выполняет простые, финансовые и научные вычисления."
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all the characters "
 "you need will be on your keyboard."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Таблица символов</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Таблица символов</"
 "application></ulink> позволяет вам выбирать буквы и символы из набора "
 "<firstterm>Юникод</firstterm> и вставлять их в любое приложение. Если вы "
 "пишете на нескольких языках, не все нужные вам символы найдутся на клавиатуре."
@@ -6557,10 +6557,10 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Терминал</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Терминал</"
 "application></ulink> обеспечивает доступ к системной командной строке."
 
 #: C/gosoverview.xml:428(para)
@@ -6926,14 +6926,14 @@ msgstr "Выбор папки"
 #: C/gosoverview.xml:529(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
 "<guibutton>Open</guibutton> when a folder is selected will choose that folder."
 msgstr ""
 "Иногда бывает нужно выбрать папку, а не открыть один файл. Например, при "
-"использовании <ulink type=\"help\" url=\"ghelp:file-roller"
+"использовании <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Менеджера архивов</application></ulink> для извлечения файлов "
 "из архива нужно указать папку, в которую будут помещены извлечённые файлы. В "
 "этом случае файлы в текущем местоположении будут затенены, а нажатие кнопки "
@@ -12166,14 +12166,14 @@ msgid ""
 "To format a floppy disk, right-click on the object that represents the floppy "
 "on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-"type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+"type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 "documentation for more details."
 msgstr ""
 "Чтобы отформатировать дискету, щёлкните правой кнопкой мыши на объекте, "
 "соответствующем дискете, на рабочем столе, затем выберите "
 "<guimenuitem>Форматировать</guimenuitem>. Появится диалоговое окно "
 "<guilabel>Форматирование дискет</guilabel>. Подробнее смотрите документацию "
-"<ulink type=\"help\" url=\"ghelp:gfloppy?usage\">Форматирование дискет</"
+"<ulink type=\"help\" url=\"help:gfloppy?usage\">Форматирование дискет</"
 "ulink>."
 
 #: C/goscaja.xml:3006(title)
@@ -13967,11 +13967,11 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on your "
-"computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:mate-"
+"computer. For more on this, see the <ulink type=\"help\" url=\"help:mate-"
 "search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>Искать файлы</guimenuitem> позволяет вам искать файлы на вашем "
-"компьютере. Подробнее об этом смотрите <ulink type=\"help\" url=\"ghelp:mate-"
+"компьютере. Подробнее об этом смотрите <ulink type=\"help\" url=\"help:mate-"
 "search-tool\">Руководство по поиску файлов</ulink>."
 
 #: C/goseditmainmenu.xml:71(para)
@@ -14111,11 +14111,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"<ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">Руководство по системному администрированию</ulink> содержит больше "
 "информации о том, как работают меню в MATE и как администраторы могут менять "
 "их содержимое."
@@ -14373,12 +14373,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility "
 "Guide</citetitle></ulink>."
 msgstr ""
 "В этом разделе описывает описан каждый из настраиваемых параметров. Если вам "
 "нужно описание специальных возможностей клавиатуры с расчётом на выполняемые "
-"задачи, смотрите <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"задачи, смотрите <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>Руководство по вспомогательным технологиям рабочей среды MATE</"
 "citetitle></ulink>."
 
@@ -14613,11 +14613,11 @@ msgstr ""
 #: C/goscustdesk.xml:566(para)
 msgid ""
 "For more information on configuring keyboard accessibility preferences, see "
-"the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"the <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "Подробнее о настройке специальных возможностей клавиатуры смотрите <ulink "
-"type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>Руководство "
+"type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>Руководство "
 "по вспомогательным технологиям рабочей среды MATE</citetitle></ulink>."
 
 #: C/goscustdesk.xml:363(title) C/goscustdesk.xml:367(title)
@@ -14754,13 +14754,13 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The list "
 "of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard to "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard to "
 "Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "Выберите этот параметр, чтобы цифровая клавиатура эмулировала действия мыши. "
 "Перечень клавиш и соответствующих им действий можно найти в "
 "<citetitle>Руководстве по специальным возможностям среды MATE</citetitle> в "
-"разделе <ulink type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-14"
+"разделе <ulink type=\"help\" url=\"help:mate-access-guide?dtconfig-14"
 "\"><citetitle>Чтобы эмулировать мышь через клавиатуру</citetitle></ulink>."
 
 #: C/goscustdesk.xml:532(para)
@@ -17295,12 +17295,12 @@ msgstr ""
 
 #: C/goscustdesk.xml:2165(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
 "Для переключения между раскладками, испольуйте <ulink type=\"help\" url="
-"\"ghelp:gswitchit\">апплет панели <application>Индикатор раскладки "
+"\"help:gswitchit\">апплет панели <application>Индикатор раскладки "
 "клавиатуры</application></ulink>."
 
 #: C/goscustdesk.xml:2169(guilabel)
@@ -17520,11 +17520,11 @@ msgstr ""
 #: C/goscustdesk.xml:2252(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 "Символы третьего и четвёртого уровня раскладки отображаются в окне раскладки "
-"апплета <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Индикатора "
+"апплета <ulink type=\"help\" url=\"help:gswitchit\"><application>Индикатора "
 "раскладки клавиатуры</application></ulink>."
 
 #: C/goscustdesk.xml:2257(guilabel)
@@ -18191,10 +18191,10 @@ msgstr "Выбор мультимедийной системы"
 
 #: C/goscustdesk.xml:2890(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"Смотрите <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">Руководство "
+"Смотрите <ulink type=\"help\" url=\"help:gstreamer-properties\">Руководство "
 "по свойствам GStreamer</ulink>."
 
 #: C/goscustdesk.xml:2894(title)
@@ -19784,7 +19784,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 ""
 "Разрешается копировать, распространять и/или изменять этот документ на "
@@ -19792,7 +19792,7 @@ msgstr ""
 "более поздней версии, опубликованной Фондом свободного программного "
 "обеспечения (Free Software Foundation), без неизменяемых частей и без текстов "
 "на обложках. Вы можете найти копию лицензии GFDL по  <ulink type=\"help\" url="
-"\"ghelp:fdl\">этой ссылке</ulink> или в файле COPYING-DOCS, распространяемом "
+"\"help:fdl\">этой ссылке</ulink> или в файле COPYING-DOCS, распространяемом "
 "с этим документом."
 
 #: C/user-guide.xml:12(para)
@@ -20100,11 +20100,11 @@ msgstr "Это руководство описывает рабочую сред
 #: C/user-guide.xml:226(para)
 msgid ""
 "To report a bug or make a suggestion regarding the MATE desktop or this "
-"manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type="
+"manual, follow the directions in the <ulink url=\"help:mate-feedback\" type="
 "\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Чтобы сообщить об ошибке или сделать предложение по рабочей среде или этому "
-"руководству, следуйте указаниям в документе <ulink url=\"ghelp:mate-feedback"
+"руководству, следуйте указаниям в документе <ulink url=\"help:mate-feedback"
 "\" type=\"help\">Обратная связь с MATE</ulink>."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
diff --git a/user-guide/sv/sv.po b/user-guide/sv/sv.po
index 674b09a..bdcbf4c 100644
--- a/user-guide/sv/sv.po
+++ b/user-guide/sv/sv.po
@@ -1163,8 +1163,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/sv/gcalctool.xml"
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> eller <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> eller <option>mate-help:</option>"
 
 #: C/gostools.xml:948(para)
 msgid "Use this URI when you want to access MATE help documents, which are typically written in DocBook format."
@@ -1172,8 +1172,8 @@ msgstr "Använd den här URI:n när du vill komma åt MATEs hjälpdokument, som
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:953(para)
 msgid "If you want to open the help document at a particular section, append a question mark to the end of the URI, followed by the section id."
@@ -1181,8 +1181,8 @@ msgstr "Lägg till ett frågetecken på slutet av URI:en följt av avsnittets id
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:961(option)
 msgid "man:"
@@ -1269,8 +1269,8 @@ msgid "Perform conversion from DocBook format to a format suitable for display."
 msgstr "Genomför konvertering från DocBook-formatet till ett format som är lämpligt att visa."
 
 #: C/gostools.xml:1026(para)
-msgid "<placeholder-1/><application>Yelp Help Browser</application> relies on <ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make\">MATE Documentation Build Utilities</ulink> are relied upon by application authors to install and register documentation within the help system."
-msgstr "<placeholder-1/><application>Hjälpbläddraren Yelp</application> använder <ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT:s formatmallar</ulink> för att genomföra konverteringen från DocBook till HTML. <ulink url=\"ghelp:mate-doc-make\">MATE Dokumentationsbyggverktyg</ulink> används av programskapare för att installera och registrera dokumentation i hjälpsystemet."
+msgid "<placeholder-1/><application>Yelp Help Browser</application> relies on <ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make\">MATE Documentation Build Utilities</ulink> are relied upon by application authors to install and register documentation within the help system."
+msgstr "<placeholder-1/><application>Hjälpbläddraren Yelp</application> använder <ulink url=\"help:mate-doc-xslt\">MATE XSLT:s formatmallar</ulink> för att genomföra konverteringen från DocBook till HTML. <ulink url=\"help:mate-doc-make\">MATE Dokumentationsbyggverktyg</ulink> används av programskapare för att installera och registrera dokumentation i hjälpsystemet."
 
 #: C/gostools.xml:1047(title)
 msgid "Homepage and Mailing List"
@@ -1420,8 +1420,8 @@ msgid "On the login screen, click on the <guilabel>Language</guilabel> icon. Cho
 msgstr "Klicka på <guilabel>Språk</guilabel>-ikonen. Välj det språk du vill ha från listan över tillgängliga språk."
 
 #: C/gosstartsession.xml:120(para)
-msgid "When you log in to a session in a different language, you are changing the language for the user interface but are not changing the keyboard layout. To choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
-msgstr "När du loggar in till en session på ett annat språk så ändrar du språket för användargränssnittet men ändrar inte tangentbordets layout. För att välja en annan tangentbordslayout, använd panelprogrammet <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Tangentbordsindikator</application></ulink>."
+msgid "When you log in to a session in a different language, you are changing the language for the user interface but are not changing the keyboard layout. To choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
+msgstr "När du loggar in till en session på ett annat språk så ändrar du språket för användargränssnittet men ändrar inte tangentbordets layout. För att välja en annan tangentbordslayout, använd panelprogrammet <ulink type=\"help\" url=\"help:gswitchit\"><application>Tangentbordsindikator</application></ulink>."
 
 #: C/gosstartsession.xml:126(para)
 msgid "Your system distributor or vendor may have altered the login screen so that it no longer has a <guilabel>Language</guilabel> icon. In this case, the option to change the session's language may be found by clicking the <guilabel>Other</guilabel> icon."
@@ -1834,16 +1834,16 @@ msgid "<application>Clock</application> applet"
 msgstr "Panelprogrammet <application>Klocka</application>"
 
 #: C/gospanel.xml:66(para)
-msgid "The <application>Clock</application> shows the current time. Click on the time to open a small calendar. You can also view a world map by clicking the <guilabel>Locations</guilabel> expansion label. For more on this, see the <ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
-msgstr "<application>Klocka</application> visar den aktuella tiden. Klicka på tiden för att öppna en liten kalender. Du kan också visa en världskarta genom att klicka på etiketten <guilabel>Platser</guilabel>. För mer information om det här, se <ulink type=\"help\" url=\"ghelp:clock\">Handbok för panelprogrammet Klocka</ulink>."
+msgid "The <application>Clock</application> shows the current time. Click on the time to open a small calendar. You can also view a world map by clicking the <guilabel>Locations</guilabel> expansion label. For more on this, see the <ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
+msgstr "<application>Klocka</application> visar den aktuella tiden. Klicka på tiden för att öppna en liten kalender. Du kan också visa en världskarta genom att klicka på etiketten <guilabel>Platser</guilabel>. För mer information om det här, se <ulink type=\"help\" url=\"help:clock\">Handbok för panelprogrammet Klocka</ulink>."
 
 #: C/gospanel.xml:70(term)
 msgid "<application>Volume Control</application> applet"
 msgstr "Panelprogrammet <application>Volymkontroll</application>"
 
 #: C/gospanel.xml:72(para)
-msgid "The <application>Volume Control</application> enables you to control the volume of the speakers on your system. For more on this, see the <ulink type=\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
-msgstr "<application>Volymkontroll</application> låter dig kontrollera volymen för högtalarna för ditt system. För mer information om det här, se <ulink type=\"help\" url=\"ghelp:mate-volume-control\">Handbok för Volymkontroll</ulink>."
+msgid "The <application>Volume Control</application> enables you to control the volume of the speakers on your system. For more on this, see the <ulink type=\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
+msgstr "<application>Volymkontroll</application> låter dig kontrollera volymen för högtalarna för ditt system. För mer information om det här, se <ulink type=\"help\" url=\"help:mate-volume-control\">Handbok för Volymkontroll</ulink>."
 
 #: C/gospanel.xml:75(term)
 msgid "<indexterm><primary>top edge panel</primary><secondary>window list icon</secondary></indexterm><application>Window Selector</application> icon"
@@ -3039,8 +3039,8 @@ msgid "To open the <application>Search Tool</application>, click on the <guibutt
 msgstr "För att öppna <application>Sökverktyg</application>, klicka på knappen <guibutton>Sök</guibutton>."
 
 #: C/gospanel.xml:1229(para)
-msgid "For more information on the <application>Search Tool</application>, see the <ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</ulink>."
-msgstr "För mer information om <application>Sökverktyg</application>, se <ulink type=\"help\" url=\"ghelp:mate-search-tool\">Handbok för sökverktyget</ulink>."
+msgid "For more information on the <application>Search Tool</application>, see the <ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</ulink>."
+msgstr "För mer information om <application>Sökverktyg</application>, se <ulink type=\"help\" url=\"help:mate-search-tool\">Handbok för sökverktyget</ulink>."
 
 #: C/gospanel.xml:1233(title)
 msgid "Show Desktop Button"
@@ -3980,32 +3980,32 @@ msgid "The applications that are part of MATE include the following:"
 msgstr "Programmen som är en del av MATE inkluderar följande:"
 
 #: C/gosoverview.xml:419(para)
-msgid "<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</application></ulink> can read, create, or modify any kind of simple text without any formatting."
-msgstr "<ulink type=\"help\" url=\"ghelp:pluma\"><application>Textredigeraren Pluma</application></ulink> kan läsa, skapa eller ändra alla former av enkel text utan någon formatering."
+msgid "<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</application></ulink> can read, create, or modify any kind of simple text without any formatting."
+msgstr "<ulink type=\"help\" url=\"help:pluma\"><application>Textredigeraren Pluma</application></ulink> kan läsa, skapa eller ändra alla former av enkel text utan någon formatering."
 
 #: C/gosoverview.xml:420(para)
-msgid "<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</application></ulink> allows you to look up definitions of a word."
-msgstr "<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Ordbok</application></ulink> låter dig slå upp definitioner av ett ord."
+msgid "<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</application></ulink> allows you to look up definitions of a word."
+msgstr "<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Ordbok</application></ulink> låter dig slå upp definitioner av ett ord."
 
 #: C/gosoverview.xml:421(para)
-msgid "<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</application></ulink> can display single image files, as well as large image collections."
-msgstr "<ulink type=\"help\" url=\"ghelp:eom\"><application>Bildvisare</application></ulink> kan visa enstaka bildfiler, såväl som stora bildsamlingar."
+msgid "<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</application></ulink> can display single image files, as well as large image collections."
+msgstr "<ulink type=\"help\" url=\"help:eom\"><application>Bildvisare</application></ulink> kan visa enstaka bildfiler, såväl som stora bildsamlingar."
 
 #: C/gosoverview.xml:422(para)
-msgid "<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</application></ulink> performs basic, financial, and scientific calculations."
-msgstr "<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Miniräknare</application></ulink> genomför grundläggande, finansiella och vetenskapliga beräkningar."
+msgid "<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</application></ulink> performs basic, financial, and scientific calculations."
+msgstr "<ulink type=\"help\" url=\"help:gcalctool\"><application>Miniräknare</application></ulink> genomför grundläggande, finansiella och vetenskapliga beräkningar."
 
 #: C/gosoverview.xml:423(para)
-msgid "<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</application></ulink> lets you choose letters and symbols from the <firstterm>Unicode</firstterm> character set and paste them into any application. If you are writing in several languages, not all of the characters you need will be on your keyboard."
-msgstr "<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Teckentabell</application></ulink> låter dig välja bokstäver och symboler från teckenuppsättningen <firstterm>Unicode</firstterm> och klistra in dem i något program. Om du skriver text på flera olika språk så finns kanske inte alla tecken som du behöver på ditt tangentbord."
+msgid "<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</application></ulink> lets you choose letters and symbols from the <firstterm>Unicode</firstterm> character set and paste them into any application. If you are writing in several languages, not all of the characters you need will be on your keyboard."
+msgstr "<ulink type=\"help\" url=\"help:gucharmap\"><application>Teckentabell</application></ulink> låter dig välja bokstäver och symboler från teckenuppsättningen <firstterm>Unicode</firstterm> och klistra in dem i något program. Om du skriver text på flera olika språk så finns kanske inte alla tecken som du behöver på ditt tangentbord."
 
 #: C/gosoverview.xml:424(para)
 msgid "<link linkend=\"caja\"><application>Caja File Manager</application></link> displays your folders and their contents. Use this to copy, move and classify your files, and to access CDs, USB flash drives, and any other removable media. When you choose an item from the <link linkend=\"places-menu\"><guimenu>Places</guimenu> menu</link>, a <application>Caja File Manager</application> window opens showing that location."
 msgstr "Filhanteraren <link linkend=\"caja\"><application>Caja</application></link> visar dina mappar och deras innehåll. Använd den för att kopiera, flytta och klassificera dina filer, och för att komma åt cd-skivor, usb-lagringsenheter eller andra typer av flyttbara media. När du väljer ett objekt från menyn <link linkend=\"places-menu\"><guimenu>Places</guimenu></link> så kommer ett <application>Caja</application>-fönster att öppnas och visa dig platsen."
 
 #: C/gosoverview.xml:425(para)
-msgid "<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</application></ulink> gives you access to the system command line."
-msgstr "<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</application></ulink> ger dig åtkomst till systemets kommandorad."
+msgid "<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</application></ulink> gives you access to the system command line."
+msgstr "<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</application></ulink> ger dig åtkomst till systemets kommandorad."
 
 #: C/gosoverview.xml:428(para)
 msgid "Further standard MATE applications include games, music and video players, a web browser, software accessibility tools, and utilities to manage your system. Your distributor or vendor may have added other applications, such as a word processor and a graphics editor. They may also provide you with a way to install further applications."
@@ -4156,8 +4156,8 @@ msgid "Choosing a folder"
 msgstr "Välj en mapp"
 
 #: C/gosoverview.xml:508(para)
-msgid "You might sometimes need to choose a folder to work with rather than open a file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller\"><application>Archive Manager</application></ulink> to extract files from an archive, you need to choose a folder to place the files into. In this case, the files in the current location are greyed out, and pressing <guibutton>Open</guibutton> when a folder is selected will choose that folder."
-msgstr "Ibland kanske du behöver välja en mapp att arbeta med istället för att öppna en fil. Om du till exempel använder <ulink type=\"help\" url=\"ghelp:file-roller\"><application>Arkivhanterare</application></ulink> för att extrahera filer från ett arkiv, behöver du välja en mapp att placera filerna i. I det här fallet är filerna i den aktuella platsen gråmarkerade och trycker man <guibutton>Öppna</guibutton> när en mapp är markerade kommer den att välja den mappen."
+msgid "You might sometimes need to choose a folder to work with rather than open a file. For example, if you use <ulink type=\"help\" url=\"help:file-roller\"><application>Archive Manager</application></ulink> to extract files from an archive, you need to choose a folder to place the files into. In this case, the files in the current location are greyed out, and pressing <guibutton>Open</guibutton> when a folder is selected will choose that folder."
+msgstr "Ibland kanske du behöver välja en mapp att arbeta med istället för att öppna en fil. Om du till exempel använder <ulink type=\"help\" url=\"help:file-roller\"><application>Arkivhanterare</application></ulink> för att extrahera filer från ett arkiv, behöver du välja en mapp att placera filerna i. I det här fallet är filerna i den aktuella platsen gråmarkerade och trycker man <guibutton>Öppna</guibutton> när en mapp är markerade kommer den att välja den mappen."
 
 #: C/gosoverview.xml:512(title)
 msgid "Open Location"
@@ -8523,8 +8523,8 @@ msgid "<guimenuitem>Connect to Server</guimenuitem> lets you choose a server on
 msgstr "<guimenuitem>Anslut till server</guimenuitem> låter dig välja en server på ditt nätverk. För mer information om det här, se <xref linkend=\"caja-server-connect\"/>."
 
 #: C/goseditmainmenu.xml:70(para)
-msgid "<guimenuitem>Search for Files</guimenuitem> lets you search for files on your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search for Files Manual</ulink>."
-msgstr "<guimenuitem>Sök efter filer</guimenuitem> låter dig söka efter filer på din dator. För mer information om det här, se <ulink type=\"help\" url=\"ghelp:mate-search-tool\">Handbok för Sök efter filer</ulink>."
+msgid "<guimenuitem>Search for Files</guimenuitem> lets you search for files on your computer. For more on this, see the <ulink type=\"help\" url=\"help:mate-search-tool\">Search for Files Manual</ulink>."
+msgstr "<guimenuitem>Sök efter filer</guimenuitem> låter dig söka efter filer på din dator. För mer information om det här, se <ulink type=\"help\" url=\"help:mate-search-tool\">Handbok för Sök efter filer</ulink>."
 
 #: C/goseditmainmenu.xml:71(para)
 msgid "The <guimenuitem>Recent Documents</guimenuitem> submenu lists the documents you have recently opened. The last entry in the submenu clears the list."
@@ -8600,8 +8600,8 @@ msgid "To remove an item from a menu, deselect it in the list. The item can be a
 msgstr "För att ta bort ett objekt från en meny, avmarkera det i listan. Objektet kan läggas tillbaka till menyn genom att markera det än en gång."
 
 #: C/goseditmainmenu.xml:118(para)
-msgid "The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0\">System Administration Guide</ulink> has more information on how MATE implements menus and how administrators can customize them."
-msgstr "<ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0\">Systemadministrationsguiden</ulink> innehåller mer information om hur MATE implementerar menyer och hur administratörer kan anpassa dem."
+msgid "The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0\">System Administration Guide</ulink> has more information on how MATE implements menus and how administrators can customize them."
+msgstr "<ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0\">Systemadministrationsguiden</ulink> innehåller mer information om hur MATE implementerar menyer och hur administratörer kan anpassa dem."
 
 #: C/goscustdesk.xml:2(title)
 msgid "Configuring Your Desktop"
@@ -8880,8 +8880,8 @@ msgid "Run at start (Accessibility only)"
 msgstr "Kör vid start (Endast hjälpmedelsfunktioner)"
 
 #: C/goscustdesk.xml:274(para)
-msgid "Select this option to run the command as soon as your session begins. For more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
-msgstr "Välj det här alternativet för att köra kommandot så snart som din session påbörjas. För fler hjälpmedelsalternativ, se <ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>Hjälpmedelsguide för MATE-skrivbordet</citetitle></ulink>."
+msgid "Select this option to run the command as soon as your session begins. For more accessibility options, see <ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
+msgstr "Välj det här alternativet för att köra kommandot så snart som din session påbörjas. För fler hjälpmedelsalternativ, se <ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>Hjälpmedelsguide för MATE-skrivbordet</citetitle></ulink>."
 
 #: C/goscustdesk.xml:286(title)
 msgid "Look and Feel"
@@ -10143,8 +10143,8 @@ msgid "You can switch between selected layouts to change the characters your key
 msgstr "Du kan växla mellan valda layouter för att ändra tecknen som ditt tangentbord producerar när du skriver. För att lägga till en layout, klicka på <guibutton>Lägg till</guibutton>. Du kan ha upp till fyra layouter. För att ta bort en layout, markera den och tryck på <guibutton>Ta bort</guibutton>."
 
 #: C/goscustdesk.xml:1624(para)
-msgid "To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard Indicator</application> panel applet</ulink>."
-msgstr "För att växla mellan tangentbordslayouter, använd panelprogrammet <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Tangentbordsindikator</application></ulink>."
+msgid "To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard Indicator</application> panel applet</ulink>."
+msgstr "För att växla mellan tangentbordslayouter, använd panelprogrammet <ulink type=\"help\" url=\"help:gswitchit\"><application>Tangentbordsindikator</application></ulink>."
 
 #: C/goscustdesk.xml:1625(para)
 msgid "To add a layout to the list of selected layouts, click the <guibutton>Add</guibutton> button. It opens a layout chooser dialog, which lets you select a layout by country or by language."
@@ -10263,8 +10263,8 @@ msgid "Pressing the third-level key and <keycap>Shift</keycap> produces a fourth
 msgstr "Tryck på tredjenivåtangenten och <keycap>Skift</keycap> producerar ett fjärde tecken från en tangent."
 
 #: C/goscustdesk.xml:1707(para)
-msgid "The third and fourth level characters for your keyboard layout are shown in the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard Indicator</application></ulink> Layout View Window."
-msgstr "Tredje- och fjärdenivåtecken för din tangentbordslayout visas i layoutvyfönstret i <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Tangentbordsindikator</application></ulink>."
+msgid "The third and fourth level characters for your keyboard layout are shown in the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard Indicator</application></ulink> Layout View Window."
+msgstr "Tredje- och fjärdenivåtecken för din tangentbordslayout visas i layoutvyfönstret i <ulink type=\"help\" url=\"help:gswitchit\"><application>Tangentbordsindikator</application></ulink>."
 
 #: C/goscustdesk.xml:1712(guilabel)
 msgid "Use keyboard LED to show alternative group."
@@ -10307,8 +10307,8 @@ msgid "The <guilabel>Accessibility</guilabel> tabbed section allows you to set o
 msgstr "Fliksektionen <guilabel>Hjälpmedel</guilabel> låter dig ställa in alternativ såsom att filtrera bort oavsiktliga tangenttryckningar och använda genvägstangenter utan att hålla ner flera tangenter samtidigt. Dessa funktioner är även kända som AccessX."
 
 #: C/goscustdesk.xml:1750(para)
-msgid "This section describes each of the preferences you can set. For a more task-oriented description of keyboard accessibility, see the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
-msgstr "Det här avsnittet beskriver de inställningar som du kan ställa in. För en mer uppgiftsorienterad beskrivning av tangentbordshjälpmedel, se <ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>Hjälpmedelsguide för MATE-skrivbordet</citetitle></ulink>."
+msgid "This section describes each of the preferences you can set. For a more task-oriented description of keyboard accessibility, see the <ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
+msgstr "Det här avsnittet beskriver de inställningar som du kan ställa in. För en mer uppgiftsorienterad beskrivning av tangentbordshjälpmedel, se <ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>Hjälpmedelsguide för MATE-skrivbordet</citetitle></ulink>."
 
 #: C/goscustdesk.xml:1752(para)
 msgid "<xref linkend=\"goscustdesk-TBL-85\"/> lists the accessibility preferences that you can modify."
@@ -10477,8 +10477,8 @@ msgid "mouse keys"
 msgstr "mustangenter"
 
 #: C/goscustdesk.xml:2016(para)
-msgid "Select this option to make the numeric keypad emulate mouse actions. The list of keys and their equivalences is in the <citetitle>MATE Desktop Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard to Emulate the Mouse</citetitle></ulink>."
-msgstr "Välj det här alternativet för att göra att det numeriska tangentbordet emulerar musåtgärder. Listan över tangenter och deras motsvarigheter finns i <citetitle>Hjälpmedelsguide för MATE-skrivbordet</citetitle> under rubriken <ulink type=\"help\" url=\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>Aktivera tangentbordet för att emulera musen</citetitle></ulink>."
+msgid "Select this option to make the numeric keypad emulate mouse actions. The list of keys and their equivalences is in the <citetitle>MATE Desktop Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url=\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard to Emulate the Mouse</citetitle></ulink>."
+msgstr "Välj det här alternativet för att göra att det numeriska tangentbordet emulerar musåtgärder. Listan över tangenter och deras motsvarigheter finns i <citetitle>Hjälpmedelsguide för MATE-skrivbordet</citetitle> under rubriken <ulink type=\"help\" url=\"help:mate-access-guide?dtconfig-14\"><citetitle>Aktivera tangentbordet för att emulera musen</citetitle></ulink>."
 
 #: C/goscustdesk.xml:2022(guilabel)
 #: C/goscustdesk.xml:2228(guilabel)
@@ -11135,8 +11135,8 @@ msgid "Multimedia Systems Selector"
 msgstr "Multimediasystemväljare"
 
 #: C/goscustdesk.xml:2834(para)
-msgid "See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer Properties Manual</ulink>."
-msgstr "Se <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer Properties Manual</ulink>."
+msgid "See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer Properties Manual</ulink>."
+msgstr "Se <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer Properties Manual</ulink>."
 
 #: C/goscustdesk.xml:2838(title)
 msgid "Sessions Preferences"
@@ -12071,8 +12071,8 @@ msgid "MATE Documentation Project"
 msgstr "Dokumentationsprojekt för MATE"
 
 #: C/user-guide.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/user-guide.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."
@@ -12361,10 +12361,10 @@ msgstr ""
 #~ msgid "Takes a screenshot of the window to which the mouse points."
 #~ msgstr "Tar en skärmbild av fönstret som musen pekar på."
 #~ msgid ""
-#~ "For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-"
+#~ "For more on this, see the <ulink type=\"help\" url=\"help:workspace-"
 #~ "switcher\">Workspace Switcher Applet Manual</ulink>."
 #~ msgstr ""
-#~ "För mer information om det här, se <ulink type=\"help\" url=\"ghelp:"
+#~ "För mer information om det här, se <ulink type=\"help\" url=\"help:"
 #~ "workspace-switcher\">Handbok för Arbetsyteväxlare</ulink>."
 #~ msgid ""
 #~ "In the <guilabel>Connect to Server</guilabel> dialog, you may click on "
@@ -12753,13 +12753,13 @@ msgstr ""
 #~ "To format a floppy disk, right-click on the object that represents the "
 #~ "floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 #~ "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-#~ "type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+#~ "type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 #~ "documentation for more details."
 #~ msgstr ""
 #~ "För att formatera en diskett, högerklicka på objektet som representerar "
 #~ "disketten på skrivbordet och välj sedan <guimenuitem>Formatera</"
 #~ "guimenuitem>. Dialogrutan <guilabel>Diskettformaterare</guilabel> kommer "
-#~ "att visas. Se dokumentationen för <ulink type=\"help\" url=\"ghelp:"
+#~ "att visas. Se dokumentationen för <ulink type=\"help\" url=\"help:"
 #~ "gfloppy?usage\">Diskettformaterare</ulink> för mer information."
 #~ msgid "Eject the diskette from the drive."
 #~ msgstr "Mata ut disketten från enheten."
@@ -12953,11 +12953,11 @@ msgstr ""
 #~ "att ange antalet tecken per sekund som matas in."
 #~ msgid ""
 #~ "For more information on configuring keyboard accessibility preferences, "
-#~ "see the <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+#~ "see the <ulink type=\"help\" url=\"help:mate-access-guide?index"
 #~ "\"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>."
 #~ msgstr ""
 #~ "För mer information om hur man konfigurerar tangentbordshjälpmedel, se "
-#~ "<ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+#~ "<ulink type=\"help\" url=\"help:mate-access-guide?index"
 #~ "\"><citetitle>Hjälpmedelsguide för MATE-skrivbordet</citetitle></ulink>."
 #~ msgid "Filter Preferences"
 #~ msgstr "Filterinställningar"
diff --git a/user-guide/th/th.po b/user-guide/th/th.po
index f4db202..768cba3 100644
--- a/user-guide/th/th.po
+++ b/user-guide/th/th.po
@@ -1422,7 +1422,7 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr ""
 
 #: C/gostools.xml:924(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
 msgstr ""
 
 #: C/gostools.xml:928(para)
@@ -1433,7 +1433,7 @@ msgstr ""
 
 #: C/gostools.xml:931(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
 msgstr ""
 
 #: C/gostools.xml:933(para)
@@ -1444,7 +1444,7 @@ msgstr ""
 
 #: C/gostools.xml:936(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
 msgstr ""
 
 #: C/gostools.xml:941(option)
@@ -1554,8 +1554,8 @@ msgstr ""
 #: C/gostools.xml:1006(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
@@ -1782,12 +1782,12 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "การเปลี่ยนภาษาขณะเข้าระบบ เป็นการเปลี่ยนภาษาของส่วนติดต่อผู้ใช้เท่านั้น "
 "ไม่ใช่การกำหนดผังแป้นพิมพ์ หากต้องการเปลี่ยนผังแป้นพิมพ์ ก็ทำได้โดยใช้แอพเพล็ต <ulink "
-"type=\"help\" url=\"ghelp:gswitchit\"><application>ภาษาแป้นพิมพ์</application></"
+"type=\"help\" url=\"help:gswitchit\"><application>ภาษาแป้นพิมพ์</application></"
 "ulink>"
 
 #: C/gosstartsession.xml:126(para)
@@ -2423,12 +2423,12 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "แอพเพล็ต <application>นาฬิกา</application> จะแสดงเวลาปัจจุบัน "
 "คุณสามารถคลิกที่เวลาเพื่อเปิดปฏิทินเล็ก ๆ ได้ และยังสามารถดูแผนที่โลกได้โดยคลิกที่ป้ายขยาย "
 "<guilabel>ตำแหน่งที่ตั้ง</guilabel> ดูข้อมูลเพิ่มเติมเกี่ยวกับเรื่องนี้ได้ที่ <ulink type="
-"\"help\" url=\"ghelp:clock\">คู่มือแอพเพล็ตนาฬิกา</ulink>"
+"\"help\" url=\"help:clock\">คู่มือแอพเพล็ตนาฬิกา</ulink>"
 
 #: C/gospanel.xml:70(term)
 msgid "<application>Volume Control</application> applet"
@@ -2438,11 +2438,11 @@ msgstr "แอพเพล็ต <application>ความดังเสีย�
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "แอพเพล็ต <application>ความดังเสียง</application> "
 "ช่วยให้คุณปรับความดังเสียงที่ออกทางลำโพงของเครื่องคุณได้ ดูข้อมูลเพิ่มเติมเกี่ยวกับเรื่องนี้ได้ที่ "
-"<ulink type=\"help\" url=\"ghelp:mate-volume-control"
+"<ulink type=\"help\" url=\"help:mate-volume-control"
 "\">คู่มือแอพเพล็ตความดังเสียง</ulink>"
 
 #: C/gospanel.xml:75(term)
@@ -4124,11 +4124,11 @@ msgstr ""
 #: C/gospanel.xml:1230(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "ดูข้อมูลเพิ่มเติมเกี่ยวกับกล่องโต้ตอบ <application>เครื่องมือค้นหา</application> ได้จาก "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">คู่มือเครื่องมือค้นหา</ulink>"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">คู่มือเครื่องมือค้นหา</ulink>"
 
 #: C/gospanel.xml:1234(title)
 msgid "Show Desktop Button"
@@ -5766,10 +5766,10 @@ msgstr ""
 
 #: C/gosoverview.xml:400(para)
 msgid ""
-"For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"For more on this, see the <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">Workspace Switcher Applet Manual</ulink>."
 msgstr ""
-"ดูข้อมูลเพิ่มเติมเกี่ยวกับเรื่องนี้ได้ที่ <ulink type=\"help\" url=\"ghelp:workspace-switcher"
+"ดูข้อมูลเพิ่มเติมเกี่ยวกับเรื่องนี้ได้ที่ <ulink type=\"help\" url=\"help:workspace-switcher"
 "\">คู่มือแอพเพล็ตสลับพื้นที่ทำงาน</ulink>"
 
 #: C/gosoverview.xml:405(title)
@@ -5806,48 +5806,48 @@ msgstr "ตัวอย่างของโปรแกรมประยุก
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>เครื่องมือแก้ไขข้อความ "
+"<ulink type=\"help\" url=\"help:pluma\"><application>เครื่องมือแก้ไขข้อความ "
 "Pluma</application></ulink> สามารถใช้อ่าน สร้าง "
 "หรือแก้ไขข้อความอย่างง่ายโดยไม่มีการจัดรูปแบบ"
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>พจนานุกรม</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>พจนานุกรม</"
 "application></ulink> ช่วยคุณเปิดหาความหมายของคำ"
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>โปรแกรมแสดงรูป</"
+"<ulink type=\"help\" url=\"help:eom\"><application>โปรแกรมแสดงรูป</"
 "application></ulink> สามารถแสดงแฟ้มรูปภาพเดี่ยว ๆ รวมทั้งรูปภาพชุดใหญ่ได้"
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>เครื่องคิดเลข</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>เครื่องคิดเลข</"
 "application></ulink> คำนวณเลขพื้นฐาน การเงิน และวิทยาศาสตร์"
 
 #: C/gosoverview.xml:424(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
 "characters you need will be on your keyboard."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>ผังอักขระ</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>ผังอักขระ</"
 "application></ulink> ช่วยคุณเลือกตัวอักษรและสัญลักษณ์ต่าง ๆ จากชุดอักขระของ "
 "<firstterm>ยูนิโค้ด</firstterm> และแปะลงในโปรแกรมใด ๆ ได้ ถ้าคุณเขียนข้อความหลายภาษา "
 "คุณอาจไม่สามารถป้อนอักขระบางตัวที่ต้องการได้โดยใช้แป้นพิมพ์"
@@ -5870,10 +5870,10 @@ msgstr ""
 
 #: C/gosoverview.xml:426(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>เทอร์มินัล</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>เทอร์มินัล</"
 "application></ulink> ให้คุณสั่งงานระบบด้วยบรรทัดคำสั่งได้"
 
 #: C/gosoverview.xml:429(para)
@@ -6167,7 +6167,7 @@ msgstr "การเลือกโฟลเดอร์"
 #: C/gosoverview.xml:509(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -6175,7 +6175,7 @@ msgid ""
 "folder."
 msgstr ""
 "ในบางครั้ง คุณอาจจำเป็นต้องเลือกโฟลเดอร์มาทำงานแทนที่จะเป็นแฟ้ม ตัวอย่างเช่น ถ้าคุณใช้ <ulink "
-"type=\"help\" url=\"ghelp:file-roller\"><application>โปรแกรมจัดการแฟ้มจัดเก็บ</"
+"type=\"help\" url=\"help:file-roller\"><application>โปรแกรมจัดการแฟ้มจัดเก็บ</"
 "application></ulink> แตกแฟ้มจากแฟ้มจัดเก็บ "
 "คุณจะต้องเลือกโฟลเดอร์ที่จะเก็บแฟ้มที่แตกออกมานั้น ในกรณีนั้น ชื่อแฟ้มต่าง ๆ "
 "ในตำแหน่งปัจจุบันจะกลายเป็นสีเทาและเลือกไม่ได้ คุณสามารถคลิกปุ่ม <guibutton>เปิด</"
@@ -12309,11 +12309,11 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>ค้นหาแฟ้ม</guimenuitem> ให้คุณค้นหาแฟ้มในเครื่องของคุณ "
-"ดูข้อมูลเพิ่มเติมเกี่ยวกับเรื่องนี้ได้ที่ <ulink type=\"help\" url=\"ghelp:mate-search-tool"
+"ดูข้อมูลเพิ่มเติมเกี่ยวกับเรื่องนี้ได้ที่ <ulink type=\"help\" url=\"help:mate-search-tool"
 "\">คู่มือเครื่องมือค้นหา</ulink>"
 
 #: C/goseditmainmenu.xml:71(para)
@@ -12448,11 +12448,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"<ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">คู่มือดูแลระบบ</ulink> มีข้อมูลเพิ่มเติมเกี่ยวกับวิธีการจัดทำเมนูของ MATE "
 "และวิธีที่ผู้ดูแลระบบจะสามารถปรับแต่งเมนูได้"
 
@@ -12842,7 +12842,7 @@ msgstr ""
 #: C/goscustdesk.xml:274(para)
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
@@ -14570,7 +14570,7 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
@@ -14744,7 +14744,7 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 
@@ -14801,7 +14801,7 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 
@@ -15023,7 +15023,7 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 
@@ -15800,7 +15800,7 @@ msgstr "การเลือกระบบสื่อผสม"
 
 #: C/goscustdesk.xml:2884(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
 
@@ -17251,14 +17251,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/user-guide.xml:12(para)
@@ -17567,7 +17567,7 @@ msgid ""
 "Feedback Page</link>."
 msgstr ""
 "หากพบปัญหาหรือมีข้อเสนอแนะสำหรับเดสก์ท็อป MATE หรือเกี่ยวกับคู่มือนี้ กรุณาแจ้งให้เราทราบ "
-"ตามขั้นตอนใน <ulink url=\"ghelp:mate-feedback\" type=\"help\">หน้าเสนอแนะ "
+"ตามขั้นตอนใน <ulink url=\"help:mate-feedback\" type=\"help\">หน้าเสนอแนะ "
 "MATE</ulink>"
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
diff --git a/user-guide/uk/uk.po b/user-guide/uk/uk.po
index c4c921a..ac52e07 100644
--- a/user-guide/uk/uk.po
+++ b/user-guide/uk/uk.po
@@ -1778,8 +1778,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> або <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> або <option>mate-help:</option>"
 
 #: C/gostools.xml:948(para)
 msgid ""
@@ -1791,8 +1791,8 @@ msgstr ""
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:953(para)
 msgid ""
@@ -1804,8 +1804,8 @@ msgstr ""
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:961(option)
 msgid "man:"
@@ -1936,16 +1936,16 @@ msgstr "Перекодування формату DocBook в формат, пр�
 #: C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/><application>Навігатор довідки Yelp</application> спирається "
-"на таблиці стилів <ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT "
+"на таблиці стилів <ulink url=\"help:mate-doc-xslt\">MATE XSLT "
 "Stylesheets</ulink> для перекодування формату DocBook в формат HTML. <ulink "
-"url=\"ghelp:mate-doc-make\">Утиліти формування документації MATE </ulink> "
+"url=\"help:mate-doc-make\">Утиліти формування документації MATE </ulink> "
 "забезпечують розробникам програм можливість встановлювати і реєструвати "
 "документацію в межах системи довідки."
 
@@ -2189,12 +2189,12 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "Під час входу в сеанс з іншою мовою, змінюється мова користувацького "
 "інтерфейсу, але не змінюється розкладка клавіатури. Щоб змінювати розкладку "
-"клавіатури використовуйте аплет <ulink type=\"help\" url=\"ghelp:gswitchit"
+"клавіатури використовуйте аплет <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>Індикатор клавіатури</application></ulink>."
 
 #: C/gosstartsession.xml:126(para)
@@ -2865,12 +2865,12 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "<application>Годинник</application> показує поточний час. Натисніть на "
 "нього, щоб побачити невеликий календар. Також можете переглянути мапу світу, "
 "натиснувши на ярлик розширення <guilabel>Адреси</guilabel>. Детальніше про "
-"це дивіться <ulink type=\"help\" url=\"ghelp:clock\">Посібник аплету "
+"це дивіться <ulink type=\"help\" url=\"help:clock\">Посібник аплету "
 "Годинник</ulink>."
 
 #: C/gospanel.xml:70(term)
@@ -2881,11 +2881,11 @@ msgstr "Аплет <application>Регулятор гучності</application
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "<application>Регулятор гучності</application> дозволяє регулювати гучність "
 "динаміків вашої системі. Детальніше про це дивіться <ulink type=\"help\" url="
-"\"ghelp:mate-volume-control\">Посібник регулятора гучності</ulink>."
+"\"help:mate-volume-control\">Посібник регулятора гучності</ulink>."
 
 #: C/gospanel.xml:75(term)
 msgid ""
@@ -4668,11 +4668,11 @@ msgstr ""
 #: C/gospanel.xml:1230(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "Детальніше про <application>Засіб пошуку</application>, дивіться <ulink type="
-"\"help\" url=\"ghelp:mate-search-tool\">Посібник до засобу пошуку</ulink>."
+"\"help\" url=\"help:mate-search-tool\">Посібник до засобу пошуку</ulink>."
 
 #: C/gospanel.xml:1234(title)
 msgid "Show Desktop Button"
@@ -6446,49 +6446,49 @@ msgstr "Наступні програми є частиною середовищ
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Текстовий редактор "
+"<ulink type=\"help\" url=\"help:pluma\"><application>Текстовий редактор "
 "Pluma</application></ulink> дозволяє читати, створювати та змінювати будь-"
 "які різновиди простого тексту без форматування."
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Словник</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Словник</"
 "application></ulink> дозволяє знаходити визначення слів."
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Програма перегляду "
+"<ulink type=\"help\" url=\"help:eom\"><application>Програма перегляду "
 "зображень</application></ulink> дозволяє переглядати як окремі файли "
 "зображень так і великі колекції."
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Калькулятор</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Калькулятор</"
 "application></ulink> виконує прості, фінансові та наукові обчислення."
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
 "characters you need will be on your keyboard."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Таблиця символів</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Таблиця символів</"
 "application></ulink> дозволяє вибирати букви та символи з набору символів "
 "<firstterm>Юнікод</firstterm> і вставляти їх в будь-яку програму. Якщо ви "
 "пишете кількома мовами, не всі потрібні символи знайдуться на клавіатурі."
@@ -6512,10 +6512,10 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Термінал</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Термінал</"
 "application></ulink> надає доступ до системного командного рядка."
 
 #: C/gosoverview.xml:428(para)
@@ -6827,7 +6827,7 @@ msgstr "Вибір теки"
 #: C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -6836,7 +6836,7 @@ msgid ""
 msgstr ""
 "Іноді виникає потреба вибрати в першу чергу теку для роботи перш ніж "
 "відкрити файл. Наприклад, якщо ви використовуєте програму <ulink type=\"help"
-"\" url=\"ghelp:file-roller\"><application>Менеджер архівів</application></"
+"\" url=\"help:file-roller\"><application>Менеджер архівів</application></"
 "ulink>, щоб витягти файли з архіву, потрібно вибрати теку в яку вони будуть "
 "розташовані. В цьому випадку, файли в поточному місці будуть позначені сірим "
 "кольором а натискання кнопки <guibutton>Відкрити</guibutton>, коли тека "
@@ -13912,11 +13912,11 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>Пошук файлів</guimenuitem> дозволяє вам шукати файли у вашому "
-"комп'ютері. Для докладнішої про це дивіться <ulink type=\"help\" url=\"ghelp:"
+"комп'ютері. Для докладнішої про це дивіться <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Посібник до пошуку файлів</ulink>."
 
 #: C/goseditmainmenu.xml:71(para)
@@ -14055,11 +14055,11 @@ msgstr ""
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"В <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"В <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">Посібнику системного адміністратора</ulink> міститься більше інформації "
 "про те, як в MATE реалізована робота з меню і як адміністратори можуть "
 "налаштовувати їх."
@@ -14556,12 +14556,12 @@ msgstr "Запускати на старті (тільки для можливо
 #: C/goscustdesk.xml:274(para)
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
 "Позначте цей пункт, щоб запускати команду під час старту сеансу. Докладніше "
-"про можливості доступності дивіться <ulink type=\"help\" url=\"ghelp:mate-"
+"про можливості доступності дивіться <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>Посібник з можливостей доступності "
 "середовища MATE</citetitle></ulink>."
 
@@ -16709,12 +16709,12 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
 "Для перемикання між розкладками клавіатури, використовуйте <ulink type=\"help"
-"\" url=\"ghelp:gswitchit\">аплет панелі <application>Індикатор клавіатури</"
+"\" url=\"help:gswitchit\">аплет панелі <application>Індикатор клавіатури</"
 "application></ulink>."
 
 #: C/goscustdesk.xml:1625(para)
@@ -16929,11 +16929,11 @@ msgstr ""
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
 "Символи третього та четвертого рівнів відображені у вікні аплета <ulink type="
-"\"help\" url=\"ghelp:gswitchit\"><application>Індикатор клавіатури</"
+"\"help\" url=\"help:gswitchit\"><application>Індикатор клавіатури</"
 "application></ulink>."
 
 #: C/goscustdesk.xml:1712(guilabel)
@@ -17001,12 +17001,12 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "В цьому розділі описується налаштування кожного окремого параметру. Для "
 "отримання більш цілеспрямованого опису можливостей доступності клавіатури "
-"дивіться <ulink type=\"help\" url=\"ghelp:mate-access-guide?index"
+"дивіться <ulink type=\"help\" url=\"help:mate-access-guide?index"
 "\"><citetitle>Посібник з можливостей доступності середовища MATE</"
 "citetitle></ulink>."
 
@@ -17256,13 +17256,13 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "Виберіть цей параметр, щоб за допомогою цифрової клавіатури емулювати дії "
 "миші. Щоб побачити перелік клавіш і відповідних їм дій, дивіться "
 "<citetitle>Посібник з можливостей доступності середовища MATE</citetitle> в "
-"розділі під заголовком <ulink type=\"help\" url=\"ghelp:mate-access-guide?"
+"розділі під заголовком <ulink type=\"help\" url=\"help:mate-access-guide?"
 "dtconfig-14\"><citetitle>Емуляція дій миші за допомогою клавіатури</"
 "citetitle></ulink>."
 
@@ -18231,10 +18231,10 @@ msgstr "Вибір мультимедійної системи"
 
 #: C/goscustdesk.xml:2834(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"Дивіться <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">Посібник з "
+"Дивіться <ulink type=\"help\" url=\"help:gstreamer-properties\">Посібник з "
 "властивостей GStreamer</ulink>."
 
 #: C/goscustdesk.xml:2838(title)
@@ -19656,14 +19656,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, який постачається разом з цією "
 "довідкою."
 
diff --git a/user-guide/zh_CN/zh_CN.po b/user-guide/zh_CN/zh_CN.po
index 3b00883..d408440 100644
--- a/user-guide/zh_CN/zh_CN.po
+++ b/user-guide/zh_CN/zh_CN.po
@@ -1649,8 +1649,8 @@ msgid "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 msgstr "yelp file:///usr/share/mate/help/gcalctool/C/gcalctool.xml"
 
 #: C/gostools.xml:944(term)
-msgid "<option>ghelp:</option> or <option>mate-help:</option>"
-msgstr "<option>ghelp:</option> 或者 <option>mate-help:</option>"
+msgid "<option>help:</option> or <option>mate-help:</option>"
+msgstr "<option>help:</option> 或者 <option>mate-help:</option>"
 
 #: C/gostools.xml:948(para)
 msgid ""
@@ -1660,8 +1660,8 @@ msgstr "但当您想打开典型的 DocBook 格式的 MATE 帮助文档时请使
 
 #: C/gostools.xml:951(userinput)
 #, no-wrap
-msgid "yelp ghelp:gcalctool"
-msgstr "yelp ghelp:gcalctool"
+msgid "yelp help:gcalctool"
+msgstr "yelp help:gcalctool"
 
 #: C/gostools.xml:953(para)
 msgid ""
@@ -1673,8 +1673,8 @@ msgstr ""
 
 #: C/gostools.xml:956(userinput)
 #, no-wrap
-msgid "yelp ghelp:user-guide?yelp-advanced-cmdline"
-msgstr "yelp ghelp:user-guide?yelp-advanced-cmdline"
+msgid "yelp help:user-guide?yelp-advanced-cmdline"
+msgstr "yelp help:user-guide?yelp-advanced-cmdline"
 
 #: C/gostools.xml:961(option)
 msgid "man:"
@@ -1793,15 +1793,15 @@ msgstr "把 DocBook 的格式转换为另一种适合显示的格式。"
 #: C/gostools.xml:1026(para)
 msgid ""
 "<placeholder-1/><application>Yelp Help Browser</application> relies on "
-"<ulink url=\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
-"perform conversion from DocBook to HTML. <ulink url=\"ghelp:mate-doc-make"
+"<ulink url=\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> to "
+"perform conversion from DocBook to HTML. <ulink url=\"help:mate-doc-make"
 "\">MATE Documentation Build Utilities</ulink> are relied upon by "
 "application authors to install and register documentation within the help "
 "system."
 msgstr ""
 "<placeholder-1/> <application>Yelp 帮助浏览器</application>依赖 <ulink url="
-"\"ghelp:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> 转换 DocBook 为 HTML "
-"格式。<ulink url=\"ghelp:mate-doc-make\">MATE 文档构建实用程序</ulink> 需要"
+"\"help:mate-doc-xslt\">MATE XSLT Stylesheets</ulink> 转换 DocBook 为 HTML "
+"格式。<ulink url=\"help:mate-doc-make\">MATE 文档构建实用程序</ulink> 需要"
 "软件作者安装并注册文档到帮助系统。"
 
 #: C/gostools.xml:1047(title)
@@ -2028,11 +2028,11 @@ msgstr ""
 msgid ""
 "When you log in to a session in a different language, you are changing the "
 "language for the user interface but are not changing the keyboard layout. To "
-"choose a different keyboard layout, use the <ulink type=\"help\" url=\"ghelp:"
+"choose a different keyboard layout, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application></ulink> applet."
 msgstr ""
 "当您用其他语言登录时，用户界面的语言会更换，但键盘布局不会更换。要改变键盘布"
-"局，使用 <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>键盘标识器"
+"局，使用 <ulink type=\"help\" url=\"help:gswitchit\"><application>键盘标识器"
 "</application></ulink> 小程序。"
 
 #: C/gosstartsession.xml:126(para)
@@ -2662,10 +2662,10 @@ msgid ""
 "The <application>Clock</application> shows the current time. Click on the "
 "time to open a small calendar. You can also view a world map by clicking the "
 "<guilabel>Locations</guilabel> expansion label. For more on this, see the "
-"<ulink type=\"help\" url=\"ghelp:clock\">Clock Applet Manual</ulink>."
+"<ulink type=\"help\" url=\"help:clock\">Clock Applet Manual</ulink>."
 msgstr ""
 "<application>时钟</application> 显示当前时间，单击时间可以打开一个小日历。更"
-"多相关信息，请参阅： <ulink type=\"help\" url=\"ghelp:clock\">时钟小程序手册"
+"多相关信息，请参阅： <ulink type=\"help\" url=\"help:clock\">时钟小程序手册"
 "</ulink>。"
 
 #: C/gospanel.xml:70(term)
@@ -2676,10 +2676,10 @@ msgstr "<application>音量控制器</application> 小程序"
 msgid ""
 "The <application>Volume Control</application> enables you to control the "
 "volume of the speakers on your system. For more on this, see the <ulink type="
-"\"help\" url=\"ghelp:mate-volume-control\">Volume Control Manual</ulink>."
+"\"help\" url=\"help:mate-volume-control\">Volume Control Manual</ulink>."
 msgstr ""
 "application>音量控制</application> 允许您控制系统扬声器和话筒的音量。更多相关"
-"信息，请参阅： <ulink type=\"help\" url=\"ghelp:mate-volume-control\">音量控"
+"信息，请参阅： <ulink type=\"help\" url=\"help:mate-volume-control\">音量控"
 "制手册</ulink>。"
 
 #: C/gospanel.xml:75(term)
@@ -4316,11 +4316,11 @@ msgstr ""
 #: C/gospanel.xml:1229(para)
 msgid ""
 "For more information on the <application>Search Tool</application>, see the "
-"<ulink type=\"help\" url=\"ghelp:mate-search-tool\">Search Tool Manual</"
+"<ulink type=\"help\" url=\"help:mate-search-tool\">Search Tool Manual</"
 "ulink>."
 msgstr ""
 "更多关于 <application>搜索工具</application> 的信息，请参阅： <ulink type="
-"\"help\" url=\"ghelp:mate-search-tool\">搜索工具手册</ulink>。"
+"\"help\" url=\"help:mate-search-tool\">搜索工具手册</ulink>。"
 
 #: C/gospanel.xml:1233(title)
 msgid "Show Desktop Button"
@@ -5933,47 +5933,47 @@ msgstr "应用程序也是 MATE 的一部分，包括下面这些："
 
 #: C/gosoverview.xml:419(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma Text Editor</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma Text Editor</"
 "application></ulink> can read, create, or modify any kind of simple text "
 "without any formatting."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:pluma\"><application>Pluma 文本编辑器</"
+"<ulink type=\"help\" url=\"help:pluma\"><application>Pluma 文本编辑器</"
 "application></ulink> 可以查看，创建，或设置各种简单的文本文件。"
 
 #: C/gosoverview.xml:420(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>Dictionary</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>Dictionary</"
 "application></ulink> allows you to look up definitions of a word."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-dictionary\"><application>字典</"
+"<ulink type=\"help\" url=\"help:mate-dictionary\"><application>字典</"
 "application></ulink> 可用以查阅单词。"
 
 #: C/gosoverview.xml:421(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>Image Viewer</"
+"<ulink type=\"help\" url=\"help:eom\"><application>Image Viewer</"
 "application></ulink> can display single image files, as well as large image "
 "collections."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:eom\"><application>图片查看器</"
+"<ulink type=\"help\" url=\"help:eom\"><application>图片查看器</"
 "application></ulink> 可以显示单张图片，以及大量图片收藏。"
 
 #: C/gosoverview.xml:422(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>Calculator</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>Calculator</"
 "application></ulink> performs basic, financial, and scientific calculations."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gcalctool\"><application>计算器</"
+"<ulink type=\"help\" url=\"help:gcalctool\"><application>计算器</"
 "application></ulink> 运行基本的、财务的和科学计算。"
 
 #: C/gosoverview.xml:423(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>Character Map</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>Character Map</"
 "application></ulink> lets you choose letters and symbols from the "
 "<firstterm>Unicode</firstterm> character set and paste them into any "
 "application. If you are writing in several languages, not all of the "
 "characters you need will be on your keyboard."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:gucharmap\"><application>字符映射表</"
+"<ulink type=\"help\" url=\"help:gucharmap\"><application>字符映射表</"
 "application></ulink> 您可以选择一个字符或符号从 <firstterm>Unicode</"
 "firstterm> 字符集并把它们粘贴到应用程序里。如果您是用几种语言写作，键盘上可能"
 "没有您所要的全部字母符号。"
@@ -5995,10 +5995,10 @@ msgstr ""
 
 #: C/gosoverview.xml:425(para)
 msgid ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>Terminal</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>Terminal</"
 "application></ulink> gives you access to the system command line."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:mate-terminal\"><application>终端</"
+"<ulink type=\"help\" url=\"help:mate-terminal\"><application>终端</"
 "application></ulink> 可以在命令行窗口里运行命令。"
 
 #: C/gosoverview.xml:428(para)
@@ -6277,7 +6277,7 @@ msgstr "选择文件夹"
 #: C/gosoverview.xml:508(para)
 msgid ""
 "You might sometimes need to choose a folder to work with rather than open a "
-"file. For example, if you use <ulink type=\"help\" url=\"ghelp:file-roller"
+"file. For example, if you use <ulink type=\"help\" url=\"help:file-roller"
 "\"><application>Archive Manager</application></ulink> to extract files from "
 "an archive, you need to choose a folder to place the files into. In this "
 "case, the files in the current location are greyed out, and pressing "
@@ -6285,7 +6285,7 @@ msgid ""
 "folder."
 msgstr ""
 "您可能有时候要选择一个文件夹而不是一个文件来工作。例如，如果您用 <ulink type="
-"\"help\" url=\"ghelp:file-roller\"><application>归档管理器</application></"
+"\"help\" url=\"help:file-roller\"><application>归档管理器</application></"
 "ulink> 从一个归档文件里解压文件，您需要选择一个文件夹来放置文件。这时，当前位"
 "置的文件是灰色的，当一个文件夹被选中后按 <guibutton>打开</guibutton>，选中的"
 "文件夹将被打开。"
@@ -12796,11 +12796,11 @@ msgstr ""
 #: C/goseditmainmenu.xml:70(para)
 msgid ""
 "<guimenuitem>Search for Files</guimenuitem> lets you search for files on "
-"your computer. For more on this, see the <ulink type=\"help\" url=\"ghelp:"
+"your computer. For more on this, see the <ulink type=\"help\" url=\"help:"
 "mate-search-tool\">Search for Files Manual</ulink>."
 msgstr ""
 "<guimenuitem>搜索文件</guimenuitem> 允许您搜索计算机上的文件。更多相关信息，"
-"请参阅： <ulink type=\"help\" url=\"ghelp:mate-search-tool\">文件搜索手册</"
+"请参阅： <ulink type=\"help\" url=\"help:mate-search-tool\">文件搜索手册</"
 "ulink>。"
 
 #: C/goseditmainmenu.xml:71(para)
@@ -12925,11 +12925,11 @@ msgstr "要移除一个菜单项，在列表里取消选中即可。再次点击
 
 #: C/goseditmainmenu.xml:118(para)
 msgid ""
-"The <ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0"
+"The <ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0"
 "\">System Administration Guide</ulink> has more information on how MATE "
 "implements menus and how administrators can customize them."
 msgstr ""
-"<ulink type=\"help\" url=\"ghelp:system-admin-guide?menustructure-0\">系统管"
+"<ulink type=\"help\" url=\"help:system-admin-guide?menustructure-0\">系统管"
 "理员指南</ulink> 有更多关于 MATE 执行菜单和管理员如何定制菜单的相关信息。"
 
 #: C/goscustdesk.xml:2(title)
@@ -13373,12 +13373,12 @@ msgstr "开机时运行(仅用于辅助工具)"
 #: C/goscustdesk.xml:274(para)
 msgid ""
 "Select this option to run the command as soon as your session begins. For "
-"more accessibility options, see <ulink type=\"help\" url=\"ghelp:mate-"
+"more accessibility options, see <ulink type=\"help\" url=\"help:mate-"
 "access-guide?index\"><citetitle>MATE Desktop Accessibility Guide</"
 "citetitle></ulink>."
 msgstr ""
 "选中此项当您开始会话时，运行这个命令。更多相关信息，请参阅 <ulink type=\"help"
-"\" url=\"ghelp:mate-access-guide?index\"><citetitle>MATE 桌面辅助功能指南</"
+"\" url=\"help:mate-access-guide?index\"><citetitle>MATE 桌面辅助功能指南</"
 "citetitle></ulink>。"
 
 #: C/goscustdesk.xml:286(title)
@@ -15323,11 +15323,11 @@ msgstr ""
 
 #: C/goscustdesk.xml:1624(para)
 msgid ""
-"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"ghelp:"
+"To switch between keyboard layouts, use the <ulink type=\"help\" url=\"help:"
 "gswitchit\"><application>Keyboard Indicator</application> panel applet</"
 "ulink>."
 msgstr ""
-"要切换键盘布局，请使用 <ulink type=\"help\" url=\"ghelp:gswitchit"
+"要切换键盘布局，请使用 <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>键盘标识器</application>面板小程序</ulink>。"
 
 #: C/goscustdesk.xml:1625(para)
@@ -15518,10 +15518,10 @@ msgstr "按住第三级按键和 <keycap>Shift</keycap> 产生第四级字符。
 #: C/goscustdesk.xml:1707(para)
 msgid ""
 "The third and fourth level characters for your keyboard layout are shown in "
-"the <ulink type=\"help\" url=\"ghelp:gswitchit\"><application>Keyboard "
+"the <ulink type=\"help\" url=\"help:gswitchit\"><application>Keyboard "
 "Indicator</application></ulink> Layout View Window."
 msgstr ""
-"第三和第四级字符的键盘布局显示在 <ulink type=\"help\" url=\"ghelp:gswitchit"
+"第三和第四级字符的键盘布局显示在 <ulink type=\"help\" url=\"help:gswitchit"
 "\"><application>键盘标识器</application></ulink> 的布局显示窗口"
 
 #: C/goscustdesk.xml:1712(guilabel)
@@ -15582,11 +15582,11 @@ msgstr ""
 msgid ""
 "This section describes each of the preferences you can set. For a more task-"
 "oriented description of keyboard accessibility, see the <ulink type=\"help\" "
-"url=\"ghelp:mate-access-guide?index\"><citetitle>MATE Desktop "
+"url=\"help:mate-access-guide?index\"><citetitle>MATE Desktop "
 "Accessibility Guide</citetitle></ulink>."
 msgstr ""
 "这一段讲述了您可以设置的各个选项。更多键盘辅助功能相关的信息，请参阅： "
-"<ulink type=\"help\" url=\"ghelp:mate-access-guide?index\"><citetitle>MATE "
+"<ulink type=\"help\" url=\"help:mate-access-guide?index\"><citetitle>MATE "
 "桌面可用性指南</citeitle></ulink>。"
 
 #: C/goscustdesk.xml:1752(para)
@@ -15815,12 +15815,12 @@ msgid ""
 "Select this option to make the numeric keypad emulate mouse actions. The "
 "list of keys and their equivalences is in the <citetitle>MATE Desktop "
 "Accessibility Guide</citetitle> under the heading <ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>To Enable the Keyboard "
 "to Emulate the Mouse</citetitle></ulink>."
 msgstr ""
 "选择此项，可以用数字小键盘模拟鼠标操作，按键表和它们的操作在这里： "
 "<citetitle>MATE 桌面辅助技术手册</citetitle>下<ulink type=\"help\" url="
-"\"ghelp:mate-access-guide?dtconfig-14\"><citetitle>允许键盘模拟鼠标</"
+"\"help:mate-access-guide?dtconfig-14\"><citetitle>允许键盘模拟鼠标</"
 "citetitle></ulink>。"
 
 #: C/goscustdesk.xml:2022(guilabel) C/goscustdesk.xml:2228(guilabel)
@@ -16676,10 +16676,10 @@ msgstr "多媒体系统选择器"
 
 #: C/goscustdesk.xml:2834(para)
 msgid ""
-"See the <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer "
+"See the <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer "
 "Properties Manual</ulink>."
 msgstr ""
-"请参阅： <ulink type=\"help\" url=\"ghelp:gstreamer-properties\">GStreamer 属"
+"请参阅： <ulink type=\"help\" url=\"help:gstreamer-properties\">GStreamer 属"
 "性手册</ulink>。"
 
 #: C/goscustdesk.xml:2838(title)
@@ -17986,12 +17986,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 的副"
 "本。"
 
@@ -18362,10 +18362,10 @@ msgstr ""
 #~ msgstr "获得鼠标所指向窗口的抓图。"
 
 #~ msgid ""
-#~ "For more on this, see the <ulink type=\"help\" url=\"ghelp:workspace-"
+#~ "For more on this, see the <ulink type=\"help\" url=\"help:workspace-"
 #~ "switcher\">Workspace Switcher Applet Manual</ulink>."
 #~ msgstr ""
-#~ "更多更多相关信息，请参阅： <ulink type=\"help\" url=\"ghelp:workspace-"
+#~ "更多更多相关信息，请参阅： <ulink type=\"help\" url=\"help:workspace-"
 #~ "switcher\">工作区切换器使用手册</ulink>。"
 
 #~ msgid ""
@@ -18792,12 +18792,12 @@ msgstr ""
 #~ "To format a floppy disk, right-click on the object that represents the "
 #~ "floppy on the desktop, then choose <guimenuitem>Format</guimenuitem>. A "
 #~ "<guilabel>Floppy Formatter</guilabel> dialog is displayed. See the <ulink "
-#~ "type=\"help\" url=\"ghelp:gfloppy?usage\">Floppy Formatter</ulink> "
+#~ "type=\"help\" url=\"help:gfloppy?usage\">Floppy Formatter</ulink> "
 #~ "documentation for more details."
 #~ msgstr ""
 #~ "要格式化一个软盘，在桌面的软驱图标上点右键，然后选择 <guimenuitem>格式化</"
 #~ "guimenuitem>。将显示一个<guilabel>软盘格式化工具</guilabel>对话。更多信息"
-#~ "请参看<ulink type=\"help\" url=\"ghelp:gfloppy?usage\">软盘格式化工具</"
+#~ "请参看<ulink type=\"help\" url=\"help:gfloppy?usage\">软盘格式化工具</"
 #~ "ulink>。"
 
 #~ msgid "Eject the diskette from the drive."
@@ -19053,11 +19053,11 @@ msgstr ""
 
 #~ msgid ""
 #~ "Click on the icon to switch user without logging out yourself. For more "
-#~ "information, see the <ulink type=\"help\" url=\"ghelp:fast-user-switch-"
+#~ "information, see the <ulink type=\"help\" url=\"help:fast-user-switch-"
 #~ "applet\">User Switcher Applet Manual</ulink>"
 #~ msgstr ""
 #~ "点击这个启动器图标来切换用户而不必注销您自己的。更多的信息，请见 <ulink "
-#~ "type=\"help\" url=\"ghelp:fast-user-switch-applet\">用户切换程序手册</"
+#~ "type=\"help\" url=\"help:fast-user-switch-applet\">用户切换程序手册</"
 #~ "ulink>"
 
 #~ msgid "<application>Deskbar</application> applet"
@@ -19089,11 +19089,11 @@ msgstr ""
 
 #~ msgid ""
 #~ "Enables you to manage deleted files and folders. For more on using the "
-#~ "wastebasket, see the <ulink type=\"help\" url=\"ghelp:trashapplet\">Trash "
+#~ "wastebasket, see the <ulink type=\"help\" url=\"help:trashapplet\">Trash "
 #~ "Manual</ulink>."
 #~ msgstr ""
 #~ "允许您管理删除的文件或文件夹，更多相关信息请参阅 <ulink type=\"help\" url="
-#~ "\"ghelp:trashapplet\">回收站使用手册</ulink>."
+#~ "\"help:trashapplet\">回收站使用手册</ulink>."
 
 #~ msgid ""
 #~ "Click <guibutton>OK</guibutton> to apply the changes, then close the "
@@ -20555,11 +20555,11 @@ msgstr ""
 #~ msgid ""
 #~ "Displays a button for each window that is open. <application>Window List</"
 #~ "application> enables you to minimize and restore windows. For more on "
-#~ "this, see the <ulink type=\"help\" url=\"ghelp:window-list\">Window List "
+#~ "this, see the <ulink type=\"help\" url=\"help:window-list\">Window List "
 #~ "manual</ulink>."
 #~ msgstr ""
 #~ "为每一个窗口显示一个按钮。<application>窗口列表</application>允许您最小化"
-#~ "或者还原窗口。更多关于此处的信息，请参阅<ulink type=\"help\" url=\"ghelp:"
+#~ "或者还原窗口。更多关于此处的信息，请参阅<ulink type=\"help\" url=\"help:"
 #~ "window-list\">窗口列表手册</ulink>。"
 
 #~ msgid ""
@@ -20988,17 +20988,17 @@ msgstr ""
 
 #~ msgid ""
 #~ "To report a bug or make a suggestion regarding the MATE desktop or this "
-#~ "manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" "
+#~ "manual, follow the directions in the <ulink url=\"help:mate-feedback\" "
 #~ "type=\"help\">MATE Feedback Page</ulink>."
 #~ msgstr ""
 #~ "要报告关于 Rhythmbox 音乐播放器或本手册的 bug 或提出建议，请遵循 <ulink "
-#~ "url=\"ghelp:mate-feedback\" type=\"help\">MATE 反馈页</ulink>中的指导。"
+#~ "url=\"help:mate-feedback\" type=\"help\">MATE 反馈页</ulink>中的指导。"
 
 #~ msgid ""
 #~ "For more information on giving feedback on MATE, such as bug reports, "
 #~ "suggestions, and corrections to documentation, see the section on <ulink "
-#~ "type=\"help\" url=\"ghelp:mate-feedback\">Reporting MATE Bugs</ulink>."
+#~ "type=\"help\" url=\"help:mate-feedback\">Reporting MATE Bugs</ulink>."
 #~ msgstr ""
 #~ "要获得关于为 MATE 提供反馈的更多信息，比如错误报告、建议以及对文档的纠"
-#~ "正，请参看<ulink type=\"help\" url=\"ghelp:mate-feedback\">报告 MATE 错"
+#~ "正，请参看<ulink type=\"help\" url=\"help:mate-feedback\">报告 MATE 错"
 #~ "误</ulink>。"