Merge with trunk

This commit is contained in:
Jacob Mason 2010-07-08 21:36:43 -05:00
commit 42761f6916
12 changed files with 179 additions and 132 deletions

View File

@ -15,9 +15,10 @@ Incompatible changes
- JavaScript - JavaScript
- reStructuredText - reStructuredText
* The old markup for defining and linking to C directives will not work * The old markup for defining and linking to C directives is now
anymore without activating the :mod:`~sphinx.ext.oldcmarkup` deprecated. It will not work anymore in future versions without
extension. activating the :mod:`~sphinx.ext.oldcmarkup` extension; in Sphinx
1.0, it is activated by default.
* Removed support for old dependency versions; requirements are now: * Removed support for old dependency versions; requirements are now:

View File

@ -34,9 +34,9 @@ epub_author = 'Georg Brandl'
epub_publisher = 'http://sphinx.pocoo.org/' epub_publisher = 'http://sphinx.pocoo.org/'
epub_scheme = 'url' epub_scheme = 'url'
epub_identifier = epub_publisher epub_identifier = epub_publisher
epub_pre_files = [('index', 'Welcome')] epub_pre_files = [('index.html', 'Welcome')]
epub_exclude_files = ['_static/opensearch.xml', '_static/doctools.js', epub_exclude_files = ['_static/opensearch.xml', '_static/doctools.js',
'_static/jquery.js', '_static/searchtools.js', '_static/jquery.js', '_static/searchtools.js', '_static/underscore.js',
'_static/basic.css', 'search.html'] '_static/basic.css', 'search.html']
latex_documents = [('contents', 'sphinx.tex', 'Sphinx Documentation', latex_documents = [('contents', 'sphinx.tex', 'Sphinx Documentation',

View File

@ -768,8 +768,8 @@ the `Dublin Core metadata <http://dublincore.org/>`_.
.. confval:: epub_post_files .. confval:: epub_post_files
Additional files that should be inserted after the text generated by Sphinx. Additional files that should be inserted after the text generated by Sphinx.
It is a list of tuples containing the file name and the title. The default It is a list of tuples containing the file name and the title. This option
value is ``[]``. can be used to add an appendix. The default value is ``[]``.
.. confval:: epub_exclude_files .. confval:: epub_exclude_files

View File

@ -134,6 +134,16 @@ some notes:
and Bookworm_. For bookworm you can download the source from and Bookworm_. For bookworm you can download the source from
http://code.google.com/p/threepress/ and run your own local server. http://code.google.com/p/threepress/ and run your own local server.
* Large floating divs are not displayed properly.
If they cover more than one page, the div is only shown on the first page.
In that case you can copy the :file:`epub.css` from the
``sphinx/themes/epub/static/`` directory to your local ``_static/``
directory and remove the float settings.
* Files that are inserted outside of the ``toctree`` directive must be manually
included. This sometimes applies to appendixes, e.g. the glossary or
the indices. You can add them with the :confval:`epub_post_files` option.
.. _Epubcheck: http://code.google.com/p/epubcheck/ .. _Epubcheck: http://code.google.com/p/epubcheck/
.. _Calibre: http://calibre-ebook.com/ .. _Calibre: http://calibre-ebook.com/
.. _FBreader: http://www.fbreader.org/ .. _FBreader: http://www.fbreader.org/

View File

@ -109,7 +109,9 @@ class Sphinx(object):
if self.confdir is None: if self.confdir is None:
self.confdir = self.srcdir self.confdir = self.srcdir
# load all extension modules # backwards compatibility: activate old C markup
self.setup_extension('sphinx.ext.oldcmarkup')
# load all user-given extension modules
for extension in self.config.extensions: for extension in self.config.extensions:
self.setup_extension(extension) self.setup_extension(extension)
# the config file itself can be an extension # the config file itself can be an extension

View File

@ -20,6 +20,7 @@ from docutils.transforms import Transform
from sphinx.builders.html import StandaloneHTMLBuilder from sphinx.builders.html import StandaloneHTMLBuilder
from sphinx.util.osutil import EEXIST from sphinx.util.osutil import EEXIST
from sphinx.util.smartypants import sphinx_smarty_pants as ssp
# (Fragment) templates from which the metainfo files content.opf, toc.ncx, # (Fragment) templates from which the metainfo files content.opf, toc.ncx,
@ -124,7 +125,7 @@ _media_types = {
class VisibleLinksTransform(Transform): class VisibleLinksTransform(Transform):
""" """
Add the link target of referances to the text, unless it is already Add the link target of references to the text, unless it is already
present in the description. present in the description.
""" """
@ -170,7 +171,10 @@ class EpubBuilder(StandaloneHTMLBuilder):
# the output files for epub must be .html only # the output files for epub must be .html only
self.out_suffix = '.html' self.out_suffix = '.html'
self.playorder = 0 self.playorder = 0
self.app.add_transform(VisibleLinksTransform) # Disable transform until the issue with cached doctrees is solved.
# Building the html file after the epub file shows the
# visible links also in the HTML output.
#self.app.add_transform(VisibleLinksTransform)
def get_theme_config(self): def get_theme_config(self):
return self.config.epub_theme, {} return self.config.epub_theme, {}
@ -194,17 +198,20 @@ class EpubBuilder(StandaloneHTMLBuilder):
"""Collect section titles, their depth in the toc and the refuri.""" """Collect section titles, their depth in the toc and the refuri."""
# XXX: is there a better way than checking the attribute # XXX: is there a better way than checking the attribute
# toctree-l[1-8] on the parent node? # toctree-l[1-8] on the parent node?
if isinstance(doctree, nodes.reference): if isinstance(doctree, nodes.reference) and hasattr(doctree, 'refuri'):
refuri = doctree['refuri']
if refuri.startswith('http://') or refuri.startswith('https://') \
or refuri.startswith('irc:') or refuri.startswith('mailto:'):
return result
classes = doctree.parent.attributes['classes'] classes = doctree.parent.attributes['classes']
level = 1 for level in range(8, 0, -1): # or range(1, 8)?
for l in range(8, 0, -1): # or range(1, 8)? if (_toctree_template % level) in classes:
if (_toctree_template % l) in classes: result.append({
level = l 'level': level,
result.append({ 'refuri': self.esc(refuri),
'level': level, 'text': ssp(self.esc(doctree.astext()))
'refuri': self.esc(doctree['refuri']), })
'text': self.esc(doctree.astext()) break
})
else: else:
for elem in doctree.children: for elem in doctree.children:
result = self.get_refnodes(elem, result) result = self.get_refnodes(elem, result)
@ -220,19 +227,20 @@ class EpubBuilder(StandaloneHTMLBuilder):
self.refnodes.insert(0, { self.refnodes.insert(0, {
'level': 1, 'level': 1,
'refuri': self.esc(self.config.master_doc + '.html'), 'refuri': self.esc(self.config.master_doc + '.html'),
'text': self.esc(self.env.titles[self.config.master_doc].astext()) 'text': ssp(self.esc(
self.env.titles[self.config.master_doc].astext()))
}) })
for file, text in reversed(self.config.epub_pre_files): for file, text in reversed(self.config.epub_pre_files):
self.refnodes.insert(0, { self.refnodes.insert(0, {
'level': 1, 'level': 1,
'refuri': self.esc(file + '.html'), 'refuri': self.esc(file),
'text': self.esc(text) 'text': ssp(self.esc(text))
}) })
for file, text in self.config.epub_post_files: for file, text in self.config.epub_post_files:
self.refnodes.append({ self.refnodes.append({
'level': 1, 'level': 1,
'refuri': self.esc(file + '.html'), 'refuri': self.esc(file),
'text': self.esc(text) 'text': ssp(self.esc(text))
}) })

View File

@ -13,6 +13,10 @@ from docutils.parsers.rst import directives
from sphinx.util.compat import Directive from sphinx.util.compat import Directive
_warned_oldcmarkup = False
WARNING_MSG = 'using old C markup; please migrate to new-style markup ' \
'(e.g. c:function instead of cfunction), see ' \
'http://sphinx.pocoo.org/domains.html'
class OldCDirective(Directive): class OldCDirective(Directive):
has_content = True has_content = True
@ -26,6 +30,9 @@ class OldCDirective(Directive):
def run(self): def run(self):
env = self.state.document.settings.env env = self.state.document.settings.env
if not env.app._oldcmarkup_warned:
env.warn(env.docname, WARNING_MSG, self.lineno)
env.app._oldcmarkup_warned = True
newname = 'c:' + self.name[1:] newname = 'c:' + self.name[1:]
newdir = env.lookup_domain_element('directive', newname)[0] newdir = env.lookup_domain_element('directive', newname)[0]
return newdir(newname, self.arguments, self.options, return newdir(newname, self.arguments, self.options,
@ -35,12 +42,16 @@ class OldCDirective(Directive):
def old_crole(typ, rawtext, text, lineno, inliner, options={}, content=[]): def old_crole(typ, rawtext, text, lineno, inliner, options={}, content=[]):
env = inliner.document.settings.env env = inliner.document.settings.env
if not env.app._oldcmarkup_warned:
env.warn(env.docname, WARNING_MSG)
env.app._oldcmarkup_warned = True
newtyp = 'c:' + typ[1:] newtyp = 'c:' + typ[1:]
newrole = env.lookup_domain_element('role', newtyp)[0] newrole = env.lookup_domain_element('role', newtyp)[0]
return newrole(newtyp, rawtext, text, lineno, inliner, options, content) return newrole(newtyp, rawtext, text, lineno, inliner, options, content)
def setup(app): def setup(app):
app._oldcmarkup_warned = False
app.add_directive('cfunction', OldCDirective) app.add_directive('cfunction', OldCDirective)
app.add_directive('cmember', OldCDirective) app.add_directive('cmember', OldCDirective)
app.add_directive('cmacro', OldCDirective) app.add_directive('cmacro', OldCDirective)

View File

@ -1 +1 @@
Documentation.addTranslations({"locale": "pt_BR", "plural_expr": "(n > 1)", "messages": {"Search Results": "Resultados da Pesquisa", "Preparing search...": "Preparando pesquisa...", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Sua pesquisa n\u00e3o encontrou nenhum documento. Por favor assegure-se de que todas as palavras foram digitadas corretamente e de que voc\u00ea tenha selecionado o m\u00ednimo de categorias.", "Search finished, found %s page(s) matching the search query.": "Pesquisa finalizada, foram encontrada(s) %s p\u00e1gina(s) que conferem com o crit\u00e9rio de pesquisa.", ", in ": ", em ", "Expand sidebar": "", "Permalink to this headline": "Link permanente para este t\u00edtulo", "Searching": "Pesquisando", "Collapse sidebar": "", "Permalink to this definition": "Link permanente para esta defini\u00e7\u00e3o", "Hide Search Matches": "Esconder Resultados da Pesquisa"}}); Documentation.addTranslations({"locale": "pt_BR", "plural_expr": "(n > 1)", "messages": {"Search Results": "Resultados da Pesquisa", "Preparing search...": "Preparando pesquisa...", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Sua pesquisa n\u00e3o encontrou nenhum documento. Por favor assegure-se de que todas as palavras foram digitadas corretamente e de que voc\u00ea tenha selecionado o m\u00ednimo de categorias.", "Search finished, found %s page(s) matching the search query.": "Pesquisa finalizada, foram encontrada(s) %s p\u00e1gina(s) que conferem com o crit\u00e9rio de pesquisa.", ", in ": ", em ", "Expand sidebar": "Expandir painel lateral", "Permalink to this headline": "Link permanente para este t\u00edtulo", "Searching": "Pesquisando", "Collapse sidebar": "Recolher painel lateral", "Permalink to this definition": "Link permanente para esta defini\u00e7\u00e3o", "Hide Search Matches": "Esconder Resultados da Pesquisa"}});

View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Sphinx 0.5\n" "Project-Id-Version: Sphinx 0.5\n"
"Report-Msgid-Bugs-To: roger.demetrescu@gmail.com\n" "Report-Msgid-Bugs-To: roger.demetrescu@gmail.com\n"
"POT-Creation-Date: 2008-11-09 19:46+0100\n" "POT-Creation-Date: 2008-11-09 19:46+0100\n"
"PO-Revision-Date: 2010-05-24 23:54+0200\n" "PO-Revision-Date: 2010-06-20 18:34-0300\n"
"Last-Translator: Roger Demetrescu <roger.demetrescu@gmail.com>\n" "Last-Translator: Roger Demetrescu <roger.demetrescu@gmail.com>\n"
"Language-Team: pt_BR <roger.demetrescu@gmail.com>\n" "Language-Team: pt_BR <roger.demetrescu@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n"
@ -17,7 +17,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n" "Generated-By: Babel 0.9.4\n"
#: sphinx/environment.py:106 sphinx/writers/latex.py:184 #: sphinx/environment.py:106
#: sphinx/writers/latex.py:184
#: sphinx/writers/manpage.py:67 #: sphinx/writers/manpage.py:67
#, python-format #, python-format
msgid "%B %d, %Y" msgid "%B %d, %Y"
@ -41,7 +42,8 @@ msgstr "Módulo"
msgid "%b %d, %Y" msgid "%b %d, %Y"
msgstr "%d/%m/%Y" msgstr "%d/%m/%Y"
#: sphinx/builders/html.py:285 sphinx/themes/basic/defindex.html:30 #: sphinx/builders/html.py:285
#: sphinx/themes/basic/defindex.html:30
msgid "General Index" msgid "General Index"
msgstr "Índice Geral" msgstr "Índice Geral"
@ -70,9 +72,8 @@ msgid "Module author: "
msgstr "Autor do módulo: " msgstr "Autor do módulo: "
#: sphinx/directives/other.py:131 #: sphinx/directives/other.py:131
#, fuzzy
msgid "Code author: " msgid "Code author: "
msgstr "Autor do módulo: " msgstr "Autor do código: "
#: sphinx/directives/other.py:133 #: sphinx/directives/other.py:133
msgid "Author: " msgid "Author: "
@ -85,18 +86,21 @@ msgstr "Veja também"
#: sphinx/domains/__init__.py:253 #: sphinx/domains/__init__.py:253
#, python-format #, python-format
msgid "%s %s" msgid "%s %s"
msgstr "" msgstr "%s %s"
#: sphinx/domains/c.py:51 sphinx/domains/python.py:49 #: sphinx/domains/c.py:51
#: sphinx/domains/python.py:49
msgid "Parameters" msgid "Parameters"
msgstr "Parâmetros" msgstr "Parâmetros"
#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:137 #: sphinx/domains/c.py:54
#: sphinx/domains/javascript.py:137
#: sphinx/domains/python.py:59 #: sphinx/domains/python.py:59
msgid "Returns" msgid "Returns"
msgstr "Retorna" msgstr "Retorna"
#: sphinx/domains/c.py:56 sphinx/domains/python.py:61 #: sphinx/domains/c.py:56
#: sphinx/domains/python.py:61
msgid "Return type" msgid "Return type"
msgstr "Tipo de retorno" msgstr "Tipo de retorno"
@ -125,12 +129,15 @@ msgstr "%s (tipo C)"
msgid "%s (C variable)" msgid "%s (C variable)"
msgstr "%s (variável C)" msgstr "%s (variável C)"
#: sphinx/domains/c.py:171 sphinx/domains/cpp.py:1031 #: sphinx/domains/c.py:171
#: sphinx/domains/javascript.py:166 sphinx/domains/python.py:497 #: sphinx/domains/cpp.py:1031
#: sphinx/domains/javascript.py:166
#: sphinx/domains/python.py:497
msgid "function" msgid "function"
msgstr "função" msgstr "função"
#: sphinx/domains/c.py:172 sphinx/domains/cpp.py:1032 #: sphinx/domains/c.py:172
#: sphinx/domains/cpp.py:1032
msgid "member" msgid "member"
msgstr "membro" msgstr "membro"
@ -138,14 +145,14 @@ msgstr "membro"
msgid "macro" msgid "macro"
msgstr "macro" msgstr "macro"
#: sphinx/domains/c.py:174 sphinx/domains/cpp.py:1033 #: sphinx/domains/c.py:174
#: sphinx/domains/cpp.py:1033
msgid "type" msgid "type"
msgstr "tipo" msgstr "tipo"
#: sphinx/domains/c.py:175 #: sphinx/domains/c.py:175
#, fuzzy
msgid "variable" msgid "variable"
msgstr "Variável" msgstr "variável"
#: sphinx/domains/cpp.py:876 #: sphinx/domains/cpp.py:876
#, python-format #, python-format
@ -167,16 +174,19 @@ msgstr "%s (membro C++)"
msgid "%s (C++ function)" msgid "%s (C++ function)"
msgstr "%s (função C++)" msgstr "%s (função C++)"
#: sphinx/domains/cpp.py:1030 sphinx/domains/python.py:499 #: sphinx/domains/cpp.py:1030
#: sphinx/domains/python.py:499
msgid "class" msgid "class"
msgstr "classe" msgstr "classe"
#: sphinx/domains/javascript.py:117 sphinx/domains/python.py:221 #: sphinx/domains/javascript.py:117
#: sphinx/domains/python.py:221
#, python-format #, python-format
msgid "%s() (built-in function)" msgid "%s() (built-in function)"
msgstr "%s() (função interna)" msgstr "%s() (função interna)"
#: sphinx/domains/javascript.py:118 sphinx/domains/python.py:285 #: sphinx/domains/javascript.py:118
#: sphinx/domains/python.py:285
#, python-format #, python-format
msgid "%s() (%s method)" msgid "%s() (%s method)"
msgstr "%s() (método %s)" msgstr "%s() (método %s)"
@ -184,41 +194,44 @@ msgstr "%s() (método %s)"
#: sphinx/domains/javascript.py:120 #: sphinx/domains/javascript.py:120
#, python-format #, python-format
msgid "%s (global variable or constant)" msgid "%s (global variable or constant)"
msgstr "" msgstr "%s (variável global ou constante)"
#: sphinx/domains/javascript.py:122 sphinx/domains/python.py:323 #: sphinx/domains/javascript.py:122
#: sphinx/domains/python.py:323
#, python-format #, python-format
msgid "%s (%s attribute)" msgid "%s (%s attribute)"
msgstr "%s (atributo %s)" msgstr "%s (atributo %s)"
#: sphinx/domains/javascript.py:131 #: sphinx/domains/javascript.py:131
#, fuzzy
msgid "Arguments" msgid "Arguments"
msgstr "Parâmetros" msgstr "Parâmetros"
#: sphinx/domains/javascript.py:134 #: sphinx/domains/javascript.py:134
msgid "Throws" msgid "Throws"
msgstr "" msgstr "Gera"
#: sphinx/domains/javascript.py:167 sphinx/domains/python.py:498 #: sphinx/domains/javascript.py:167
#: sphinx/domains/python.py:498
msgid "data" msgid "data"
msgstr "" msgstr "dado"
#: sphinx/domains/javascript.py:168 sphinx/domains/python.py:504 #: sphinx/domains/javascript.py:168
#: sphinx/domains/python.py:504
msgid "attribute" msgid "attribute"
msgstr "atributo" msgstr "atributo"
#: sphinx/domains/python.py:53 #: sphinx/domains/python.py:53
#, fuzzy
msgid "Variables" msgid "Variables"
msgstr "Variável" msgstr "Variáveis"
#: sphinx/domains/python.py:56 #: sphinx/domains/python.py:56
msgid "Raises" msgid "Raises"
msgstr "Levanta" msgstr "Levanta"
#: sphinx/domains/python.py:222 sphinx/domains/python.py:279 #: sphinx/domains/python.py:222
#: sphinx/domains/python.py:291 sphinx/domains/python.py:304 #: sphinx/domains/python.py:279
#: sphinx/domains/python.py:291
#: sphinx/domains/python.py:304
#, python-format #, python-format
msgid "%s() (in module %s)" msgid "%s() (in module %s)"
msgstr "%s() (no módulo %s)" msgstr "%s() (no módulo %s)"
@ -228,7 +241,8 @@ msgstr "%s() (no módulo %s)"
msgid "%s (built-in variable)" msgid "%s (built-in variable)"
msgstr "%s (variável interna)" msgstr "%s (variável interna)"
#: sphinx/domains/python.py:226 sphinx/domains/python.py:317 #: sphinx/domains/python.py:226
#: sphinx/domains/python.py:317
#, python-format #, python-format
msgid "%s (in module %s)" msgid "%s (in module %s)"
msgstr "%s (no módulo %s)" msgstr "%s (no módulo %s)"
@ -259,14 +273,14 @@ msgid "%s() (%s static method)"
msgstr "%s() (método estático %s)" msgstr "%s() (método estático %s)"
#: sphinx/domains/python.py:308 #: sphinx/domains/python.py:308
#, fuzzy, python-format #, python-format
msgid "%s() (%s.%s class method)" msgid "%s() (%s.%s class method)"
msgstr "%s() (método %s.%s)" msgstr "%s() (método de classe %s.%s)"
#: sphinx/domains/python.py:311 #: sphinx/domains/python.py:311
#, fuzzy, python-format #, python-format
msgid "%s() (%s class method)" msgid "%s() (%s class method)"
msgstr "%s() (método %s)" msgstr "%s() (método de classe %s)"
#: sphinx/domains/python.py:321 #: sphinx/domains/python.py:321
#, python-format #, python-format
@ -283,9 +297,8 @@ msgid "%s (module)"
msgstr "%s (módulo)" msgstr "%s (módulo)"
#: sphinx/domains/python.py:429 #: sphinx/domains/python.py:429
#, fuzzy
msgid "Python Module Index" msgid "Python Module Index"
msgstr "Índice do Módulo" msgstr "Índice de Módulos do Python"
#: sphinx/domains/python.py:430 #: sphinx/domains/python.py:430
msgid "modules" msgid "modules"
@ -295,47 +308,49 @@ msgstr "módulos"
msgid "Deprecated" msgid "Deprecated"
msgstr "Obsoleto" msgstr "Obsoleto"
#: sphinx/domains/python.py:500 sphinx/locale/__init__.py:162 #: sphinx/domains/python.py:500
#: sphinx/locale/__init__.py:162
msgid "exception" msgid "exception"
msgstr "exceção" msgstr "exceção"
#: sphinx/domains/python.py:501 #: sphinx/domains/python.py:501
msgid "method" msgid "method"
msgstr "" msgstr "método"
#: sphinx/domains/python.py:502 #: sphinx/domains/python.py:502
#, fuzzy, python-format #, python-format
msgid "class method" msgid "class method"
msgstr "%s() (método %s)" msgstr "método de classe"
#: sphinx/domains/python.py:503 #: sphinx/domains/python.py:503
msgid "static method" msgid "static method"
msgstr "método estático" msgstr "método estático"
#: sphinx/domains/python.py:505 sphinx/locale/__init__.py:158 #: sphinx/domains/python.py:505
#: sphinx/locale/__init__.py:158
msgid "module" msgid "module"
msgstr "módulo" msgstr "módulo"
#: sphinx/domains/rst.py:53 #: sphinx/domains/rst.py:53
#, python-format #, python-format
msgid "%s (directive)" msgid "%s (directive)"
msgstr "" msgstr "%s (diretiva)"
#: sphinx/domains/rst.py:55 #: sphinx/domains/rst.py:55
#, fuzzy, python-format #, python-format
msgid "%s (role)" msgid "%s (role)"
msgstr "%s (módulo)" msgstr "%s (papel)"
#: sphinx/domains/rst.py:103 #: sphinx/domains/rst.py:103
msgid "directive" msgid "directive"
msgstr "" msgstr "diretiva"
#: sphinx/domains/rst.py:104 #: sphinx/domains/rst.py:104
#, fuzzy
msgid "role" msgid "role"
msgstr "módulo" msgstr "papel"
#: sphinx/domains/std.py:68 sphinx/domains/std.py:84 #: sphinx/domains/std.py:68
#: sphinx/domains/std.py:84
#, python-format #, python-format
msgid "environment variable; %s" msgid "environment variable; %s"
msgstr "váriavel de ambiente; %s" msgstr "váriavel de ambiente; %s"
@ -347,15 +362,15 @@ msgstr "%sopção de linha de comando; %s"
#: sphinx/domains/std.py:328 #: sphinx/domains/std.py:328
msgid "glossary term" msgid "glossary term"
msgstr "" msgstr "Termo de glossário"
#: sphinx/domains/std.py:329 #: sphinx/domains/std.py:329
msgid "grammar token" msgid "grammar token"
msgstr "" msgstr "token de gramática"
#: sphinx/domains/std.py:330 #: sphinx/domains/std.py:330
msgid "reference label" msgid "reference label"
msgstr "" msgstr "rótulo de referência"
#: sphinx/domains/std.py:331 #: sphinx/domains/std.py:331
msgid "environment variable" msgid "environment variable"
@ -363,13 +378,16 @@ msgstr "váriavel de ambiente"
#: sphinx/domains/std.py:332 #: sphinx/domains/std.py:332
msgid "program option" msgid "program option"
msgstr "" msgstr "opção de programa"
#: sphinx/domains/std.py:360 sphinx/themes/basic/genindex-single.html:11 #: sphinx/domains/std.py:360
#: sphinx/themes/basic/genindex-single.html:11
#: sphinx/themes/basic/genindex-split.html:11 #: sphinx/themes/basic/genindex-split.html:11
#: sphinx/themes/basic/genindex-split.html:14 #: sphinx/themes/basic/genindex-split.html:14
#: sphinx/themes/basic/genindex.html:11 sphinx/themes/basic/genindex.html:14 #: sphinx/themes/basic/genindex.html:11
#: sphinx/themes/basic/genindex.html:50 sphinx/themes/basic/layout.html:125 #: sphinx/themes/basic/genindex.html:14
#: sphinx/themes/basic/genindex.html:50
#: sphinx/themes/basic/layout.html:125
#: sphinx/writers/latex.py:173 #: sphinx/writers/latex.py:173
msgid "Index" msgid "Index"
msgstr "Índice" msgstr "Índice"
@ -378,19 +396,20 @@ msgstr "Índice"
msgid "Module Index" msgid "Module Index"
msgstr "Índice do Módulo" msgstr "Índice do Módulo"
#: sphinx/domains/std.py:362 sphinx/themes/basic/defindex.html:25 #: sphinx/domains/std.py:362
#: sphinx/themes/basic/defindex.html:25
msgid "Search Page" msgid "Search Page"
msgstr "Página de Pesquisa" msgstr "Página de Pesquisa"
#: sphinx/ext/autodoc.py:917 #: sphinx/ext/autodoc.py:917
#, python-format #, python-format
msgid " Bases: %s" msgid " Bases: %s"
msgstr "" msgstr " Bases: %s"
#: sphinx/ext/autodoc.py:950 #: sphinx/ext/autodoc.py:950
#, python-format #, python-format
msgid "alias of :class:`%s`" msgid "alias of :class:`%s`"
msgstr "" msgstr "apelido de :class:`%s`"
#: sphinx/ext/todo.py:41 #: sphinx/ext/todo.py:41
msgid "Todo" msgid "Todo"
@ -407,29 +426,28 @@ msgstr "entrada original"
#: sphinx/ext/viewcode.py:66 #: sphinx/ext/viewcode.py:66
msgid "[source]" msgid "[source]"
msgstr "" msgstr "[código fonte]"
#: sphinx/ext/viewcode.py:109 #: sphinx/ext/viewcode.py:109
msgid "[docs]" msgid "[docs]"
msgstr "" msgstr "[documentos]"
#: sphinx/ext/viewcode.py:123 #: sphinx/ext/viewcode.py:123
#, fuzzy
msgid "Module code" msgid "Module code"
msgstr "módulo" msgstr "Código do módulo"
#: sphinx/ext/viewcode.py:129 #: sphinx/ext/viewcode.py:129
#, python-format #, python-format
msgid "<h1>Source code for %s</h1>" msgid "<h1>Source code for %s</h1>"
msgstr "" msgstr "<h1>Código fonte de %s</h1>"
#: sphinx/ext/viewcode.py:156 #: sphinx/ext/viewcode.py:156
msgid "Overview: module code" msgid "Overview: module code"
msgstr "" msgstr "Visão geral: código do módulo"
#: sphinx/ext/viewcode.py:157 #: sphinx/ext/viewcode.py:157
msgid "<h1>All modules for which code is available</h1>" msgid "<h1>All modules for which code is available</h1>"
msgstr "" msgstr "<h1>Todos os módulos onde este código está disponível</h1>"
#: sphinx/locale/__init__.py:139 #: sphinx/locale/__init__.py:139
msgid "Attention" msgid "Attention"
@ -506,26 +524,31 @@ msgstr "comando"
msgid "built-in function" msgid "built-in function"
msgstr "função interna" msgstr "função interna"
#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10 #: sphinx/themes/agogo/layout.html:45
#: sphinx/themes/basic/globaltoc.html:10
#: sphinx/themes/basic/localtoc.html:11 #: sphinx/themes/basic/localtoc.html:11
msgid "Table Of Contents" msgid "Table Of Contents"
msgstr "Tabela de Conteúdo" msgstr "Tabela de Conteúdo"
#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:128 #: sphinx/themes/agogo/layout.html:49
#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:14 #: sphinx/themes/basic/layout.html:128
#: sphinx/themes/basic/search.html:11
#: sphinx/themes/basic/search.html:14
msgid "Search" msgid "Search"
msgstr "Pesquisar" msgstr "Pesquisar"
#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15 #: sphinx/themes/agogo/layout.html:52
#: sphinx/themes/basic/searchbox.html:15
msgid "Go" msgid "Go"
msgstr "Ir" msgstr "Ir"
#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20 #: sphinx/themes/agogo/layout.html:57
#, fuzzy #: sphinx/themes/basic/searchbox.html:20
msgid "Enter search terms or a module, class or function name." msgid "Enter search terms or a module, class or function name."
msgstr "Informe o nome de um módulo, classe ou função." msgstr "Digite os termos da busca ou o nome de um módulo, classe ou função."
#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14 #: sphinx/themes/agogo/layout.html:78
#: sphinx/themes/basic/sourcelink.html:14
msgid "Show Source" msgid "Show Source"
msgstr "Exibir Fonte" msgstr "Exibir Fonte"
@ -615,12 +638,8 @@ msgstr "Última atualização em %(last_updated)s."
#: sphinx/themes/basic/layout.html:189 #: sphinx/themes/basic/layout.html:189
#, python-format #, python-format
msgid "" msgid "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " msgstr "Criado com <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
"%(sphinx_version)s."
msgstr ""
"Criado com <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
"%(sphinx_version)s."
#: sphinx/themes/basic/opensearch.xml:4 #: sphinx/themes/basic/opensearch.xml:4
#, python-format #, python-format
@ -647,10 +666,9 @@ msgstr "próximo capítulo"
msgid "" msgid ""
"Please activate JavaScript to enable the search\n" "Please activate JavaScript to enable the search\n"
" functionality." " functionality."
msgstr "" msgstr "Por favor ative o JavaScript para habilitar a funcionalidade de pesquisa."
#: sphinx/themes/basic/search.html:23 #: sphinx/themes/basic/search.html:23
#, fuzzy
msgid "" msgid ""
"From here you can search these documents. Enter your search\n" "From here you can search these documents. Enter your search\n"
" words into the box below and click \"search\". Note that the search\n" " words into the box below and click \"search\". Note that the search\n"
@ -658,11 +676,9 @@ msgid ""
" containing fewer words won't appear in the result list." " containing fewer words won't appear in the result list."
msgstr "" msgstr ""
"A partir daqui você pode pesquisar estes documentos. Preencha suas \n" "A partir daqui você pode pesquisar estes documentos. Preencha suas \n"
" palavras de pesquisa na caixa abaixo e clique em \"pesquisar\". " " palavras de pesquisa na caixa abaixo e clique em \"pesquisar\". Observe que a função de pesquisa\n"
"Observe que a função de pesquisa\n"
" irá pesquisar automaticamente por todas as palavras.\n" " irá pesquisar automaticamente por todas as palavras.\n"
" Páginas contendo menos palavras não irão aparecer na lista de " " Páginas contendo menos palavras não irão aparecer na lista de resultado."
"resultado."
#: sphinx/themes/basic/search.html:30 #: sphinx/themes/basic/search.html:30
msgid "search" msgid "search"
@ -713,12 +729,14 @@ msgstr "Alterações na API C"
msgid "Other changes" msgid "Other changes"
msgstr "Outras alterações" msgstr "Outras alterações"
#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:482 #: sphinx/themes/basic/static/doctools.js:154
#: sphinx/writers/html.py:482
#: sphinx/writers/html.py:487 #: sphinx/writers/html.py:487
msgid "Permalink to this headline" msgid "Permalink to this headline"
msgstr "Link permanente para este título" msgstr "Link permanente para este título"
#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:87 #: sphinx/themes/basic/static/doctools.js:160
#: sphinx/writers/html.py:87
msgid "Permalink to this definition" msgid "Permalink to this definition"
msgstr "Link permanente para esta definição" msgstr "Link permanente para esta definição"
@ -739,51 +757,45 @@ msgid ", in "
msgstr ", em " msgstr ", em "
#: sphinx/themes/basic/static/searchtools.js:491 #: sphinx/themes/basic/static/searchtools.js:491
msgid "" msgid "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories."
"Your search did not match any documents. Please make sure that all words " msgstr "Sua pesquisa não encontrou nenhum documento. Por favor assegure-se de que todas as palavras foram digitadas corretamente e de que você tenha selecionado o mínimo de categorias."
"are spelled correctly and that you've selected enough categories."
msgstr ""
"Sua pesquisa não encontrou nenhum documento. Por favor assegure-se de que"
" todas as palavras foram digitadas corretamente e de que você tenha "
"selecionado o mínimo de categorias."
#: sphinx/themes/basic/static/searchtools.js:493 #: sphinx/themes/basic/static/searchtools.js:493
#, python-format #, python-format
msgid "Search finished, found %s page(s) matching the search query." msgid "Search finished, found %s page(s) matching the search query."
msgstr "" msgstr "Pesquisa finalizada, foram encontrada(s) %s página(s) que conferem com o critério de pesquisa."
"Pesquisa finalizada, foram encontrada(s) %s página(s) que conferem com o "
"critério de pesquisa."
#: sphinx/themes/default/static/sidebar.js:66 #: sphinx/themes/default/static/sidebar.js:66
msgid "Expand sidebar" msgid "Expand sidebar"
msgstr "" msgstr "Expandir painel lateral"
#: sphinx/themes/default/static/sidebar.js:79 #: sphinx/themes/default/static/sidebar.js:79
#: sphinx/themes/default/static/sidebar.js:106 #: sphinx/themes/default/static/sidebar.js:106
msgid "Collapse sidebar" msgid "Collapse sidebar"
msgstr "" msgstr "Recolher painel lateral"
#: sphinx/themes/haiku/layout.html:26 #: sphinx/themes/haiku/layout.html:26
msgid "Contents" msgid "Contents"
msgstr "" msgstr "Conteúdo"
#: sphinx/writers/latex.py:171 #: sphinx/writers/latex.py:171
msgid "Release" msgid "Release"
msgstr "Versão" msgstr "Versão"
#: sphinx/writers/latex.py:572 sphinx/writers/manpage.py:178 #: sphinx/writers/latex.py:572
#: sphinx/writers/manpage.py:178
msgid "Footnotes" msgid "Footnotes"
msgstr "" msgstr "Notas de rodapé"
#: sphinx/writers/latex.py:641 #: sphinx/writers/latex.py:641
msgid "continued from previous page" msgid "continued from previous page"
msgstr "" msgstr "continuação da página anterior"
#: sphinx/writers/latex.py:646 #: sphinx/writers/latex.py:646
#, fuzzy
msgid "Continued on next page" msgid "Continued on next page"
msgstr "Índice completo em uma página" msgstr "Continua na próxima página"
#: sphinx/writers/text.py:422 #: sphinx/writers/text.py:422
msgid "[image]" msgid "[image]"
msgstr "[imagem]" msgstr "[imagem]"

View File

@ -14,7 +14,7 @@
{%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %} {%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %} {%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and {%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and
(not sidebars == []) %} (sidebars != []) %}
{%- set url_root = pathto('', 1) %} {%- set url_root = pathto('', 1) %}
{%- if url_root == '#' %}{% set url_root = '' %}{% endif %} {%- if url_root == '#' %}{% set url_root = '' %}{% endif %}

View File

@ -39,6 +39,9 @@ http://www.python.org/logo.png
reading included file u'wrongenc.inc' seems to be wrong, try giving an \ reading included file u'wrongenc.inc' seems to be wrong, try giving an \
:encoding: option :encoding: option
%(root)s/includes.txt:4: WARNING: download file not readable: nonexisting.png %(root)s/includes.txt:4: WARNING: download file not readable: nonexisting.png
%(root)s/objects.txt:79: WARNING: using old C markup; please migrate to \
new-style markup \(e.g. c:function instead of cfunction\), see \
http://sphinx.pocoo.org/domains.html
""" """
HTML_WARNINGS = ENV_WARNINGS + """\ HTML_WARNINGS = ENV_WARNINGS + """\