[gnome-media] Build with yelp-tools instead of gnome-doc-utils



commit 1574fb30c6a2660a1c81f87093107b62555f1b3e
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Fri Jul 19 23:06:23 2013 -0400

    Build with yelp-tools instead of gnome-doc-utils
    
    https://bugzilla.gnome.org/show_bug.cgi?id=704590

 Makefile.am                                        |    2 -
 autogen.sh                                         |    2 +-
 configure.ac                                       |    6 +-
 grecord/Makefile.am                                |    2 +-
 grecord/doc/Makefile.am                            |    9 --
 grecord/doc/es/legal.xml                           |   81 --------------------
 grecord/doc/gnome-sound-recorder.omf.in            |   30 -------
 grecord/{doc => help}/C/figures/grecord_window.png |  Bin 16794 -> 16794 bytes
 .../C/index.docbook}                               |    0
 grecord/{doc => help}/C/l10n.txt                   |    0
 {gst-mixer/doc/uk => grecord/help/C}/legal.xml     |    2 +-
 grecord/{doc => help}/ChangeLog                    |    0
 grecord/help/Makefile.am                           |   13 +++
 grecord/{doc => help}/ca/ca.po                     |    4 +-
 .../{doc => help}/ca/figures/grecord_window.png    |  Bin 30774 -> 30774 bytes
 grecord/{doc => help}/cs/cs.po                     |    4 +-
 .../{doc => help}/cs/figures/grecord_window.png    |  Bin 34532 -> 34532 bytes
 grecord/{doc => help}/da/da.po                     |    4 +-
 grecord/{doc => help}/de/de.po                     |    4 +-
 .../{doc => help}/de/figures/grecord_window.png    |  Bin 18675 -> 18675 bytes
 grecord/{doc => help}/el/el.po                     |    4 +-
 .../{doc => help}/el/figures/grecord_window.png    |  Bin 42092 -> 42092 bytes
 grecord/{doc => help}/en_GB/en_GB.po               |    4 +-
 grecord/{doc => help}/es/es.po                     |    4 +-
 .../{doc => help}/es/figures/grecord_window.png    |  Bin 31557 -> 31557 bytes
 grecord/{doc => help}/es/grecord-es.omf            |    0
 grecord/{doc => help}/es/grecord.xml               |    0
 {gst-mixer/doc/uk => grecord/help/es}/legal.xml    |   23 +-----
 .../{doc => help}/fr/figures/grecord_window.png    |  Bin 32479 -> 32479 bytes
 grecord/{doc => help}/fr/fr.po                     |    4 +-
 .../{doc => help}/it/figures/grecord_window.png    |  Bin 29038 -> 29038 bytes
 grecord/{doc => help}/it/it.po                     |    4 +-
 .../ja/figures/grecord-prefs-path.eps              |    0
 .../ja/figures/grecord-prefs-path.png              |  Bin 14779 -> 14779 bytes
 .../ja/figures/grecord-prefs-play.eps              |    0
 .../ja/figures/grecord-prefs-play.png              |  Bin 14940 -> 14940 bytes
 .../{doc => help}/ja/figures/grecord-prefs-rec.eps |    0
 .../{doc => help}/ja/figures/grecord-prefs-rec.png |  Bin 18405 -> 18405 bytes
 .../ja/figures/grecord-prefs-sound.eps             |    0
 .../ja/figures/grecord-prefs-sound.png             |  Bin 17397 -> 17397 bytes
 .../{doc => help}/ja/figures/grecord-prefs-ui.eps  |    0
 .../{doc => help}/ja/figures/grecord-prefs-ui.png  |  Bin 5618 -> 5618 bytes
 grecord/{doc => help}/ja/figures/grecord.eps       |    0
 grecord/{doc => help}/ja/figures/grecord.png       |  Bin 5739 -> 5739 bytes
 .../{doc => help}/ja/figures/grecord_window.png    |  Bin 12178 -> 12178 bytes
 grecord/{doc => help}/ja/grecord-ja.omf            |    0
 grecord/{doc => help}/ja/grecord.xml               |    0
 grecord/{doc => help}/ja/legal.xml                 |    2 +-
 .../ko/figures/grecord-prefs-path.eps              |    0
 .../ko/figures/grecord-prefs-path.png              |  Bin 11624 -> 11624 bytes
 .../ko/figures/grecord-prefs-play.eps              |    0
 .../ko/figures/grecord-prefs-play.png              |  Bin 11367 -> 11367 bytes
 .../{doc => help}/ko/figures/grecord-prefs-rec.eps |    0
 .../{doc => help}/ko/figures/grecord-prefs-rec.png |  Bin 13796 -> 13796 bytes
 .../ko/figures/grecord-prefs-sound.eps             |    0
 .../ko/figures/grecord-prefs-sound.png             |  Bin 13156 -> 13156 bytes
 .../{doc => help}/ko/figures/grecord-prefs-ui.eps  |    0
 .../{doc => help}/ko/figures/grecord-prefs-ui.png  |  Bin 5618 -> 5618 bytes
 grecord/{doc => help}/ko/figures/grecord.eps       |    0
 grecord/{doc => help}/ko/figures/grecord.png       |  Bin 8636 -> 8636 bytes
 .../{doc => help}/ko/figures/grecord_window.png    |  Bin 9253 -> 9253 bytes
 grecord/{doc => help}/ko/grecord-ko.omf            |    0
 grecord/{doc => help}/ko/grecord.xml               |    0
 grecord/{doc => help}/ko/legal.xml                 |    2 +-
 grecord/{doc => help}/oc/oc.po                     |    2 +-
 grecord/{doc => help}/ru/ru.po                     |    4 +-
 grecord/{doc => help}/sl/sl.po                     |    2 +-
 .../{doc => help}/sv/figures/grecord_window.png    |  Bin 29200 -> 29200 bytes
 grecord/{doc => help}/sv/sv.po                     |    4 +-
 .../{doc => help}/uk/figures/grecord_window.png    |  Bin 16794 -> 16794 bytes
 grecord/{doc => help}/uk/uk.po                     |    4 +-
 grecord/{doc => help}/zh_CN/zh_CN.po               |    2 +-
 .../zh_TW/figures/grecord-prefs-path.eps           |    0
 .../zh_TW/figures/grecord-prefs-path.png           |  Bin 11831 -> 11831 bytes
 .../zh_TW/figures/grecord-prefs-play.eps           |    0
 .../zh_TW/figures/grecord-prefs-play.png           |  Bin 11654 -> 11654 bytes
 .../zh_TW/figures/grecord-prefs-rec.eps            |    0
 .../zh_TW/figures/grecord-prefs-rec.png            |  Bin 14567 -> 14567 bytes
 .../zh_TW/figures/grecord-prefs-sound.eps          |    0
 .../zh_TW/figures/grecord-prefs-sound.png          |  Bin 13969 -> 13969 bytes
 .../zh_TW/figures/grecord-prefs-ui.eps             |    0
 .../zh_TW/figures/grecord-prefs-ui.png             |  Bin 5618 -> 5618 bytes
 grecord/{doc => help}/zh_TW/figures/grecord.eps    |    0
 grecord/{doc => help}/zh_TW/figures/grecord.png    |  Bin 8851 -> 8851 bytes
 .../{doc => help}/zh_TW/figures/grecord_window.png |  Bin 9559 -> 9559 bytes
 grecord/{doc => help}/zh_TW/grecord-zh_TW.omf      |    0
 grecord/{doc => help}/zh_TW/grecord.xml            |    0
 grecord/{doc => help}/zh_TW/legal.xml              |    2 +-
 grecord/src/gsr-window.c                           |    2 +-
 gst-mixer/Makefile.am                              |    2 +-
 gst-mixer/doc/C/Makefile.am                        |    9 --
 gst-mixer/doc/C/topic.dat                          |    1 -
 gst-mixer/doc/Makefile.am                          |    9 --
 gst-mixer/doc/gnome-volume-control.omf.in          |   30 -------
 .../C/figures/gnome-volume-control_window.png      |  Bin 13809 -> 13809 bytes
 .../C/index.docbook}                               |    4 +-
 gst-mixer/{doc => help}/C/l10n.txt                 |    0
 gst-mixer/{doc => help}/C/legal.xml                |    2 +-
 gst-mixer/{doc => help}/ChangeLog                  |    0
 gst-mixer/help/Makefile.am                         |   13 +++
 gst-mixer/{doc => help}/ca/ca.po                   |    4 +-
 .../ca/figures/gnome-volume-control_window.png     |  Bin 23896 -> 23896 bytes
 gst-mixer/{doc => help}/cs/cs.po                   |    4 +-
 gst-mixer/{doc => help}/da/da.po                   |    4 +-
 gst-mixer/{doc => help}/de/de.po                   |    4 +-
 .../de/figures/gnome-volume-control_window.png     |  Bin 19089 -> 19089 bytes
 gst-mixer/{doc => help}/el/el.po                   |    2 +-
 gst-mixer/{doc => help}/en_GB/en_GB.po             |    4 +-
 gst-mixer/{doc => help}/es/es.po                   |    4 +-
 .../es/figures/gnome-volume-control_window.png     |  Bin 22061 -> 22061 bytes
 .../fr/figures/gnome-volume-control_window.png     |  Bin 26367 -> 26367 bytes
 gst-mixer/{doc => help}/fr/fr.po                   |    4 +-
 .../it/figures/gnome-volume-control_window.png     |  Bin 20473 -> 20473 bytes
 gst-mixer/{doc => help}/it/it.po                   |    4 +-
 gst-mixer/{doc => help}/oc/oc.po                   |    2 +-
 gst-mixer/{doc => help}/ru/ru.po                   |    4 +-
 gst-mixer/{doc => help}/sl/sl.po                   |    2 +-
 .../sv/figures/gnome-volume-control_window.png     |  Bin 24896 -> 24896 bytes
 gst-mixer/{doc => help}/sv/sv.po                   |    4 +-
 gst-mixer/{doc => help}/uk/figures/gmix-prefs.png  |  Bin 8055 -> 8055 bytes
 gst-mixer/{doc => help}/uk/figures/gmix.png        |  Bin 31671 -> 31671 bytes
 .../uk/figures/gnome-volume-control_window.png     |  Bin 13809 -> 13809 bytes
 .../{doc => help}/uk/gnome-volume-control-uk.omf   |    0
 .../{doc => help}/uk/gnome-volume-control.xml      |    0
 {grecord/doc/C => gst-mixer/help/uk}/legal.xml     |    2 +-
 gst-mixer/{doc => help}/zh_CN/zh_CN.po             |    2 +-
 gst-mixer/src/window.c                             |    2 +-
 gstreamer-properties/gstreamer-properties.c        |    2 +-
 .../C/{gstreamer-properties.xml => index.docbook}  |    0
 gstreamer-properties/help/C/legal.xml              |    2 +-
 gstreamer-properties/help/Makefile.am              |   17 +++--
 gstreamer-properties/help/ca/ca.po                 |    4 +-
 gstreamer-properties/help/cs/cs.po                 |    4 +-
 gstreamer-properties/help/da/da.po                 |    4 +-
 gstreamer-properties/help/de/de.po                 |    4 +-
 gstreamer-properties/help/de/legal.xml             |   57 +++++++++++++-
 gstreamer-properties/help/el/el.po                 |    4 +-
 gstreamer-properties/help/en_GB/en_GB.po           |    4 +-
 gstreamer-properties/help/es/es.po                 |    4 +-
 gstreamer-properties/help/fr/fr.po                 |    4 +-
 gstreamer-properties/help/gl/gl.po                 |    2 +-
 .../help/gstreamer-properties.omf.in               |   29 -------
 gstreamer-properties/help/it/it.po                 |    4 +-
 gstreamer-properties/help/oc/oc.po                 |    2 +-
 gstreamer-properties/help/pt_BR/pt_BR.po           |    4 +-
 gstreamer-properties/help/ru/ru.po                 |    4 +-
 gstreamer-properties/help/sl/sl.po                 |    2 +-
 gstreamer-properties/help/sv/sv.po                 |    4 +-
 gstreamer-properties/help/th/th.po                 |    4 +-
 gstreamer-properties/help/uk/uk.po                 |    4 +-
 gstreamer-properties/help/zh_CN/zh_CN.po           |    2 +-
 151 files changed, 194 insertions(+), 331 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 088058f..eef99bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,6 @@ EXTRA_DIST = \
        COPYING.gst-mixer       \
        MAINTAINERS             \
         build-aux/git-version-gen \
