[sound-juicer] Use yelp-tools instead of gnome-doc-utils

From: Christophe Fergeau <teuf src gnome org>
To: commits-list gnome org
Cc:
Subject: [sound-juicer] Use yelp-tools instead of gnome-doc-utils
Date: Fri, 14 Feb 2014 12:31:56 +0000 (UTC)
commit 1e80a55adaed595dd3695a783729223ae7c8b664
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sun Jul 21 17:49:19 2013 -0400

    Use yelp-tools instead of gnome-doc-utils
    
    https://bugzilla.gnome.org/show_bug.cgi?id=704653

 Makefile.am                                        |    9 ++-------
 configure.ac                                       |    7 +------
 help/{sound-juicer => }/C/.cvsignore               |    0
 help/{sound-juicer => }/C/figures/prefs.png        |  Bin 32875 -> 32875 bytes
 help/{sound-juicer => }/C/figures/startup.png      |  Bin 39246 -> 39246 bytes
 .../C/sound-juicer.xml => C/index.docbook}         |    0
 help/{sound-juicer => }/C/legal.xml                |    2 +-
 help/{sound-juicer => }/ChangeLog                  |    0
 help/Makefile.am                                   |   14 +++++++++++++-
 help/{sound-juicer => }/ar/ar.po                   |    2 +-
 help/{sound-juicer => }/ca/ca.po                   |    4 ++--
 help/{sound-juicer => }/ca/figures/prefs.png       |  Bin 43446 -> 43446 bytes
 help/{sound-juicer => }/ca/figures/startup.png     |  Bin 38689 -> 38689 bytes
 help/{sound-juicer => }/cs/cs.po                   |    4 ++--
 help/{sound-juicer => }/cs/figures/prefs.png       |  Bin 54671 -> 54671 bytes
 help/{sound-juicer => }/cs/figures/startup.png     |  Bin 75219 -> 75219 bytes
 help/{sound-juicer => }/de/de.po                   |    4 ++--
 help/{sound-juicer => }/de/figures/prefs.png       |  Bin 40263 -> 40263 bytes
 help/{sound-juicer => }/de/figures/startup.png     |  Bin 44020 -> 44020 bytes
 help/{sound-juicer => }/el/.cvsignore              |    0
 help/{sound-juicer => }/el/el.po                   |    4 ++--
 help/{sound-juicer => }/el/figures/prefs.png       |  Bin 43063 -> 43063 bytes
 help/{sound-juicer => }/el/figures/startup.png     |  Bin 42388 -> 42388 bytes
 help/{sound-juicer => }/en_GB/en_GB.po             |    4 ++--
 help/{sound-juicer => }/es/.cvsignore              |    0
 help/{sound-juicer => }/es/es.po                   |    4 ++--
 help/{sound-juicer => }/es/figures/prefs.png       |  Bin 51046 -> 51046 bytes
 help/{sound-juicer => }/es/figures/startup.png     |  Bin 60145 -> 60145 bytes
 help/{sound-juicer => }/eu/eu.po                   |    4 ++--
 help/{sound-juicer => }/eu/figures/prefs.png       |  Bin 40318 -> 40318 bytes
 help/{sound-juicer => }/eu/figures/startup.png     |  Bin 48689 -> 48689 bytes
 help/{sound-juicer => }/fr/.cvsignore              |    0
 help/{sound-juicer => }/fr/figures/prefs.png       |  Bin 53600 -> 53600 bytes
 help/{sound-juicer => }/fr/figures/startup.png     |  Bin 64325 -> 64325 bytes
 help/{sound-juicer => }/fr/fr.po                   |    4 ++--
 help/{sound-juicer => }/ja/ja.po                   |    4 ++--
 help/{sound-juicer => }/nl/.cvsignore              |    0
 help/{sound-juicer => }/nl/figures/prefs.png       |  Bin 41419 -> 41419 bytes
 help/{sound-juicer => }/nl/figures/startup.png     |  Bin 42388 -> 42388 bytes
 help/{sound-juicer => }/nl/nl.po                   |    2 +-
 help/{sound-juicer => }/oc/oc.po                   |    2 +-
 help/{sound-juicer => }/pl/figures/prefs.png       |  Bin 52687 -> 52687 bytes
 help/{sound-juicer => }/pl/figures/startup.png     |  Bin 63846 -> 63846 bytes
 help/{sound-juicer => }/pl/pl.po                   |    4 ++--
 help/{sound-juicer => }/pt_BR/pt_BR.po             |    4 ++--
 help/{sound-juicer => }/ru/ru.po                   |    4 ++--
 help/{sound-juicer => }/sl/sl.po                   |    2 +-
 help/sound-juicer/.cvsignore                       |    3 ---
 help/sound-juicer/Makefile.am                      |   10 ----------
 help/sound-juicer/sound-juicer.omf.in              |   10 ----------
 help/{sound-juicer => }/sv/.cvsignore              |    0
 help/{sound-juicer => }/sv/figures/prefs.png       |  Bin 51039 -> 51039 bytes
 help/{sound-juicer => }/sv/figures/startup.png     |  Bin 99509 -> 99509 bytes
 help/{sound-juicer => }/sv/sv.po                   |    4 ++--
 help/{sound-juicer => }/uk/.cvsignore              |    0
 help/{sound-juicer => }/uk/figures/prefs.png       |  Bin 47280 -> 47280 bytes
 help/{sound-juicer => }/uk/figures/startup.png     |  Bin 33781 -> 33781 bytes
 help/{sound-juicer => }/uk/uk.po                   |    4 ++--
 help/{sound-juicer => }/zh_CN/zh_CN.po             |    4 ++--
 src/sj-main.c                                      |    2 +-
 src/sj-prefs.c                                     |    2 +-
 61 files changed, 53 insertions(+), 74 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1fe677c..3837253 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = \
        autogen.sh \
