From ddb856f330e2cf0966e7fc14abee004dad87c8e7 Mon Sep 17 00:00:00 2001 From: infirit Date: Fri, 2 Aug 2013 17:30:47 +0200 Subject: Enable yelp and ghelp: -> help: --- autogen.sh | 8 +++++++- configure.ac | 2 +- help/Makefile.am | 2 +- help/bg/bg.po | 8 ++++---- help/eu/eu.po | 8 ++++---- help/gl/gl.po | 8 ++++---- help/it/it.po | 8 ++++---- help/ja/ja.po | 4 ++-- help/ko/ko.po | 8 ++++---- help/oc/oc.po | 4 ++-- help/pt_BR/pt_BR.po | 8 ++++---- help/ru/ru.po | 6 +++--- help/sv/sv.po | 8 ++++---- help/zh_CN/zh_CN.po | 8 ++++---- help/zh_HK/zh_HK.po | 8 ++++---- help/zh_TW/zh_TW.po | 8 ++++---- src/math-window.c | 2 +- 17 files changed, 57 insertions(+), 51 deletions(-) diff --git a/autogen.sh b/autogen.sh index 0645f28..9d96f39 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=. PKG_NAME="mate-calc" REQUIRED_AUTOMAKE_VERSION=1.7 -#REQUIRED_YELP_TOOLS_VERSION=3.1.1 +REQUIRED_YELP_TOOLS_VERSION=3.1.1 (test -f $srcdir/configure.ac \ && test -d $srcdir/src) || { @@ -19,4 +19,10 @@ which mate-autogen || { echo "You need to install mate-common from the MATE git" exit 1 } + +which yelp-build || { + echo "You need to install yelp-tools" + exit 1 +} + USE_MATE2_MACROS=1 USE_COMMON_DOC_BUILD=yes . mate-autogen diff --git a/configure.ac b/configure.ac index 6c2c6ed..1d37f58 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ dnl ########################################################################### dnl Documentation dnl ########################################################################### -#YELP_HELP_INIT +YELP_HELP_INIT dnl ########################################################################### dnl Files to generate diff --git a/help/Makefile.am b/help/Makefile.am index 3b1640f..66caf06 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,4 +1,4 @@ -#@YELP_HELP_RULES@ +@YELP_HELP_RULES@ HELP_ID = mate-calc HELP_FILES = absolute.page \ base.page \ diff --git a/help/bg/bg.po b/help/bg/bg.po index 18379de..23a5320 100644 --- a/help/bg/bg.po +++ b/help/bg/bg.po @@ -131,11 +131,11 @@ msgstr "Обратна връзка" msgid "" "To report a bug or make a suggestion regarding the Calculator application or this manual, follow the directions in the MATE Feedback Page." +"url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page." msgstr "" "За да докладвате за грешка или да направите предложение относно програмата " "Калкулатор или това ръководство, следвайте " -"указанията, описани в Страницата за обратна връзка на MATE." #: base.xml:161(primary) @@ -4324,7 +4324,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 link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "Предоставя се разрешение за копиране, разпространение и/или промяна на този " @@ -4332,7 +4332,7 @@ msgstr "" "версия 1.1 или всяка следваща версия, издадена от Фондация „Свободен " "софтуер“; без „Непроменливи раздели“, „Текстове на предната корица“, както и " "„Текстове на задната корица“. Копие на лиценза може да бъде намерено тук или във файла COPYING-DOCS, " +"type=\"help\" url=\"help:fdl\">тук или във файла COPYING-DOCS, " "разпространяван с това ръководство." #: legal.xml:12(para) diff --git a/help/eu/eu.po b/help/eu/eu.po index 42ceae3..5112baa 100644 --- a/help/eu/eu.po +++ b/help/eu/eu.po @@ -72,8 +72,8 @@ msgid "MATE Documentation Project" msgstr "MATEren dokumentazio-proiektua" #: C/mate-calc.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 link or in the file COPYING-DOCS distributed with this manual." -msgstr "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko Free Software Foundation-ek argitaratutako GNU Dokumentazio Librearen Lizentziaren 1.1. bertsioan edo berriago batean ezarritako baldintzak betetzen badira; Atal Aldaezinik, Aurreko azaleko testurik eta Atzeko azaleko testurik gabe. GFDL lizentziaren kopia esteka honetan edo eskuliburu honekin batera ematen den COPYING-DOCS fitxategian aurkituko duzu." +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko Free Software Foundation-ek argitaratutako GNU Dokumentazio Librearen Lizentziaren 1.1. bertsioan edo berriago batean ezarritako baldintzak betetzen badira; Atal Aldaezinik, Aurreko azaleko testurik eta Atzeko azaleko testurik gabe. GFDL lizentziaren kopia esteka honetan edo eskuliburu honekin batera ematen den COPYING-DOCS fitxategian aurkituko duzu." #: C/mate-calc.xml:12(para) msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." @@ -188,8 +188,8 @@ msgid "Feedback" msgstr "Oharrak" #: C/mate-calc.xml:171(para) -msgid "To report a bug or make a suggestion regarding the Calculator application or this manual, follow the directions in the MATE Feedback Page." -msgstr "Kalkulagailuari buruzko akatsen berri emateko edo oharrak bidaltzeko, MATEra oharrak bidaltzeko orrian aurkituko dituzu argibideak." +msgid "To report a bug or make a suggestion regarding the Calculator application or this manual, follow the directions in the MATE Feedback Page." +msgstr "Kalkulagailuari buruzko akatsen berri emateko edo oharrak bidaltzeko, MATEra oharrak bidaltzeko orrian aurkituko dituzu argibideak." #: C/mate-calc.xml:178(primary) msgid "mate-calc" diff --git a/help/gl/gl.po b/help/gl/gl.po index 50ec4ca..6ed5cf5 100644 --- a/help/gl/gl.po +++ b/help/gl/gl.po @@ -1484,23 +1484,23 @@ msgstr "Fran Dieguez , 2011." #~ "the photo stream at the bottom of the Cheese window. From " #~ "there, you can play back the video, " #~ "upload it to a social network, post it on your blog or YouTube channel, " -#~ "or share it with friends by email." #~ msgstr "" #~ "Despois de deter a gravación, o vídeo aparecerá automaticamente na tira " #~ "de fotos da parte inferior da xanela de Cheese. Desde alí pode " #~ "reproducir o vídeo, subir o vídeo a unha " #~ "rede social, envialo ao seu blogue ou canle de YouTube ou compartilo cos " -#~ "seus amigos mediante correo electrónico." #~ msgid "" #~ "If you have problems sharing a video with people using other operating " -#~ "systems (like Windows or Mac OS), you may need to convert it to a different format." #~ msgstr "" #~ "Se ten problemas ao compartir un vídeo coa xente usando outros sistemas " -#~ "operativos (como Windows ou Mac OS), debe converter o vídeo a un formato diferente." #~ msgid "Introduction to the Cheese Webcam Booth." diff --git a/help/it/it.po b/help/it/it.po index c2539fe..3e97b6f 100644 --- a/help/it/it.po +++ b/help/it/it.po @@ -1420,7 +1420,7 @@ msgstr "Valore casuale nell'intervallo [0,1] (cambia ad ogni lettura)" #~ "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 link or in the file COPYING-DOCS distributed with this manual." #~ msgstr "" #~ "Il permesso è assegnato alla copia, distribuisci e/o modifica questo " @@ -1428,7 +1428,7 @@ msgstr "Valore casuale nell'intervallo [0,1] (cambia ad ogni lettura)" #~ "1.1, o successiva, della documentazione di GNU pubblicata da Free " #~ "Software Foundation senza le sezioni invariabili, i testi front-cover e " #~ "testi back-cover. Puoi trovare una copia della GDFL a questo indirizzo: " -#~ "link o nel file COPYING-" +#~ "link o nel file COPYING-" #~ "DOCS distribuito con questo manuale." #~ msgid "" @@ -1590,12 +1590,12 @@ msgstr "Valore casuale nell'intervallo [0,1] (cambia ad ogni lettura)" #~ msgid "" #~ "To report a bug or make a suggestion regarding the " #~ "mate-calc application or this manual, follow " -#~ "the directions in the MATE Feedback Page." #~ msgstr "" #~ "Per segnalare un problema o inviare suggerimenti sull'applicazione " #~ "mate-calc o su questo manuale, seguire le " -#~ "istruzioni presenti alla Pagina di commenti su MATE." #~ msgid "Calculator" diff --git a/help/ja/ja.po b/help/ja/ja.po index 5203f40..c4a6ea5 100644 --- a/help/ja/ja.po +++ b/help/ja/ja.po @@ -1336,11 +1336,11 @@ msgstr "" #~ msgid "" #~ "To report a bug or make a suggestion regarding the " #~ "mate-calc application or this manual, follow " -#~ "the directions in the MATE Feedback Page." #~ msgstr "" #~ "電卓 アプリケーションまたはこのマニュアルに関し" -#~ "てバグやご意見をご報告いただく場合は、MATE フィードバックページ にある説明に従ってくださ" #~ "い。" diff --git a/help/ko/ko.po b/help/ko/ko.po index 4566517..1ec8f11 100644 --- a/help/ko/ko.po +++ b/help/ko/ko.po @@ -107,13 +107,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 link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "본 설명서는 프리 소프트웨어 재단(FSF)에서 발행한 GNU 자유 문서 라이센스" "(GFDL) 버전 1.1 이상의 조항에 따라 변경 불가 부분, 앞 표지 텍스트 및 뒷 표지 " "텍스트를 제외하고 복사, 수정 및/또는 배포할 수 있습니다. GFDL의 사본은 " -"링크 또는 본 설명서와 함께 배" +"링크 또는 본 설명서와 함께 배" "포된 COPYING-DOCS 파일에서 찾을 수 있습니다." #: ../C/mate-calc.xml:12(para) ../C/legal.xml:12(para) @@ -289,8 +289,8 @@ msgstr "피드백" msgid "" "To report a bug or make a suggestion regarding the mate-calc application or this manual, follow the directions in the MATE Feedback Page." -msgstr "mate-calc 응용 프로그램 또는 이 설명서에 대한 버그를 알려 주시거나 의견을 제시하려면 그놈 피드백 페이지에 있는 대로 해 주십시오." +"url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page." +msgstr "mate-calc 응용 프로그램 또는 이 설명서에 대한 버그를 알려 주시거나 의견을 제시하려면 그놈 피드백 페이지에 있는 대로 해 주십시오." #: ../C/mate-calc.xml:180(primary) ../C/mate-calc.xml:0(application) msgid "mate-calc" diff --git a/help/oc/oc.po b/help/oc/oc.po index ebe563d..bd3ab9a 100644 --- a/help/oc/oc.po +++ b/help/oc/oc.po @@ -111,7 +111,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 link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" @@ -267,7 +267,7 @@ msgstr "" msgid "" "To report a bug or make a suggestion regarding the mate-calc application or this manual, follow the directions in the MATE Feedback Page." +"url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page." msgstr "" #: C/mate-calc.xml:180(primary) C/mate-calc.xml:0(application) diff --git a/help/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po index 6dae083..4783497 100644 --- a/help/pt_BR/pt_BR.po +++ b/help/pt_BR/pt_BR.po @@ -193,11 +193,11 @@ msgstr "Feedback" msgid "" "To report a bug or make a suggestion regarding the Calculator application or this manual, follow the directions in the MATE Feedback Page." +"url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page." msgstr "" "Para reportar um erro ou fazer uma sugestão a respeito da aplicação " "Calculadora ou deste manual, siga as instruções " -"na MATE Feedback PageMATE Feedback Page." #: ../C/mate-calc.xml:178(primary) @@ -4601,7 +4601,7 @@ msgstr "Irapuan Pascoal , 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 link or in the file COPYING-DOCS distributed with this manual." #~ msgstr "" #~ "Permissão é garantida para copiar, distribuir e/ou modificar este " @@ -4609,7 +4609,7 @@ msgstr "Irapuan Pascoal , 2007" #~ "1.1 ou qualquer uma posterior publicada pela Free Software Foundation sem " #~ "Invariant Sections, sem Front-Cover Texts, e sem Back-Cover Texts. Você " #~ "pode encontrar uma cópia do GFDL neste link link ou no arquivo COPYING-DOCS distribuído com " +#~ "\"help:fdl\">link ou no arquivo COPYING-DOCS distribuído com " #~ "este manual." #~ msgid "" diff --git a/help/ru/ru.po b/help/ru/ru.po index 565bfb9..e8be357 100644 --- a/help/ru/ru.po +++ b/help/ru/ru.po @@ -108,7 +108,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 link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" @@ -264,11 +264,11 @@ msgstr "Обратная связь" msgid "" "To report a bug or make a suggestion regarding the mate-calc application or this manual, follow the directions in the MATE Feedback Page." +"url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page." msgstr "" "Для того, чтобы сообщить об ошибке или сделать предложение относительно " "приложения mate-calc или этого руководства, " -"следуйте инструкциям страницы обратной связи MATE." #: C/mate-calc.xml:180(primary) C/mate-calc.xml:0(application) diff --git a/help/sv/sv.po b/help/sv/sv.po index 31b52a9..93e5fb6 100644 --- a/help/sv/sv.po +++ b/help/sv/sv.po @@ -91,8 +91,8 @@ msgid "MATE Documentation Project" msgstr "Dokumentationsprojekt för MATE" #: C/mate-calc.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 link 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 länk 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 link 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 länk eller i filen COPYING-DOCS som medföljer denna handbok." #: C/mate-calc.xml:12(para) msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." @@ -218,8 +218,8 @@ msgstr "Återkoppling" #: C/mate-calc.xml:173(para) #, fuzzy -msgid "To report a bug or make a suggestion regarding the mate-calc application or this manual, follow the directions in the MATE Feedback Page." -msgstr "För att rapportera ett fel eller komma med ett förslag angående programmet Miniräknare eller denna handbok, följ instruktionerna på MATE:s återkopplingssida." +msgid "To report a bug or make a suggestion regarding the mate-calc application or this manual, follow the directions in the MATE Feedback Page." +msgstr "För att rapportera ett fel eller komma med ett förslag angående programmet Miniräknare eller denna handbok, följ instruktionerna på MATE:s återkopplingssida." #: C/mate-calc.xml:180(primary) #: C/mate-calc.xml:0(application) diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po index 2b3ed37..45c1082 100644 --- a/help/zh_CN/zh_CN.po +++ b/help/zh_CN/zh_CN.po @@ -1245,11 +1245,11 @@ msgstr "TeliuTe , 2010" #~ msgid "" #~ "To report a bug or make a suggestion regarding the " #~ "mate-calc application or this manual, follow " -#~ "the directions in the MATE Feedback Page." #~ msgstr "" #~ "要报告关于 Calculator 应用程序或本手册的错误或" -#~ "提出建议，请遵循 MATE " +#~ "提出建议，请遵循 MATE " #~ "反馈页中的指导。" #, fuzzy @@ -3310,13 +3310,13 @@ msgstr "TeliuTe , 2010" #~ "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 link or in the file COPYING-DOCS distributed with this manual." #~ msgstr "" #~ "对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software " #~ "Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.1 或更高版本， 该许可" #~ "证没有固定的部分、没有封面和背页文本。您可以在此链接上或在随本手册一起分发的 COPYING-DOCS 文件中找" +#~ "\"help:fdl\">链接上或在随本手册一起分发的 COPYING-DOCS 文件中找" #~ "到 GFDL 的副本。" #~ msgid "" diff --git a/help/zh_HK/zh_HK.po b/help/zh_HK/zh_HK.po index 3e195b4..79dc020 100644 --- a/help/zh_HK/zh_HK.po +++ b/help/zh_HK/zh_HK.po @@ -1175,11 +1175,11 @@ msgstr "" #~ msgid "" #~ "To report a bug or make a suggestion regarding the " #~ "mate-calc application or this manual, follow " -#~ "the directions in the MATE Feedback Page." #~ msgstr "" #~ "關於本 Calculator 應用程式或 手冊，如果要報告錯" -#~ "誤或提出建議，請遵照 MATE Feedback Page 的指示。" #~ msgid "Calculator" @@ -3151,13 +3151,13 @@ msgstr "" #~ "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 link or in the file COPYING-DOCS distributed with this manual." #~ msgstr "" #~ "根據自由軟體基金會 (Free Software Foundation) 所發佈 的 GNU 自由文件授權 " #~ "(GNU Free Documentation License, GFDL) 1.1 (含) 以後版本， 使用者可以複" #~ "製、散佈，或修改本文件，但不得增刪章節，不得加上封面文字， 亦不得加上封底" -#~ "文字。 如要取得 GFDL 的副本，請參閱 此連結，或是參閱與本手冊一同隨附的 COPYING-DOCS 檔案。" #~ msgid "" diff --git a/help/zh_TW/zh_TW.po b/help/zh_TW/zh_TW.po index 407d944..1869400 100644 --- a/help/zh_TW/zh_TW.po +++ b/help/zh_TW/zh_TW.po @@ -1249,11 +1249,11 @@ msgstr "" #~ msgid "" #~ "To report a bug or make a suggestion regarding the " #~ "mate-calc application or this manual, follow " -#~ "the directions in the MATE Feedback Page." #~ msgstr "" #~ "關於本 Calculator 應用程式或 手冊，如果要報告錯" -#~ "誤或提出建議，請遵照 MATE Feedback Page 的指示。" #~ msgid "Calculator" @@ -3225,13 +3225,13 @@ msgstr "" #~ "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 link or in the file COPYING-DOCS distributed with this manual." #~ msgstr "" #~ "根據自由軟體基金會 (Free Software Foundation) 所發佈 的 GNU 自由文件授權 " #~ "(GNU Free Documentation License, GFDL) 1.1 (含) 以後版本， 使用者可以複" #~ "製、散佈，或修改本文件，但不得增刪章節，不得加上封面文字， 亦不得加上封底" -#~ "文字。 如要取得 GFDL 的副本，請參閱 此連結，或是參閱與本手冊一同隨附的 COPYING-DOCS 檔案。" #~ msgid "" diff --git a/src/math-window.c b/src/math-window.c index 8a9302d..5d7cc12 100644 --- a/src/math-window.c +++ b/src/math-window.c @@ -211,7 +211,7 @@ static void help_cb(GtkWidget *widget, MathWindow *window) GError *error = NULL; screen = gtk_widget_get_screen(GTK_WIDGET(window)); - gtk_show_uri(screen, "ghelp:mate-calc", gtk_get_current_event_time(), &error); + gtk_show_uri(screen, "help:mate-calc", gtk_get_current_event_time(), &error); if (error != NULL) { -- cgit v1.2.1