-       build-aux/gnome-doc-utils.make  \
        m4/as-compiler-flag.m4  \
        m4/as-version.m4        \
        ChangeLog.pre-2-26      \
@@ -49,7 +48,6 @@ EXTRA_DIST = \
        $(NULL)
 
 DISTCLEANFILES = \
-       build-aux/gnome-doc-utils.make  \
        po/.intltool-merge-cache        \
        $(NULL)
 
diff --git a/autogen.sh b/autogen.sh
index ea368a4..7b014ae 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="gnome-media"
 REQUIRED_AUTOMAKE_VERSION=1.9
 REQUIRED_INTLTOOL_VERSION=0.35
-USE_COMMON_DOC_BUILD=yes
+REQUIRED_YELP_TOOLS_VERSION=3.1.1
 
 (test -f $srcdir/configure.ac \
   && test -d $srcdir/grecord) || {
diff --git a/configure.ac b/configure.ac
index fb1a772..d84dfb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,7 +153,7 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
 AM_GLIB_GNU_GETTEXT
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 AM_PROG_LIBTOOL
 AM_PROG_CC_C_O
@@ -297,7 +297,7 @@ sound-theme/sounds/Makefile
 grecord/Makefile
 grecord/gnome-sound-recorder.schemas.in
 grecord/src/Makefile
-grecord/doc/Makefile
+grecord/help/Makefile
 grecord/icons/Makefile
 grecord/icons/16x16/Makefile
 grecord/icons/22x22/Makefile
@@ -314,7 +314,7 @@ gst-mixer/icons/16x16/devices/Makefile
 gst-mixer/icons/16x16/status/Makefile
 gst-mixer/src/Makefile
 gst-mixer/pixmaps/Makefile
-gst-mixer/doc/Makefile
+gst-mixer/help/Makefile
 grecord/gnome-sound-recorder.desktop.in
 gst-mixer/gnome-volume-control.desktop.in
 gstreamer-properties/gstreamer-properties.desktop.in
diff --git a/grecord/Makefile.am b/grecord/Makefile.am
index 85e63cd..8e177df 100644
--- a/grecord/Makefile.am
+++ b/grecord/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src doc icons
+SUBDIRS = help icons src
 
 EXTRA_DIST = \
        README AUTHORS INSTALL ChangeLog.pre-2-26 \
diff --git a/grecord/doc/C/gnome-sound-recorder.xml b/grecord/help/C/index.docbook
similarity index 100%
rename from grecord/doc/C/gnome-sound-recorder.xml
rename to grecord/help/C/index.docbook
diff --git a/grecord/doc/C/l10n.txt b/grecord/help/C/l10n.txt
similarity index 100%
rename from grecord/doc/C/l10n.txt
rename to grecord/help/C/l10n.txt
diff --git a/gst-mixer/doc/uk/legal.xml b/grecord/help/C/legal.xml
similarity index 98%
copy from gst-mixer/doc/uk/legal.xml
copy to grecord/help/C/legal.xml
index ac97e1d..899282c 100644
--- a/gst-mixer/doc/uk/legal.xml
+++ b/grecord/help/C/legal.xml
@@ -6,7 +6,7 @@
          by the Free Software Foundation with no Invariant Sections,
          no Front-Cover Texts, and no Back-Cover Texts.  You can find
          a copy of the GFDL at this <ulink type="help"
-         url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+         url="help:fdl">link</ulink> or in the file COPYING-DOCS
          distributed with this manual.
          </para>
          <para> This manual is part of a collection of GNOME manuals
diff --git a/grecord/doc/ChangeLog b/grecord/help/ChangeLog
similarity index 100%
rename from grecord/doc/ChangeLog
rename to grecord/help/ChangeLog
diff --git a/grecord/help/Makefile.am b/grecord/help/Makefile.am
new file mode 100644
index 0000000..06d835f
--- /dev/null
+++ b/grecord/help/Makefile.am
@@ -0,0 +1,13 @@
+ YELP_HELP_RULES@
+
+HELP_ID = gnome-sound-recorder
+
+HELP_FILES = \
+       index.docbook \
+       legal.xml
+
+HELP_MEDIA = figures/grecord_window.png
+
+HELP_LINGUAS = ca cs da de el en_GB es fr it oc ru sl sv uk zh_CN
+
+-include $(top_srcdir)/git.mk
diff --git a/grecord/doc/ca/ca.po b/grecord/help/ca/ca.po
similarity index 99%
rename from grecord/doc/ca/ca.po
rename to grecord/help/ca/ca.po
index 524cb1b..c49ec6c 100644
--- a/grecord/doc/ca/ca.po
+++ b/grecord/help/ca/ca.po
@@ -65,7 +65,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota "
@@ -73,7 +73,7 @@ msgstr ""
 "qualsevol versió publicada posteriorment per la Free Software Foundation, "
 "sense seccions invariants, sense texts de portada i sense texts de "
 "contraportada. Podeu trobar una còpia de la GFDL en aquest <ulink type=\"help"
-"\" url=\"ghelp:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït "
+"\" url=\"help:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït "
 "amb aquest manual."
 
 #: C/gnome-sound-recorder.xml:12(para)
diff --git a/grecord/doc/cs/cs.po b/grecord/help/cs/cs.po
similarity index 98%
rename from grecord/doc/cs/cs.po
rename to grecord/help/cs/cs.po
index ffab1f4..332b9f6 100644
--- a/grecord/doc/cs/cs.po
+++ b/grecord/help/cs/cs.po
@@ -61,8 +61,8 @@ msgid "GNOME Documentation Project"
 msgstr "Dokumentační projekt GNOME"
 
 #: C/gnome-sound-recorder.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with 
no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this 
<ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU Free Documentation 
License, verze 1.1 nebo jakékoli další verze vydané nadací Free Software Foundation; bez neměnných oddílů, 
bez textů předních desek a bez textů zadních desek. Kopie této licence je zahrnuta v oddílu jménem <ulink 
type=\"help\" url=\"ghelp:fdl\">GNU Free Documentation License</ulink> nebo v souboru COPYING-DOCS dodávaném 
s touto příručkou."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with 
no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this 
<ulink type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU Free Documentation 
License, verze 1.1 nebo jakékoli další verze vydané nadací Free Software Foundation; bez neměnných oddílů, 
bez textů předních desek a bez textů zadních desek. Kopie této licence je zahrnuta v oddílu jménem <ulink 
type=\"help\" url=\"help:fdl\">GNU Free Documentation License</ulink> nebo v souboru COPYING-DOCS dodávaném s 
touto příručkou."
 
 #: C/gnome-sound-recorder.xml:12(para)
 msgid "This manual is part of a collection of GNOME 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."
diff --git a/grecord/doc/da/da.po b/grecord/help/da/da.po
similarity index 99%
rename from grecord/doc/da/da.po
rename to grecord/help/da/da.po
index 6126d85..e206838 100644
--- a/grecord/doc/da/da.po
+++ b/grecord/help/da/da.po
@@ -22,14 +22,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Tilladelse er givet til at kopiere, distribuere og/eller ændre dette "
 "dokument under betingelserne i GNU Free Documentation License (GFDL), "
 "version 1.1 eller enhver senere version udgivet af Free Software Foundation; "
 "uden invariante afsnit, forsidetekster, samt bagsidetekster. Du kan se en "
-"kopi af GFDL her <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> eller i "
+"kopi af GFDL her <ulink type=\"help\" url=\"help:fdl\">link</ulink> eller i "
 "filen COPYING-DOCS som distribueres sammen med denne manual."
 
 #: ../C/legal.xml:12(para) ../C/gnome-sound-recorder.xml:12(para)
diff --git a/grecord/doc/de/de.po b/grecord/help/de/de.po
similarity index 99%
rename from grecord/doc/de/de.po
rename to grecord/help/de/de.po
index 43899c6..2703eca 100644
--- a/grecord/doc/de/de.po
+++ b/grecord/help/de/de.po
@@ -62,7 +62,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or in "
 "the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free "
@@ -70,7 +70,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/gnome-sound-recorder.xml:12(para)
diff --git a/grecord/doc/el/el.po b/grecord/help/el/el.po
similarity index 99%
rename from grecord/doc/el/el.po
rename to grecord/help/el/el.po
index 4d85f33..dd5317f 100644
--- a/grecord/doc/el/el.po
+++ b/grecord/help/el/el.po
@@ -63,7 +63,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 ""
 "Χορηγείται η άδεια για αντιγραφή, διανομή ή/και τροποποίηση αυτού του "
@@ -71,7 +71,7 @@ msgstr ""
 "έκδοσης 1.1 ή οποιαδήποτε άλλης έκδοσης δημοσιευμένης από το "
 "Free·Software·Foundation χωρίς αναλλοίωτα στοιχεία, χωρίς κείμενα Front-"
 "Cover και κείμενα Back-Cover. Μπορείτε να βρείτε ένα αντίγραφο της GFDL σ' "
-"αυτό το <ulink type=\"help\" url=\"ghelp:fdl\">σύνδεσμο</ulink> ή στο αρχείο "
+"αυτό το <ulink type=\"help\" url=\"help:fdl\">σύνδεσμο</ulink> ή στο αρχείο "
 "COPYING-DOCS που διανέμεται με αυτόν τον οδηγό."
 
 #: C/gnome-sound-recorder.xml:12(para)
diff --git a/grecord/doc/en_GB/en_GB.po b/grecord/help/en_GB/en_GB.po
similarity index 99%
rename from grecord/doc/en_GB/en_GB.po
rename to grecord/help/en_GB/en_GB.po
index 1384a2e..4dd3bad 100644
--- a/grecord/doc/en_GB/en_GB.po
+++ b/grecord/help/en_GB/en_GB.po
@@ -66,14 +66,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Permission is granted to copy, distribute and/or modify this document under "
 "the terms of the GNU Free Documentation Licence (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 
 #: C/gnome-sound-recorder.xml:12(para)
diff --git a/grecord/doc/es/es.po b/grecord/help/es/es.po
similarity index 99%
rename from grecord/doc/es/es.po
rename to grecord/help/es/es.po
index 07422be..f8a0d0d 100644
--- a/grecord/doc/es/es.po
+++ b/grecord/help/es/es.po
@@ -64,14 +64,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/gnome-sound-recorder.xml:12(para)
diff --git a/grecord/doc/es/grecord-es.omf b/grecord/help/es/grecord-es.omf
similarity index 100%
rename from grecord/doc/es/grecord-es.omf
rename to grecord/help/es/grecord-es.omf
diff --git a/grecord/doc/es/grecord.xml b/grecord/help/es/grecord.xml
similarity index 100%
rename from grecord/doc/es/grecord.xml
rename to grecord/help/es/grecord.xml
diff --git a/gst-mixer/doc/uk/legal.xml b/grecord/help/es/legal.xml
similarity index 76%
rename from gst-mixer/doc/uk/legal.xml
rename to grecord/help/es/legal.xml
index ac97e1d..473adfc 100644
--- a/gst-mixer/doc/uk/legal.xml
+++ b/grecord/help/es/legal.xml
@@ -1,29 +1,17 @@
-  <legalnotice id="legalnotice">
+<?xml version="1.0" encoding="utf-8"?>
+<legalnotice id="legalnotice">
        <para>
          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
+         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.
          </para>
-         <para> This manual is part of a collection of GNOME 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.
-       </para>
+         <para>Este manual forma parte de una colección de documentos de GNOME distribuidos según la GFDL. 
Si desea distribuir este manual de forma independiente de la colección, puede hacerlo agregando una copia de 
la licencia al documento, según se describe en la sección 6 de la misma.</para>
 
-       <para>
-         Many of the names used by companies to distinguish their
-         products and services are claimed as trademarks. Where those
-         names appear in any GNOME documentation, and the members of
-         the GNOME Documentation Project are made aware of those
-         trademarks, then the names are in capital letters or initial
-         capital letters.
-       </para>
+       <para>Muchos de los nombres utilizados por las empresas para distinguir sus productos y servicios se 
consideran marcas comerciales. Cuando estos nombres aparezcan en la documentación de GNOME, y siempre que se 
haya informado a los miembros del Proyecto de documentación de GNOME de dichas marcas comerciales, los 
nombres aparecerán en mayúsculas o con las iniciales en mayúsculas.</para>
 
        <para>
          DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
@@ -73,4 +61,3 @@
          </orderedlist>
        </para>
   </legalnotice>
-
diff --git a/grecord/doc/fr/fr.po b/grecord/help/fr/fr.po
similarity index 99%
rename from grecord/doc/fr/fr.po
rename to grecord/help/fr/fr.po
index 79a917b..3b1a998 100644
--- a/grecord/doc/fr/fr.po
+++ b/grecord/help/fr/fr.po
@@ -68,7 +68,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 "
@@ -76,7 +76,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/gnome-sound-recorder.xml:12(para)
diff --git a/grecord/doc/it/it.po b/grecord/help/it/it.po
similarity index 99%
rename from grecord/doc/it/it.po
rename to grecord/help/it/it.po
index ec4f675..257cdf4 100644
--- a/grecord/doc/it/it.po
+++ b/grecord/help/it/it.po
@@ -65,14 +65,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Questo documento può essere copiato, distribuito o modificato solo in "
 "conformità con i termini della GNU Free Documentation License (GFDL) "
 "Versione 1.1 o delle versioni successive pubblicate dalla Free Software "
 "Foundation senza sezioni invariabili, frontespizi e testi di copertina. Una "
-"copia della GFDL è disponibile su questo <ulink type=\"help\" url=\"ghelp:fdl"
+"copia della GFDL è disponibile su questo <ulink type=\"help\" url=\"help:fdl"
 "\">collegamento</ulink> o nel file COPYING-DOCS distribuito con questo "
 "manuale."
 
diff --git a/grecord/doc/ja/figures/grecord-prefs-path.eps b/grecord/help/ja/figures/grecord-prefs-path.eps
similarity index 100%
rename from grecord/doc/ja/figures/grecord-prefs-path.eps
rename to grecord/help/ja/figures/grecord-prefs-path.eps
diff --git a/grecord/doc/ja/figures/grecord-prefs-play.eps b/grecord/help/ja/figures/grecord-prefs-play.eps
similarity index 100%
rename from grecord/doc/ja/figures/grecord-prefs-play.eps
rename to grecord/help/ja/figures/grecord-prefs-play.eps
diff --git a/grecord/doc/ja/figures/grecord-prefs-rec.eps b/grecord/help/ja/figures/grecord-prefs-rec.eps
similarity index 100%
rename from grecord/doc/ja/figures/grecord-prefs-rec.eps
rename to grecord/help/ja/figures/grecord-prefs-rec.eps
diff --git a/grecord/doc/ja/figures/grecord-prefs-sound.eps b/grecord/help/ja/figures/grecord-prefs-sound.eps
similarity index 100%
rename from grecord/doc/ja/figures/grecord-prefs-sound.eps
rename to grecord/help/ja/figures/grecord-prefs-sound.eps
diff --git a/grecord/doc/ja/figures/grecord-prefs-ui.eps b/grecord/help/ja/figures/grecord-prefs-ui.eps
similarity index 100%
rename from grecord/doc/ja/figures/grecord-prefs-ui.eps
rename to grecord/help/ja/figures/grecord-prefs-ui.eps
diff --git a/grecord/doc/ja/figures/grecord.eps b/grecord/help/ja/figures/grecord.eps
similarity index 100%
rename from grecord/doc/ja/figures/grecord.eps
rename to grecord/help/ja/figures/grecord.eps
diff --git a/grecord/doc/ja/grecord-ja.omf b/grecord/help/ja/grecord-ja.omf
similarity index 100%
rename from grecord/doc/ja/grecord-ja.omf
rename to grecord/help/ja/grecord-ja.omf
diff --git a/grecord/doc/ja/grecord.xml b/grecord/help/ja/grecord.xml
similarity index 100%
rename from grecord/doc/ja/grecord.xml
rename to grecord/help/ja/grecord.xml
diff --git a/grecord/doc/ja/legal.xml b/grecord/help/ja/legal.xml
similarity index 96%
rename from grecord/doc/ja/legal.xml
rename to grecord/help/ja/legal.xml
index 69abfd0..a3f00f6 100644
--- a/grecord/doc/ja/legal.xml
+++ b/grecord/help/ja/legal.xml
@@ -4,7 +4,7 @@
          をコピー、配布、または変更することを許可します。Free Software 
          Foundation から発行されたバージョン 1.1 以降のドキュメントには、
          セクションや表紙などがありません。GFDL のコピーは、<ulink 
-         type="help" url="ghelp:fdl">URL</ulink> またはこのマニュアルと
+         type="help" url="help:fdl">URL</ulink> またはこのマニュアルと
          一緒に配布された COPYING-DOCS を参照してください。
          </para>
          <para> このマニュアルは、GFDL から配布された GNOME マニュアルの
diff --git a/grecord/doc/ko/figures/grecord-prefs-path.eps b/grecord/help/ko/figures/grecord-prefs-path.eps
similarity index 100%
rename from grecord/doc/ko/figures/grecord-prefs-path.eps
rename to grecord/help/ko/figures/grecord-prefs-path.eps
diff --git a/grecord/doc/ko/figures/grecord-prefs-play.eps b/grecord/help/ko/figures/grecord-prefs-play.eps
similarity index 100%
rename from grecord/doc/ko/figures/grecord-prefs-play.eps
rename to grecord/help/ko/figures/grecord-prefs-play.eps
diff --git a/grecord/doc/ko/figures/grecord-prefs-rec.eps b/grecord/help/ko/figures/grecord-prefs-rec.eps
similarity index 100%
rename from grecord/doc/ko/figures/grecord-prefs-rec.eps
rename to grecord/help/ko/figures/grecord-prefs-rec.eps
diff --git a/grecord/doc/ko/figures/grecord-prefs-sound.eps b/grecord/help/ko/figures/grecord-prefs-sound.eps
similarity index 100%
rename from grecord/doc/ko/figures/grecord-prefs-sound.eps
rename to grecord/help/ko/figures/grecord-prefs-sound.eps
diff --git a/grecord/doc/ko/figures/grecord-prefs-ui.eps b/grecord/help/ko/figures/grecord-prefs-ui.eps
similarity index 100%
rename from grecord/doc/ko/figures/grecord-prefs-ui.eps
rename to grecord/help/ko/figures/grecord-prefs-ui.eps
diff --git a/grecord/doc/ko/figures/grecord.eps b/grecord/help/ko/figures/grecord.eps
similarity index 100%
rename from grecord/doc/ko/figures/grecord.eps
rename to grecord/help/ko/figures/grecord.eps
diff --git a/grecord/doc/ko/grecord-ko.omf b/grecord/help/ko/grecord-ko.omf
similarity index 100%
rename from grecord/doc/ko/grecord-ko.omf
rename to grecord/help/ko/grecord-ko.omf
diff --git a/grecord/doc/ko/grecord.xml b/grecord/help/ko/grecord.xml
similarity index 100%
rename from grecord/doc/ko/grecord.xml
rename to grecord/help/ko/grecord.xml
diff --git a/grecord/doc/ko/legal.xml b/grecord/help/ko/legal.xml
similarity index 97%
rename from grecord/doc/ko/legal.xml
rename to grecord/help/ko/legal.xml
index 5d2e658..6debc47 100644
--- a/grecord/doc/ko/legal.xml
+++ b/grecord/help/ko/legal.xml
@@ -5,7 +5,7 @@
          앞 표지 텍스트 및 뒷 표지 텍스트를 제외하고 복사, 수정 및/또는 
          배포할 수 있습니다.  
          
-         GFDL의 사본은 <ulink type="help" url="ghelp:fdl">링크</ulink>
+         GFDL의 사본은 <ulink type="help" url="help:fdl">링크</ulink>
          또는 본 설명서와 함께 배포된 COPYING-DOCS 파일에서 찾을 
          수 있습니다.
          </para>
diff --git a/grecord/doc/oc/oc.po b/grecord/help/oc/oc.po
similarity index 99%
rename from grecord/doc/oc/oc.po
rename to grecord/help/oc/oc.po
index e64da87..b0a42a2 100644
--- a/grecord/doc/oc/oc.po
+++ b/grecord/help/oc/oc.po
@@ -69,7 +69,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/grecord/doc/ru/ru.po b/grecord/help/ru/ru.po
similarity index 99%
rename from grecord/doc/ru/ru.po
rename to grecord/help/ru/ru.po
index da6426b..0904e31 100644
--- a/grecord/doc/ru/ru.po
+++ b/grecord/help/ru/ru.po
@@ -61,7 +61,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 ""
 "Разрешается копировать, распространять и/или изменять этот документ на "
@@ -69,7 +69,7 @@ msgstr ""
 "более поздней версии, опубликованной Фондом свободного программного "
 "обеспечения (Free Software Foundation), без неизменяемых частей и без текстов "
 "на обложках. Вы можете найти копию лицензии GFDL по  <ulink type=\"help\" url="
-"\"ghelp:fdl\">этой ссылке</ulink> или в файле COPYING-DOCS, распространяемом "
+"\"help:fdl\">этой ссылке</ulink> или в файле COPYING-DOCS, распространяемом "
 "с этим документом."
 
 #: C/gnome-sound-recorder.xml:12(para)
diff --git a/grecord/doc/sl/sl.po b/grecord/help/sl/sl.po
similarity index 99%
rename from grecord/doc/sl/sl.po
rename to grecord/help/sl/sl.po
index a16945a..e136286 100644
--- a/grecord/doc/sl/sl.po
+++ b/grecord/help/sl/sl.po
@@ -70,7 +70,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/grecord/doc/sv/sv.po b/grecord/help/sv/sv.po
similarity index 98%
rename from grecord/doc/sv/sv.po
rename to grecord/help/sv/sv.po
index 5b7a147..73ba1db 100644
--- a/grecord/doc/sv/sv.po
+++ b/grecord/help/sv/sv.po
@@ -52,8 +52,8 @@ msgid "GNOME Documentation Project"
 msgstr "Dokumentationsprojekt för GNOME"
 
 #: C/gnome-sound-recorder.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/gnome-sound-recorder.xml:12(para)
 msgid "This manual is part of a collection of GNOME 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."
diff --git a/grecord/doc/uk/uk.po b/grecord/help/uk/uk.po
similarity index 99%
rename from grecord/doc/uk/uk.po
rename to grecord/help/uk/uk.po
index 7a363fd..a3eba1e 100644
--- a/grecord/doc/uk/uk.po
+++ b/grecord/help/uk/uk.po
@@ -20,14 +20,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Дозволяється копіювати, розповсюджувати та/або змінювати цей документ на "
 "умовах ліцензії GNU Free Documentation License (GFDL), версії 1.1 або будь-"
 "якої старшої версії, що опублікована Free Software Foundation без "
 "інваріантних розділів, тексту титульної сторінки, та тексту фінальної "
-"сторінки. Копію GFDL можна знайти <ulink type=\"help\" url=\"ghelp:fdl\">за "
+"сторінки. Копію GFDL можна знайти <ulink type=\"help\" url=\"help:fdl\">за "
 "адресою</ulink> або у файлі COPYING-DOCS, що постачається з цією довідкою."
 
 #: ../C/legal.xml:12(para)
diff --git a/grecord/doc/zh_CN/zh_CN.po b/grecord/help/zh_CN/zh_CN.po
similarity index 99%
rename from grecord/doc/zh_CN/zh_CN.po
rename to grecord/help/zh_CN/zh_CN.po
index 9cf38bf..d50a0f5 100644
--- a/grecord/doc/zh_CN/zh_CN.po
+++ b/grecord/help/zh_CN/zh_CN.po
@@ -64,7 +64,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 ""
 "对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software "
diff --git a/grecord/doc/zh_TW/figures/grecord-prefs-path.eps 
b/grecord/help/zh_TW/figures/grecord-prefs-path.eps
similarity index 100%
rename from grecord/doc/zh_TW/figures/grecord-prefs-path.eps
rename to grecord/help/zh_TW/figures/grecord-prefs-path.eps
diff --git a/grecord/doc/zh_TW/figures/grecord-prefs-play.eps 
b/grecord/help/zh_TW/figures/grecord-prefs-play.eps
similarity index 100%
rename from grecord/doc/zh_TW/figures/grecord-prefs-play.eps
rename to grecord/help/zh_TW/figures/grecord-prefs-play.eps
diff --git a/grecord/doc/zh_TW/figures/grecord-prefs-rec.eps 
b/grecord/help/zh_TW/figures/grecord-prefs-rec.eps
similarity index 100%
rename from grecord/doc/zh_TW/figures/grecord-prefs-rec.eps
rename to grecord/help/zh_TW/figures/grecord-prefs-rec.eps
diff --git a/grecord/doc/zh_TW/figures/grecord-prefs-sound.eps 
b/grecord/help/zh_TW/figures/grecord-prefs-sound.eps
similarity index 100%
rename from grecord/doc/zh_TW/figures/grecord-prefs-sound.eps
rename to grecord/help/zh_TW/figures/grecord-prefs-sound.eps
diff --git a/grecord/doc/zh_TW/figures/grecord-prefs-ui.eps b/grecord/help/zh_TW/figures/grecord-prefs-ui.eps
similarity index 100%
rename from grecord/doc/zh_TW/figures/grecord-prefs-ui.eps
rename to grecord/help/zh_TW/figures/grecord-prefs-ui.eps
diff --git a/grecord/doc/zh_TW/figures/grecord.eps b/grecord/help/zh_TW/figures/grecord.eps
similarity index 100%
rename from grecord/doc/zh_TW/figures/grecord.eps
rename to grecord/help/zh_TW/figures/grecord.eps
diff --git a/grecord/doc/zh_TW/grecord-zh_TW.omf b/grecord/help/zh_TW/grecord-zh_TW.omf
similarity index 100%
rename from grecord/doc/zh_TW/grecord-zh_TW.omf
rename to grecord/help/zh_TW/grecord-zh_TW.omf
diff --git a/grecord/doc/zh_TW/grecord.xml b/grecord/help/zh_TW/grecord.xml
similarity index 100%
rename from grecord/doc/zh_TW/grecord.xml
rename to grecord/help/zh_TW/grecord.xml
diff --git a/grecord/doc/zh_TW/legal.xml b/grecord/help/zh_TW/legal.xml
similarity index 96%
rename from grecord/doc/zh_TW/legal.xml
rename to grecord/help/zh_TW/legal.xml
index 54215ec..afec277 100644
--- a/grecord/doc/zh_TW/legal.xml
+++ b/grecord/help/zh_TW/legal.xml
@@ -6,7 +6,7 @@
          亦不得加上封底文字。
          如要取得 GFDL 的副本,請參閱
          此<ulink type="help"
-         url="ghelp:fdl">連結</ulink>,或是參閱與本手冊一同隨附的 COPYING-DOCS
+         url="help:fdl">連結</ulink>,或是參閱與本手冊一同隨附的 COPYING-DOCS
          檔案。
          </para>
          <para> 本手冊是屬於依 GFDL 授權所發佈之 GNOME 手冊集中的一部份。
diff --git a/grecord/src/gsr-window.c b/grecord/src/gsr-window.c
index 850ebf0..8407938 100644
--- a/grecord/src/gsr-window.c
+++ b/grecord/src/gsr-window.c
@@ -1200,7 +1200,7 @@ help_contents_cb (GtkAction *action,
        GError *error = NULL;
 
        gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (window)),
-                     "ghelp:gnome-sound-recorder",
+                     "help:gnome-sound-recorder",
                      gtk_get_current_event_time (), &error);
 
        if (error != NULL)
