Use yelp-tools instead of mate-doc-utils

author: infirit <[email protected]> 2013-08-01 13:30:42 +0200
committer: infirit <[email protected]> 2013-08-01 13:30:42 +0200
commit: fed34fd36fba90cb73245a13344bacddb1d689fd (patch)
tree: 28e43ced64892e51c63319053865eafd56acd00e
parent: db06e0af97a338992db45656f2ca9cd4a30abfe6 (diff)
download: mate-control-center-fed34fd36fba90cb73245a13344bacddb1d689fd.tar.bz2
mate-control-center-fed34fd36fba90cb73245a13344bacddb1d689fd.tar.xz
29 files changed, 60 insertions, 63 deletions
diff --git a/Makefile.am b/Makefile.am
index 3c5145f3..5bd26cf2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,8 +32,7 @@ CLEANFILES = \
 $(gsettings_SCHEMAS) \
 *.gschema.valid
 
-DISTCLEANFILES = \
- mate-doc-utils.make
+DISTCLEANFILES = 
 
 MAINTAINERCLEANFILES = \
 $(srcdir)/INSTALL \
diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c
index e5f358f5..10f7e8b5 100644
--- a/capplets/common/capplet-util.c
+++ b/capplets/common/capplet-util.c
@@ -80,7 +80,7 @@ capplet_help (GtkWindow *parent, char const *section)
 else
 screen = gtk_widget_get_screen (GTK_WIDGET (parent));
 