-       sound-juicer.spec \
-       gnome-doc-utils.make
+       sound-juicer.spec
 
 MAINTAINERCLEANFILES = \
        $(srcdir)/aclocal.m4 \
@@ -19,11 +18,7 @@ MAINTAINERCLEANFILES = \
        $(srcdir)/missing \
        $(srcdir)/mkinstalldirs
 
-DISTCLEANFILES = po/.intltool-merge-cache \
-       gnome-doc-utils.make
-
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-
+DISTCLEANFILES = po/.intltool-merge-cache
 
 WEBROOT := $(HOME)/WebSites/Burtonini/htdocs
 
diff --git a/configure.ac b/configure.ac
index 97e3cbd..b1cbc2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ GTK_REQUIRED=3.2.0
 AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
 
 # Use the GNOME documentation framework
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 # Find GLib and GObject
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32 gthread-2.0 gobject-2.0)
@@ -114,10 +114,6 @@ if test "$enable_deprecations" = "no"; then
        AC_SUBST(DISABLE_DEPRECATED)
 fi
 
-# We require Scroll Keeper 0.3.5 or above for the help
-SCROLLKEEPER_BUILD_REQUIRED=0.3.5
-AC_SUBST(SCROLLKEEPER_BUILD_REQUIRED)
-
 AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_CXXFLAGS])
@@ -130,7 +126,6 @@ Makefile
 data/Makefile
 data/sound-juicer.desktop.in
 help/Makefile
-help/sound-juicer/Makefile
 libjuicer/Makefile
 po/Makefile.in
 src/Makefile