diff --git a/gst-mixer/Makefile.am b/gst-mixer/Makefile.am
index 07680cd..d036f26 100644
--- a/gst-mixer/Makefile.am
+++ b/gst-mixer/Makefile.am
@@ -1,5 +1,5 @@
 Desktopdir = $(datadir)/applications
-SUBDIRS = doc icons pixmaps src
+SUBDIRS = help icons pixmaps src
 
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
diff --git a/gst-mixer/doc/C/gnome-volume-control.xml b/gst-mixer/help/C/index.docbook
similarity index 99%
rename from gst-mixer/doc/C/gnome-volume-control.xml
rename to gst-mixer/help/C/index.docbook
index 2c6b0aa..169cc88 100644
--- a/gst-mixer/doc/C/gnome-volume-control.xml
+++ b/gst-mixer/help/C/index.docbook
@@ -18,7 +18,7 @@
 -->
 
 
-<article id="index" lang="en">
+<article id="index" lang="en" xmlns:xi="http://www.w3.org/2003/XInclude";>
 <articleinfo> 
    <title>&appname; Manual V&manrevision;</title>
 
@@ -59,7 +59,7 @@
     <publishername>GNOME Documentation Project</publishername>
   </publisher>
 
-  &legal;
+  <xi:include href="legal.xml" />
    <!-- This file  contains link to license for the documentation (GNU FDL), and
         other legal stuff such as "NO WARRANTY" statement. Please do not change
         any of this. -->