- uri = g_strdup_printf ("ghelp:user-guide#%s", section);
+ uri = g_strdup_printf ("help:user-guide#%s", section);
 
 if (!gtk_show_uri (screen, uri, gtk_get_current_event_time (), &error)) {
 capplet_error_dialog (
diff --git a/configure.ac b/configure.ac
index ae400444..8d6b0f5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,8 +14,8 @@ AM_PROG_CC_C_O
 AC_STDC_HEADERS
 AM_PROG_LIBTOOL
 
-# Use the MATE documentation framework
-MATE_DOC_INIT
+# Use the Yelp documentation framework
+YELP_HELP_INIT
 
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
diff --git a/help/C/mate-control-center.xml b/help/C/index.docbook
index 64bddc4e..ca1117eb 100644
--- a/help/C/mate-control-center.xml
+++ b/help/C/index.docbook
@@ -70,7 +70,7 @@
 To launch the <application>MATE Control Center</application>,
 type <command>mate-control-center</command> in a terminal window. 
 </para>
- <para>For help on using preference tools, see the <ulink type="help" url="ghelp:user-guide?prefs">User Guide</ulink>.</para>
+ <para>For help on using preference tools, see the <ulink type="help" url="help:user-guide?prefs">User Guide</ulink>.</para>
 </sect1>
 
 <sect1 id="matecc-interface">
diff --git a/help/Makefile.am b/help/Makefile.am
index 5c6ded9c..70bf2969 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,10 +1,8 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = mate-control-center
-DOC_ENTITIES = config-accessibility-keyboard.xml config-background.xml config-behavior.xml config-cds.xml config-default-apps.xml config-file-type.xml config-hints.xml config-html.xml config-kbd.xml config-keybindings.xml config-mouse.xml config-screensaver.xml config-themes.xml
-DOC_INCLUDES =
+HELP_ID = mate-control-center
+HELP_FILES = index.docbook config-accessibility-keyboard.xml config-background.xml config-behavior.xml config-cds.xml config-default-apps.xml config-file-type.xml config-hints.xml config-html.xml config-kbd.xml config-keybindings.xml config-mouse.xml config-screensaver.xml config-themes.xml
 
-DOC_LINGUAS = ca ca@valencia cs de el en_GB es fr id it ja oc pa pl pt pt_BR ru sv th uk vi zh_CN
+HELP_LINGUAS = ca ca@valencia cs de el en_GB es fr id it ja oc pa pl pt pt_BR ru sv th uk vi zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/help/ca/ca.po b/help/ca/ca.po
index c179f226..fcf3f9a7 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -48,7 +48,7 @@ msgstr "2006-03"
 
 #: C/control-center.xml:38(para) 
 msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the <ulink type=\"help\" url=\"mate-help:fdl\"><citetitle> GNU Free Documentation License </citetitle></ulink>, 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. A copy of the license can be found <ulink type=\"help\" url=\"mate-help:fdl\">here</ulink>."
-msgstr "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota els termes de la <ulink type=\"help\" url=\"mate-help:fdl\"><citetitle>Llicència de documentació lliure GNU</citetitle></ulink> 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 d'aquesta llicència <ulink type=\"help\" url=\"ghelp:fdl\">aquí</ulink>."
+msgstr "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota els termes de la <ulink type=\"help\" url=\"mate-help:fdl\"><citetitle>Llicència de documentació lliure GNU</citetitle></ulink> 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 d'aquesta llicència <ulink type=\"help\" url=\"help:fdl\">aquí</ulink>."
 
 #: C/control-center.xml:50(para) 
 msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any MATE documentation, and those trademarks are made aware to the members of the MATE Documentation Project, the names have been printed in caps or initial caps."
@@ -71,8 +71,8 @@ msgid "To launch the <application>MATE Control Center</application>, type <comma
 msgstr "Per a executar el <application>Centre de control del MATE</application>, introduïu <command>mate-control-center</command> en una finestra de terminal."
 
 #: C/control-center.xml:73(para) 
-msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">User Guide</ulink>."
-msgstr "Per a més ajuda quant a utilitzar les eines de preferències, vegeu la <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">Guia d'usuari</ulink>."
+msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"help:user-guide?prefs\">User Guide</ulink>."
+msgstr "Per a més ajuda quant a utilitzar les eines de preferències, vegeu la <ulink type=\"help\" url=\"help:user-guide?prefs\">Guia d'usuari</ulink>."
 
 #: C/control-center.xml:77(title) 
 msgid "Usage"
diff --git a/help/ca@valencia/[email protected] b/help/ca@valencia/[email protected]
index eeae879b..f65d160e 100644
--- a/help/ca@valencia/[email protected]
+++ b/help/ca@valencia/[email protected]
@@ -48,7 +48,7 @@ msgstr "2006-03"
 
 #: C/control-center.xml:38(para) 
 msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the <ulink type=\"help\" url=\"mate-help:fdl\"><citetitle> GNU Free Documentation License </citetitle></ulink>, 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. A copy of the license can be found <ulink type=\"help\" url=\"mate-help:fdl\">here</ulink>."
-msgstr "Teniu permís per a copiar, distribuir i/o modificar este document, sota els termes de la <ulink type=\"help\" url=\"mate-help:fdl\"><citetitle>Llicència de documentació lliure GNU</citetitle></ulink> 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 d'esta llicència <ulink type=\"help\" url=\"ghelp:fdl\">ací</ulink>."
+msgstr "Teniu permís per a copiar, distribuir i/o modificar este document, sota els termes de la <ulink type=\"help\" url=\"mate-help:fdl\"><citetitle>Llicència de documentació lliure GNU</citetitle></ulink> 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 d'esta llicència <ulink type=\"help\" url=\"help:fdl\">ací</ulink>."
 
 #: C/control-center.xml:50(para) 
 msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any MATE documentation, and those trademarks are made aware to the members of the MATE Documentation Project, the names have been printed in caps or initial caps."
@@ -71,8 +71,8 @@ msgid "To launch the <application>MATE Control Center</application>, type <comma
 msgstr "Per a executar el <application>Centre de control del MATE</application>, introduïu <command>mate-control-center</command> en una finestra de terminal."
 
 #: C/control-center.xml:73(para) 
-msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">User Guide</ulink>."
-msgstr "Per a més ajuda quant a utilitzar les eines de preferències, vegeu la <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">Guia d'usuari</ulink>."
+msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"help:user-guide?prefs\">User Guide</ulink>."
+msgstr "Per a més ajuda quant a utilitzar les eines de preferències, vegeu la <ulink type=\"help\" url=\"help:user-guide?prefs\">Guia d'usuari</ulink>."
 
 #: C/control-center.xml:77(title) 
 msgid "Usage"
diff --git a/help/cs/cs.po b/help/cs/cs.po
index b7f5f984..b5bf4161 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -52,7 +52,7 @@ msgstr "3/2006"
 
 #: C/control-center.xml:38(para)
 msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the <ulink type=\"help\" url=\"mate-help:fdl\"><citetitle> GNU Free Documentation License </citetitle></ulink>, 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. A copy of the license can be found <ulink type=\"help\" url=\"mate-help:fdl\">here</ulink>."
-msgstr "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU Free Documentation License (GFDL), verze 1.1 nebo jakékoli další verze vydané nadací Free Software Foundation; bez neměnných oddílů, bez textů předních desek a bez textů zadních desek. Kopii licence GFDL naleznete pod <ulink type=\"help\" url=\"ghelp:fdl\">tímto odkazem</ulink> nebo v souboru COPYING-DOCS dodávaném s touto příručkou."
+msgstr "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU Free Documentation License (GFDL), verze 1.1 nebo jakékoli další verze vydané nadací Free Software Foundation; bez neměnných oddílů, bez textů předních desek a bez textů zadních desek. Kopii licence GFDL naleznete pod <ulink type=\"help\" url=\"help:fdl\">tímto odkazem</ulink> nebo v souboru COPYING-DOCS dodávaném s touto příručkou."
 
 #: C/control-center.xml:50(para)
 msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any MATE documentation, and those trademarks are made aware to the members of the MATE Documentation Project, the names have been printed in caps or initial caps."
@@ -75,8 +75,8 @@ msgid "To launch the <application>MATE Control Center</application>, type <comma
 msgstr "Pokud chcete <application>Ovládací centrum MATE</application> spustit, spusťte z příkazového řádku <command>mate-control-center</command>."
 
 #: C/control-center.xml:73(para)
-msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">User Guide</ulink>."
-msgstr "Nápovědu k jednotlivým nástrojům nastavení obsahuje <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">Uživatelská příručka</ulink>."
+msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"help:user-guide?prefs\">User Guide</ulink>."
+msgstr "Nápovědu k jednotlivým nástrojům nastavení obsahuje <ulink type=\"help\" url=\"help:user-guide?prefs\">Uživatelská příručka</ulink>."
 
 #: C/control-center.xml:77(title)
 msgid "Usage"
diff --git a/help/de/de.po b/help/de/de.po
index f4b59419..0c2a8d34 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -111,11 +111,11 @@ msgstr ""
 
 #: C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr ""
 "Hilfe zur Benutzung der einzelnen Einstellungswerzeuge finden Sie im <ulink "
-"type=\"help\" url=\"ghelp:user-guide?prefs\">Desktop-Benutzerhandbuch</ulink>."
+"type=\"help\" url=\"help:user-guide?prefs\">Desktop-Benutzerhandbuch</ulink>."
 
 #: C/control-center.xml:77(title)
 msgid "Usage"
diff --git a/help/el/el.po b/help/el/el.po
index ad21ffd9..3115c131 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -111,11 +111,11 @@ msgstr ""
 
 #: C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr ""
 "Για βοήθεια σχετικά με τη χρήση των εργαλείων προτμήσεων, βλέπε <ulink type="
-"\"help\" url=\"ghelp:user-guide?prefs\">Οδηγός Χρήστη</ulink>."
+"\"help\" url=\"help:user-guide?prefs\">Οδηγός Χρήστη</ulink>."
 
 #: C/control-center.xml:77(title)
 msgid "Usage"
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
index 9d0f0cc4..bcfc9721 100644
--- a/help/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -72,8 +72,8 @@ msgid "To launch the <application>MATE Control Center</application>, type <comma
 msgstr "To launch the <application>MATE Control Centre</application>, type <command>mate-control-center</command> in a terminal window."
 
 #: C/control-center.xml:73(para)
-msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">User Guide</ulink>."
-msgstr "For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">User Guide</ulink>."
+msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"help:user-guide?prefs\">User Guide</ulink>."
+msgstr "For help on using preference tools, see the <ulink type=\"help\" url=\"help:user-guide?prefs\">User Guide</ulink>."
 
 #: C/control-center.xml:77(title)
 msgid "Usage"
diff --git a/help/es/es.po b/help/es/es.po
index 7ed3ac32..22eacdea 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -116,11 +116,11 @@ msgstr ""
 
 #: C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr ""
 "Para ayuda en el uso de las herramientas de preferencias, ver la <ulink type="
-"\"help\" url=\"ghelp:user-guide?prefs\">Guía del Usuario</ulink>."
+"\"help\" url=\"help:user-guide?prefs\">Guía del Usuario</ulink>."
 
 #: C/control-center.xml:77(title)
 msgid "Usage"
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 83b23f5e..8e9ee0d5 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -117,11 +117,11 @@ msgstr ""
 
 #: ../C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr ""
 "Pour obtenir de l'aide sur l'utilisation des outils de préférences, "
-"consultez le <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">guide "
+"consultez le <ulink type=\"help\" url=\"help:user-guide?prefs\">guide "
 "d'utilisation</ulink>."
 
 #: ../C/control-center.xml:77(title)
diff --git a/help/id/id.po b/help/id/id.po
index 203d8b9b..b1b9b03c 100644
--- a/help/id/id.po
+++ b/help/id/id.po
@@ -117,11 +117,11 @@ msgstr ""
 
 #: C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr ""
 "Untuk bantuan tentang memakai alat preferensi, lihat <ulink type=\"help\" "
-"url=\"ghelp:user-guide?prefs\">Panduan Pengguna</ulink>."
+"url=\"help:user-guide?prefs\">Panduan Pengguna</ulink>."
 
 #: C/control-center.xml:77(title)
 msgid "Usage"
diff --git a/help/it/it.po b/help/it/it.po
index 1a906a9a..16be2e02 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -49,7 +49,7 @@ msgstr "2006-03"
 
 #: C/control-center.xml:38(para) 
 msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the <ulink type=\"help\" url=\"mate-help:fdl\"><citetitle> GNU Free Documentation License </citetitle></ulink>, 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. A copy of the license can be found <ulink type=\"help\" url=\"mate-help:fdl\">here</ulink>."
-msgstr "Questo documento può essere copiato, distribuito e/o modificato solo in conformità con i termini della <ulink type=\"help\" url=\"mate-help:fdl\"><citetitle> GNU Free Documentation License (GFDL)</citetitle></ulink>, Versione 1.1 o delle versioni successive pubblicate dalla Free Software Foundation senza sezioni invariabili, frontespizi e testi di copertina. Una copia della GFDL è disponibile seguendo questo <ulink type=\"help\" url=\"ghelp:fdl\">collegamento</ulink>."
+msgstr "Questo documento può essere copiato, distribuito e/o modificato solo in conformità con i termini della <ulink type=\"help\" url=\"mate-help:fdl\"><citetitle> GNU Free Documentation License (GFDL)</citetitle></ulink>, Versione 1.1 o delle versioni successive pubblicate dalla Free Software Foundation senza sezioni invariabili, frontespizi e testi di copertina. Una copia della GFDL è disponibile seguendo questo <ulink type=\"help\" url=\"help:fdl\">collegamento</ulink>."
 
 #: C/control-center.xml:50(para) 
 msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any MATE documentation, and those trademarks are made aware to the members of the MATE Documentation Project, the names have been printed in caps or initial caps."
@@ -72,8 +72,8 @@ msgid "To launch the <application>MATE Control Center</application>, type <comma
 msgstr "Per lanciare il <application>Centro di controllo di MATE</application>, digitare <command>mate-control-center</command> in una finestra di terminale."
 
 #: C/control-center.xml:73(para) 
-msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">User Guide</ulink>."
-msgstr "Per aiuto sull'uso degli strumenti di preferenza, consultare la <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">Guida per l'utente</ulink>."
+msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"help:user-guide?prefs\">User Guide</ulink>."
+msgstr "Per aiuto sull'uso degli strumenti di preferenza, consultare la <ulink type=\"help\" url=\"help:user-guide?prefs\">Guida per l'utente</ulink>."
 
 #: C/control-center.xml:77(title) 
 msgid "Usage"
diff --git a/help/ja/ja.po b/help/ja/ja.po
index b8da5672..a9df4f6d 100644
--- a/help/ja/ja.po
+++ b/help/ja/ja.po
@@ -104,10 +104,10 @@ msgstr "<application>MATE コントロールセンター</application> を"
 
 #: C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr "設定ツールの使い方のヘルプは "
-"<ulink type=\"help\" url=\"ghelp:user-guide?prefs\">ユーザーガイド</ulink>"
+"<ulink type=\"help\" url=\"help:user-guide?prefs\">ユーザーガイド</ulink>"
 " を参照して下さい。"
 
 #: C/control-center.xml:77(title)
diff --git a/help/oc/oc.po b/help/oc/oc.po
index 7f23417b..6ab06f1d 100644
--- a/help/oc/oc.po
+++ b/help/oc/oc.po
@@ -100,7 +100,7 @@ msgstr ""
 
 #: C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr ""
 
diff --git a/help/pa/pa.po b/help/pa/pa.po
index 108d1149..8be6d960 100644
--- a/help/pa/pa.po
+++ b/help/pa/pa.po
@@ -101,10 +101,10 @@ msgstr ""
 
 #: C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr ""
-"ਪਸੰਦੀਦਾ ਸੰਦਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਬਾਰੇ <ulink type=\"help\" url=\"ghelp:user-guide?prefs"
+"ਪਸੰਦੀਦਾ ਸੰਦਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਬਾਰੇ <ulink type=\"help\" url=\"help:user-guide?prefs"
 "\">ਉਪਭੋਗੀ ਗਾਈਡ</ulink> ਵੇਖੋ।"
 
 #: C/control-center.xml:77(title)
diff --git a/help/pl/pl.po b/help/pl/pl.po
index 389d4ed9..27e1a9f7 100644
--- a/help/pl/pl.po
+++ b/help/pl/pl.po
@@ -72,8 +72,8 @@ msgid "To launch the <application>MATE Control Center</application>, type <comma
 msgstr "Aby uruchomić <application>Centrum sterowania MATE</application>, należy wpisać <command>mate-control-center</command> w oknie terminala."
 
 #: C/control-center.xml:73(para)
-msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">User Guide</ulink>."
-msgstr "Aby uzyskać pomoc dotyczącą narzędzi preferencji należy przejść do <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">Podręcznika użytkownika</ulink>."
+msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"help:user-guide?prefs\">User Guide</ulink>."
+msgstr "Aby uzyskać pomoc dotyczącą narzędzi preferencji należy przejść do <ulink type=\"help\" url=\"help:user-guide?prefs\">Podręcznika użytkownika</ulink>."
 
 #: C/control-center.xml:77(title)
 msgid "Usage"
diff --git a/help/pt/pt.po b/help/pt/pt.po
index 2a5aa743..a93e9df2 100644
--- a/help/pt/pt.po
+++ b/help/pt/pt.po
@@ -75,8 +75,8 @@ msgid "To launch the <application>MATE Control Center</application>, type <comma
 msgstr "Para iniciar o <application>Centro de Controlo MATE</application>, escreva <command>mate-control-center</command> numa janela de consola." 
 
 #: C/control-center.xml:73(para) 
-msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">User Guide</ulink>." 
-msgstr "Para ajuda na utilização de ferramentas de configuração, consulte o <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">Manual de Utilização</ulink>." 
+msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"help:user-guide?prefs\">User Guide</ulink>." 
+msgstr "Para ajuda na utilização de ferramentas de configuração, consulte o <ulink type=\"help\" url=\"help:user-guide?prefs\">Manual de Utilização</ulink>." 
 
 #: C/control-center.xml:77(title) 
 msgid "Usage" 
diff --git a/help/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po
index 5ff7c60e..050ad7a1 100644
--- a/help/pt_BR/pt_BR.po
+++ b/help/pt_BR/pt_BR.po
@@ -115,11 +115,11 @@ msgstr ""
 
 #: ../C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr ""
 "Para mais ajuda sobre como usar as ferramentas de preferência, veja o <ulink "
-"type=\"help\" url=\"ghelp:user-guide?prefs\">Guia do Usuário</ulink>."
+"type=\"help\" url=\"help:user-guide?prefs\">Guia do Usuário</ulink>."
 
 #: ../C/control-center.xml:77(title)
 msgid "Usage"
diff --git a/help/ru/ru.po b/help/ru/ru.po
index a0c69e31..9362d19a 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -101,10 +101,10 @@ msgstr ""
 #: C/control-center.xml:62(para)
 msgid ""
 "For help on using preference tools, see the <ulink type=\"help\" "
-"url=\"ghelp:user-guide?prefs\">User Guide</ulink>."
+"url=\"help:user-guide?prefs\">User Guide</ulink>."
 msgstr ""
 "Для получения дополнительной информации по использованию утилит настройки "
-"обратитесь к <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">Руководству "
+"обратитесь к <ulink type=\"help\" url=\"help:user-guide?prefs\">Руководству "
 "пользователя</ulink>."
 
 #: C/control-center.xml:66(title)
diff --git a/help/sv/sv.po b/help/sv/sv.po
index 94f3a9e2..6c71cbca 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -48,7 +48,7 @@ msgstr "2006-03"
 
 #: C/control-center.xml:38(para)
 msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the <ulink type=\"help\" url=\"mate-help:fdl\"><citetitle> GNU Free Documentation License </citetitle></ulink>, 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. A copy of the license can be found <ulink type=\"help\" url=\"mate-help:fdl\">here</ulink>."
-msgstr "Var och en äger rätt att kopiera, sprida och/eller förändra detta dokument under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare publicerad av Free Software Foundation, utan oföränderliga avsnitt, utan framsidestexter och utan baksidestexter. En kopia av GFDL kan hittas <ulink type=\"help\" url=\"ghelp:fdl\">här</ulink> eller i filen COPYING-DOCS som skickas med denna handbok."
+msgstr "Var och en äger rätt att kopiera, sprida och/eller förändra detta dokument under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare publicerad av Free Software Foundation, utan oföränderliga avsnitt, utan framsidestexter och utan baksidestexter. En kopia av GFDL kan hittas <ulink type=\"help\" url=\"help:fdl\">här</ulink> eller i filen COPYING-DOCS som skickas med denna handbok."
 
 #: C/control-center.xml:50(para)
 msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any MATE documentation, and those trademarks are made aware to the members of the MATE Documentation Project, the names have been printed in caps or initial caps."
@@ -71,8 +71,8 @@ msgid "To launch the <application>MATE Control Center</application>, type <comma
 msgstr "För att starta <application>MATE-kontrollpanelen</application>, skriv <command>mate-control-center</command> i ett terminalfönster."
 
 #: C/control-center.xml:73(para)
-msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">User Guide</ulink>."
-msgstr "För hjälp att använda inställningsverktyg, se <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">användarguiden</ulink>."
+msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"help:user-guide?prefs\">User Guide</ulink>."
+msgstr "För hjälp att använda inställningsverktyg, se <ulink type=\"help\" url=\"help:user-guide?prefs\">användarguiden</ulink>."
 
 #: C/control-center.xml:77(title)
 msgid "Usage"
diff --git a/help/th/th.po b/help/th/th.po
index 19880649..ec308587 100644
--- a/help/th/th.po
+++ b/help/th/th.po
@@ -112,10 +112,10 @@ msgstr ""
 
 #: C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr ""
-"ดูวิธีใช้เครื่องมือปรับแต่งค่าต่าง ๆ ได้ที่ <ulink type=\"help\" url=\"ghelp:user-"
+"ดูวิธีใช้เครื่องมือปรับแต่งค่าต่าง ๆ ได้ที่ <ulink type=\"help\" url=\"help:user-"
 "guide?prefs\">คู่มือผู้ใช้</ulink>"
 
 #: C/control-center.xml:77(title)
diff --git a/help/uk/uk.po b/help/uk/uk.po
index d3de63d2..adb7589a 100644
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
@@ -110,11 +110,11 @@ msgstr ""
 
 #: C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr ""
 "Для отримання додаткової інформації з використання програм налаштовування "
-"зверніться до <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">Посібник користувача</ulink>."
+"зверніться до <ulink type=\"help\" url=\"help:user-guide?prefs\">Посібник користувача</ulink>."
 
 #: C/control-center.xml:77(title)
 msgid "Usage"
diff --git a/help/vi/vi.po b/help/vi/vi.po
index c3f75844..f9c70e99 100644
--- a/help/vi/vi.po
+++ b/help/vi/vi.po
@@ -76,8 +76,8 @@ msgid "To launch the <application>MATE Control Center</application>, type <comma
 msgstr "Để khởi chạy ứng dụng <application>Trung tâm Điều khiển MATE</application>, đơn giản gõ vào cửa sổ dòng lệnh chuỗi <command>mate-control-center</command>."
 
 #: C/control-center.xml:73
-msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">User Guide</ulink>."
-msgstr "Để tìm trợ giúp về cách sử dụng công cụ tùy thích, xem <ulink type=\"help\" url=\"ghelp:user-guide?prefs\">Sổ tay Người dùng</ulink>."
+msgid "For help on using preference tools, see the <ulink type=\"help\" url=\"help:user-guide?prefs\">User Guide</ulink>."
+msgstr "Để tìm trợ giúp về cách sử dụng công cụ tùy thích, xem <ulink type=\"help\" url=\"help:user-guide?prefs\">Sổ tay Người dùng</ulink>."
 
 #: C/control-center.xml:77
 msgid "Usage"
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 1ae24460..e51f65da 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -62,7 +62,7 @@ msgid ""
 msgstr ""
 "对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software "
 "Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.1 或更高版本，该许可证没"
-"有固定的部分、没有封面和背页文本。您可以在此<ulink type=\"help\" url=\"ghelp:"
+"有固定的部分、没有封面和背页文本。您可以在此<ulink type=\"help\" url=\"help:"
 "fdl\">链接</ulink>上或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副"
 "本。"
 
@@ -104,10 +104,10 @@ msgstr ""
 
 #: C/control-center.xml:73(para)
 msgid ""
-"For help on using preference tools, see the <ulink type=\"help\" url=\"ghelp:"
+"For help on using preference tools, see the <ulink type=\"help\" url=\"help:"
 "user-guide?prefs\">User Guide</ulink>."
 msgstr ""
-"要获得关于使用首选项工具的帮助，请参见<ulink type=\"help\" url=\"ghelp:user-"
+"要获得关于使用首选项工具的帮助，请参见<ulink type=\"help\" url=\"help:user-"
 "guide?prefs\">用户指南</ulink>。"
 
 #: C/control-center.xml:77(title)
diff --git a/libslab/libslab-utils.c b/libslab/libslab-utils.c
index fa96b260..6e073b0e 100644
--- a/libslab/libslab-utils.c
+++ b/libslab/libslab-utils.c
@@ -219,7 +219,7 @@ libslab_mate_desktop_item_open_help (MateDesktopItem *item)
 doc_path = libslab_mate_desktop_item_get_docpath (item);
 
 if (doc_path) {
- help_uri = g_strdup_printf ("ghelp:%s", doc_path);
+ help_uri = g_strdup_printf ("help:%s", doc_path);
 
 if (!gtk_show_uri (libslab_get_current_screen (), help_uri, gtk_get_current_event_time (), &error)) {
 g_warning ("error opening %s [%s]\n", help_uri, error->message);
diff --git a/libslab/slab-mate-util.c b/libslab/slab-mate-util.c
index 31088346..a4527dc0 100644
--- a/libslab/slab-mate-util.c
+++ b/libslab/slab-mate-util.c
@@ -156,7 +156,7 @@ open_desktop_item_help (MateDesktopItem * desktop_item)
 
 if (doc_path)
 {
- help_uri = g_strdup_printf ("ghelp:%s", doc_path);
+ help_uri = g_strdup_printf ("help:%s", doc_path);
 
 error = NULL;
 if (!gtk_show_uri (libslab_get_current_screen (), help_uri, gtk_get_current_event_time (), &error))
author	infirit <[email protected]>	2013-08-01 13:30:42 +0200
committer	infirit <[email protected]>	2013-08-01 13:30:42 +0200
commit	fed34fd36fba90cb73245a13344bacddb1d689fd (patch)
tree	28e43ced64892e51c63319053865eafd56acd00e
parent	db06e0af97a338992db45656f2ca9cd4a30abfe6 (diff)
download	mate-control-center-fed34fd36fba90cb73245a13344bacddb1d689fd.tar.bz2 mate-control-center-fed34fd36fba90cb73245a13344bacddb1d689fd.tar.xz