diff --git a/help/sound-juicer/C/.cvsignore b/help/C/.cvsignore
similarity index 100%
rename from help/sound-juicer/C/.cvsignore
rename to help/C/.cvsignore
diff --git a/help/sound-juicer/C/sound-juicer.xml b/help/C/index.docbook
similarity index 100%
rename from help/sound-juicer/C/sound-juicer.xml
rename to help/C/index.docbook
diff --git a/help/sound-juicer/C/legal.xml b/help/C/legal.xml
similarity index 98%
rename from help/sound-juicer/C/legal.xml
rename to help/C/legal.xml
index ac97e1d..899282c 100644
--- a/help/sound-juicer/C/legal.xml
+++ b/help/C/legal.xml
@@ -6,7 +6,7 @@
          by the Free Software Foundation with no Invariant Sections,
          no Front-Cover Texts, and no Back-Cover Texts.  You can find
          a copy of the GFDL at this <ulink type="help"
-         url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+         url="help:fdl">link</ulink> or in the file COPYING-DOCS
          distributed with this manual.
          </para>
          <para> This manual is part of a collection of GNOME manuals
diff --git a/help/sound-juicer/ChangeLog b/help/ChangeLog
similarity index 100%
rename from help/sound-juicer/ChangeLog
rename to help/ChangeLog
diff --git a/help/Makefile.am b/help/Makefile.am
index 75f65fa..fdc6fdb 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,3 +1,15 @@
-SUBDIRS = sound-juicer
+ YELP_HELP_RULES@
+
+HELP_ID = sound-juicer
+
+HELP_FILES = \
+       index.docbook \
+       legal.xml
+
+HELP_MEDIA = \
+       figures/prefs.png \
+       figures/startup.png
+
+HELP_LINGUAS = ar ca cs de el en_GB es eu fr ja nl oc pl pt_BR ru sl sv uk zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/help/sound-juicer/ar/ar.po b/help/ar/ar.po
similarity index 99%
rename from help/sound-juicer/ar/ar.po
rename to help/ar/ar.po
index 0993d43..33498f9 100644
--- a/help/sound-juicer/ar/ar.po
+++ b/help/ar/ar.po
@@ -11,7 +11,7 @@ msgstr ""
 "X-Poedit-Language: Arabic\n"
 
 #: C/legal.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with 
no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this 
<ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with 
no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this 
<ulink type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 
 #: C/legal.xml:12(para)
diff --git a/help/sound-juicer/ca/ca.po b/help/ca/ca.po
similarity index 99%
rename from help/sound-juicer/ca/ca.po
rename to help/ca/ca.po
index bb0e80f..9bd7bd9 100644
--- a/help/sound-juicer/ca/ca.po
+++ b/help/ca/ca.po
@@ -343,8 +343,8 @@ msgid "If your document contains nontrivial examples of program code, we recomme
 msgstr ""
 
 #: C/legal.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 "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota els termes de la Llicència 
de documentació lliure GNU (GFDL), versió 1.1 o 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 amb aquest manual."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with 
no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this 
<ulink type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota els termes de la Llicència 
de documentació lliure GNU (GFDL), versió 1.1 o 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=\"help:fdl\">enllaç</ulink> o en el fitxer 
COPYING-DOCS distribuït amb aquest manual."
 
 #: C/legal.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/help/sound-juicer/cs/cs.po b/help/cs/cs.po
similarity index 99%
rename from help/sound-juicer/cs/cs.po
rename to help/cs/cs.po
index 35f3219..5ea3d21 100644
--- a/help/sound-juicer/cs/cs.po
+++ b/help/cs/cs.po
@@ -23,14 +23,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/legal.xml:12(para)
diff --git a/help/sound-juicer/de/de.po b/help/de/de.po
similarity index 99%
rename from help/sound-juicer/de/de.po
rename to help/de/de.po
index f280580..0e486e2 100644
--- a/help/sound-juicer/de/de.po
+++ b/help/de/de.po
@@ -20,7 +20,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 "
@@ -28,7 +28,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/legal.xml:12(para)
diff --git a/help/sound-juicer/el/.cvsignore b/help/el/.cvsignore
similarity index 100%
rename from help/sound-juicer/el/.cvsignore
rename to help/el/.cvsignore
diff --git a/help/sound-juicer/el/el.po b/help/el/el.po
similarity index 99%
rename from help/sound-juicer/el/el.po
rename to help/el/el.po
index 21d586b..e87f957 100644
--- a/help/sound-juicer/el/el.po
+++ b/help/el/el.po
@@ -18,14 +18,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Δίνεται άδεια για αντιγραφή, διανομή και/ή τροποποίηση του εγγράφου υπό τους "
 "όρους της Ελεύθερης Άδειας Τεκμηρίωσης GNU (GFDL), Έκδοση 1.1 ή "
 "μεταγενέστερη εκδιδόμενη από το Ίδρυμα Ελεύθερου Λογισμικού χωρίς Σταθερά "
 "Εδάφια, χωρίς Εξώφυλλα Κειμένου, και χωρίς Οπισθόφυλλα Κειμένου. Μπορείτε να "