diff --git a/gst-mixer/doc/C/l10n.txt b/gst-mixer/help/C/l10n.txt
similarity index 100%
rename from gst-mixer/doc/C/l10n.txt
rename to gst-mixer/help/C/l10n.txt
diff --git a/gst-mixer/doc/C/legal.xml b/gst-mixer/help/C/legal.xml
similarity index 98%
rename from gst-mixer/doc/C/legal.xml
rename to gst-mixer/help/C/legal.xml
index ac97e1d..899282c 100644
--- a/gst-mixer/doc/C/legal.xml
+++ b/gst-mixer/help/C/legal.xml
@@ -6,7 +6,7 @@
          by the Free Software Foundation with no Invariant Sections,
          no Front-Cover Texts, and no Back-Cover Texts.  You can find
          a copy of the GFDL at this <ulink type="help"
-         url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+         url="help:fdl">link</ulink> or in the file COPYING-DOCS
          distributed with this manual.
          </para>
          <para> This manual is part of a collection of GNOME manuals
diff --git a/gst-mixer/doc/ChangeLog b/gst-mixer/help/ChangeLog
similarity index 100%
rename from gst-mixer/doc/ChangeLog
rename to gst-mixer/help/ChangeLog
diff --git a/gst-mixer/help/Makefile.am b/gst-mixer/help/Makefile.am
new file mode 100644
index 0000000..9982b1f
--- /dev/null
+++ b/gst-mixer/help/Makefile.am
@@ -0,0 +1,13 @@
+ YELP_HELP_RULES@
+
+HELP_ID = gnome-volume-control
+
+HELP_LINGUAS = ca cs da de el en_GB es fr it oc ru sl sv zh_CN
+
+HELP_FILES = \
+       index.docbook \
+       legal.xml
+
+HELP_MEDIA = figures/gnome-volume-control_window.png
+
+-include $(top_srcdir)/git.mk
diff --git a/gst-mixer/doc/ca/ca.po b/gst-mixer/help/ca/ca.po
similarity index 99%
rename from gst-mixer/doc/ca/ca.po
rename to gst-mixer/help/ca/ca.po
index 9466b4e..a357a55 100644
--- a/gst-mixer/doc/ca/ca.po
+++ b/gst-mixer/help/ca/ca.po
@@ -83,7 +83,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota "
@@ -91,7 +91,7 @@ msgstr ""
 "qualsevol versió publicada posteriorment per la Free Software Foundation, "
 "sense seccions invariants, sense texts de portada i sense texts de "
 "contraportada. Podeu trobar una còpia de la GFDL en aquest <ulink type=\"help"
