Commit d9eb206f authored by Don Scorgie's avatar Don Scorgie

Merge of yelp rework branch:

- Depreciate yelp-*-pager in favour of
  yelp-document and such.
  Gives us on-demand loading of pages
- Switch to using rarian instead of scrollkeeper
- Update to using shiny newness of gnome-doc-utils
- Make printing docbook pretty
- Clean up lots of errors and general cleanup
  of other source files
- Make our resolver much, much better
  - and remove reliance on libgnome there

svn path=/trunk/; revision=2848
parent 89a4f049
This diff is collapsed.
AC_INIT([Yelp],[2.18.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp])
AC_INIT([Yelp],[2.18.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp])
GNOME_COMMON_INIT
......@@ -66,7 +66,7 @@ AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR])
PKG_CHECK_MODULES(YELP,
[
gconf-2.0
gnome-doc-utils >= 0.3.1
gnome-doc-utils >= 0.11.1
gtk+-unix-print-2.0
gnome-vfs-2.0 >= 1.1
gtk+-2.0 >= 2.10.0
......@@ -78,6 +78,7 @@ PKG_CHECK_MODULES(YELP,
libexslt >= 0.8.1
libstartup-notification-1.0 >= 0.8
dbus-glib-1
rarian >= 0.5.0
])
AC_SUBST([YELP_CFLAGS])
AC_SUBST([YELP_LIBS])
......@@ -88,9 +89,15 @@ XSLT_PATH="`$PKG_CONFIG --variable=xsltdir gnome-doc-utils`"
DB_TITLE="$XSLT_PATH""/docbook/common/db-title.xsl"
AC_SUBST(DB_TITLE)
DB2HTML="`$PKG_CONFIG --variable=db2html gnome-doc-utils`"
DB2HTML="`$PKG_CONFIG --variable=db2xhtml gnome-doc-utils`"
AC_SUBST(DB2HTML)
GDU_ICON_PATH="`$PKG_CONFIG --variable=icondir gnome-doc-utils`/hicolor/48x48/"
AC_SUBST(GDU_ICON_PATH)
GLIB_GENMARSHAL="`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`"
AC_SUBST(GLIB_GENMARSHAL)
#
# If Pango included the shared library dependencies from X11 in
# the pkg-config output, then we use that (to avoid duplicates).
......@@ -121,34 +128,6 @@ fi
AC_SUBST(X_LIBS)
AC_ARG_ENABLE([man],
[AC_HELP_STRING([--enable-man],
[turn on man page support [default=yes]])],,
enable_man=yes)
AC_ARG_ENABLE([info],
[AC_HELP_STRING([--enable-info],
[turn on GNU info support [default=yes]])],,
enable_info=yes)
if test "x$enable_man" = "xyes"; then
AC_DEFINE(ENABLE_MAN, 1, [turn on man page support])
AM_CONDITIONAL(ENABLE_MAN, true)
else
AM_CONDITIONAL(ENABLE_MAN, false)
fi
if test "x$enable_info" = "xyes"; then
AC_DEFINE(ENABLE_INFO, 1, [turn on GNU info support])
AM_CONDITIONAL(ENABLE_INFO, true)
else
AM_CONDITIONAL(ENABLE_INFO, false)
fi
if test "x$enable_man" = "xyes" -o "x$enable_info" = "xyes"; then
AC_DEFINE(ENABLE_MAN_OR_INFO, 1, [turn of man page or GNU info support])
AM_CONDITIONAL(ENABLE_MAN_OR_INFO, true)
else
AM_CONDITIONAL(ENABLE_MAN_OR_INFO, false)
fi
dnl ******
dnl beagle
......@@ -157,7 +136,7 @@ dnl ******
BEAGLE_MODULES="libbeagle-0.0 >= 0.2.4"
AC_ARG_WITH([search],
[AC_HELP_STRING([--with-search=basic|beagle|auto|no],
[AC_HELP_STRING([--with-search=basic|beagle|auto],
[turn on search support [default=auto]])], ,
with_search=auto)
......@@ -165,7 +144,6 @@ if test "x$with_search" = "xauto"; then
PKG_CHECK_MODULES(YELP_SEARCH, $BEAGLE_MODULES, have_beagle=yes, have_beagle=no)
fi
AM_CONDITIONAL(ENABLE_SEARCH, test x"$with_search" != xno)
AM_CONDITIONAL(ENABLE_BEAGLE, test x"$with_search" = xbeagle)
if test "x$with_search" = "xbeagle"; then
......@@ -176,18 +154,12 @@ fi
case "x$with_search" in
"xbasic")
search_backend="basic"
AC_DEFINE(ENABLE_SEARCH, 1, [Define if you want any search])
;;
"xbeagle")
search_backend="beagle"
AC_DEFINE(ENABLE_SEARCH, 1, [Define if you want any search])
AC_DEFINE(ENABLE_BEAGLE, 1, [Define if you want the power of Beagle])
;;
"xno")
search_backend="none"
;;
"xauto")
AC_DEFINE(ENABLE_SEARCH, 1)
search_backend="auto - basic"
if test x$have_beagle = xyes; then
AC_DEFINE(ENABLE_BEAGLE, 1)
......@@ -195,7 +167,7 @@ case "x$with_search" in
fi
;;
*)
AC_MSG_ERROR([Unknown search type selected - Please use --with-search=auto|basic|beagle|no])
AC_MSG_ERROR([Unknown search type selected - Please use --with-search=auto|basic|beagle])
;;
esac
......@@ -289,8 +261,6 @@ yelp-$VERSION:
compiler: ${CC}
Debug enabled: ${enable_debug}
Man Pages enabled: ${enable_man}
Info Pages enabled: ${enable_info}
Search backend: ${search_backend}
Mozilla version: ${MOZILLA}
"
2007-07-16 Ilkka Tuohela <hile@iki.fi>
* fi.po: Updated Finnish translation.
2007-07-16 Sunil Mohan Adapa <sunil@atc.tcs.com>
* te.po: Added Telugu translation done by
Bharat Kumar <jonnalagaddabharat@gmail.com>.
2007-06-28 Priit Laes <plaes@svn.gnome.org>
* et.po: Estonian translation update by Ivar Smolin.
2007-06-13 Yair Hershkovitz <yairhr@gmail.com>
* he.po: Updated Hebrew translation.
2007-05-23 Rhys Jones <rhys@sucs.org>
* cy.po: Updated Welsh translation.
2007-04-17 Guntupalli Karunakar <karunakar@indlinux.org>
* hi.po: Updated Hindi translation.
2007-04-10 Peter Bach <bach.peter@gmail.com>
* da.po: Updated Danish translation.
2007-04-03 Inaki Larranaga Murgoitio <dooteo@euskalgnu.org>
* eu.po: Updated Basque translation.
2007-03-25 Ignacio Casal Quinteiro <nacho.resa@gmail.com>
* gl.po: Updated Galician Translation.
2007-03-23 Luca Ferretti <elle.uca@libero.it>
* it.po: Updated Italian translation.
......
......@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: or\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-08-10 00:46+0200\n"
"POT-Creation-Date: 2007-07-29 15:14+0100\n"
"PO-Revision-Date: 2007-05-13 13:26+0200\n"
"Last-Translator: Yannig MARCHEGAY <yannig@marchegay.org>\n"
"Language-Team: Occitan (post 1500) <ubuntu-l10n-oci@lists.ubuntu.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: ../data/info.xml.in.h:1 ../src/yelp-toc-pager.c:1849
#: ../data/info.xml.in.h:1 ../src/yelp-toc-pager.c:1847
msgid "GNU Info Pages"
msgstr "Paginas d'informacions GNU"
......@@ -61,7 +61,7 @@ msgstr "Periferics materials"
msgid "Kernel Routines"
msgstr ""
#: ../data/man.xml.in.h:10 ../src/yelp-toc-pager.c:1843
#: ../data/man.xml.in.h:10 ../src/yelp-toc-pager.c:1841
msgid "Manual Pages"
msgstr "Paginas del manual"
......@@ -605,7 +605,7 @@ msgstr ""
"Impossible d'analizar '%s'. Ja lo fichièr existís pas, ja es pas una pagina "
"XML corrècta."
#: ../src/yelp-io-channel.c:101
#: ../src/yelp-io-channel.c:107
#, c-format
msgid ""
"The file ‘%s’ could not be read and decoded. The file may be compressed in "
......@@ -614,20 +614,20 @@ msgstr ""
"Impossible de legir e descodar lo fichièr \"%s\". Es possible que lo fichièr "
"siá compressat dins un format pas gerit."
#: ../src/yelp-main.c:91
#: ../src/yelp-main.c:92
msgid "Use a private session"
msgstr "Utilisar una session privada"
#: ../src/yelp-main.c:100
#: ../src/yelp-main.c:101
msgid "Define which cache directory to use"
msgstr "Definís lo repertòri d'escondedor d'utilizar"
#. Commandline parsing is done here
#: ../src/yelp-main.c:354
#: ../src/yelp-main.c:358
msgid " GNOME Help Browser"
msgstr " Navegador d'ajuda GNOME"
#: ../src/yelp-main.c:372 ../yelp.desktop.in.in.h:2
#: ../src/yelp-main.c:376 ../yelp.desktop.in.in.h:2
msgid "Help"
msgstr "Ajuda"
......@@ -661,23 +661,19 @@ msgstr "Aquesta estampadoira gerís pas l'estampatge"
msgid "Printer %s does not support postscript printing."
msgstr "L'estampadoira %s gerís pas l'estampatge PostScript."
#: ../src/yelp-print.c:337
#: ../src/yelp-print.c:337 ../src/yelp-print.c:365
msgid "Printing"
msgstr "Estampatge"
#: ../src/yelp-print.c:364
msgid "<b>Printing</b>"
msgstr ""
#: ../src/yelp-print.c:366
#: ../src/yelp-print.c:367
msgid "Waiting to print"
msgstr ""
#: ../src/yelp-print.c:578
#: ../src/yelp-print.c:579
msgid "An error occurred while printing"
msgstr "I a agut una error al moment d'estampar"
#: ../src/yelp-print.c:582
#: ../src/yelp-print.c:583
#, c-format
msgid "It was not possible to print your document: %s"
msgstr "Impossible d'estampar vòstre document : %s"
......@@ -719,17 +715,17 @@ msgstr "Resultas de la recèrca per \"%s\""
msgid "Repeat the search online at %s"
msgstr ""
#: ../src/yelp-search-pager.c:905 ../src/yelp-toc-pager.c:2144
#: ../src/yelp-search-pager.c:905 ../src/yelp-toc-pager.c:2068
#: ../src/yelp-xslt-pager.c:364
msgid "No href attribute found on yelp:document"
msgstr ""
#: ../src/yelp-search-pager.c:919 ../src/yelp-toc-pager.c:2157
#: ../src/yelp-search-pager.c:919 ../src/yelp-toc-pager.c:2081
#: ../src/yelp-xslt-pager.c:380 ../src/yelp-xslt-pager.c:531
msgid "Out of memory"
msgstr "Pas pro de memòria"
#: ../src/yelp-search-pager.c:960 ../src/yelp-toc-pager.c:2206
#: ../src/yelp-search-pager.c:960 ../src/yelp-toc-pager.c:2130
msgid "Help Contents"
msgstr "Somari de l'ajuda"
......@@ -741,7 +737,7 @@ msgstr "Somari de l'ajuda"
#. * "how do I", and words for functional states like "not",
#. * "work", and "broken".
#.
#: ../src/yelp-search-pager.c:1286
#: ../src/yelp-search-pager.c:1288
msgid ""
"a:about:an:are:as:at:be:broke:broken:by:can:can't:dialog:dialogue:do:doesn't:"
"doesnt:don't:dont:explain:for:from:get:gets:got:make:makes:not:when:has:have:"
......@@ -757,7 +753,7 @@ msgstr ""
#. * E.g. if the common prefix is re then the string would be
#. * "re:"
#.
#: ../src/yelp-search-pager.c:1302
#: ../src/yelp-search-pager.c:1304
msgid "re"
msgstr ""
......@@ -768,11 +764,11 @@ msgstr ""
#. * please use the strig NULL. If there is only 1, please
#. * add a colon at the end of the list
#.
#: ../src/yelp-search-pager.c:1311
#: ../src/yelp-search-pager.c:1313
msgid "ers:er:ing:es:s:'s"
msgstr ""
#: ../src/yelp-search-pager.c:1506 ../src/yelp-toc-pager.c:631
#: ../src/yelp-search-pager.c:1518 ../src/yelp-toc-pager.c:629
#, c-format
msgid "Could not load the OMF file '%s'."
msgstr "Impossible de cargar lo fichièr OMF '%s'."
......@@ -802,248 +798,248 @@ msgstr "Impossible de cargar lo fichièr OMF '%s'."
msgid "yelp-watermark-blockquote-201C"
msgstr "yelp-watermark-blockquote-00AB"
#: ../src/yelp-toc-pager.c:268
#: ../src/yelp-toc-pager.c:267
msgid "YelpTocPager: Pause count is negative."
msgstr ""
#: ../src/yelp-toc-pager.c:379 ../src/yelp-toc-pager.c:1957
#: ../src/yelp-toc-pager.c:378
#, c-format
msgid ""
"The table of contents could not be processed. The file ‘%s’ is either "
"missing or is not a valid XSLT stylesheet."
msgstr ""
#: ../src/yelp-toc-pager.c:1110
#: ../src/yelp-toc-pager.c:1109
#, c-format
msgid "Read man page for %s"
msgstr "Legir la pagina man per %s"
#: ../src/yelp-toc-pager.c:1703
#: ../src/yelp-toc-pager.c:1701
#, c-format
msgid "Read info page for %s"
msgstr "Legir la pagina info per %s"
#: ../src/yelp-toc-pager.c:1816
#: ../src/yelp-toc-pager.c:1814
#, c-format
msgid ""
"The table of contents could not be loaded. The file ‘%s’ is either missing "
"or is not well-formed XML."
msgstr ""
#: ../src/yelp-toc-pager.c:1838
#: ../src/yelp-toc-pager.c:1836
msgid "Command Line Help"
msgstr "Ajuda per la linha de comanda"
#: ../src/yelp-window.c:318
#: ../src/yelp-window.c:317
msgid "_File"
msgstr "_Fichièr"
#: ../src/yelp-window.c:319
#: ../src/yelp-window.c:318
msgid "_Edit"
msgstr "_Edicion"
#: ../src/yelp-window.c:320
#: ../src/yelp-window.c:319
msgid "_Go"
msgstr "_Anar"
#: ../src/yelp-window.c:321
#: ../src/yelp-window.c:320
msgid "_Bookmarks"
msgstr "_Favorits"
#: ../src/yelp-window.c:322
#: ../src/yelp-window.c:321
msgid "_Help"
msgstr "_Ajuda"
#: ../src/yelp-window.c:325
#: ../src/yelp-window.c:324
msgid "_New Window"
msgstr "Fenèstra _nòva"
#: ../src/yelp-window.c:330
#: ../src/yelp-window.c:329
msgid "Print This Document"
msgstr "Estampar aqueste document"
#: ../src/yelp-window.c:335
#: ../src/yelp-window.c:334
msgid "Print This Page"
msgstr "Estampar aquesta pagina"
#: ../src/yelp-window.c:340
#: ../src/yelp-window.c:339
msgid "About This Document"
msgstr "A prepaus del document"
#: ../src/yelp-window.c:345
#: ../src/yelp-window.c:344
msgid "Open _Location"
msgstr "Dobrir un _emplaçament"
#: ../src/yelp-window.c:350
#: ../src/yelp-window.c:349
msgid "_Close Window"
msgstr "_Tampar la fenèstra"
#: ../src/yelp-window.c:356
#: ../src/yelp-window.c:355
msgid "_Copy"
msgstr "_Copiar"
#: ../src/yelp-window.c:362
#: ../src/yelp-window.c:361
msgid "_Select All"
msgstr "Tot _seleccionar"
#: ../src/yelp-window.c:367
#: ../src/yelp-window.c:366
msgid "_Find..."
msgstr "_Recèrcar"
#: ../src/yelp-window.c:372
#: ../src/yelp-window.c:371
msgid "Find Pre_vious"
msgstr "Recèrcar lo _precedent"
#: ../src/yelp-window.c:374
#: ../src/yelp-window.c:373
msgid "Find previous occurrence of the word or phrase"
msgstr ""
#: ../src/yelp-window.c:377
#: ../src/yelp-window.c:376
msgid "Find Ne_xt"
msgstr "Recèrcar lo seguent"
#: ../src/yelp-window.c:379
#: ../src/yelp-window.c:378
msgid "Find next occurrence of the word or phrase"
msgstr ""
#: ../src/yelp-window.c:382
#: ../src/yelp-window.c:381
msgid "_Preferences"
msgstr "_Preferéncias"
#: ../src/yelp-window.c:387
#: ../src/yelp-window.c:386
msgid "_Reload"
msgstr "_Tornar cargar"
#: ../src/yelp-window.c:399
#: ../src/yelp-window.c:398
msgid "_Back"
msgstr "_Tornar"
#: ../src/yelp-window.c:401
#: ../src/yelp-window.c:400
msgid "Show previous page in history"
msgstr "Visualizar la pagina precedenta de l'istoric"
#: ../src/yelp-window.c:404
#: ../src/yelp-window.c:403
msgid "_Forward"
msgstr "_Seguent"
#: ../src/yelp-window.c:406
#: ../src/yelp-window.c:405
msgid "Show next page in history"
msgstr "Visualizar la pagina seguenta de l'istoric"
#: ../src/yelp-window.c:409
#: ../src/yelp-window.c:408
msgid "_Help Topics"
msgstr "Somari de l'_ajuda"
#: ../src/yelp-window.c:411
#: ../src/yelp-window.c:410
msgid "Go to the listing of help topics"
msgstr ""
#: ../src/yelp-window.c:414
#: ../src/yelp-window.c:413
msgid "_Previous Section"
msgstr "Seccion _precedenta"
#: ../src/yelp-window.c:419
#: ../src/yelp-window.c:418
msgid "_Next Section"
msgstr "Seccion _seguenta"
#: ../src/yelp-window.c:424 ../src/yelp-window.c:456
#: ../src/yelp-window.c:423 ../src/yelp-window.c:455
msgid "_Contents"
msgstr "_Somari"
#: ../src/yelp-window.c:430
#: ../src/yelp-window.c:429
msgid "_Add Bookmark"
msgstr "_Apondre un favorit"
#: ../src/yelp-window.c:435
#: ../src/yelp-window.c:434
msgid "_Edit Bookmarks..."
msgstr "_Editar los favorits..."
#: ../src/yelp-window.c:441
#: ../src/yelp-window.c:440
msgid "_Open Link"
msgstr "_Dubrir lo ligam"
#: ../src/yelp-window.c:446
#: ../src/yelp-window.c:445
msgid "Open Link in _New Window"
msgstr "Dobrir lo ligam dins una fenèstra _nòva"
#: ../src/yelp-window.c:451
#: ../src/yelp-window.c:450
msgid "_Copy Link Address"
msgstr "_Copiar l'adreça del ligam"
#: ../src/yelp-window.c:458
#: ../src/yelp-window.c:457
msgid "Help On this application"
msgstr "Ajuda sus l'aplicacion"
#: ../src/yelp-window.c:461
#: ../src/yelp-window.c:460
msgid "_About"
msgstr "_A prepaus"
#: ../src/yelp-window.c:466
#: ../src/yelp-window.c:465
msgid "Copy _Email Address"
msgstr "Copiar l'adreça _electronica"
#: ../src/yelp-window.c:515
#: ../src/yelp-window.c:514
msgid "Help Browser"
msgstr "Navegador d'ajuda"
#: ../src/yelp-window.c:926 ../src/yelp-window.c:1082
#: ../src/yelp-window.c:925 ../src/yelp-window.c:1081
msgid "The Uniform Resource Identifier for the file is invalid."
msgstr "L'URI del fichièr es pas valid."
#: ../src/yelp-window.c:938 ../src/yelp-window.c:1077
#: ../src/yelp-window.c:937 ../src/yelp-window.c:1076
#, c-format
msgid ""
"The Uniform Resource Identifier ‘%s’ is invalid or does not point to an "
"actual file."
msgstr ""
#: ../src/yelp-window.c:1026 ../src/yelp-window.c:1506
#: ../src/yelp-window.c:1025 ../src/yelp-window.c:1505
msgid "Man pages are not supported in this version."
msgstr "Las paginas de manual son pas geridas dins aquesta version."
#: ../src/yelp-window.c:1036 ../src/yelp-window.c:1497
#: ../src/yelp-window.c:1035 ../src/yelp-window.c:1496
msgid "GNU info pages are not supported in this version"
msgstr "Las paginas GNU info son pas geridas dins aquesta version"
#: ../src/yelp-window.c:1052 ../src/yelp-window.c:1519
#: ../src/yelp-window.c:1051 ../src/yelp-window.c:1518
msgid "Search is not supported in this version."
msgstr "La foncion de recèrca es pas gerida dins aquesta version."
#: ../src/yelp-window.c:1057
#: ../src/yelp-window.c:1056
msgid ""
"SGML documents are no longer supported. Please ask the author of the "
"document to convert to XML."
msgstr ""
#: ../src/yelp-window.c:1223
#: ../src/yelp-window.c:1222
msgid "_Search:"
msgstr "_Recèrcar :"
#: ../src/yelp-window.c:1224
#: ../src/yelp-window.c:1223
msgid "Search for other documentation"
msgstr "Recercar d'autras documentacions"
#: ../src/yelp-window.c:1386
#: ../src/yelp-window.c:1385
msgid "Fin_d:"
msgstr "_Recèrcar :"
#: ../src/yelp-window.c:1406
#: ../src/yelp-window.c:1405
msgid "Find _Next"
msgstr "Recèrcar lo seguent"
#: ../src/yelp-window.c:1418
#: ../src/yelp-window.c:1417
msgid "Find _Previous"
msgstr "Recèrcar lo _precedent"
#: ../src/yelp-window.c:1532
#: ../src/yelp-window.c:1531
#, c-format
msgid ""
"A transformation context could not be created for the file ‘%s’. The format "
"may not be supported."
msgstr ""
#: ../src/yelp-window.c:1562 ../src/yelp-window.c:1981
#: ../src/yelp-window.c:2064
#: ../src/yelp-window.c:1561 ../src/yelp-window.c:1980
#: ../src/yelp-window.c:2063
#, c-format
msgid ""
"The section ‘%s’ does not exist in this document. If you were directed to "
......@@ -1051,29 +1047,30 @@ msgid ""
"maintainers of that application."
msgstr ""
#: ../src/yelp-window.c:1677 ../src/yelp-window.c:2468
#: ../src/yelp-window.c:1676 ../src/yelp-window.c:2467
#, c-format
msgid ""
"The file ‘%s’ could not be read. This file might be missing, or you might "
"not have permissions to read it."
msgstr ""
#: ../src/yelp-window.c:1728
#: ../src/yelp-window.c:1727
msgid "Loading..."
msgstr "Cargament..."
#. Note to translators: put here your name (and address) so it
#. * will show up in the "about" box
#: ../src/yelp-window.c:2911
#: ../src/yelp-window.c:2901
msgid "translator-credits"
msgstr ""
"La còla occitana de revirada d'Ubuntu, 2007 - ubuntu-l10n-oci@lists.ubuntu.com"
"La còla occitana de revirada d'Ubuntu, 2007 - ubuntu-l10n-oci@lists.ubuntu."
"com"
#: ../src/yelp-window.c:2914
#: ../src/yelp-window.c:2904
msgid "Yelp"
msgstr "Yelp"
#: ../src/yelp-window.c:2916
#: ../src/yelp-window.c:2906
msgid "A documentation browser and viewer for the Gnome Desktop."
msgstr "Un navegador e legidor de documentacion pel burèu GNOME."
......@@ -1096,4 +1093,3 @@ msgstr ""
#: ../yelp.desktop.in.in.h:1
msgid "Get help with GNOME"
msgstr ""