-"βρείτε ένα αντίγραφο της GFDL σε αυτόν τον <ulink type=\"help\" url=\"ghelp:"
+"βρείτε ένα αντίγραφο της GFDL σε αυτόν τον <ulink type=\"help\" url=\"help:"
 "fdl\">σύνδεσμο</ulink> ή στο αρχείο COPYING-DOCS που διανεμήθηκε με αυτόν "
 "τον οδηγό."
 
diff --git a/help/sound-juicer/en_GB/en_GB.po b/help/en_GB/en_GB.po
similarity index 99%
rename from help/sound-juicer/en_GB/en_GB.po
rename to help/en_GB/en_GB.po
index 7f56f63..7e568b4 100644
--- a/help/sound-juicer/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -1676,14 +1676,14 @@ msgstr "David Lodge <dave cirt net>, 2007"
 #~ "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"
+#~ "can find a copy of the GFDL at this <ulink type=\"help\" url=\"help:fdl"
 #~ "\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
 #~ msgstr ""
 #~ "Permission is granted to copy, distribute and/or modify this document "
 #~ "under the terms of the GNU Free Documentation 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"
+#~ "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."
 
 #~ msgid ""
diff --git a/help/sound-juicer/es/.cvsignore b/help/es/.cvsignore
similarity index 100%
rename from help/sound-juicer/es/.cvsignore
rename to help/es/.cvsignore
diff --git a/help/sound-juicer/es/es.po b/help/es/es.po
similarity index 99%
rename from help/sound-juicer/es/es.po
rename to help/es/es.po
index d8ae3ff..6609bff 100644
--- a/help/sound-juicer/es/es.po
+++ b/help/es/es.po
@@ -25,7 +25,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Se otorga permiso para copiar, distribuir y/o modificar este documento bajo "
@@ -33,7 +33,7 @@ msgstr ""
 "cualquier otra versión posterior publicada por la Free Software Foundation; "
 "sin Secciones Invariantes ni Textos de Cubierta Delantera ni Textos de "
 "Cubierta Trasera. Puede encontrar una copia de la licencia GFDL en este "
-"<ulink type=\"help\" url=\"ghelp:fdl\">enlace</ulink> o en el archivo "
+"<ulink type=\"help\" url=\"help:fdl\">enlace</ulink> o en el archivo "
 "COPYING-DOCS distribuido con este manual."
 
 #: C/legal.xml:12(para)
diff --git a/help/sound-juicer/eu/eu.po b/help/eu/eu.po
similarity index 99%
rename from help/sound-juicer/eu/eu.po
rename to help/eu/eu.po
index 42cb89b..b779df3 100644
--- a/help/sound-juicer/eu/eu.po
+++ b/help/eu/eu.po
@@ -342,8 +342,8 @@ msgid "If your document contains nontrivial examples of program code, we recomme
 msgstr "Zure dokumentuan programa-kodearen adibide ez-tribialik baldin badago, adibide horiek paraleloan 
argitaratzea gomendatzen dizugu eta zeuk aukeratu software librearen lizentzia eman nahi diezun, <ulink 
type=\"http\"  url=\"http://www.gnu.org/copyleft/gpl.html\";>GNU Lizentzia Publiko Orokorra</ulink> lizentzian 
esaterako, software libre gisa erabil ahal izan daitezen."
 
 #: C/legal.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with 