-"\" url=\"ghelp:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït "
+"\" url=\"help:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït "
 "amb aquest manual."
 
 #: C/gnome-volume-control.xml:12(para)
diff --git a/gst-mixer/doc/cs/cs.po b/gst-mixer/help/cs/cs.po
similarity index 99%
rename from gst-mixer/doc/cs/cs.po
rename to gst-mixer/help/cs/cs.po
index 00b50e8..1d9b242 100644
--- a/gst-mixer/doc/cs/cs.po
+++ b/gst-mixer/help/cs/cs.po
@@ -82,14 +82,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU "
 "Free Documentation License, verze 1.1 nebo jakékoli další verze vydané "
 "nadací Free Software Foundation; bez neměnných oddílů, bez textů předních "
 "desek a bez textů zadních desek. Kopie této licence je zahrnuta v oddílu "
-"jménem <ulink type=\"help\" url=\"ghelp:fdl\">GNU Free Documentation "
+"jménem <ulink type=\"help\" url=\"help:fdl\">GNU Free Documentation "
 "License</ulink> nebo v souboru COPYING-DOCS dodávaném s touto příručkou."
 
 #: C/gnome-volume-control.xml:12(para)
diff --git a/gst-mixer/doc/da/da.po b/gst-mixer/help/da/da.po
similarity index 99%
rename from gst-mixer/doc/da/da.po
rename to gst-mixer/help/da/da.po
index cb3cb05..adbe54b 100644
--- a/gst-mixer/doc/da/da.po
+++ b/gst-mixer/help/da/da.po
@@ -23,7 +23,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Tilladelse er givet til at kopiere, distribuere og/eller ændre dette "
@@ -31,7 +31,7 @@ msgstr ""
 "version 1.1 eller andre senere versioner udgivet af Free Software Foundation "
 "med ikke indholdte sektioner, ingen frontomslagstekster, og ingen "
 "bagsideomslagstekster. Du kan finde en kopi af GFDL her <ulink type=\"help\" "
