diff --git a/AUTHORS b/AUTHORS index 6750dad90..c13d267e2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,6 +12,7 @@ Other contributors, listed alphabetically, are: * Dave Kuhlman -- original LaTeX writer * Thomas Lamb -- linkcheck builder * Benjamin Peterson -- unittests +* Stefan Seefeld -- toctree improvements * Antonio Valentino -- qthelp builder * Pauli Virtanen -- autodoc improvements * Sebastian Wiesner -- image handling, distutils support diff --git a/CHANGES b/CHANGES index 4171e45b7..56c24a24a 100644 --- a/CHANGES +++ b/CHANGES @@ -49,6 +49,9 @@ New features added - #23: Added a ``classmethod`` directive along with ``method`` and ``staticmethod``. + - Added a toctree variable to the templates, and the ability to + include external links in toctrees. + * Configuration: - The new ``html_add_permalinks`` config value can be used to @@ -84,6 +87,9 @@ New features added - There is now a ``Sphinx.add_lexer()`` method to be able to use custom Pygments lexers easily. + - There is now ``Sphinx.add_generic_rol()`` to mirror the docutils' + own function. + * Other changes: - Config overrides for single dict keys can now be given on the @@ -100,6 +106,11 @@ New features added Release 0.5.2 (in development) ============================== +* Open literalinclude files in universal newline mode to allow + arbitrary newline conventions. + +* Actually make the ``-Q`` option work. + * #86: Fix explicit document titles in toctrees. * #81: Write environment and search index in a manner that is safe diff --git a/EXAMPLES b/EXAMPLES index e81947a33..1f71ea935 100644 --- a/EXAMPLES +++ b/EXAMPLES @@ -36,14 +36,18 @@ included, please mail to `the Google group * Pylons: http://docs.pylonshq.com/ * Pysparse: http://pysparse.sourceforge.net/ * Python: http://docs.python.org/dev/ +* python-apt: http://people.debian.org/~jak/python-apt-doc/ * Reteisi: http://docs.argolinux.org/reteisi/ * Satchmo: http://www.satchmoproject.com/docs/svn/ +* Self: http://selflanguage.org/ * Sphinx: http://sphinx.pocoo.org/ * SQLAlchemy: http://www.sqlalchemy.org/docs/ * Sqlkit: http://sqlkit.argolinux.org/ * SymPy: http://docs.sympy.org/ * tinyTiM: http://tinytim.sourceforge.net/docs/2.0/ * TurboGears: http://turbogears.org/2.0/docs/ +* VOR: http://www.vor-cycling.be/ * WFront: http://discorporate.us/projects/WFront/ +* WTForms: http://wtforms.simplecodes.com/docs/ * Zope 3: e.g. http://docs.carduner.net/z3c-tutorial/ * zc.async: http://packages.python.org/zc.async/1.5.0/ diff --git a/doc/concepts.rst b/doc/concepts.rst index afb9503bb..f2dcbd70a 100644 --- a/doc/concepts.rst +++ b/doc/concepts.rst @@ -71,6 +71,9 @@ tables of contents. The ``toctree`` directive is the central element. The second line above will link to the ``strings`` document, but will use the title "All about strings" instead of the title of the ``strings`` document. + You can also add external links, by giving an HTTP URL instead of a document + name. + You can use "globbing" in toctree directives, by giving the ``glob`` flag option. All entries are then matched against the list of available documents, and matches are inserted into the list alphabetically. Example:: @@ -113,7 +116,7 @@ tables of contents. The ``toctree`` directive is the central element. Added "globbing" option. .. versionchanged:: 0.6 - Added "hidden" option. + Added "hidden" option and external links. Special names diff --git a/doc/ext/appapi.rst b/doc/ext/appapi.rst index 84978da3a..218c561be 100644 --- a/doc/ext/appapi.rst +++ b/doc/ext/appapi.rst @@ -86,6 +86,13 @@ the following public API: source, *role* the role function (see the `Docutils documentation `_ on details). +.. method:: Sphinx.add_generic_role(name, nodeclass) + + Register a Docutils role that does nothing but wrap its contents in the + node given by *nodeclass*. + + .. versionadded:: 0.6 + .. method:: Sphinx.add_description_unit(directivename, rolename, indextemplate='', parse_node=None, ref_nodeclass=None) This method is a very convenient way to add a new type of information that diff --git a/doc/templating.rst b/doc/templating.rst index ff4bdd514..20c61ce09 100644 --- a/doc/templating.rst +++ b/doc/templating.rst @@ -221,8 +221,12 @@ in the future. .. data:: builder - The name of the builder (for builtin builders, ``html``, ``htmlhelp``, or - ``web``). + The name of the builder (e.g. ``html`` or ``htmlhelp``). + +.. data:: embedded + + True if the built HTML is supposed to be embedded in some application that + handles navigation, e.g. HTML Help or Qt Help. .. data:: next @@ -239,3 +243,18 @@ in the future. .. data:: prev Like :data:`next`, but for the previous page. + + +In documents that are created from source files (as opposed to +automatically-generated files like the module index, or documents that already +are in HTML form), these variables are also available: + +.. data:: toc + + The local table of contents for the current page, rendered as HTML bullet + lists. + +.. data:: toctree + + The global TOC tree containing the current page, rendered as HTML bullet + lists. diff --git a/sphinx/application.py b/sphinx/application.py index 761188049..20bc169fe 100644 --- a/sphinx/application.py +++ b/sphinx/application.py @@ -287,6 +287,9 @@ class Sphinx(object): def add_role(self, name, role): roles.register_canonical_role(name, role) + def add_generic_role(self, name, nodeclass): + roles.register_generic_role(name, nodeclass) + def add_description_unit(self, directivename, rolename, indextemplate='', parse_node=None, ref_nodeclass=None): additional_xref_types[directivename] = (rolename, indextemplate, diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py index 97ff50966..d47163d4f 100644 --- a/sphinx/builders/html.py +++ b/sphinx/builders/html.py @@ -230,8 +230,10 @@ class StandaloneHTMLBuilder(Builder): # metadata for the document meta = self.env.metadata.get(docname) - # TOC + # local TOC and global TOC tree toc = self.render_partial(self.env.get_toc_for(docname))['fragment'] + toctree = self.render_partial( + self.env.get_toctree_for(docname, self))['fragment'] return dict( parents = parents, @@ -244,6 +246,7 @@ class StandaloneHTMLBuilder(Builder): rellinks = rellinks, sourcename = sourcename, toc = toc, + toctree = toctree, # only display a TOC if there's more than one item to show display_toc = (self.env.toc_num_entries[docname] > 1), ) diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py index 5b57a7c39..4642b7953 100644 --- a/sphinx/cmdline.py +++ b/sphinx/cmdline.py @@ -57,7 +57,7 @@ def main(argv): nocolor() try: - opts, args = getopt.getopt(argv[1:], 'ab:d:c:CD:A:NEqP') + opts, args = getopt.getopt(argv[1:], 'ab:d:c:CD:A:NEqQP') allopts = set(opt[0] for opt in opts) srcdir = confdir = path.abspath(args[0]) if not path.isdir(srcdir): diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py index da68cf2e2..3162d5575 100644 --- a/sphinx/directives/code.py +++ b/sphinx/directives/code.py @@ -78,7 +78,7 @@ def literalinclude_directive(name, arguments, options, content, lineno, encoding = options.get('encoding', env.config.source_encoding) try: - f = codecs.open(fn, 'r', encoding) + f = codecs.open(fn, 'rU', encoding) lines = f.readlines() f.close() except (IOError, OSError): diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py index 18e18fd92..0ac238825 100644 --- a/sphinx/directives/other.py +++ b/sphinx/directives/other.py @@ -27,6 +27,9 @@ def toctree_directive(name, arguments, options, content, lineno, glob = 'glob' in options ret = [] + # (title, ref) pairs, where ref may be a document, or an external link, + # and title may be None if the document's title is to be used + entries = [] includefiles = [] includetitles = {} all_docnames = env.found_docs.copy() @@ -39,34 +42,40 @@ def toctree_directive(name, arguments, options, content, lineno, # look for explicit titles and documents ("Some Title "). m = caption_ref_re.match(entry) if m: - docname = m.group(2) - includetitles[docname] = m.group(1) + ref = m.group(2) + title = m.group(1) + docname = ref else: - docname = entry + ref = docname = entry + title = None # remove suffixes (backwards compatibility) if docname.endswith(suffix): docname = docname[:-len(suffix)] # absolutize filenames docname = docname_join(env.docname, docname) - if docname not in env.found_docs: + if ref.startswith('http://'): # FIXME: generalize to arbitrary xrefs + entries.append((title, ref)) + elif docname not in env.found_docs: ret.append(state.document.reporter.warning( 'toctree references unknown document %r' % docname, line=lineno)) else: + entries.append((title, ref)) includefiles.append(docname) else: patname = docname_join(env.docname, entry) docnames = sorted(patfilter(all_docnames, patname)) for docname in docnames: all_docnames.remove(docname) # don't include it again + entries.append((None, docname)) includefiles.append(docname) if not docnames: ret.append(state.document.reporter.warning( 'toctree glob pattern %r didn\'t match any documents' % entry, line=lineno)) subnode = addnodes.toctree() + subnode['entries'] = entries subnode['includefiles'] = includefiles - subnode['includetitles'] = includetitles subnode['maxdepth'] = options.get('maxdepth', -1) subnode['glob'] = glob subnode['hidden'] = 'hidden' in options diff --git a/sphinx/environment.py b/sphinx/environment.py index 08431c283..def7728e1 100644 --- a/sphinx/environment.py +++ b/sphinx/environment.py @@ -841,6 +841,17 @@ class BuildEnvironment: node['refuri'] = node['anchorname'] return toc + def get_toctree_for(self, docname, builder): + """Return the global TOC nodetree.""" + + # XXX why master_doc? + doctree = self.get_doctree(self.config.master_doc) + for toctreenode in doctree.traverse(addnodes.toctree): + result = self.resolve_toctree(docname, builder, toctreenode, + prune=True) + if result is not None: + return result + # ------- # these are called from docutils directives and therefore use self.docname # @@ -927,37 +938,47 @@ class BuildEnvironment: if toctree.get('hidden', False): return None - def _walk_depth(node, depth, maxdepth, titleoverrides): + def _walk_depth(node, depth, maxdepth): """Utility: Cut a TOC at a specified depth.""" for subnode in node.children[:]: if isinstance(subnode, (addnodes.compact_paragraph, nodes.list_item)): subnode['classes'].append('toctree-l%d' % (depth-1)) - _walk_depth(subnode, depth, maxdepth, titleoverrides) + _walk_depth(subnode, depth, maxdepth) elif isinstance(subnode, nodes.bullet_list): if maxdepth > 0 and depth > maxdepth: subnode.parent.replace(subnode, []) else: - _walk_depth(subnode, depth+1, maxdepth, titleoverrides) + _walk_depth(subnode, depth+1, maxdepth) def _entries_from_toctree(toctreenode, separate=False, subtree=False): """Return TOC entries for a toctree node.""" - includefiles = map(str, toctreenode['includefiles']) - + refs = [(e[0], str(e[1])) for e in toctreenode['entries']] entries = [] - for includefile in includefiles: + for (title, ref) in refs: try: - toc = self.tocs[includefile].deepcopy() + if ref.startswith('http://'): # FIXME: (see directives/other.py) + reference = nodes.reference('', '', refuri=ref, anchorname='', + *[nodes.Text(title)]) + para = addnodes.compact_paragraph('', '', reference) + item = nodes.list_item('', para) + toc = nodes.bullet_list('', item) + else: + toc = self.tocs[ref].deepcopy() + if title and toc.children and len(toc.children) == 1: + for refnode in toc.children[0].traverse(nodes.reference): + if refnode['refuri'] == ref and not refnode['anchorname']: + refnode.children = [nodes.Text(title)] if not toc.children: # empty toc means: no titles will show up in the toctree self.warn(docname, 'toctree contains reference to document ' '%r that doesn\'t have a title: no link ' - 'will be generated' % includefile) + 'will be generated' % ref) except KeyError: # this is raised if the included file does not exist self.warn(docname, 'toctree contains reference to ' - 'nonexisting document %r' % includefile) + 'nonexisting document %r' % ref) else: # if titles_only is given, only keep the main title and # sub-toctrees @@ -988,7 +1009,6 @@ class BuildEnvironment: return entries maxdepth = maxdepth or toctree.get('maxdepth', -1) - titleoverrides = toctree.get('includetitles', {}) # NOTE: previously, this was separate=True, but that leads to artificial # separation when two or more toctree entries form a logical unit, so @@ -1000,16 +1020,12 @@ class BuildEnvironment: newnode = addnodes.compact_paragraph('', '', *tocentries) newnode['toctree'] = True # prune the tree to maxdepth and replace titles, also set level classes - _walk_depth(newnode, 1, prune and maxdepth or 0, titleoverrides) - # replace titles, if needed, and set the target paths in the - # toctrees (they are not known at TOC generation time) + _walk_depth(newnode, 1, prune and maxdepth or 0) + # set the target paths in the toctrees (they are not known at TOC generation time) for refnode in newnode.traverse(nodes.reference): - if titleoverrides and not refnode['anchorname'] \ - and refnode['refuri'] in titleoverrides: - newtitle = titleoverrides[refnode['refuri']] - refnode.children = [nodes.Text(newtitle)] - refnode['refuri'] = builder.get_relative_uri( - docname, refnode['refuri']) + refnode['anchorname'] + if not refnode['refuri'].startswith('http://'): # FIXME: see above + refnode['refuri'] = builder.get_relative_uri( + docname, refnode['refuri']) + refnode['anchorname'] return newnode descroles = frozenset(('data', 'exc', 'func', 'class', 'const', diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index c005e36a9..87d876cd8 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -458,7 +458,10 @@ class RstGenerator(object): # add content from attribute documentation if analyzer: - sourcename = '%s:docstring of %s' % (analyzer.srcname, fullname) + # prevent encoding errors when the file name is non-ASCII + srcname = unicode(analyzer.srcname, + sys.getfilesystemencoding(), 'replace') + sourcename = u'%s:docstring of %s' % (srcname, fullname) attr_docs = analyzer.find_attr_docs() if what in ('data', 'attribute'): key = ('.'.join(objpath[:-1]), objpath[-1]) @@ -469,7 +472,7 @@ class RstGenerator(object): fullname, todoc)): self.result.append(indent + line, sourcename, i) else: - sourcename = 'docstring of %s' % fullname + sourcename = u'docstring of %s' % fullname attr_docs = {} # add content from docstrings diff --git a/sphinx/locale/cs/LC_MESSAGES/sphinx.po b/sphinx/locale/cs/LC_MESSAGES/sphinx.po index 0d11dded3..7d7273993 100644 --- a/sphinx/locale/cs/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/cs/LC_MESSAGES/sphinx.po @@ -8,107 +8,38 @@ msgstr "" "Project-Id-Version: Sphinx 0.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2008-11-27 18:39+0100\n" -"PO-Revision-Date: 2008-12-25 05:59+0100\n" +"PO-Revision-Date: 2009-01-24 18:39+0000\n" "Last-Translator: Pavel Kosina \n" "Language-Team: Pavel Kosina \n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -"Generated-By: Babel 0.9.4\n" -"X-Poedit-Language: Czech\n" -"X-Poedit-Country: CZECH REPUBLIC\n" +"Generated-By: Babel 0.9.3\n" -#: sphinx/builder.py:408 -#, python-format -msgid "%b %d, %Y" -msgstr "%d.%m.%Y" - -#: sphinx/builder.py:427 -#: sphinx/templates/defindex.html:21 -msgid "General Index" -msgstr "Rejstřík indexů" - -#: sphinx/builder.py:427 -msgid "index" -msgstr "index" - -#: sphinx/builder.py:429 -#: sphinx/htmlhelp.py:156 -#: sphinx/templates/defindex.html:19 -#: sphinx/templates/modindex.html:2 -#: sphinx/templates/modindex.html:13 -msgid "Global Module Index" -msgstr "Celkový rejstřík modulů" - -#: sphinx/builder.py:429 -msgid "modules" -msgstr "moduly" - -#: sphinx/builder.py:466 -msgid "next" -msgstr "další" - -#: sphinx/builder.py:473 -msgid "previous" -msgstr "předchozí" - -#: sphinx/builder.py:1054 -msgid " (in " -msgstr "(v" - -#: sphinx/builder.py:1129 -msgid "Builtins" -msgstr "Vestavěné funkce " - -#: sphinx/builder.py:1131 -msgid "Module level" -msgstr "Úroveň modulů" - -#: sphinx/environment.py:102 -#: sphinx/latexwriter.py:169 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, python-format msgid "%B %d, %Y" msgstr "%d.%m.%Y" -#: sphinx/environment.py:291 -#: sphinx/latexwriter.py:175 -#: sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 -#: sphinx/templates/genindex-split.html:5 -#: sphinx/templates/genindex.html:2 -#: sphinx/templates/genindex.html:5 -#: sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:130 +#: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 +#: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "Index" -#: sphinx/environment.py:292 -#: sphinx/latexwriter.py:174 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "Rejstřík modulů " -#: sphinx/environment.py:293 -#: sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "Vyhledávací stránka" -#: sphinx/htmlwriter.py:79 -#: sphinx/static/doctools.js:145 -msgid "Permalink to this definition" -msgstr "Trvalý odkaz na tuto definici" - -#: sphinx/htmlwriter.py:399 -#: sphinx/static/doctools.js:139 -msgid "Permalink to this headline" -msgstr "Trvalý odkaz na tento nadpis" - -#: sphinx/latexwriter.py:172 -msgid "Release" -msgstr "Vydání" - -#: sphinx/roles.py:53 -#: sphinx/directives/desc.py:537 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "promměná prostředí, %s" @@ -118,22 +49,55 @@ msgstr "promměná prostředí, %s" msgid "Python Enhancement Proposals!PEP %s" msgstr "Python Enhancement Proposals!PEP %s" -#: sphinx/textwriter.py:166 -#, python-format -msgid "Platform: %s" -msgstr "Platforma: %s" +#: sphinx/builders/changes.py:64 +msgid "Builtins" +msgstr "Vestavěné funkce " -#: sphinx/textwriter.py:422 -msgid "[image]" -msgstr "[obrázek]" +#: sphinx/builders/changes.py:66 +msgid "Module level" +msgstr "Úroveň modulů" + +#: sphinx/builders/html.py:118 +#, python-format +msgid "%b %d, %Y" +msgstr "%d.%m.%Y" + +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 +msgid "General Index" +msgstr "Rejstřík indexů" + +#: sphinx/builders/html.py:137 +msgid "index" +msgstr "index" + +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 +#: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 +msgid "Global Module Index" +msgstr "Celkový rejstřík modulů" + +#: sphinx/builders/html.py:139 +msgid "modules" +msgstr "moduly" + +#: sphinx/builders/html.py:179 +msgid "next" +msgstr "další" + +#: sphinx/builders/html.py:186 +msgid "previous" +msgstr "předchozí" + +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 +msgid " (in " +msgstr "(v" #: sphinx/directives/desc.py:25 #, python-format msgid "%s() (built-in function)" msgstr "%s() (vestavěná funkce)" -#: sphinx/directives/desc.py:26 -#: sphinx/directives/desc.py:42 +#: sphinx/directives/desc.py:26 sphinx/directives/desc.py:42 #: sphinx/directives/desc.py:54 #, python-format msgid "%s() (in module %s)" @@ -144,8 +108,7 @@ msgstr "%s() (v modulu %s)" msgid "%s (built-in variable)" msgstr "%s() (vestavěná proměnná)" -#: sphinx/directives/desc.py:30 -#: sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "%s() (v modulu %s)" @@ -180,62 +143,67 @@ msgstr "%s() (statická metoda %s.%s)" msgid "%s() (%s static method)" msgstr "%s() (statická metoda %s)" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s() (atribut %s.%s)" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "%s() (atribut %s)" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "%s (C funkce)" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "%s (člen C)" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "%s (C makro)" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "%s (C typ)" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "%s (C proměnná)" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "Vyvolá" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "Proměnná" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "Vrací" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 msgid "Return type" msgstr "Typ navrácené hodnoty" -#: sphinx/directives/desc.py:143 +#: sphinx/directives/desc.py:213 +#, fuzzy +msgid "Parameter" +msgstr "Parametry" + +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "Parametry" -#: sphinx/directives/desc.py:423 +#: sphinx/directives/desc.py:465 #, python-format msgid "%scommand line option; %s" msgstr "%s parametry příkazového řádku; %s" @@ -261,10 +229,20 @@ msgstr "Autor modulu: " msgid "Author: " msgstr "Autor: " -#: sphinx/directives/other.py:246 +#: sphinx/directives/other.py:249 msgid "See also" msgstr "Viz také" +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 +#, python-format +msgid "alias of :class:`%s`" +msgstr "" + #: sphinx/ext/todo.py:31 msgid "Todo" msgstr "Todo" @@ -361,6 +339,14 @@ msgstr "příkaz" msgid "built-in function" msgstr "vestavěná funkce" +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 +msgid "Permalink to this headline" +msgstr "Trvalý odkaz na tento nadpis" + +#: sphinx/static/doctools.js:145 sphinx/writers/html.py:80 +msgid "Permalink to this definition" +msgstr "Trvalý odkaz na tuto definici" + #: sphinx/static/doctools.js:174 msgid "Hide Search Matches" msgstr "Skrýt výsledky vyhledávání" @@ -381,16 +367,19 @@ msgstr "modul, v" msgid ", in " msgstr ", v" -#: sphinx/static/searchtools.js:447 -#: sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "Výsledky hledání" -#: sphinx/static/searchtools.js:449 -msgid "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories." -msgstr "Nenalezli jsme žádný dokument. Ujistěte se prosím, že všechna slova jsou správně a že jste vybral dostatek kategorií." +#: sphinx/static/searchtools.js:455 +msgid "" +"Your search did not match any documents. Please make sure that all words " +"are spelled correctly and that you've selected enough categories." +msgstr "" +"Nenalezli jsme žádný dokument. Ujistěte se prosím, že všechna slova jsou " +"správně a že jste vybral dostatek kategorií." -#: sphinx/static/searchtools.js:451 +#: sphinx/static/searchtools.js:457 #, python-format msgid "Search finished, found %s page(s) matching the search query." msgstr "Vyhledávání skončilo, nalezeno %s stran." @@ -430,8 +419,7 @@ msgstr "Index – %(key)s" #: sphinx/templates/genindex-single.html:44 #: sphinx/templates/genindex-split.html:14 -#: sphinx/templates/genindex-split.html:27 -#: sphinx/templates/genindex.html:54 +#: sphinx/templates/genindex-split.html:27 sphinx/templates/genindex.html:54 msgid "Full index on one page" msgstr "Plný index na jedné stránce" @@ -455,28 +443,23 @@ msgstr "Obsah" msgid "Previous topic" msgstr "Přechozí téma" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "předchozí kapitola" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "Další téma" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "další kapitola" -#: sphinx/templates/layout.html:55 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "Tato stránka" -#: sphinx/templates/layout.html:59 -msgid "Suggest Change" -msgstr "Návrh změnu" - -#: sphinx/templates/layout.html:60 -#: sphinx/templates/layout.html:62 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "Ukázat zdroj" @@ -484,66 +467,58 @@ msgstr "Ukázat zdroj" msgid "Quick search" msgstr "Rychlé vyhledávání" -#: sphinx/templates/layout.html:71 -msgid "Keyword search" -msgstr "Hledání dle klíče" - -#: sphinx/templates/layout.html:73 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "hledej" #: sphinx/templates/layout.html:78 -msgid "Enter a module, class or function name." +#, fuzzy +msgid "Enter search terms or a module, class or function name." msgstr "Zadej jméno modulu, třídy nebo funkce." -#: sphinx/templates/layout.html:119 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "Hledání uvnitř %(docstitle)s" -#: sphinx/templates/layout.html:128 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "O těchto dokumentech" -#: sphinx/templates/layout.html:131 -#: sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "Hledání" -#: sphinx/templates/layout.html:133 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "Veškerá práva vyhrazena" -#: sphinx/templates/layout.html:178 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:180 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:183 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "Aktualizováno dne %(last_updated)s." -#: sphinx/templates/layout.html:186 +#: sphinx/templates/layout.html:182 #, python-format -msgid "Created using Sphinx %(sphinx_version)s." -msgstr "Vytvořeno pomocí Sphinx %(sphinx_version)s." +msgid "" +"Created using Sphinx " +"%(sphinx_version)s." +msgstr "" +"Vytvořeno pomocí Sphinx " +"%(sphinx_version)s." -#: sphinx/templates/modindex.html:15 -msgid "Most popular modules:" -msgstr "Nejpopulárnější moduly:" - -#: sphinx/templates/modindex.html:24 -msgid "Show modules only available on these platforms" -msgstr "Zobrazit moduly dostupné na této platformě" - -#: sphinx/templates/modindex.html:56 +#: sphinx/templates/modindex.html:36 msgid "Deprecated" msgstr "Zastaralé" @@ -552,25 +527,29 @@ msgstr "Zastaralé" msgid "Search %(docstitle)s" msgstr "Prohledat %(docstitle)s" -#: sphinx/templates/page.html:8 -msgid "Note: You requested an out-of-date URL from this server. We've tried to redirect you to the new location of this page, but it may not be the right one." -msgstr "Poznámka: Stránka, kterou hledáte, neexistuje.
Snažili jsme se najít nové umístění této stránky, ale nepovedlo se." +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" -#: sphinx/templates/search.html:7 +#: sphinx/templates/search.html:14 msgid "" "From here you can search these documents. Enter your search\n" " words into the box below and click \"search\". Note that the search\n" " function will automatically search for all of the words. Pages\n" " containing fewer words won't appear in the result list." msgstr "" -"Toto je vyhledávací stránka. Zadejte klíčová slova a klikněte na \"hledej\". \n" -"Vyhledávání hledá automaticky všechna slova. Nebudou tedy nalezeny stránky, obsahující méně slov." +"Toto je vyhledávací stránka. Zadejte klíčová slova a klikněte na " +"\"hledej\". \n" +"Vyhledávání hledá automaticky všechna slova. Nebudou tedy nalezeny " +"stránky, obsahující méně slov." -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "hledej" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "Nic jsme nenašli." @@ -602,3 +581,40 @@ msgstr "Změny API" msgid "Other changes" msgstr "Ostatní změny" +#: sphinx/writers/latex.py:173 +msgid "Release" +msgstr "Vydání" + +#: sphinx/writers/text.py:166 +#, python-format +msgid "Platform: %s" +msgstr "Platforma: %s" + +#: sphinx/writers/text.py:427 +msgid "[image]" +msgstr "[obrázek]" + +#~ msgid "Suggest Change" +#~ msgstr "Návrh změnu" + +#~ msgid "Keyword search" +#~ msgstr "Hledání dle klíče" + +#~ msgid "Most popular modules:" +#~ msgstr "Nejpopulárnější moduly:" + +#~ msgid "Show modules only available on these platforms" +#~ msgstr "Zobrazit moduly dostupné na této platformě" + +#~ msgid "" +#~ "Note: You requested an " +#~ "out-of-date URL from this server. " +#~ "We've tried to redirect you to the" +#~ " new location of this page, but " +#~ "it may not be the right one." +#~ msgstr "" +#~ "Poznámka: Stránka, kterou hledáte," +#~ " neexistuje.
Snažili jsme se najít nové" +#~ " umístění této stránky, ale nepovedlo " +#~ "se." + diff --git a/sphinx/locale/de/LC_MESSAGES/sphinx.po b/sphinx/locale/de/LC_MESSAGES/sphinx.po index 2fac78d9a..a830aeefb 100644 --- a/sphinx/locale/de/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/de/LC_MESSAGES/sphinx.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2008-08-07 21:40+0200\n" -"PO-Revision-Date: 2008-12-28 23:40+0100\n" +"PO-Revision-Date: 2009-01-24 18:43+0000\n" "Last-Translator: Horst Gutmann \n" "Language-Team: de \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -16,28 +16,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.3\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:170 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, python-format msgid "%B %d, %Y" msgstr "%d. %m. %Y" -#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "Stichwortverzeichnis" -#: sphinx/environment.py:294 sphinx/writers/latex.py:175 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "Modulindex" -#: sphinx/environment.py:295 sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "Suche" -#: sphinx/roles.py:53 sphinx/directives/desc.py:564 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "Umgebungsvariable; %s" @@ -55,40 +55,40 @@ msgstr "Builtins" msgid "Module level" msgstr "Modulebene" -#: sphinx/builders/html.py:115 +#: sphinx/builders/html.py:118 #, python-format msgid "%b %d, %Y" msgstr "%d. %m. %Y" -#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21 +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 msgid "General Index" msgstr "Allgemeiner Index" -#: sphinx/builders/html.py:134 +#: sphinx/builders/html.py:137 msgid "index" msgstr "Index" -#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180 -#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19 +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 #: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 msgid "Global Module Index" msgstr "Globaler Modulindex" -#: sphinx/builders/html.py:136 +#: sphinx/builders/html.py:139 msgid "modules" msgstr "Module" -#: sphinx/builders/html.py:175 +#: sphinx/builders/html.py:179 msgid "next" msgstr "weiter" -#: sphinx/builders/html.py:182 +#: sphinx/builders/html.py:186 msgid "previous" msgstr "zurück" -#: sphinx/builders/latex.py:155 +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 msgid " (in " -msgstr "" +msgstr " (in " #: sphinx/directives/desc.py:25 #, python-format @@ -106,7 +106,7 @@ msgstr "%s() (in Modul %s)" msgid "%s (built-in variable)" msgstr "%s (eingebaute Variable)" -#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "%s (in Modul %s)" @@ -141,67 +141,66 @@ msgstr "%s() (statische Methode von %s.%s)" msgid "%s() (%s static method)" msgstr "%s() (statische Methode von %s)" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (Attribut von %s.%s)" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "%s (Attribut von %s)" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "%s (C-Funktion)" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "%s (C-Member)" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "%s (C-Makro)" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "%s (C-Typ)" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "%s (C-Variable)" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "Verursacht:" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "Variable" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "Rückgabe" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 msgid "Return type" msgstr "Rückgabetyp" -#: sphinx/directives/desc.py:201 -#, fuzzy +#: sphinx/directives/desc.py:213 msgid "Parameter" msgstr "Parameter" -#: sphinx/directives/desc.py:205 +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "Parameter" -#: sphinx/directives/desc.py:450 +#: sphinx/directives/desc.py:465 #, python-format msgid "%scommand line option; %s" msgstr "%sKommandozeilenoption; %s" @@ -231,23 +230,28 @@ msgstr "Autor: " msgid "See also" msgstr "Siehe auch" -#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590 +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr " Basisklassen: %s" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 #, python-format msgid "alias of :class:`%s`" -msgstr "" +msgstr "Alias von :class:`%s`" #: sphinx/ext/todo.py:31 msgid "Todo" -msgstr "" +msgstr "Zu tun" #: sphinx/ext/todo.py:75 #, python-format msgid "(The original entry is located in %s, line %d and can be found " -msgstr "" +msgstr "(Der Eintrag steht in %s, Zeile %s, siehe " #: sphinx/ext/todo.py:81 msgid "here" -msgstr "" +msgstr "hier" #: sphinx/locale/__init__.py:15 msgid "Attention" @@ -332,7 +336,7 @@ msgstr "Statement" msgid "built-in function" msgstr "eingebaute Funktion" -#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415 +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 msgid "Permalink to this headline" msgstr "Permalink zu dieser Überschrift" @@ -358,9 +362,9 @@ msgstr "Modul, in " #: sphinx/static/searchtools.js:347 msgid ", in " -msgstr "" +msgstr ", in " -#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "Suchergebnisse" @@ -436,73 +440,72 @@ msgstr "Inhalt" msgid "Previous topic" msgstr "Vorheriges Thema" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "vorheriges Kapitel" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "Nächstes Thema" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "nächstes Kapitel" -#: sphinx/templates/layout.html:56 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "Diese Seite" -#: sphinx/templates/layout.html:58 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "Quelltext anzeigen" -#: sphinx/templates/layout.html:67 +#: sphinx/templates/layout.html:71 msgid "Quick search" msgstr "Schnellsuche" -#: sphinx/templates/layout.html:69 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "Los" -#: sphinx/templates/layout.html:73 -#, fuzzy +#: sphinx/templates/layout.html:78 msgid "Enter search terms or a module, class or function name." -msgstr "Gib einen Modul-, Klassen- oder Funktionsnamen an." +msgstr "Geben Sie einen Modul-, Klassen- oder Funktionsnamen einn." -#: sphinx/templates/layout.html:106 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "Suche in %(docstitle)s" -#: sphinx/templates/layout.html:115 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "Über diese Dokumentation" -#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "Suche" -#: sphinx/templates/layout.html:120 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "Copyright" -#: sphinx/templates/layout.html:165 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:167 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:170 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "Zuletzt aktualisiert am %(last_updated)s." -#: sphinx/templates/layout.html:173 +#: sphinx/templates/layout.html:182 #, python-format msgid "" "Created using Sphinx " @@ -520,25 +523,25 @@ msgstr "Veraltet" msgid "Search %(docstitle)s" msgstr "Suche in %(docstitle)s" -#: sphinx/templates/search.html:7 -#, fuzzy +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "Bitte aktivieren Sie JavaScript, wenn Sie die Suchfunktion nutzen wollen." + +#: sphinx/templates/search.html:14 msgid "" "From here you can search these documents. Enter your search\n" " words into the box below and click \"search\". Note that the search\n" " function will automatically search for all of the words. Pages\n" " containing fewer words won't appear in the result list." -msgstr "" -"Von hier aus kannst du die Dokumentation durchsuchen. Gib deine " -"Suchbegriffe in das untenstehende Feld ein und klicke auf \"suchen\". " -"Bitte beachte, dass die Suchfunktion automatisch nach all diesen Worten " -"suchen wird. Seiten, die nicht alle Worte enthalten, werden nicht in der " -"Ergebnisliste erscheinen." +msgstr "Von hier aus können Sie die Dokumentation durchsuchen. Geben Sie Ihre Suchbegriffe in das untenstehende Feld ein und klicken Sie auf \"Suchen\". Bitte beachten Sie, dass die Suchfunktion automatisch nach all diesen Worten suchen wird. Seiten, die nicht alle Worte enthalten, werden nicht in der Ergebnisliste erscheinen." -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "suchen" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "Deine Suche ergab leider keine Treffer." @@ -583,29 +586,3 @@ msgstr "Plattform: %s" msgid "[image]" msgstr "[Bild]" -#~ msgid "Suggest Change" -#~ msgstr "Änderung vorschlagen" - -#~ msgid "Keyword search" -#~ msgstr "Stichwortsuche" - -#~ msgid "Most popular modules:" -#~ msgstr "Beliebteste Module:" - -#~ msgid "Show modules only available on these platforms" -#~ msgstr "Zeige nur Module, die auf diesen Plattformen verfügbar sind" - -#~ msgid "" -#~ "Note: You requested an " -#~ "out-of-date URL from this server. " -#~ "We've tried to redirect you to the" -#~ " new location of this page, but " -#~ "it may not be the right one." -#~ msgstr "" -#~ "Anmerkung: Du hast eine nicht" -#~ " länger gültige URL von diesem Server" -#~ " angefragt. Wir haben versucht dich " -#~ "auf die neue Adresse dieser Seite " -#~ "umzuleiten, aber dies muss nicht die " -#~ "richtige Seite sein." - diff --git a/sphinx/locale/es/LC_MESSAGES/sphinx.po b/sphinx/locale/es/LC_MESSAGES/sphinx.po index f50a34cc3..09ebda8b7 100644 --- a/sphinx/locale/es/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/es/LC_MESSAGES/sphinx.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Sphinx 0.5\n" "Report-Msgid-Bugs-To: guillem@torroja.dmt.upm.es\n" "POT-Creation-Date: 2008-09-11 23:58+0200\n" -"PO-Revision-Date: 2008-12-28 23:40+0100\n" +"PO-Revision-Date: 2009-01-24 18:39+0000\n" "Last-Translator: Guillem Borrell \n" "Language-Team: es \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -17,28 +17,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.3\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:170 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, fuzzy, python-format msgid "%B %d, %Y" msgstr "%d de %B de %Y" -#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "Índice" -#: sphinx/environment.py:294 sphinx/writers/latex.py:175 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "Índice de Módulos" -#: sphinx/environment.py:295 sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "Página de Búsqueda" -#: sphinx/roles.py:53 sphinx/directives/desc.py:564 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "variables de entorno; %s" @@ -58,38 +58,38 @@ msgstr "Funciones de base" msgid "Module level" msgstr "Módulos" -#: sphinx/builders/html.py:115 +#: sphinx/builders/html.py:118 #, python-format msgid "%b %d, %Y" msgstr "%d %b, %Y" -#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21 +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 msgid "General Index" msgstr "Índice General" -#: sphinx/builders/html.py:134 +#: sphinx/builders/html.py:137 msgid "index" msgstr "índice" -#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180 -#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19 +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 #: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 msgid "Global Module Index" msgstr "Índice Global de Módulos" -#: sphinx/builders/html.py:136 +#: sphinx/builders/html.py:139 msgid "modules" msgstr "módulos" -#: sphinx/builders/html.py:175 +#: sphinx/builders/html.py:179 msgid "next" msgstr "siguiente" -#: sphinx/builders/html.py:182 +#: sphinx/builders/html.py:186 msgid "previous" msgstr "anterior" -#: sphinx/builders/latex.py:155 +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 msgid " (in " msgstr "" @@ -109,7 +109,7 @@ msgstr "%s() (en el módulo %s)" msgid "%s (built-in variable)" msgstr "%s (variable de base)" -#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "%s (en el módulo %s)" @@ -144,68 +144,68 @@ msgstr "%s() (%s.%s método estático)" msgid "%s() (%s static method)" msgstr "%s() (%s método estático)" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s atributo)" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "%s (%s atributo)" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "%s (función C)" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "%s (miembro C)" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "%s (macro C)" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "%s (tipo C)" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "%s (variable C)" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "Muestra" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "Variable" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "Devuelve" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 #, fuzzy msgid "Return type" msgstr "Tipo del argumento devuelto" -#: sphinx/directives/desc.py:201 +#: sphinx/directives/desc.py:213 #, fuzzy msgid "Parameter" msgstr "Parámetros" -#: sphinx/directives/desc.py:205 +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "Parámetros" -#: sphinx/directives/desc.py:450 +#: sphinx/directives/desc.py:465 #, fuzzy, python-format msgid "%scommand line option; %s" msgstr "%sOpciones en línea de comandos; %s" @@ -235,7 +235,12 @@ msgstr "Autor:" msgid "See also" msgstr "Ver también" -#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590 +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -337,7 +342,7 @@ msgstr "sentencia" msgid "built-in function" msgstr "función de base" -#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415 +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 msgid "Permalink to this headline" msgstr "Enlazar permanentemente con este título" @@ -367,7 +372,7 @@ msgstr "módulo" msgid ", in " msgstr "" -#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "Resultados de la búsqueda" @@ -446,73 +451,73 @@ msgstr "Contenidos" msgid "Previous topic" msgstr "Tema anterior" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "Capítulo anterior" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "Próximo tema" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "Próximo capítulo" -#: sphinx/templates/layout.html:56 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "Esta página" -#: sphinx/templates/layout.html:58 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "Enseñar el código" -#: sphinx/templates/layout.html:67 +#: sphinx/templates/layout.html:71 msgid "Quick search" msgstr "Búsqueda rápida" -#: sphinx/templates/layout.html:69 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "Ir a" -#: sphinx/templates/layout.html:73 +#: sphinx/templates/layout.html:78 #, fuzzy msgid "Enter search terms or a module, class or function name." msgstr "Introducir en nombre de un módulo, clase o función" -#: sphinx/templates/layout.html:106 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "Buscar en %(docstitle)s" -#: sphinx/templates/layout.html:115 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "Sobre este documento" -#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "Búsqueda" -#: sphinx/templates/layout.html:120 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "Copyright" -#: sphinx/templates/layout.html:165 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:167 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:170 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "Actualizado por última vez en %(last_updated)s." -#: sphinx/templates/layout.html:173 +#: sphinx/templates/layout.html:182 #, python-format msgid "" "Created using Sphinx " @@ -530,7 +535,13 @@ msgstr "Obsoleto" msgid "Search %(docstitle)s" msgstr "Buscar en %(docstitle)s" -#: sphinx/templates/search.html:7 +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" + +#: sphinx/templates/search.html:14 #, fuzzy msgid "" "From here you can search these documents. Enter your search\n" @@ -543,11 +554,11 @@ msgstr "" " las palabras. Las páginas que contengan menos palabras no aparecerán en" " la lista de resultados." -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "buscar" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "Tu consulta no obtuvo ningún resultado" @@ -593,28 +604,3 @@ msgstr "Plataforma: %s" msgid "[image]" msgstr "[imagen]" -#~ msgid "Suggest Change" -#~ msgstr "Sugerir una modificación" - -#~ msgid "Keyword search" -#~ msgstr "Búsqueda por palabras clave" - -#~ msgid "Most popular modules:" -#~ msgstr "Módulos más comunes:" - -#~ msgid "Show modules only available on these platforms" -#~ msgstr "Mostrar sólo los módulos disponibles en estas plataformas" - -#~ msgid "" -#~ "Note: You requested an " -#~ "out-of-date URL from this server. " -#~ "We've tried to redirect you to the" -#~ " new location of this page, but " -#~ "it may not be the right one." -#~ msgstr "" -#~ "Nota: Has solicitado una " -#~ "dirección desactualizada a este servidor. " -#~ "Hemos intentado redirigirte a la nueva" -#~ " dirección de la misma página pero" -#~ " puede no ser la correcta." - diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.po b/sphinx/locale/fr/LC_MESSAGES/sphinx.po index c715e6261..bd6ea6ec2 100644 --- a/sphinx/locale/fr/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/fr/LC_MESSAGES/sphinx.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Sphinx 0.5\n" "Report-Msgid-Bugs-To: larlet@gmail.com\n" "POT-Creation-Date: 2008-08-08 12:39+0000\n" -"PO-Revision-Date: 2008-12-28 23:40+0100\n" +"PO-Revision-Date: 2009-01-24 18:39+0000\n" "Last-Translator: Sébastien Douche \n" "Language-Team: French Translation Team \n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" @@ -18,28 +18,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.3\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:170 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, python-format msgid "%B %d, %Y" msgstr "%d %B %Y" -#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "Index" -#: sphinx/environment.py:294 sphinx/writers/latex.py:175 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "Index du module" -#: sphinx/environment.py:295 sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "Page de recherche" -#: sphinx/roles.py:53 sphinx/directives/desc.py:564 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "variable d'environnement; %s" @@ -57,38 +57,38 @@ msgstr "Fonctions de base" msgid "Module level" msgstr "Module" -#: sphinx/builders/html.py:115 +#: sphinx/builders/html.py:118 #, python-format msgid "%b %d, %Y" msgstr "%d %b %Y" -#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21 +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 msgid "General Index" msgstr "Index général" -#: sphinx/builders/html.py:134 +#: sphinx/builders/html.py:137 msgid "index" msgstr "index" -#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180 -#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19 +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 #: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 msgid "Global Module Index" msgstr "Index général des modules" -#: sphinx/builders/html.py:136 +#: sphinx/builders/html.py:139 msgid "modules" msgstr "modules" -#: sphinx/builders/html.py:175 +#: sphinx/builders/html.py:179 msgid "next" msgstr "suivant" -#: sphinx/builders/html.py:182 +#: sphinx/builders/html.py:186 msgid "previous" msgstr "précédent" -#: sphinx/builders/latex.py:155 +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 msgid " (in " msgstr "(dans" @@ -108,7 +108,7 @@ msgstr "%s() (dans le module %s)" msgid "%s (built-in variable)" msgstr "%s (variable de base)" -#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "%s (dans le module %s)" @@ -143,67 +143,67 @@ msgstr "%s() (méthode statique %s.%s)" msgid "%s() (%s static method)" msgstr "%s() (méthode statique %s)" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (attribut %s.%s)" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "%s (attribut %s)" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "%s (fonction C)" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "%s (membre C)" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "%s (macro C)" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "%s (type C)" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "%s (variable C)" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "Lève" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "Variable" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "Retourne" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 msgid "Return type" msgstr "Type retourné" -#: sphinx/directives/desc.py:201 +#: sphinx/directives/desc.py:213 #, fuzzy msgid "Parameter" msgstr "Paramètres" -#: sphinx/directives/desc.py:205 +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "Paramètres" -#: sphinx/directives/desc.py:450 +#: sphinx/directives/desc.py:465 #, python-format msgid "%scommand line option; %s" msgstr "%soption de ligne de commande; %s" @@ -233,7 +233,12 @@ msgstr "Auteur : " msgid "See also" msgstr "Voir aussi" -#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590 +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -334,7 +339,7 @@ msgstr "état" msgid "built-in function" msgstr "fonction de base" -#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415 +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 msgid "Permalink to this headline" msgstr "Lien permanent vers ce titre" @@ -362,7 +367,7 @@ msgstr "module, dans" msgid ", in " msgstr ", dans" -#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "Résultats de la recherche" @@ -439,73 +444,73 @@ msgstr "Table des matières" msgid "Previous topic" msgstr "Sujet précédent" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "Chapitre précédent" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "Sujet suivant" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "Chapitre suivant" -#: sphinx/templates/layout.html:56 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "Cette page" -#: sphinx/templates/layout.html:58 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "Montrer la source" -#: sphinx/templates/layout.html:67 +#: sphinx/templates/layout.html:71 msgid "Quick search" msgstr "Recherche rapide" -#: sphinx/templates/layout.html:69 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "Go" -#: sphinx/templates/layout.html:73 +#: sphinx/templates/layout.html:78 #, fuzzy msgid "Enter search terms or a module, class or function name." msgstr "Saisissez un nom de module, classe ou fonction." -#: sphinx/templates/layout.html:106 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "Recherchez dans %(docstitle)s" -#: sphinx/templates/layout.html:115 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "À propos de ces documents" -#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "Recherche" -#: sphinx/templates/layout.html:120 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "Copyright" -#: sphinx/templates/layout.html:165 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:167 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:170 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "Mis à jour le %(last_updated)s." -#: sphinx/templates/layout.html:173 +#: sphinx/templates/layout.html:182 #, python-format msgid "" "Created using Sphinx " @@ -523,7 +528,13 @@ msgstr "Obsolète" msgid "Search %(docstitle)s" msgstr "Rechercher %(docstitle)s" -#: sphinx/templates/search.html:7 +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" + +#: sphinx/templates/search.html:14 #, fuzzy msgid "" "From here you can search these documents. Enter your search\n" @@ -539,11 +550,11 @@ msgstr "" " contenant moins de mots n'apparaîtront pas dans la liste des " "résultats." -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "rechercher" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "Votre recherche n'a retourné aucun résultat" @@ -588,29 +599,3 @@ msgstr "Plateforme : %s" msgid "[image]" msgstr "[image]" -#~ msgid "Suggest Change" -#~ msgstr "Suggérer une modification" - -#~ msgid "Keyword search" -#~ msgstr "Recherche par mot-clé" - -#~ msgid "Most popular modules:" -#~ msgstr "Modules les plus utilisés :" - -#~ msgid "Show modules only available on these platforms" -#~ msgstr "N'afficher que les modules disponibles sur ces plateformes" - -#~ msgid "" -#~ "Note: You requested an " -#~ "out-of-date URL from this server. " -#~ "We've tried to redirect you to the" -#~ " new location of this page, but " -#~ "it may not be the right one." -#~ msgstr "" -#~ "Note : Vous tentez d'accéder" -#~ " à une ancienne URL de ce " -#~ "serveur. Nous avons essayé de vous " -#~ "rediriger vers la nouvelle adresse de" -#~ " cette page, mais ce n'est peut-être" -#~ " pas la bonne." - diff --git a/sphinx/locale/it/LC_MESSAGES/sphinx.po b/sphinx/locale/it/LC_MESSAGES/sphinx.po index 73c88e2bd..c6db18306 100644 --- a/sphinx/locale/it/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/it/LC_MESSAGES/sphinx.po @@ -7,38 +7,37 @@ msgstr "" "Project-Id-Version: Sphinx 0.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2008-11-27 18:39+0100\n" -"PO-Revision-Date: 2009-01-06 17:38+0200\n" +"PO-Revision-Date: 2009-01-24 18:39+0000\n" "Last-Translator: Sandro Dentella \n" "Language-Team: \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\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)\n" -"X-Generator: Virtaal 0.2\n" "Generated-By: Babel 0.9.3\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:170 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, python-format msgid "%B %d, %Y" msgstr "%d %B %Y" -#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "Indice" -#: sphinx/environment.py:294 sphinx/writers/latex.py:175 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "Indice dei Moduli" -#: sphinx/environment.py:295 sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "Cerca" -#: sphinx/roles.py:53 sphinx/directives/desc.py:564 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "variabile d'ambiente, %s" @@ -56,38 +55,38 @@ msgstr "Builtin" msgid "Module level" msgstr "Modulo" -#: sphinx/builders/html.py:115 +#: sphinx/builders/html.py:118 #, python-format msgid "%b %d, %Y" msgstr "%d/%b/%Y" -#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21 +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 msgid "General Index" msgstr "Indice generale" -#: sphinx/builders/html.py:134 +#: sphinx/builders/html.py:137 msgid "index" msgstr "indice" -#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180 -#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19 +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 #: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 msgid "Global Module Index" msgstr "Indice dei moduli" -#: sphinx/builders/html.py:136 +#: sphinx/builders/html.py:139 msgid "modules" msgstr "moduli" -#: sphinx/builders/html.py:175 +#: sphinx/builders/html.py:179 msgid "next" msgstr "successivo" -#: sphinx/builders/html.py:182 +#: sphinx/builders/html.py:186 msgid "previous" msgstr "precedente" -#: sphinx/builders/latex.py:155 +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 msgid " (in " msgstr " (in " @@ -107,7 +106,7 @@ msgstr "%s() (nel modulo %s)" msgid "%s (built-in variable)" msgstr "%s (variabile built-in)" -#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "%s (nel modulo %s)" @@ -142,66 +141,66 @@ msgstr "%s() (%s.%s metodo statico)" msgid "%s() (%s static method)" msgstr "%s() (%s metodo statico)" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s attributo)" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "%s (%s attributo)" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "%s (funzione C)" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "%s (membro C )" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "%s (macro C)" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "%s (tipo C)" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "%s (variabile C)" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "Solleva" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "Variabile" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "Ritorna" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 msgid "Return type" msgstr "Tipo di ritorno" -#: sphinx/directives/desc.py:201 +#: sphinx/directives/desc.py:213 msgid "Parameter" msgstr "Parametri" -#: sphinx/directives/desc.py:205 +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "Parametri" -#: sphinx/directives/desc.py:450 +#: sphinx/directives/desc.py:465 #, python-format msgid "%scommand line option; %s" msgstr "%sopzione di linea di comando; %s" @@ -231,7 +230,12 @@ msgstr "Autore: " msgid "See also" msgstr "Vedi anche" -#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590 +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 #, python-format msgid "alias of :class:`%s`" msgstr "alias per :class:`%s`" @@ -332,7 +336,7 @@ msgstr "statement" msgid "built-in function" msgstr "funzione built-in" -#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415 +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 msgid "Permalink to this headline" msgstr "link permanente per questa intestazione" @@ -360,7 +364,7 @@ msgstr "modulo, in" msgid ", in " msgstr ", in " -#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "Risultati della ricerca" @@ -369,8 +373,9 @@ msgid "" "Your search did not match any documents. Please make sure that all words " "are spelled correctly and that you've selected enough categories." msgstr "" -"La tua ricerca non ha trovato alcun risultato. Controlla la correttezza dei " -"termini di ricerca e di avere selezionato un numero sufficiente di categorie" +"La tua ricerca non ha trovato alcun risultato. Controlla la correttezza " +"dei termini di ricerca e di avere selezionato un numero sufficiente di " +"categorie" #: sphinx/static/searchtools.js:457 #, python-format @@ -436,72 +441,72 @@ msgstr "Tabella dei contenuti" msgid "Previous topic" msgstr "Argomento precedente" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "capitolo precedente" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "Argomento successivo" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "capitolo successivo" -#: sphinx/templates/layout.html:56 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "Questa pagina" -#: sphinx/templates/layout.html:58 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "Mostra sorgente" -#: sphinx/templates/layout.html:67 +#: sphinx/templates/layout.html:71 msgid "Quick search" msgstr "Ricerca veloce" -#: sphinx/templates/layout.html:69 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "Vai" -#: sphinx/templates/layout.html:73 +#: sphinx/templates/layout.html:78 msgid "Enter search terms or a module, class or function name." msgstr "Inserisci un termine di ricerca un modulo, classe o nome di funzione" -#: sphinx/templates/layout.html:106 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "Cerca in %(docstitle)s" -#: sphinx/templates/layout.html:115 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "A proposito di questi documenti" -#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "Cerca" -#: sphinx/templates/layout.html:120 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "Copyright" -#: sphinx/templates/layout.html:165 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:167 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:170 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "Ultimo Aggiornamento on %(last_updated)s." -#: sphinx/templates/layout.html:173 +#: sphinx/templates/layout.html:182 #, python-format msgid "" "Created using Sphinx " @@ -519,23 +524,31 @@ msgstr "Deprecato" msgid "Search %(docstitle)s" msgstr "Cerca %(docstitle)s" -#: sphinx/templates/search.html:7 +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" + +#: sphinx/templates/search.html:14 msgid "" "From here you can search these documents. Enter your search\n" " words into the box below and click \"search\". Note that the search\n" " function will automatically search for all of the words. Pages\n" " containing fewer words won't appear in the result list." msgstr "" -"Puoi effettuare una ricerca in questi documenti. Immetti le parole chiave \n" -" della tua ricerca nel riquadro sottostante \"cerca\". Nota che la funzione\n" +"Puoi effettuare una ricerca in questi documenti. Immetti le parole chiave" +" \n" +" della tua ricerca nel riquadro sottostante \"cerca\". Nota che la " +"funzione\n" " di ricerca cerca automaticamente per tutte le parole. Le pagine\n" " che contendono meno parole non compariranno nei risultati di ricerca." -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "cerca" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "La tua ricerca non ha ottenuto risultati" @@ -580,26 +593,3 @@ msgstr "Piattaforma: %s" msgid "[image]" msgstr "[immagine]" -#~ msgid "Suggest Change" -#~ msgstr "Suggerisci una modifica" - -#~ msgid "Keyword search" -#~ msgstr "Ricerca per parola chiave" - -#~ msgid "Most popular modules:" -#~ msgstr "Moduli più utilizzati" - -#~ msgid "Show modules only available on these platforms" -#~ msgstr "Mostra solo i moduli disponibili su questa piattaforma" - -#~ msgid "" -#~ "Note: You requested an " -#~ "out-of-date URL from this server. " -#~ "We've tried to redirect you to the" -#~ " new location of this page, but " -#~ "it may not be the right one." -#~ msgstr "" -#~ "Nota: Hai chiesto un URL " -#~ "non più valido. Abbiamo provato a " -#~ "ridirigerti verso il nuovo indirizzo, ma" -#~ " potrebbe non essere quello giusto" diff --git a/sphinx/locale/ja/LC_MESSAGES/sphinx.po b/sphinx/locale/ja/LC_MESSAGES/sphinx.po index a2c654468..307a8700c 100644 --- a/sphinx/locale/ja/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/ja/LC_MESSAGES/sphinx.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Sphinx 0.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2008-09-11 23:58+0200\n" -"PO-Revision-Date: 2008-12-28 23:40+0100\n" +"PO-Revision-Date: 2009-01-24 18:39+0000\n" "Last-Translator: Yasushi MASUDA \n" "Language-Team: ja \n" "Plural-Forms: nplurals=1; plural=0\n" @@ -17,28 +17,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.3\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:170 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, python-format msgid "%B %d, %Y" msgstr "%Y 年 %m 月 %d 日" -#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "索引" -#: sphinx/environment.py:294 sphinx/writers/latex.py:175 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "モジュール索引" -#: sphinx/environment.py:295 sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "検索ページ" -#: sphinx/roles.py:53 sphinx/directives/desc.py:564 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "環境変数; %s" @@ -56,38 +56,38 @@ msgstr "組み込み" msgid "Module level" msgstr "モジュールレベル" -#: sphinx/builders/html.py:115 +#: sphinx/builders/html.py:118 #, python-format msgid "%b %d, %Y" msgstr "%Y 年 %m 月 %d 日" -#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21 +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 msgid "General Index" msgstr "総合索引" -#: sphinx/builders/html.py:134 +#: sphinx/builders/html.py:137 msgid "index" msgstr "索引" -#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180 -#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19 +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 #: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 msgid "Global Module Index" msgstr "モジュール総索引" -#: sphinx/builders/html.py:136 +#: sphinx/builders/html.py:139 msgid "modules" msgstr "モジュール" -#: sphinx/builders/html.py:175 +#: sphinx/builders/html.py:179 msgid "next" msgstr "次へ" -#: sphinx/builders/html.py:182 +#: sphinx/builders/html.py:186 msgid "previous" msgstr "前へ" -#: sphinx/builders/latex.py:155 +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 msgid " (in " msgstr "" @@ -107,7 +107,7 @@ msgstr "%s() (%s モジュール)" msgid "%s (built-in variable)" msgstr "%s (組み込み変数)" -#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "%s (%s モジュール)" @@ -142,67 +142,67 @@ msgstr "%s() (%s.%s の静的メソッド)" msgid "%s() (%s static method)" msgstr "%s() (%s の静的メソッド)" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s の属性)" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "%s (%s の属性)" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "%s (C の関数)" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "%s (C のメンバ変数)" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "%s (C のマクロ)" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "%s (C のデータ型)" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "%s (C の変数)" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "例外" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "変数" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "戻り値" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 msgid "Return type" msgstr "戻り値の型" -#: sphinx/directives/desc.py:201 +#: sphinx/directives/desc.py:213 #, fuzzy msgid "Parameter" msgstr "パラメタ" -#: sphinx/directives/desc.py:205 +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "パラメタ" -#: sphinx/directives/desc.py:450 +#: sphinx/directives/desc.py:465 #, fuzzy, python-format msgid "%scommand line option; %s" msgstr "%sコマンドラインオプション; %s" @@ -232,7 +232,12 @@ msgstr "作者: " msgid "See also" msgstr "参考" -#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590 +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -333,7 +338,7 @@ msgstr "文" msgid "built-in function" msgstr "組み込み関数" -#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415 +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 msgid "Permalink to this headline" msgstr "このヘッドラインへのパーマリンク" @@ -362,7 +367,7 @@ msgstr "モジュール" msgid ", in " msgstr "" -#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "検索結果" @@ -436,73 +441,73 @@ msgstr "目次" msgid "Previous topic" msgstr "前のトピックへ" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "前の章へ" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "次のトピックへ" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "次の章へ" -#: sphinx/templates/layout.html:56 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "このページ" -#: sphinx/templates/layout.html:58 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "ソースコードを表示" -#: sphinx/templates/layout.html:67 +#: sphinx/templates/layout.html:71 msgid "Quick search" msgstr "クイック検索" -#: sphinx/templates/layout.html:69 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "検索" -#: sphinx/templates/layout.html:73 +#: sphinx/templates/layout.html:78 #, fuzzy msgid "Enter search terms or a module, class or function name." msgstr "モジュール、クラス、または関数名を入力してください" -#: sphinx/templates/layout.html:106 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "%(docstitle)s 内を検索" -#: sphinx/templates/layout.html:115 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "このドキュメントについて" -#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "検索" -#: sphinx/templates/layout.html:120 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "著作権" -#: sphinx/templates/layout.html:165 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:167 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:170 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "最終更新: %(last_updated)s" -#: sphinx/templates/layout.html:173 +#: sphinx/templates/layout.html:182 #, python-format msgid "" "Created using Sphinx " @@ -520,7 +525,13 @@ msgstr "撤廃" msgid "Search %(docstitle)s" msgstr "%(docstitle)s 内を検索" -#: sphinx/templates/search.html:7 +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" + +#: sphinx/templates/search.html:14 #, fuzzy msgid "" "From here you can search these documents. Enter your search\n" @@ -529,11 +540,11 @@ msgid "" " containing fewer words won't appear in the result list." msgstr "このページからドキュメントを検索できます。キーワードを下のボックスに入力して、「検索」をクリックしてください。入力された全てのキーワードを含むページが検索されます。一部のキーワードしか含まないページは検索結果に表示されないので注意してください。" -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "検索" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "検索条件に一致する項目がありませんでした。" @@ -578,26 +589,3 @@ msgstr "プラットフォーム: %s" msgid "[image]" msgstr "[画像]" -#~ msgid "Suggest Change" -#~ msgstr "変更のサジェスト" - -#~ msgid "Keyword search" -#~ msgstr "キーワード検索" - -#~ msgid "Most popular modules:" -#~ msgstr "よく参照されているモジュール:" - -#~ msgid "Show modules only available on these platforms" -#~ msgstr "このプラットフォームで利用可能なモジュールだけを表示する" - -#~ msgid "" -#~ "Note: You requested an " -#~ "out-of-date URL from this server. " -#~ "We've tried to redirect you to the" -#~ " new location of this page, but " -#~ "it may not be the right one." -#~ msgstr "" -#~ "注意: あなたが表示しようとしているのは古い URL " -#~ "です。このページに対応する新しい URL " -#~ "へのリダイレクトを試みますが、適切なリダイレクト先でないかもしれないので注意してください。" - diff --git a/sphinx/locale/nl/LC_MESSAGES/sphinx.po b/sphinx/locale/nl/LC_MESSAGES/sphinx.po index fe6a45568..1dbc43992 100644 --- a/sphinx/locale/nl/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/nl/LC_MESSAGES/sphinx.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Sphinx 0.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2008-09-11 23:58+0200\n" -"PO-Revision-Date: 2008-12-28 23:40+0100\n" +"PO-Revision-Date: 2009-01-24 18:39+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: nl \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -16,28 +16,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.3\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:170 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, python-format msgid "%B %d, %Y" msgstr "%d. %B %Y" -#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "Index" -#: sphinx/environment.py:294 sphinx/writers/latex.py:175 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "Module-index" -#: sphinx/environment.py:295 sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "Zoekpagina" -#: sphinx/roles.py:53 sphinx/directives/desc.py:564 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "Omgevingsvariabele; %s" @@ -55,38 +55,38 @@ msgstr "Builtins" msgid "Module level" msgstr "Moduleniveau" -#: sphinx/builders/html.py:115 +#: sphinx/builders/html.py:118 #, python-format msgid "%b %d, %Y" msgstr "%d.%b.%Y" -#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21 +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 msgid "General Index" msgstr "Algemene index" -#: sphinx/builders/html.py:134 +#: sphinx/builders/html.py:137 msgid "index" msgstr "Index" -#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180 -#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19 +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 #: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 msgid "Global Module Index" msgstr "Globale Module-index" -#: sphinx/builders/html.py:136 +#: sphinx/builders/html.py:139 msgid "modules" msgstr "modules" -#: sphinx/builders/html.py:175 +#: sphinx/builders/html.py:179 msgid "next" msgstr "volgende" -#: sphinx/builders/html.py:182 +#: sphinx/builders/html.py:186 msgid "previous" msgstr "vorige" -#: sphinx/builders/latex.py:155 +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 msgid " (in " msgstr "" @@ -106,7 +106,7 @@ msgstr "%s() (in module %s)" msgid "%s (built-in variable)" msgstr "%s (geïntegreerde variabele)" -#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "%s (in module %s)" @@ -141,67 +141,67 @@ msgstr "%s() (%s.%s statische methode)" msgid "%s() (%s static method)" msgstr "%s() (%s statische methode)" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s attribuut)" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "%s (%s attribuut)" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "%s (C-functie)" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "%s (C member)" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "%s (C-macro)" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "%s (C type)" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "%s (C-variabele)" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "Veroorzaakt" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "Variabele" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "Returns" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 msgid "Return type" msgstr "Return type" -#: sphinx/directives/desc.py:201 +#: sphinx/directives/desc.py:213 #, fuzzy msgid "Parameter" msgstr "Parameters" -#: sphinx/directives/desc.py:205 +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "Parameters" -#: sphinx/directives/desc.py:450 +#: sphinx/directives/desc.py:465 #, fuzzy, python-format msgid "%scommand line option; %s" msgstr "%scommandolijn optie; %s" @@ -231,7 +231,12 @@ msgstr "Auteur: " msgid "See also" msgstr "Zie ook" -#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590 +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -332,7 +337,7 @@ msgstr "statement" msgid "built-in function" msgstr "geïntegreerde functie" -#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415 +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 msgid "Permalink to this headline" msgstr "Permanente link naar deze titel" @@ -361,7 +366,7 @@ msgstr "module" msgid ", in " msgstr "" -#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "Zoekresultaten" @@ -437,73 +442,73 @@ msgstr "Inhoudstafel" msgid "Previous topic" msgstr "Vorig onderwerp" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "Vorig hoofdstuk" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "Volgend onderwerp" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "volgend hoofdstuk" -#: sphinx/templates/layout.html:56 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "Deze Pagina" -#: sphinx/templates/layout.html:58 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "Broncode weergeven" -#: sphinx/templates/layout.html:67 +#: sphinx/templates/layout.html:71 msgid "Quick search" msgstr "Snel zoeken" -#: sphinx/templates/layout.html:69 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "Go" -#: sphinx/templates/layout.html:73 +#: sphinx/templates/layout.html:78 #, fuzzy msgid "Enter search terms or a module, class or function name." msgstr "Geef de naam van een module, klasse of functie." -#: sphinx/templates/layout.html:106 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "Zoeken in %(docstitle)s" -#: sphinx/templates/layout.html:115 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "Over deze documenten" -#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "Zoeken" -#: sphinx/templates/layout.html:120 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "Copyright" -#: sphinx/templates/layout.html:165 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:167 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:170 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "Laatste aanpassing op %(last_updated)s." -#: sphinx/templates/layout.html:173 +#: sphinx/templates/layout.html:182 #, python-format msgid "" "Created using Sphinx " @@ -521,7 +526,13 @@ msgstr "Verouderd" msgid "Search %(docstitle)s" msgstr "Zoeken %(docstitle)s" -#: sphinx/templates/search.html:7 +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" + +#: sphinx/templates/search.html:14 #, fuzzy msgid "" "From here you can search these documents. Enter your search\n" @@ -536,11 +547,11 @@ msgstr "" "\n" " zullen niet tussen de resultaten verschijnen." -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "zoeken" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "Uw zoekopdracht leverde geen resultaten op." @@ -585,29 +596,3 @@ msgstr "Platform: %s" msgid "[image]" msgstr "[afbeelding]" -#~ msgid "Suggest Change" -#~ msgstr "Wijziging Voorstellen" - -#~ msgid "Keyword search" -#~ msgstr "Trefwoord opzoeken" - -#~ msgid "Most popular modules:" -#~ msgstr "Populairste modules:" - -#~ msgid "Show modules only available on these platforms" -#~ msgstr "Enkel modules weergeven die op deze platformen beschikbaar zijn" - -#~ msgid "" -#~ "Note: You requested an " -#~ "out-of-date URL from this server. " -#~ "We've tried to redirect you to the" -#~ " new location of this page, but " -#~ "it may not be the right one." -#~ msgstr "" -#~ "Opgelet: U heeft een " -#~ "verouderde URL aangevraagd op deze " -#~ "server. Wij hebben probeerd u door " -#~ "te verwijzen naar de nieuwe locatie " -#~ "van deze pagina, maar dat is " -#~ "misschien niet gelukt." - diff --git a/sphinx/locale/pl/LC_MESSAGES/sphinx.po b/sphinx/locale/pl/LC_MESSAGES/sphinx.po index fdd14ca34..990c8e383 100644 --- a/sphinx/locale/pl/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/pl/LC_MESSAGES/sphinx.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Sphinx 0.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2008-08-10 11:43+0000\n" -"PO-Revision-Date: 2008-12-28 23:40+0100\n" +"PO-Revision-Date: 2009-01-24 18:39+0000\n" "Last-Translator: Michał Kandulski \n" "Language-Team: \n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && " @@ -14,28 +14,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.3\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:170 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, python-format msgid "%B %d, %Y" msgstr "%B %d %Y" -#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "Indeks" -#: sphinx/environment.py:294 sphinx/writers/latex.py:175 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "Indeks modułów" -#: sphinx/environment.py:295 sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "Wyszukiwanie" -#: sphinx/roles.py:53 sphinx/directives/desc.py:564 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "zmienna środowiskowa; %s" @@ -53,38 +53,38 @@ msgstr "Wbudowane" msgid "Module level" msgstr "Poziom modułu" -#: sphinx/builders/html.py:115 +#: sphinx/builders/html.py:118 #, python-format msgid "%b %d, %Y" msgstr "%b %d %Y" -#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21 +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 msgid "General Index" msgstr "Indeks ogólny" -#: sphinx/builders/html.py:134 +#: sphinx/builders/html.py:137 msgid "index" msgstr "indeks" -#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180 -#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19 +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 #: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 msgid "Global Module Index" msgstr "Indeks modułów" -#: sphinx/builders/html.py:136 +#: sphinx/builders/html.py:139 msgid "modules" msgstr "moduły" -#: sphinx/builders/html.py:175 +#: sphinx/builders/html.py:179 msgid "next" msgstr "dalej" -#: sphinx/builders/html.py:182 +#: sphinx/builders/html.py:186 msgid "previous" msgstr "wstecz" -#: sphinx/builders/latex.py:155 +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 msgid " (in " msgstr "" @@ -104,7 +104,7 @@ msgstr "%s() (w module %s)" msgid "%s (built-in variable)" msgstr "%s (zmienna wbudowana)" -#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "%s (w module %s)" @@ -139,67 +139,67 @@ msgstr "%s() (%s.%s statyczna metoda)" msgid "%s() (%s static method)" msgstr "%s() (%s statyczna metoda)" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s atrybut)" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "%s (%s atrybut)" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "%s (funkcja C)" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "%s (pole C)" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "%s (makro C)" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "%s (typ C)" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "%s (zmienna C)" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "Wyrzuca" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "Zmienna" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "Zwraca" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 msgid "Return type" msgstr "Typ zwracany" -#: sphinx/directives/desc.py:201 +#: sphinx/directives/desc.py:213 #, fuzzy msgid "Parameter" msgstr "Parametry" -#: sphinx/directives/desc.py:205 +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "Parametry" -#: sphinx/directives/desc.py:450 +#: sphinx/directives/desc.py:465 #, fuzzy, python-format msgid "%scommand line option; %s" msgstr "%sopcja linii komend; %s" @@ -229,7 +229,12 @@ msgstr "Autor: " msgid "See also" msgstr "Zobacz także" -#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590 +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -330,7 +335,7 @@ msgstr "instrukcja" msgid "built-in function" msgstr "funkcja wbudowana" -#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415 +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 msgid "Permalink to this headline" msgstr "Stały odnośnik do tego nagłówka" @@ -359,7 +364,7 @@ msgstr "moduł" msgid ", in " msgstr "" -#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "Wyniki wyszukiwania" @@ -435,73 +440,73 @@ msgstr "Spis treści" msgid "Previous topic" msgstr "Poprzedni temat" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "poprzedni rozdział" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "Następny temat" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "następny rozdział" -#: sphinx/templates/layout.html:56 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "Ta strona" -#: sphinx/templates/layout.html:58 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "Pokaż źródło" -#: sphinx/templates/layout.html:67 +#: sphinx/templates/layout.html:71 msgid "Quick search" msgstr "Szybkie wyszukiwanie" -#: sphinx/templates/layout.html:69 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "Szukaj" -#: sphinx/templates/layout.html:73 +#: sphinx/templates/layout.html:78 #, fuzzy msgid "Enter search terms or a module, class or function name." msgstr "Wprowadź nazwę modułu, klasy lub funkcji." -#: sphinx/templates/layout.html:106 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "Szukaj pośród %(docstitle)s" -#: sphinx/templates/layout.html:115 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "O tych dokumentach" -#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "Szukaj" -#: sphinx/templates/layout.html:120 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "Copyright" -#: sphinx/templates/layout.html:165 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:167 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:170 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "Ostatnia modyfikacja %(last_updated)s." -#: sphinx/templates/layout.html:173 +#: sphinx/templates/layout.html:182 #, python-format msgid "" "Created using Sphinx " @@ -519,7 +524,13 @@ msgstr "Niezalecane" msgid "Search %(docstitle)s" msgstr "Przeszukaj %(docstitle)s" -#: sphinx/templates/search.html:7 +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" + +#: sphinx/templates/search.html:14 #, fuzzy msgid "" "From here you can search these documents. Enter your search\n" @@ -533,11 +544,11 @@ msgstr "" "Strony nie zawierające wszystkich słów nie znajdą się na wynikowej " "liście." -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "Szukaj" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "Nie znaleziono żadnych pasujących stron." @@ -582,27 +593,3 @@ msgstr "Platforma: %s" msgid "[image]" msgstr "[obrazek]" -#~ msgid "Suggest Change" -#~ msgstr "Zasugeruj zmianę" - -#~ msgid "Keyword search" -#~ msgstr "Szukanie wg słowa kluczowego" - -#~ msgid "Most popular modules:" -#~ msgstr "Najbardziej popularne moduły:" - -#~ msgid "Show modules only available on these platforms" -#~ msgstr "Pokaż moduły dostępne tylko na tych platformach" - -#~ msgid "" -#~ "Note: You requested an " -#~ "out-of-date URL from this server. " -#~ "We've tried to redirect you to the" -#~ " new location of this page, but " -#~ "it may not be the right one." -#~ msgstr "" -#~ "Uwaga: Zażądano przedawnionego " -#~ "URL'a z tego serwera. Nastąpiła próba" -#~ " przekierowania do nowej lokalizacji, ale" -#~ " może ona być niewłaściwa." - diff --git a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po index d3144c251..48ee96dba 100644 --- a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Sphinx 0.5\n" "Report-Msgid-Bugs-To: roger.demetrescu@gmail.com\n" "POT-Creation-Date: 2008-11-09 19:46+0100\n" -"PO-Revision-Date: 2008-12-28 23:40+0100\n" +"PO-Revision-Date: 2009-01-24 18:39+0000\n" "Last-Translator: Roger Demetrescu \n" "Language-Team: pt_BR \n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" @@ -17,28 +17,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.3\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:170 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, python-format msgid "%B %d, %Y" msgstr "%d/%m/%Y" -#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "Índice" -#: sphinx/environment.py:294 sphinx/writers/latex.py:175 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "Índice do Módulo" -#: sphinx/environment.py:295 sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "Página de Pesquisa" -#: sphinx/roles.py:53 sphinx/directives/desc.py:564 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "váriavel de ambiente; %s" @@ -56,38 +56,38 @@ msgstr "Internos" msgid "Module level" msgstr "Módulo" -#: sphinx/builders/html.py:115 +#: sphinx/builders/html.py:118 #, python-format msgid "%b %d, %Y" msgstr "%d/%m/%Y" -#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21 +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 msgid "General Index" msgstr "Índice Geral" -#: sphinx/builders/html.py:134 +#: sphinx/builders/html.py:137 msgid "index" msgstr "índice" -#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180 -#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19 +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 #: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 msgid "Global Module Index" msgstr "Índice Global de Módulos" -#: sphinx/builders/html.py:136 +#: sphinx/builders/html.py:139 msgid "modules" msgstr "módulos" -#: sphinx/builders/html.py:175 +#: sphinx/builders/html.py:179 msgid "next" msgstr "próximo" -#: sphinx/builders/html.py:182 +#: sphinx/builders/html.py:186 msgid "previous" msgstr "anterior" -#: sphinx/builders/latex.py:155 +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 msgid " (in " msgstr " (em " @@ -107,7 +107,7 @@ msgstr "%s() (no módulo %s)" msgid "%s (built-in variable)" msgstr "%s (variável interna)" -#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "%s (no módulo %s)" @@ -142,67 +142,67 @@ msgstr "%s() (método estático %s.%s)" msgid "%s() (%s static method)" msgstr "%s() (método estático %s)" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (atributo %s.%s)" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "%s (atributo %s)" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "%s (função C)" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "%s (membro C)" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "%s (macro C)" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "%s (tipo C)" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "%s (variável C)" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "Levanta" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "Variável" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "Retorna" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 msgid "Return type" msgstr "Tipo de retorno" -#: sphinx/directives/desc.py:201 +#: sphinx/directives/desc.py:213 #, fuzzy msgid "Parameter" msgstr "Parâmetros" -#: sphinx/directives/desc.py:205 +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "Parâmetros" -#: sphinx/directives/desc.py:450 +#: sphinx/directives/desc.py:465 #, python-format msgid "%scommand line option; %s" msgstr "%sopção de linha de comando; %s" @@ -232,7 +232,12 @@ msgstr "Autor: " msgid "See also" msgstr "Veja também" -#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590 +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -333,7 +338,7 @@ msgstr "comando" msgid "built-in function" msgstr "função interna" -#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415 +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 msgid "Permalink to this headline" msgstr "Link permanente para este título" @@ -361,7 +366,7 @@ msgstr "módulo, em " msgid ", in " msgstr ", em " -#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "Resultados da Pesquisa" @@ -440,73 +445,73 @@ msgstr "Tabela de Conteúdo" msgid "Previous topic" msgstr "Tópico anterior" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "capítulo anterior" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "Próximo tópico" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "próximo capítulo" -#: sphinx/templates/layout.html:56 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "Esta Página" -#: sphinx/templates/layout.html:58 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "Exibir Fonte" -#: sphinx/templates/layout.html:67 +#: sphinx/templates/layout.html:71 msgid "Quick search" msgstr "Pesquisa rápida" -#: sphinx/templates/layout.html:69 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "Ir" -#: sphinx/templates/layout.html:73 +#: sphinx/templates/layout.html:78 #, fuzzy msgid "Enter search terms or a module, class or function name." msgstr "Informe o nome de um módulo, classe ou função." -#: sphinx/templates/layout.html:106 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "Pesquisar dentro de %(docstitle)s" -#: sphinx/templates/layout.html:115 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "Sobre estes documentos" -#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "Pesquisar" -#: sphinx/templates/layout.html:120 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "Copyright" -#: sphinx/templates/layout.html:165 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:167 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/templates/layout.html:170 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "Última atualização em %(last_updated)s." -#: sphinx/templates/layout.html:173 +#: sphinx/templates/layout.html:182 #, python-format msgid "" "Created using Sphinx " @@ -524,7 +529,13 @@ msgstr "Obsoleto" msgid "Search %(docstitle)s" msgstr "Pesquisar em %(docstitle)s" -#: sphinx/templates/search.html:7 +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" + +#: sphinx/templates/search.html:14 #, fuzzy msgid "" "From here you can search these documents. Enter your search\n" @@ -539,11 +550,11 @@ msgstr "" " Páginas contendo menos palavras não irão aparecer na lista de " "resultado." -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "pesquisar" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "Sua pesquisa não encontrou nenhum resultado." @@ -588,28 +599,3 @@ msgstr "Plataforma: %s" msgid "[image]" msgstr "[imagem]" -#~ msgid "Suggest Change" -#~ msgstr "Sugerir Alteração" - -#~ msgid "Keyword search" -#~ msgstr "Pesquisa de palavras-chave" - -#~ msgid "Most popular modules:" -#~ msgstr "Módulos mais populares:" - -#~ msgid "Show modules only available on these platforms" -#~ msgstr "Exibir somente módulos disponíveis nestas plataformas" - -#~ msgid "" -#~ "Note: You requested an " -#~ "out-of-date URL from this server. " -#~ "We've tried to redirect you to the" -#~ " new location of this page, but " -#~ "it may not be the right one." -#~ msgstr "" -#~ "Nota: Você requisitou uma URL" -#~ " desatualizada deste servidor. Tentamos " -#~ "redirecioná-lo para um novo endereço " -#~ "desta página, porém é possível que " -#~ "o mesmo não seja o correto." - diff --git a/sphinx/locale/sl/LC_MESSAGES/sphinx.po b/sphinx/locale/sl/LC_MESSAGES/sphinx.po index b08c75c9b..f980ee1bc 100644 --- a/sphinx/locale/sl/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/sl/LC_MESSAGES/sphinx.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Sphinx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2008-09-11 23:58+0200\n" -"PO-Revision-Date: 2008-12-28 23:40+0100\n" +"PO-Revision-Date: 2009-01-24 18:39+0000\n" "Last-Translator: Rok Garbas \n" "Language-Team: Rok Garbas \n" "Plural-Forms: nplurals=1; plural=0\n" @@ -13,28 +13,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.3\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:170 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, python-format msgid "%B %d, %Y" msgstr "%d %B, %Y" -#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "Abecedni seznam" -#: sphinx/environment.py:294 sphinx/writers/latex.py:175 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "Seznam modulov" -#: sphinx/environment.py:295 sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "Iskalna stran" -#: sphinx/roles.py:53 sphinx/directives/desc.py:564 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "globalna spremenljivka; %s" @@ -52,38 +52,38 @@ msgstr "Vgrajeni deli" msgid "Module level" msgstr "Nivo modula" -#: sphinx/builders/html.py:115 +#: sphinx/builders/html.py:118 #, python-format msgid "%b %d, %Y" msgstr "%d %b, %Y" -#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21 +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 msgid "General Index" msgstr "Splošni abecedni seznam" -#: sphinx/builders/html.py:134 +#: sphinx/builders/html.py:137 msgid "index" msgstr "abecedni seznam" -#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180 -#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19 +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 #: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 msgid "Global Module Index" msgstr "Splošen Seznam Modulov" -#: sphinx/builders/html.py:136 +#: sphinx/builders/html.py:139 msgid "modules" msgstr "Moduli" -#: sphinx/builders/html.py:175 +#: sphinx/builders/html.py:179 msgid "next" msgstr "naprej" -#: sphinx/builders/html.py:182 +#: sphinx/builders/html.py:186 msgid "previous" msgstr "nazaj" -#: sphinx/builders/latex.py:155 +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 msgid " (in " msgstr "(v " @@ -103,7 +103,7 @@ msgstr "%s() (v modulu %s)" msgid "%s (built-in variable)" msgstr "%s (vgrajene spremenljivke)" -#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "%s (v modulu %s)" @@ -138,67 +138,67 @@ msgstr "%s() (%s.%s statična metoda)" msgid "%s() (%s static method)" msgstr "%s() (%s statična metoda)" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s atribut)" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "%s (%s atribut)" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "%s (C funkcija)" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "%s (C član)" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "%s (C makro)" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "%s (C tip)" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "%s (C spremenljivka)" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "Javi" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "Spremenljivka" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "Vrne" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 msgid "Return type" msgstr "Vrne tip" -#: sphinx/directives/desc.py:201 +#: sphinx/directives/desc.py:213 #, fuzzy msgid "Parameter" msgstr "Parametri" -#: sphinx/directives/desc.py:205 +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "Parametri" -#: sphinx/directives/desc.py:450 +#: sphinx/directives/desc.py:465 #, python-format msgid "%scommand line option; %s" msgstr "%sopcija komandne linije; %s" @@ -228,7 +228,12 @@ msgstr "Avtor:" msgid "See also" msgstr "Poglej tudi" -#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590 +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -329,7 +334,7 @@ msgstr "izjava" msgid "built-in function" msgstr "vgrajene funkcije" -#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415 +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 msgid "Permalink to this headline" msgstr "Povezava na naslov" @@ -357,7 +362,7 @@ msgstr "modul, v " msgid ", in " msgstr ", v " -#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "Rezultati Iskanja" @@ -433,73 +438,73 @@ msgstr "Seznam Vsebine" msgid "Previous topic" msgstr "Prejšnja tema" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "prejšnje poglavje" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "Naslednja tema" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "naslednje poglavje" -#: sphinx/templates/layout.html:56 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "Ta stran" -#: sphinx/templates/layout.html:58 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "Prikaži izvorno kodo" -#: sphinx/templates/layout.html:67 +#: sphinx/templates/layout.html:71 msgid "Quick search" msgstr "Hitro iskanje" -#: sphinx/templates/layout.html:69 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "Potrdi" -#: sphinx/templates/layout.html:73 +#: sphinx/templates/layout.html:78 #, fuzzy msgid "Enter search terms or a module, class or function name." msgstr "Vnesi ime mudla, razreda ali funkcije." -#: sphinx/templates/layout.html:106 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "Išči med %(docstitle)s" -#: sphinx/templates/layout.html:115 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "O teh dokumentih" -#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "Išči" -#: sphinx/templates/layout.html:120 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "Vse pravice pridržane" -#: sphinx/templates/layout.html:165 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Vse pravice pridržane %(copyright)s." -#: sphinx/templates/layout.html:167 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Vse pravice pridržane %(copyright)s." -#: sphinx/templates/layout.html:170 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "Zadnjič posodobljeno na %(last_updated)s." -#: sphinx/templates/layout.html:173 +#: sphinx/templates/layout.html:182 #, python-format msgid "" "Created using Sphinx " @@ -517,7 +522,13 @@ msgstr "Zastarelo" msgid "Search %(docstitle)s" msgstr "Išči %(docstitle)s" -#: sphinx/templates/search.html:7 +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" + +#: sphinx/templates/search.html:14 #, fuzzy msgid "" "From here you can search these documents. Enter your search\n" @@ -530,11 +541,11 @@ msgstr "" " bo iskalo po vseh besedah v iskalnem nizu. Strani, ki ne\n" " vsebujejo vseh besed ne bodo prikazane na seznamu rezultatov." -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "išči" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "Vaše iskanje ni imelo nobenega zadetka." @@ -579,27 +590,3 @@ msgstr "Platforma: %s" msgid "[image]" msgstr "[slika]" -#~ msgid "Suggest Change" -#~ msgstr "Predlagaj spremembo" - -#~ msgid "Keyword search" -#~ msgstr "Iskanje po ključniih besedah" - -#~ msgid "Most popular modules:" -#~ msgstr "Najbolj popularni moduli:" - -#~ msgid "Show modules only available on these platforms" -#~ msgstr "Prikaži module na razpolago na platformah" - -#~ msgid "" -#~ "Note: You requested an " -#~ "out-of-date URL from this server. " -#~ "We've tried to redirect you to the" -#~ " new location of this page, but " -#~ "it may not be the right one." -#~ msgstr "" -#~ "Opomba: Vaš zahtevek za URL" -#~ " s tega streznika je zastaral. " -#~ "Poskušali smo vas preusmeriti na novo" -#~ " lokacijo, vendar utegne biti napačna." - diff --git a/sphinx/locale/sphinx.pot b/sphinx/locale/sphinx.pot index bcaee360c..657f5df16 100644 --- a/sphinx/locale/sphinx.pot +++ b/sphinx/locale/sphinx.pot @@ -1,14 +1,14 @@ # Translations template for Sphinx. -# Copyright (C) 2008 ORGANIZATION +# Copyright (C) 2009 ORGANIZATION # This file is distributed under the same license as the Sphinx project. -# FIRST AUTHOR , 2008. +# FIRST AUTHOR , 2009. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Sphinx 0.6\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2008-12-28 23:40+0100\n" +"POT-Creation-Date: 2009-01-24 18:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,28 +17,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.3\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:170 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, python-format msgid "%B %d, %Y" msgstr "" -#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "" -#: sphinx/environment.py:294 sphinx/writers/latex.py:175 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "" -#: sphinx/environment.py:295 sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "" -#: sphinx/roles.py:53 sphinx/directives/desc.py:564 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "" @@ -56,38 +56,38 @@ msgstr "" msgid "Module level" msgstr "" -#: sphinx/builders/html.py:115 +#: sphinx/builders/html.py:118 #, python-format msgid "%b %d, %Y" msgstr "" -#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21 +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 msgid "General Index" msgstr "" -#: sphinx/builders/html.py:134 +#: sphinx/builders/html.py:137 msgid "index" msgstr "" -#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180 -#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19 +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 #: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 msgid "Global Module Index" msgstr "" -#: sphinx/builders/html.py:136 +#: sphinx/builders/html.py:139 msgid "modules" msgstr "" -#: sphinx/builders/html.py:175 +#: sphinx/builders/html.py:179 msgid "next" msgstr "" -#: sphinx/builders/html.py:182 +#: sphinx/builders/html.py:186 msgid "previous" msgstr "" -#: sphinx/builders/latex.py:155 +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 msgid " (in " msgstr "" @@ -107,7 +107,7 @@ msgstr "" msgid "%s (built-in variable)" msgstr "" -#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "" @@ -142,66 +142,66 @@ msgstr "" msgid "%s() (%s static method)" msgstr "" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 msgid "Return type" msgstr "" -#: sphinx/directives/desc.py:201 +#: sphinx/directives/desc.py:213 msgid "Parameter" msgstr "" -#: sphinx/directives/desc.py:205 +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "" -#: sphinx/directives/desc.py:450 +#: sphinx/directives/desc.py:465 #, python-format msgid "%scommand line option; %s" msgstr "" @@ -231,7 +231,12 @@ msgstr "" msgid "See also" msgstr "" -#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590 +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -332,7 +337,7 @@ msgstr "" msgid "built-in function" msgstr "" -#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415 +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 msgid "Permalink to this headline" msgstr "" @@ -360,7 +365,7 @@ msgstr "" msgid ", in " msgstr "" -#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "" @@ -434,72 +439,72 @@ msgstr "" msgid "Previous topic" msgstr "" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "" -#: sphinx/templates/layout.html:56 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "" -#: sphinx/templates/layout.html:58 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "" -#: sphinx/templates/layout.html:67 +#: sphinx/templates/layout.html:71 msgid "Quick search" msgstr "" -#: sphinx/templates/layout.html:69 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "" -#: sphinx/templates/layout.html:73 +#: sphinx/templates/layout.html:78 msgid "Enter search terms or a module, class or function name." msgstr "" -#: sphinx/templates/layout.html:106 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "" -#: sphinx/templates/layout.html:115 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "" -#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "" -#: sphinx/templates/layout.html:120 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "" -#: sphinx/templates/layout.html:165 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "" -#: sphinx/templates/layout.html:167 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "" -#: sphinx/templates/layout.html:170 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "" -#: sphinx/templates/layout.html:173 +#: sphinx/templates/layout.html:182 #, python-format msgid "" "Created using Sphinx " @@ -515,7 +520,13 @@ msgstr "" msgid "Search %(docstitle)s" msgstr "" -#: sphinx/templates/search.html:7 +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" + +#: sphinx/templates/search.html:14 msgid "" "From here you can search these documents. Enter your search\n" " words into the box below and click \"search\". Note that the search\n" @@ -523,11 +534,11 @@ msgid "" " containing fewer words won't appear in the result list." msgstr "" -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "" diff --git a/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po b/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po index 0e27e947a..9dc3c8ea2 100644 --- a/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Sphinx 0.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2008-11-09 19:46+0100\n" -"PO-Revision-Date: 2008-12-28 23:40+0100\n" +"PO-Revision-Date: 2009-01-24 18:39+0000\n" "Last-Translator: Fred Lin \n" "Language-Team: tw \n" "Plural-Forms: nplurals=1; plural=0\n" @@ -17,28 +17,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.3\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:170 +#: sphinx/environment.py:104 sphinx/writers/latex.py:170 #, python-format msgid "%B %d, %Y" msgstr "%Y 年 %m 月 %d 日" -#: sphinx/environment.py:293 sphinx/templates/genindex-single.html:2 +#: sphinx/environment.py:300 sphinx/templates/genindex-single.html:2 #: sphinx/templates/genindex-split.html:2 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48 -#: sphinx/templates/layout.html:117 sphinx/writers/latex.py:176 +#: sphinx/templates/layout.html:126 sphinx/writers/latex.py:176 msgid "Index" msgstr "索引" -#: sphinx/environment.py:294 sphinx/writers/latex.py:175 +#: sphinx/environment.py:301 sphinx/writers/latex.py:175 msgid "Module Index" msgstr "模組索引" -#: sphinx/environment.py:295 sphinx/templates/defindex.html:16 +#: sphinx/environment.py:302 sphinx/templates/defindex.html:16 msgid "Search Page" msgstr "搜尋頁面" -#: sphinx/roles.py:53 sphinx/directives/desc.py:564 +#: sphinx/roles.py:53 sphinx/directives/desc.py:580 #, python-format msgid "environment variable; %s" msgstr "環境變數; %s" @@ -56,38 +56,38 @@ msgstr "" msgid "Module level" msgstr "" -#: sphinx/builders/html.py:115 +#: sphinx/builders/html.py:118 #, python-format msgid "%b %d, %Y" msgstr "%Y 年 %m 月 %d 日" -#: sphinx/builders/html.py:134 sphinx/templates/defindex.html:21 +#: sphinx/builders/html.py:137 sphinx/templates/defindex.html:21 msgid "General Index" msgstr "總索引" -#: sphinx/builders/html.py:134 +#: sphinx/builders/html.py:137 msgid "index" msgstr "索引" -#: sphinx/builders/html.py:136 sphinx/builders/htmlhelp.py:180 -#: sphinx/builders/qthelp.py:129 sphinx/templates/defindex.html:19 +#: sphinx/builders/html.py:139 sphinx/builders/htmlhelp.py:182 +#: sphinx/builders/qthelp.py:131 sphinx/templates/defindex.html:19 #: sphinx/templates/modindex.html:2 sphinx/templates/modindex.html:13 msgid "Global Module Index" msgstr "" -#: sphinx/builders/html.py:136 +#: sphinx/builders/html.py:139 msgid "modules" msgstr "模組" -#: sphinx/builders/html.py:175 +#: sphinx/builders/html.py:179 msgid "next" msgstr "下一頁" -#: sphinx/builders/html.py:182 +#: sphinx/builders/html.py:186 msgid "previous" msgstr "上一頁" -#: sphinx/builders/latex.py:155 +#: sphinx/builders/latex.py:155 sphinx/builders/pdf.py:162 msgid " (in " msgstr "" @@ -107,7 +107,7 @@ msgstr "%s() (在 %s 模組中)" msgid "%s (built-in variable)" msgstr "%s (內建變數)" -#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:66 +#: sphinx/directives/desc.py:30 sphinx/directives/desc.py:78 #, python-format msgid "%s (in module %s)" msgstr "%s() (在 %s 模組中)" @@ -142,67 +142,67 @@ msgstr "%s() (%s.%s 靜態方法)" msgid "%s() (%s static method)" msgstr "%s() (%s 靜態方法)" -#: sphinx/directives/desc.py:70 +#: sphinx/directives/desc.py:82 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s 屬性)" -#: sphinx/directives/desc.py:72 +#: sphinx/directives/desc.py:84 #, python-format msgid "%s (%s attribute)" msgstr "%s (%s 屬性)" -#: sphinx/directives/desc.py:74 +#: sphinx/directives/desc.py:86 #, python-format msgid "%s (C function)" msgstr "%s (C 函式)" -#: sphinx/directives/desc.py:76 +#: sphinx/directives/desc.py:88 #, python-format msgid "%s (C member)" msgstr "%s (C 成員)" -#: sphinx/directives/desc.py:78 +#: sphinx/directives/desc.py:90 #, python-format msgid "%s (C macro)" msgstr "%s (C 巨集)" -#: sphinx/directives/desc.py:80 +#: sphinx/directives/desc.py:92 #, python-format msgid "%s (C type)" msgstr "%s (C 類別)" -#: sphinx/directives/desc.py:82 +#: sphinx/directives/desc.py:94 #, python-format msgid "%s (C variable)" msgstr "%s (C 變數)" -#: sphinx/directives/desc.py:100 +#: sphinx/directives/desc.py:112 msgid "Raises" msgstr "" -#: sphinx/directives/desc.py:104 +#: sphinx/directives/desc.py:116 msgid "Variable" msgstr "變數" -#: sphinx/directives/desc.py:107 +#: sphinx/directives/desc.py:119 msgid "Returns" msgstr "返回" -#: sphinx/directives/desc.py:116 +#: sphinx/directives/desc.py:128 msgid "Return type" msgstr "返回類別" -#: sphinx/directives/desc.py:201 +#: sphinx/directives/desc.py:213 #, fuzzy msgid "Parameter" msgstr "參數" -#: sphinx/directives/desc.py:205 +#: sphinx/directives/desc.py:217 msgid "Parameters" msgstr "參數" -#: sphinx/directives/desc.py:450 +#: sphinx/directives/desc.py:465 #, python-format msgid "%scommand line option; %s" msgstr "%s命令列選項; %s" @@ -232,7 +232,12 @@ msgstr "作者：" msgid "See also" msgstr "" -#: sphinx/ext/autodoc.py:576 sphinx/ext/autodoc.py:590 +#: sphinx/ext/autodoc.py:442 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:566 sphinx/ext/autodoc.py:583 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -333,7 +338,7 @@ msgstr "" msgid "built-in function" msgstr "內建函式" -#: sphinx/static/doctools.js:139 sphinx/writers/html.py:415 +#: sphinx/static/doctools.js:139 sphinx/writers/html.py:425 msgid "Permalink to this headline" msgstr "" @@ -361,7 +366,7 @@ msgstr "" msgid ", in " msgstr "" -#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:18 +#: sphinx/static/searchtools.js:453 sphinx/templates/search.html:25 msgid "Search Results" msgstr "搜尋結果" @@ -435,73 +440,73 @@ msgstr "內容目錄" msgid "Previous topic" msgstr "上一個主題" -#: sphinx/templates/layout.html:47 +#: sphinx/templates/layout.html:48 msgid "previous chapter" msgstr "上一章" -#: sphinx/templates/layout.html:50 +#: sphinx/templates/layout.html:51 msgid "Next topic" msgstr "下一個主題" -#: sphinx/templates/layout.html:51 +#: sphinx/templates/layout.html:53 msgid "next chapter" msgstr "下一章" -#: sphinx/templates/layout.html:56 +#: sphinx/templates/layout.html:58 msgid "This Page" msgstr "本頁" -#: sphinx/templates/layout.html:58 +#: sphinx/templates/layout.html:61 msgid "Show Source" msgstr "顯示原始碼" -#: sphinx/templates/layout.html:67 +#: sphinx/templates/layout.html:71 msgid "Quick search" msgstr "快速搜尋" -#: sphinx/templates/layout.html:69 +#: sphinx/templates/layout.html:74 msgid "Go" msgstr "" -#: sphinx/templates/layout.html:73 +#: sphinx/templates/layout.html:78 #, fuzzy msgid "Enter search terms or a module, class or function name." msgstr "輸入一個模組、類別、或是函式名稱." -#: sphinx/templates/layout.html:106 +#: sphinx/templates/layout.html:115 #, python-format msgid "Search within %(docstitle)s" msgstr "在 %(docstitle)s 中搜尋" -#: sphinx/templates/layout.html:115 +#: sphinx/templates/layout.html:124 msgid "About these documents" msgstr "" -#: sphinx/templates/layout.html:118 sphinx/templates/search.html:2 +#: sphinx/templates/layout.html:127 sphinx/templates/search.html:2 #: sphinx/templates/search.html:5 msgid "Search" msgstr "搜尋" -#: sphinx/templates/layout.html:120 +#: sphinx/templates/layout.html:129 msgid "Copyright" msgstr "版權所有" -#: sphinx/templates/layout.html:165 +#: sphinx/templates/layout.html:174 #, python-format msgid "© Copyright %(copyright)s." msgstr "" -#: sphinx/templates/layout.html:167 +#: sphinx/templates/layout.html:176 #, python-format msgid "© Copyright %(copyright)s." msgstr "" -#: sphinx/templates/layout.html:170 +#: sphinx/templates/layout.html:179 #, python-format msgid "Last updated on %(last_updated)s." msgstr "最後更新日期是 %(last_updated)s." -#: sphinx/templates/layout.html:173 +#: sphinx/templates/layout.html:182 #, python-format msgid "" "Created using Sphinx " @@ -517,7 +522,13 @@ msgstr "已移除" msgid "Search %(docstitle)s" msgstr "搜尋 %(docstitle)s" -#: sphinx/templates/search.html:7 +#: sphinx/templates/search.html:9 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" + +#: sphinx/templates/search.html:14 msgid "" "From here you can search these documents. Enter your search\n" " words into the box below and click \"search\". Note that the search\n" @@ -525,11 +536,11 @@ msgid "" " containing fewer words won't appear in the result list." msgstr "" -#: sphinx/templates/search.html:14 +#: sphinx/templates/search.html:21 msgid "search" msgstr "搜尋" -#: sphinx/templates/search.html:20 +#: sphinx/templates/search.html:27 msgid "Your search did not match any results." msgstr "" @@ -574,23 +585,3 @@ msgstr "平台：%s" msgid "[image]" msgstr "[圖片]" -#~ msgid "Suggest Change" -#~ msgstr "" - -#~ msgid "Keyword search" -#~ msgstr "關鍵字搜尋" - -#~ msgid "Most popular modules:" -#~ msgstr "" - -#~ msgid "Show modules only available on these platforms" -#~ msgstr "" - -#~ msgid "" -#~ "Note: You requested an " -#~ "out-of-date URL from this server. " -#~ "We've tried to redirect you to the" -#~ " new location of this page, but " -#~ "it may not be the right one." -#~ msgstr "" - diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index 9149b1112..c7bf92f64 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -256,7 +256,7 @@ PAPEROPT_letter = -D latex_paper_size=letter ALLSPHINXOPTS = -d %(rbuilddir)s/doctrees $(PAPEROPT_$(PAPER)) \ $(SPHINXOPTS) %(rsrcdir)s -.PHONY: help clean html pickle json htmlhelp qthelp latex changes linkcheck +.PHONY: help clean html pickle json htmlhelp qthelp latex changes linkcheck doctest help: \t@echo "Please use \\`make ' where is one of" @@ -268,6 +268,7 @@ help: \t@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" \t@echo " changes to make an overview of all changed/added/deprecated items" \t@echo " linkcheck to check all external links for integrity" +\t@echo " doctest to run all doctests embedded in the documentation (if enabled)" clean: \t-rm -rf %(rbuilddir)s/* @@ -319,6 +320,11 @@ linkcheck: \t@echo \t@echo "Link check complete; look for any errors in the above output " \\ \t "or in %(rbuilddir)s/linkcheck/output.txt." + +doctest: +\t$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) %(rbuilddir)s/doctest +\t@echo "Testing of doctests in the sources finished, look at the " \\ +\t "results in %(rbuilddir)s/doctest/output.txt." ''' BATCHFILE = '''\ @@ -345,6 +351,7 @@ if "%%1" == "help" ( \techo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter \techo. changes to make an overview over all changed/added/deprecated items \techo. linkcheck to check all external links for integrity +\techo. doctest to run all doctests embedded in the documentation if enabled \tgoto end ) @@ -416,6 +423,14 @@ or in %(rbuilddir)s/linkcheck/output.txt. \tgoto end ) +if "%%1" == "doctest" ( +\t%%SPHINXBUILD%% -b doctest %%ALLSPHINXOPTS%% %(rbuilddir)s/doctest +\techo. +\techo.Testing of doctests in the sources finished, look at the ^ +results in %(rbuilddir)s/doctest/output.txt. +\tgoto end +) + :end ''' diff --git a/sphinx/search.py b/sphinx/search.py index f39d3674f..fe20c24a5 100644 --- a/sphinx/search.py +++ b/sphinx/search.py @@ -134,13 +134,16 @@ class IndexBuilder(object): def get_modules(self, fn2index): rv = {} for name, (doc, _, _, _) in self.env.modules.iteritems(): - rv[name] = fn2index[doc] + if doc in fn2index: + rv[name] = fn2index[doc] return rv def get_descrefs(self, fn2index): rv = {} dt = self._desctypes for fullname, (doc, desctype) in self.env.descrefs.iteritems(): + if doc not in fn2index: + continue prefix, name = rpartition(fullname, '.') pdict = rv.setdefault(prefix, {}) try: @@ -156,9 +159,10 @@ class IndexBuilder(object): for k, v in self._mapping.iteritems(): if len(v) == 1: fn, = v - rv[k] = fn2index[fn] + if fn in fn2index: + rv[k] = fn2index[fn] else: - rv[k] = [fn2index[fn] for fn in v] + rv[k] = [fn2index[fn] for fn in v if fn in fn2index] return rv def freeze(self): diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index bb247664a..364b571eb 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -454,13 +454,7 @@ % class method ---------------------------------------------------------- % \begin{classmethoddesc}[classname]{methodname}{args} \newcommand{\classmethodline}[3][\@undefined]{ - \classmethodlineni{#2}{#3} - \ifx\@undefined#1\relax - \index{#2@{\py@idxcode{#2()}} (\py@thisclass\ class method)} - \else - \index{#2@{\py@idxcode{#2()}} (#1 class method)} - \fi -} + \py@sigline{class \bfcode{#2}}{#3}} \newenvironment{classmethoddesc}[3][\@undefined]{ \begin{fulllineitems} \ifx\@undefined#1\relax @@ -471,15 +465,6 @@ \fi }{\end{fulllineitems}} -% similar to {classmethoddesc}, but doesn't add to the index -% (never actually uses the optional argument) -\newcommand{\classmethodlineni}[3][\py@classbadkey]{% - \py@sigline{class \bfcode{#2}}{#3}} -\newenvironment{classmethoddescni}[3][\py@classbadkey]{ - \begin{fulllineitems} - \classmethodlineni{#2}{#3} -}{\end{fulllineitems}} - % object data attribute -------------------------------------------------- % \begin{memberdesc}[classname]{membername} \newcommand{\memberline}[2][\py@classbadkey]{% diff --git a/tests/root/contents.txt b/tests/root/contents.txt index 61646f622..c87a2d8e6 100644 --- a/tests/root/contents.txt +++ b/tests/root/contents.txt @@ -18,6 +18,8 @@ Contents: math autodoc + Python + Indices and tables ================== diff --git a/tests/test_build.py b/tests/test_build.py index cb206979b..a44d198e8 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -96,6 +96,7 @@ HTML_XPATH = { ".//li[@class='toctree-l2']/a": 'Admonitions', ".//title": 'Sphinx ', ".//div[@class='footer']": 'Georg Brandl & Team', + ".//a[@href='http://python.org/']": '', }, }