no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this 
<ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko, Free Software Foundation-ek 
argitaratutako GNU Dokumentazio Librearen Lizentziaren 1.1 bertsioan edo berriago batean ezarritako 
baldintzetan, atal aldaezinik gabe, aurreko azaleko testurik gabe eta atzeko azaleko testurik gabe. GFDL 
lizentziaren kopia <ulink type=\"help\" url=\"ghelp:fdl\">esteka honetan</ulink> edo eskuliburu honekin 
batera ematen den COPYING-DOCS fitxategian aurkituko duzu."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with 
no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this 
<ulink type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko, Free Software Foundation-ek 
argitaratutako GNU Dokumentazio Librearen Lizentziaren 1.1 bertsioan edo berriago batean ezarritako 
baldintzetan, atal aldaezinik gabe, aurreko azaleko testurik gabe eta atzeko azaleko testurik gabe. GFDL 
lizentziaren kopia <ulink type=\"help\" url=\"help:fdl\">esteka honetan</ulink> edo eskuliburu honekin batera 
ematen den COPYING-DOCS fitxategian aurkituko duzu."
 
 #: C/legal.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/help/sound-juicer/fr/.cvsignore b/help/fr/.cvsignore
similarity index 100%
rename from help/sound-juicer/fr/.cvsignore
rename to help/fr/.cvsignore
diff --git a/help/sound-juicer/fr/fr.po b/help/fr/fr.po
similarity index 99%
rename from help/sound-juicer/fr/fr.po
rename to help/fr/fr.po
index c94fb22..fdfea78 100644
--- a/help/sound-juicer/fr/fr.po
+++ b/help/fr/fr.po
@@ -26,7 +26,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 "
@@ -34,7 +34,7 @@ msgstr ""
 "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 "
+"<ulink type=\"help\" url=\"help:fdl\">lien</ulink> ou dans le fichier "
 "COPYING-DOCS fourni avec le présent manuel."
 
 #: C/legal.xml:12(para)
diff --git a/help/sound-juicer/ja/ja.po b/help/ja/ja.po
similarity index 99%
rename from help/sound-juicer/ja/ja.po
rename to help/ja/ja.po
index 22dfd69..7631470 100644
--- a/help/sound-juicer/ja/ja.po
+++ b/help/ja/ja.po
@@ -22,13 +22,13 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "この文書を、フリーソフトウェア財団発行の GNU フリー文書利用許諾契約書 (GFDL) "
 "のバージョン 1.1 かそれ以降が定める条件の下で複製、頒布、あるいは改変すること"
 "を許可します。変更不可部分、表カバーテキスト、裏カバーテキストは存在しませ"
-"ん。この利用許諾契約書 (GFDL) の複製は<ulink type=\"help\" url=\"ghelp:fdl\">"
+"ん。この利用許諾契約書 (GFDL) の複製は<ulink type=\"help\" url=\"help:fdl\">"
 "このリンク</ulink> またはこのマニュアルと一緒に配布されているファイル "
 "COPYING-DOCS を参照してください。"
 
diff --git a/help/sound-juicer/nl/.cvsignore b/help/nl/.cvsignore
similarity index 100%
rename from help/sound-juicer/nl/.cvsignore
rename to help/nl/.cvsignore
diff --git a/help/sound-juicer/nl/nl.po b/help/nl/nl.po
similarity index 99%
rename from help/sound-juicer/nl/nl.po
rename to help/nl/nl.po
index 3739931..be77d04 100644
--- a/help/sound-juicer/nl/nl.po
+++ b/help/nl/nl.po
@@ -338,7 +338,7 @@ msgid "If your document contains nontrivial examples of program code, we recomme
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/sound-juicer.HEAD/C/legal.xml:2(para) 
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with 
no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this 
<ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with 
no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this 
<ulink type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 
 #: /tmp/doc-l10n/cvs/sound-juicer.HEAD/C/legal.xml:12(para) 