-"url=\"ghelp:fdl\">link</ulink> eller i filen COPYING-DOCS der er "
+"url=\"help:fdl\">link</ulink> eller i filen COPYING-DOCS der er "
 "distribueret med denne manual."
 
 #: ../C/legal.xml:12(para) ../C/gnome-volume-control.xml:12(para)
diff --git a/gst-mixer/doc/de/de.po b/gst-mixer/help/de/de.po
similarity index 99%
rename from gst-mixer/doc/de/de.po
rename to gst-mixer/help/de/de.po
index 3bfc3c0..f15afaa 100644
--- a/gst-mixer/doc/de/de.po
+++ b/gst-mixer/help/de/de.po
@@ -77,7 +77,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or in "
 "the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free "
@@ -85,7 +85,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/gnome-volume-control.xml:12(para)
diff --git a/gst-mixer/doc/el/el.po b/gst-mixer/help/el/el.po
similarity index 99%
rename from gst-mixer/doc/el/el.po
rename to gst-mixer/help/el/el.po
index d5d547a..3b70c43 100644
--- a/gst-mixer/doc/el/el.po
+++ b/gst-mixer/help/el/el.po
@@ -82,7 +82,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/gst-mixer/doc/en_GB/en_GB.po b/gst-mixer/help/en_GB/en_GB.po
similarity index 99%
rename from gst-mixer/doc/en_GB/en_GB.po
rename to gst-mixer/help/en_GB/en_GB.po
index 342aaa3..b8ca9e6 100644
--- a/gst-mixer/doc/en_GB/en_GB.po
+++ b/gst-mixer/help/en_GB/en_GB.po
@@ -76,14 +76,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Permission is granted to copy, distribute and/or modify this document under "
 "the terms of the GNU Free Documentation Licence (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 
 #: C/gnome-volume-control.xml:12(para)
diff --git a/gst-mixer/doc/es/es.po b/gst-mixer/help/es/es.po
similarity index 99%
rename from gst-mixer/doc/es/es.po
rename to gst-mixer/help/es/es.po
index 6002fe7..88858dd 100644
--- a/gst-mixer/doc/es/es.po
+++ b/gst-mixer/help/es/es.po
@@ -82,14 +82,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"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/gnome-volume-control.xml:12(para)
diff --git a/gst-mixer/doc/fr/fr.po b/gst-mixer/help/fr/fr.po
similarity index 99%
rename from gst-mixer/doc/fr/fr.po
rename to gst-mixer/help/fr/fr.po
index 8984055..20da1d5 100644
--- a/gst-mixer/doc/fr/fr.po
+++ b/gst-mixer/help/fr/fr.po
@@ -86,7 +86,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 "
@@ -94,7 +94,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/gnome-volume-control.xml:12(para)
diff --git a/gst-mixer/doc/it/it.po b/gst-mixer/help/it/it.po
similarity index 99%
rename from gst-mixer/doc/it/it.po
rename to gst-mixer/help/it/it.po
index 09f37c3..0d04a14 100644
--- a/gst-mixer/doc/it/it.po
+++ b/gst-mixer/help/it/it.po
@@ -77,14 +77,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."
 
diff --git a/gst-mixer/doc/oc/oc.po b/gst-mixer/help/oc/oc.po
similarity index 99%
rename from gst-mixer/doc/oc/oc.po
rename to gst-mixer/help/oc/oc.po
index fbe0219..663356f 100644
--- a/gst-mixer/doc/oc/oc.po
+++ b/gst-mixer/help/oc/oc.po
@@ -89,7 +89,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/gst-mixer/doc/ru/ru.po b/gst-mixer/help/ru/ru.po
similarity index 99%
rename from gst-mixer/doc/ru/ru.po
rename to gst-mixer/help/ru/ru.po
index 6cdff77..f359a93 100644
--- a/gst-mixer/doc/ru/ru.po
+++ b/gst-mixer/help/ru/ru.po
@@ -78,7 +78,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 ""
 "Разрешается копировать, распространять и/или изменять этот документ на "
@@ -86,7 +86,7 @@ msgstr ""
 "более поздней версии, опубликованной Фондом свободного программного "
 "обеспечения (Free Software Foundation), без неизменяемых частей и без текстов "
 "на обложках. Вы можете найти копию лицензии GFDL по  <ulink type=\"help\" url="
-"\"ghelp:fdl\">этой ссылке</ulink> или в файле COPYING-DOCS, распространяемом "
+"\"help:fdl\">этой ссылке</ulink> или в файле COPYING-DOCS, распространяемом "
 "с этим документом."
 
 #: C/gnome-volume-control.xml:12(para)
diff --git a/gst-mixer/doc/sl/sl.po b/gst-mixer/help/sl/sl.po
similarity index 99%
rename from gst-mixer/doc/sl/sl.po
rename to gst-mixer/help/sl/sl.po
index e43f2a3..cfada0e 100644
--- a/gst-mixer/doc/sl/sl.po
+++ b/gst-mixer/help/sl/sl.po
@@ -88,7 +88,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/gst-mixer/doc/sv/sv.po b/gst-mixer/help/sv/sv.po
similarity index 98%
rename from gst-mixer/doc/sv/sv.po
rename to gst-mixer/help/sv/sv.po
index e0bb689..fa775f4 100644
--- a/gst-mixer/doc/sv/sv.po
+++ b/gst-mixer/help/sv/sv.po
@@ -69,8 +69,8 @@ msgid "GNOME Documentation Project"
 msgstr "Dokumentationsprojekt för GNOME"
 
 #: C/gnome-volume-control.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/gnome-volume-control.xml:12(para)
 msgid "This manual is part of a collection of GNOME 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."
diff --git a/gst-mixer/doc/uk/gnome-volume-control-uk.omf b/gst-mixer/help/uk/gnome-volume-control-uk.omf
similarity index 100%
rename from gst-mixer/doc/uk/gnome-volume-control-uk.omf
rename to gst-mixer/help/uk/gnome-volume-control-uk.omf
diff --git a/gst-mixer/doc/uk/gnome-volume-control.xml b/gst-mixer/help/uk/gnome-volume-control.xml
similarity index 100%
rename from gst-mixer/doc/uk/gnome-volume-control.xml
rename to gst-mixer/help/uk/gnome-volume-control.xml
diff --git a/grecord/doc/C/legal.xml b/gst-mixer/help/uk/legal.xml
similarity index 98%
rename from grecord/doc/C/legal.xml
rename to gst-mixer/help/uk/legal.xml
index ac97e1d..899282c 100644
--- a/grecord/doc/C/legal.xml
+++ b/gst-mixer/help/uk/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 GNOME manuals
diff --git a/gst-mixer/doc/zh_CN/zh_CN.po b/gst-mixer/help/zh_CN/zh_CN.po
similarity index 99%
rename from gst-mixer/doc/zh_CN/zh_CN.po
rename to gst-mixer/help/zh_CN/zh_CN.po
index 6a4f695..36fb881 100644
--- a/gst-mixer/doc/zh_CN/zh_CN.po
+++ b/gst-mixer/help/zh_CN/zh_CN.po
@@ -82,7 +82,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 ""
 "对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software "
diff --git a/gst-mixer/src/window.c b/gst-mixer/src/window.c
index ea4815a..638db62 100644
--- a/gst-mixer/src/window.c
+++ b/gst-mixer/src/window.c
@@ -108,7 +108,7 @@ cb_help (GtkAction *action,
 
   screen = gtk_window_get_screen (GTK_WINDOW (win));
 
-  if (gtk_show_uri (screen, "ghelp:gnome-volume-control", GDK_CURRENT_TIME,
+  if (gtk_show_uri (screen, "help:gnome-volume-control", GDK_CURRENT_TIME,
                                &error) == FALSE) {
        dialog = gtk_message_dialog_new (GTK_WINDOW (win), GTK_DIALOG_DESTROY_WITH_PARENT,
                                      GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", error->message);
diff --git a/gstreamer-properties/gstreamer-properties.c b/gstreamer-properties/gstreamer-properties.c
index b21cdd5..f1f60ee 100644
--- a/gstreamer-properties/gstreamer-properties.c
+++ b/gstreamer-properties/gstreamer-properties.c
@@ -99,7 +99,7 @@ dialog_response (GtkDialog * widget, gint response_id, GtkBuilder * dialog)
 
   if (response_id == GTK_RESPONSE_HELP)
     gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
-                  "ghelp:gstreamer-properties",
+                  "help:gstreamer-properties",
                    gtk_get_current_event_time (),
                   &error);
   else
diff --git a/gstreamer-properties/help/C/gstreamer-properties.xml b/gstreamer-properties/help/C/index.docbook
similarity index 100%
rename from gstreamer-properties/help/C/gstreamer-properties.xml
rename to gstreamer-properties/help/C/index.docbook
diff --git a/gstreamer-properties/help/C/legal.xml b/gstreamer-properties/help/C/legal.xml
index ac97e1d..899282c 100644
--- a/gstreamer-properties/help/C/legal.xml
+++ b/gstreamer-properties/help/C/legal.xml
@@ -6,7 +6,7 @@
          by the Free Software Foundation with no Invariant Sections,
          no Front-Cover Texts, and no Back-Cover Texts.  You can find
          a copy of the GFDL at this <ulink type="help"
-         url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+         url="help:fdl">link</ulink> or in the file COPYING-DOCS
          distributed with this manual.
          </para>
          <para> This manual is part of a collection of GNOME manuals
diff --git a/gstreamer-properties/help/Makefile.am b/gstreamer-properties/help/Makefile.am
index b0dbb6e..61eb02e 100644
--- a/gstreamer-properties/help/Makefile.am
+++ b/gstreamer-properties/help/Makefile.am
@@ -1,9 +1,12 @@
-include $(top_srcdir)/build-aux/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-DOC_MODULE = gstreamer-properties
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = figures/gstreamer_properties_window.png
-DOC_LINGUAS = ca cs da de el en_GB es fr gl it oc pt_BR ru sl sv th uk zh_CN
+ YELP_HELP_RULES@
+
+HELP_ID = gstreamer-properties
+
+HELP_LINGUAS = ca cs da de el en_GB es fr gl it oc pt_BR ru sl sv th uk zh_CN
+
+HELP_FILES = \
+       index.docbook \
+       legal.xml
+HELP_MEDIA = figures/gstreamer_properties_window.png
 
 -include $(top_srcdir)/git.mk
diff --git a/gstreamer-properties/help/ca/ca.po b/gstreamer-properties/help/ca/ca.po
index a4141b9..fef7844 100644
--- a/gstreamer-properties/help/ca/ca.po
+++ b/gstreamer-properties/help/ca/ca.po
@@ -57,7 +57,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota "
@@ -65,7 +65,7 @@ msgstr ""
 "qualsevol versió publicada posteriorment per la Free Software Foundation, "
 "sense seccions invariants, sense texts de portada i sense texts de "
 "contraportada. Podeu trobar una còpia de la GFDL en aquest <ulink type=\"help"
-"\" url=\"ghelp:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït "
+"\" url=\"help:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït "
 "amb aquest manual."
 
 #: C/gstreamer-properties.xml:12(para)
diff --git a/gstreamer-properties/help/cs/cs.po b/gstreamer-properties/help/cs/cs.po
index 8478516..4805412 100644
--- a/gstreamer-properties/help/cs/cs.po
+++ b/gstreamer-properties/help/cs/cs.po
@@ -63,14 +63,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, verze 1.1 nebo jakékoli další verze vydané "
 "nadací Free Software Foundation; bez neměnných oddílů, bez textů předních "
 "desek a bez textů zadních desek. Kopie této licence je zahrnuta v oddílu "
-"jménem <ulink type=\"help\" url=\"ghelp:fdl\">GNU Free Documentation "
+"jménem <ulink type=\"help\" url=\"help:fdl\">GNU Free Documentation "
 "License</ulink> nebo v souboru COPYING-DOCS dodávaném s touto příručkou."
 
 #: C/gstreamer-properties.xml:12(para)
diff --git a/gstreamer-properties/help/da/da.po b/gstreamer-properties/help/da/da.po
index ae9981c..bc0511d 100644
--- a/gstreamer-properties/help/da/da.po
+++ b/gstreamer-properties/help/da/da.po
@@ -22,7 +22,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Tilladelse er givet til at kopiere, distribuere og/eller ændre dette "
@@ -30,7 +30,7 @@ msgstr ""
 "version 1.1 eller andre senere versioner udgivet af Free Software Foundation "
 "med ikke indholdte sektioner, ingen frontomslagstekster, og ingen "
 "bagsideomslagstekster. Du kan finde en kopi af GFDL her <ulink type=\"help\" "
-"url=\"ghelp:fdl\">link</ulink> eller i filen COPYING-DOCS der er "
+"url=\"help:fdl\">link</ulink> eller i filen COPYING-DOCS der er "
 "distribueret med denne manual."
 
 #: ../C/legal.xml:12(para) ../C/gstreamer-properties.xml:12(para)
diff --git a/gstreamer-properties/help/de/de.po b/gstreamer-properties/help/de/de.po
index e2a6cc0..0f4d05d 100644
--- a/gstreamer-properties/help/de/de.po
+++ b/gstreamer-properties/help/de/de.po
@@ -57,7 +57,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or in "
 "the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free "
@@ -65,7 +65,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/gstreamer-properties.xml:12(para)
diff --git a/gstreamer-properties/help/de/legal.xml b/gstreamer-properties/help/de/legal.xml
index 1449bb8..49608ab 100644
--- a/gstreamer-properties/help/de/legal.xml
+++ b/gstreamer-properties/help/de/legal.xml
@@ -1,16 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <legalnotice id="legalnotice">
-       <para>Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free Documentation License (GFDL), 
Version 1.1 oder jeder späteren, von der Free 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 Handbuch gelieferten Datei COPYING-DOCs.</para>
+       <para>
+         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.
+         </para>
          <para>Dieses Handbuch ist Teil einer Sammlung von GNOME-Handbüchern, die unter der GFDL 
veröffentlicht werden. Wenn Sie dieses Handbuch getrennt von der Sammlung weiterverbreiten möchten, können 
Sie das tun, indem Sie eine Kopie der Lizenz zum Handbuch hinzufügen, wie es in Abschnitt 6 der Lizenz 
beschrieben ist.</para>
 
        <para>Viele der Namen, die von Unternehmen verwendet werden, um ihre Produkte und Dienstleistungen 
von anderen zu unterscheiden, sind eingetragene Warenzeichen. An den Stellen, an denen diese Namen in einer 
GNOME-Dokumentation erscheinen, werden die Namen in Großbuchstaben oder mit einem großen Anfangsbuchstaben 
geschrieben, wenn das GNOME-Dokumentationsprojekt auf diese Warenzeichen hingewiesen wird.</para>
 
-       <para>DAS DOKUMENT UND VERÄNDERTE FASSUNGEN DES DOKUMENTS WERDEN UNTER DEN BEDINGUNGEN DER GNU FREE 
DOCUMENTATION LICENSE ZUR VERFÜGUNG GESTELLT MIT DEM WEITERGEHENDEN VERSTÄNDNIS, DASS: <orderedlist>
+       <para>
+         DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
+         UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
+         WITH THE FURTHER UNDERSTANDING THAT:
+
+         <orderedlist>
                <listitem>
-                 <para>DIESES DOKUMENT WIRD »WIE VORLIEGEND« GELIEFERT, OHNE GARANTIEN IRGENDEINER ART, 
SOWOHL AUSDRÜCKLICH GENANNTE ALS AUCH ANGEDEUTETE. DIES BEZIEHT SICH AUCH OHNE EINSCHRÄNKUNG AUF GARANTIEN, 
DASS DIESES DOKUMENT ODER VERÄNDERTE FASSUNGEN DIESES DOKUMENTS FREI VON HANDELSDEFEKTEN, FÜR EINEN 
BESTIMMTEN ZWECK GEEIGNET IST ODER DASS ES KEINE RECHTE DRITTER VERLETZT. DAS VOLLE RISIKO WAS QUALITÄT, 
GENAUIGKEIT UND LEISTUNG DES DOKUMENTS ODER VERÄNDERTE FASSUNGEN DES DOKUMENTS LIEGT BEI IHNEN. SOLLTE EIN 
DOKUMENT ODER EINE VERÄNDERTE FASSUNG DAVON FEHLER IRGENDEINER ART BEINHALTEN, TRAGEN SIE (NICHT DER 
URSPRUNGSAUTOR, DER AUTOR ODER EIN MITWIRKENDER) DIE KOSTEN FÜR NOTWENDIGE DIENSTLEISTUNGEN, REPARATUREN ODER 
FEHLERKORREKTUREN. DIESER HAFTUNGSAUSSCHLUSS IST EIN ESSENZIELLER TEIL DIESER LIZENZ. DIE VERWENDUNG EINES 
DOKUMENTS ODER EINER VERÄNDERTEN VERSION DES DOKUMENTS IST NICHT GESTATTET AUßER UNTER BEACHTUNG DIESES 
HAFTUNGSAUSSCHLUSSES UND</para>
+                 <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
+                    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+                    IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
+                    THAT THE DOCUMENT OR MODIFIED VERSION OF THE
+                    DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
+                    A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
+                    RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
+                    OF THE DOCUMENT OR MODIFIED VERSION OF THE
+                    DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
+                    MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
+                    YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
+                    CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
+                    SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+                    OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+                    LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
+                    VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
+                    EXCEPT UNDER THIS DISCLAIMER; AND
+                 </para>
                </listitem>
                <listitem>
-                 <para>UNTER KEINEN UMSTÄNDEN UND AUF BASIS KEINER RECHTSGRUNDLAGE, EGAL OB DURCH 
UNERLAUBTEN HANDLUNGEN (EINSCHLIEßLICH FAHRLÄSSIGKEIT), VERTRAG ODER ANDERWEITIG KANN DER AUTOR, 
URSPRUNGSAUTOR, EIN MITWIRKENDER ODER EIN VERTRIEBSPARTNER DIESES DOKUMENTS ODER EINER VERÄNDERTEN FASSUNG 
DES DOKUMENTS ODER EIN ZULIEFERER EINER DIESER PARTEIEN, HAFTBAR GEMACHT WERDEN FÜR DIREKTE, INDIREKTE, 
SPEZIELLE, VERSEHENTLICHE ODER FOLGESCHÄDEN JEGLICHER ART, EINSCHLIEßLICH UND OHNE EINSCHRÄNKUNGEN SCHÄDEN 
DURCH VERLUST VON KULANZ, ARBEITSAUSFALL, COMPUTERVERSAGEN ODER COMPUTERFEHLFUNKTIONEN ODER ALLE ANDEREN 
SCHÄDEN ODER VERLUSTE, DIE SICH AUS ODER IN VERBINDUNG MIT DER VERWENDUNG DES DOKUMENTS UND VERÄNDERTER 
FASSUNGEN DES DOKUMENTS ERGEBEN, AUCH WENN DIE OBEN GENANNTEN PARTEIEN ÜBER DIE MÖGLICHKEIT SOLCHER SCHÄDEN 
INFORMIERT WAREN.</para>
+                 <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
+                       THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
+                       CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
+                       INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
+                       DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
+                       OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
+                       PARTIES, BE LIABLE TO ANY PERSON FOR ANY
+                       DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
+                       CONSEQUENTIAL DAMAGES OF ANY CHARACTER
+                       INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
+                       OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+                       MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
+                       LOSSES ARISING OUT OF OR RELATING TO USE OF THE
+                       DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
+                       EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
+                       THE POSSIBILITY OF SUCH DAMAGES.
+                 </para>
                </listitem>
-         </orderedlist></para>
+         </orderedlist>
+       </para>
   </legalnotice>
diff --git a/gstreamer-properties/help/el/el.po b/gstreamer-properties/help/el/el.po
index cc63535..533ce05 100644
--- a/gstreamer-properties/help/el/el.po
+++ b/gstreamer-properties/help/el/el.po
@@ -47,8 +47,8 @@ msgid "GNOME Documentation Project"
 msgstr "Έργο Τεκμηρίωσης GNOME"
 
 #: C/gstreamer-properties.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/gstreamer-properties.xml:12(para)
 msgid "This manual is part of a collection of GNOME 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."
diff --git a/gstreamer-properties/help/en_GB/en_GB.po b/gstreamer-properties/help/en_GB/en_GB.po
index 5f10891..bad5b8a 100644
--- a/gstreamer-properties/help/en_GB/en_GB.po
+++ b/gstreamer-properties/help/en_GB/en_GB.po
@@ -56,14 +56,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Permission is granted to copy, distribute and/or modify this document under "
 "the terms of the GNU Free Documentation Licence (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 
 #: C/gstreamer-properties.xml:12(para)
diff --git a/gstreamer-properties/help/es/es.po b/gstreamer-properties/help/es/es.po
index 43ab4bc..f30a44d 100644
--- a/gstreamer-properties/help/es/es.po
+++ b/gstreamer-properties/help/es/es.po
@@ -59,14 +59,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/gstreamer-properties.xml:12(para)
diff --git a/gstreamer-properties/help/fr/fr.po b/gstreamer-properties/help/fr/fr.po
index 3178fc1..b436860 100644
--- a/gstreamer-properties/help/fr/fr.po
+++ b/gstreamer-properties/help/fr/fr.po
@@ -60,7 +60,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 "
@@ -68,7 +68,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/gstreamer-properties.xml:12(para)
diff --git a/gstreamer-properties/help/gl/gl.po b/gstreamer-properties/help/gl/gl.po
index fc2d1b2..05edf79 100644
--- a/gstreamer-properties/help/gl/gl.po
+++ b/gstreamer-properties/help/gl/gl.po
@@ -59,7 +59,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/gstreamer-properties/help/it/it.po b/gstreamer-properties/help/it/it.po
index cae6365..f390b23 100644
--- a/gstreamer-properties/help/it/it.po
+++ b/gstreamer-properties/help/it/it.po
@@ -51,14 +51,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."
 
diff --git a/gstreamer-properties/help/oc/oc.po b/gstreamer-properties/help/oc/oc.po
index 6951dcc..df8795a 100644
--- a/gstreamer-properties/help/oc/oc.po
+++ b/gstreamer-properties/help/oc/oc.po
@@ -58,7 +58,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/gstreamer-properties/help/pt_BR/pt_BR.po b/gstreamer-properties/help/pt_BR/pt_BR.po
index 23bb5c9..cde0872 100644
--- a/gstreamer-properties/help/pt_BR/pt_BR.po
+++ b/gstreamer-properties/help/pt_BR/pt_BR.po
@@ -63,7 +63,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 "
@@ -71,7 +71,7 @@ msgstr ""
 "qualquer versão mais recente publicada pela Free Software Foundation sem "
 "Seções Invariantes, sem Textos de Capa Frontal, e sem Textos de Contracapa. "
 "Você pode encontrar uma cópia da licença GFDL no <ulink type=\"help\" url="
-"\"ghelp:fdl\">link</ulink> ou no arquivo COPYING-DOCS distribuído com este "
+"\"help:fdl\">link</ulink> ou no arquivo COPYING-DOCS distribuído com este "
 "manual."
 
 #: C/gstreamer-properties.xml:12(para)
diff --git a/gstreamer-properties/help/ru/ru.po b/gstreamer-properties/help/ru/ru.po
index cdb7346..d35ae8d 100644
--- a/gstreamer-properties/help/ru/ru.po
+++ b/gstreamer-properties/help/ru/ru.po
@@ -54,7 +54,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 ""
 "Разрешается копировать, распространять и/или изменять этот документ на "
@@ -62,7 +62,7 @@ msgstr ""
 "более поздней версии, опубликованной Фондом свободного программного "
 "обеспечения (Free Software Foundation), без неизменяемых частей и без текстов "
 "на обложках. Вы можете найти копию лицензии GFDL по  <ulink type=\"help\" url="
-"\"ghelp:fdl\">этой ссылке</ulink> или в файле COPYING-DOCS, распространяемом "
+"\"help:fdl\">этой ссылке</ulink> или в файле COPYING-DOCS, распространяемом "
 "с этим документом."
 
 #: C/gstreamer-properties.xml:12(para)
diff --git a/gstreamer-properties/help/sl/sl.po b/gstreamer-properties/help/sl/sl.po
index e903dbf..91ce351 100644
--- a/gstreamer-properties/help/sl/sl.po
+++ b/gstreamer-properties/help/sl/sl.po
@@ -63,7 +63,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/gstreamer-properties/help/sv/sv.po b/gstreamer-properties/help/sv/sv.po
index dff6fb2..5e71998 100644
--- a/gstreamer-properties/help/sv/sv.po
+++ b/gstreamer-properties/help/sv/sv.po
@@ -41,8 +41,8 @@ msgid "GNOME Documentation Project"
 msgstr "Dokumentationsprojekt för GNOME"
 
 #: C/gstreamer-properties.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/gstreamer-properties.xml:12(para)
 msgid "This manual is part of a collection of GNOME 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."
diff --git a/gstreamer-properties/help/th/th.po b/gstreamer-properties/help/th/th.po
index 822beb1..009c921 100644
--- a/gstreamer-properties/help/th/th.po
+++ b/gstreamer-properties/help/th/th.po
@@ -58,14 +58,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/gstreamer-properties.xml:12(para)
diff --git a/gstreamer-properties/help/uk/uk.po b/gstreamer-properties/help/uk/uk.po
index 5df3a89..fd636ed 100644
--- a/gstreamer-properties/help/uk/uk.po
+++ b/gstreamer-properties/help/uk/uk.po
@@ -59,7 +59,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 ""
 "Дозволяється копіювати, розповсюджувати та/або змінювати цей документ за "
@@ -67,7 +67,7 @@ msgstr ""
 "якої старішої версії, опублікованої Фондом вільного програмного забезпечення "
 "(Free Software Foundation), без змінених частин та без текстів на "
 "обкладинках. Ви можете знайти копію ліцензії GFDL за <ulink type=\"help\" "
-"url=\"ghelp:fdl\"> цим посиланням </ulink> або в файлі COPYING-DOCS, який "
+"url=\"help:fdl\"> цим посиланням </ulink> або в файлі COPYING-DOCS, який "
 "поширюється разом з цим посібником."
 
 #: C/gstreamer-properties.xml:12(para)
diff --git a/gstreamer-properties/help/zh_CN/zh_CN.po b/gstreamer-properties/help/zh_CN/zh_CN.po
index 4fc1319..320808d 100644
--- a/gstreamer-properties/help/zh_CN/zh_CN.po
+++ b/gstreamer-properties/help/zh_CN/zh_CN.po
@@ -58,7 +58,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 ""
 "对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software "


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]