diff --git a/help/sound-juicer/oc/oc.po b/help/oc/oc.po
similarity index 99%
rename from help/sound-juicer/oc/oc.po
rename to help/oc/oc.po
index 370014f..deaedb4 100644
--- a/help/sound-juicer/oc/oc.po
+++ b/help/oc/oc.po
@@ -660,7 +660,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/help/sound-juicer/pl/pl.po b/help/pl/pl.po
similarity index 99%
rename from help/sound-juicer/pl/pl.po
rename to help/pl/pl.po
index c666e0e..bc465cf 100644
--- a/help/sound-juicer/pl/pl.po
+++ b/help/pl/pl.po
@@ -22,8 +22,8 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: C/legal.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with 
no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this 
<ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "Udziela się zezwolenia do kopiowania rozpowszechniania i/lub modyfikację tego dokumentu zgodnie z 
zasadami Licencji GNU Wolnej Dokumentacji w wersji 1.1 lub dowolnej późniejszej opublikowanej przez Free 
Software Foundation; wraz z zawartymi Sekcjami Niezmiennymi, wraz z Tekstem na Przedniej Okładce i z Tekstem 
na Tylnej Okładce. Kopia licencji dostępna jest pod adresem <ulink type=\"help\" 
url=\"ghelp:fdl\">link</ulink> oraz w pliku COPYING-DOCS dystrybuowanym z niniejszym podręcznikiem."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with 
no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this 
<ulink type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Udziela się zezwolenia do kopiowania rozpowszechniania i/lub modyfikację tego dokumentu zgodnie z 
zasadami Licencji GNU Wolnej Dokumentacji w wersji 1.1 lub dowolnej późniejszej opublikowanej przez Free 
Software Foundation; wraz z zawartymi Sekcjami Niezmiennymi, wraz z Tekstem na Przedniej Okładce i z Tekstem 
na Tylnej Okładce. Kopia licencji dostępna jest pod adresem <ulink type=\"help\" 
url=\"help:fdl\">link</ulink> oraz w pliku COPYING-DOCS dystrybuowanym z niniejszym podręcznikiem."
 
 #: C/legal.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/help/sound-juicer/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po
similarity index 99%
rename from help/sound-juicer/pt_BR/pt_BR.po
rename to help/pt_BR/pt_BR.po
index affec45..fa33820 100644
--- a/help/sound-juicer/pt_BR/pt_BR.po
+++ b/help/pt_BR/pt_BR.po
@@ -23,14 +23,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Permissão concedida para copiar, distribuir e/ou modificar este documento "
 "sob os termos da Licença de Documentação Livre GNU (GFDL), Versão 1.1 ou "
 "algum versão posterior publicada pela Free Software Foundation sem Seções "
 "Invariantes, sem Textos Frontais de Capa e sem Textos de Contracapa. Você "
-"pode encontrar uma cópia da GFDL neste <ulink type=\"help\" url=\"ghelp:fdl"
+"pode encontrar uma cópia da GFDL neste <ulink type=\"help\" url=\"help:fdl"
 "\">link</ulink> ou no arquivo COPYING-DOCS distribuído com este manual."
 
 #: C/legal.xml:12(para)
diff --git a/help/sound-juicer/ru/ru.po b/help/ru/ru.po
similarity index 99%
rename from help/sound-juicer/ru/ru.po
rename to help/ru/ru.po
index c99e385..e2318ac 100644
--- a/help/sound-juicer/ru/ru.po
+++ b/help/ru/ru.po
@@ -957,7 +957,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 ""
 "Разрешается копировать, распространять и/или изменять этот документ на "
@@ -965,7 +965,7 @@ msgstr ""
 "более поздней версии, опубликованной Фондом свободного программного "
 "обеспечения (Free Software Foundation), без неизменяемых частей и без текстов "
 "на обложках. Вы можете найти копию лицензии GFDL по  <ulink type=\"help\" url="
-"\"ghelp:fdl\">этой ссылке</ulink> или в файле COPYING-DOCS, распространяемом "
+"\"help:fdl\">этой ссылке</ulink> или в файле COPYING-DOCS, распространяемом "
 "с этим документом."
 
 #: C/legal.xml:12(para)
diff --git a/help/sound-juicer/sl/sl.po b/help/sl/sl.po
similarity index 99%
rename from help/sound-juicer/sl/sl.po
rename to help/sl/sl.po
index 93566e5..4cfeb8a 100644
--- a/help/sound-juicer/sl/sl.po
+++ b/help/sl/sl.po
@@ -27,7 +27,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/help/sound-juicer/sv/.cvsignore b/help/sv/.cvsignore
similarity index 100%
rename from help/sound-juicer/sv/.cvsignore
rename to help/sv/.cvsignore
diff --git a/help/sound-juicer/sv/sv.po b/help/sv/sv.po
similarity index 99%
rename from help/sound-juicer/sv/sv.po
rename to help/sv/sv.po
index 434bf2d..43b0d09 100644
--- a/help/sound-juicer/sv/sv.po
+++ b/help/sv/sv.po
@@ -11,8 +11,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: C/legal.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/legal.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/help/sound-juicer/uk/.cvsignore b/help/uk/.cvsignore
similarity index 100%
rename from help/sound-juicer/uk/.cvsignore
rename to help/uk/.cvsignore
diff --git a/help/sound-juicer/uk/uk.po b/help/uk/uk.po
similarity index 99%
rename from help/sound-juicer/uk/uk.po
rename to help/uk/uk.po
index 5589e99..f6e7dd2 100644
--- a/help/sound-juicer/uk/uk.po
+++ b/help/uk/uk.po
@@ -972,14 +972,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/help/sound-juicer/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
similarity index 99%
rename from help/sound-juicer/zh_CN/zh_CN.po
rename to help/zh_CN/zh_CN.po
index a9b3b8d..06456ee 100644
--- a/help/sound-juicer/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -20,12 +20,12 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published by the Free Software Foundation with no Invariant "
 "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software "
 "Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.1 或更高版本， 该许可证没"
-"有固定的部分、没有封面和背页文本。您可以在此<ulink type=\"help\" url=\"ghelp:"
+"有固定的部分、没有封面和背页文本。您可以在此<ulink type=\"help\" url=\"help:"
 "fdl\">链接</ulink>上或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副"
 "本。"
 
diff --git a/src/sj-main.c b/src/sj-main.c
index 0bfc361..17b4ff5 100644
--- a/src/sj-main.c
+++ b/src/sj-main.c
@@ -1933,7 +1933,7 @@ G_MODULE_EXPORT void on_disc_number_edit_changed(GtkEditable *widget, gpointer u
 static void on_contents_activate(GSimpleAction *action, GVariant *parameter, gpointer data) {
   GError *error = NULL;
 
-  gtk_show_uri (NULL, "ghelp:sound-juicer", GDK_CURRENT_TIME, &error);
+  gtk_show_uri (NULL, "help:sound-juicer", GDK_CURRENT_TIME, &error);
   if (error) {
     GtkWidget *dialog;
 
diff --git a/src/sj-prefs.c b/src/sj-prefs.c
index 15dc71d..48d6da3 100644
--- a/src/sj-prefs.c
+++ b/src/sj-prefs.c
@@ -107,7 +107,7 @@ void show_help (GtkWindow *parent)
 {
   GError *error = NULL;
 
-  gtk_show_uri (NULL, "ghelp:sound-juicer?preferences", GDK_CURRENT_TIME, &error);
+  gtk_show_uri (NULL, "help:sound-juicer/preferences", GDK_CURRENT_TIME, &error);
   if (error) {
     GtkWidget *dialog;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]