diff options
| author | Roland Meister <devnull@localhost> | 2012-02-21 21:00:14 +0100 |
|---|---|---|
| committer | Roland Meister <devnull@localhost> | 2012-02-21 21:00:14 +0100 |
| commit | 0cbae1ffe2ba0cda931e6d23d342bdc530d49cf2 (patch) | |
| tree | 89745e757dbf5746140460741572d6c8e07305f0 | |
| parent | 2845f0145d340a5bd6543fbf5dabe2d3cad95c8c (diff) | |
| parent | fa16f15fccef71aee359138d9e7d5b745bf15b16 (diff) | |
| download | sphinx-0cbae1ffe2ba0cda931e6d23d342bdc530d49cf2.tar.gz | |
Merge with arlaneenalra/sphinx
161 files changed, 6103 insertions, 2833 deletions
@@ -40,6 +40,7 @@ Other contributors, listed alphabetically, are: * John Waltman -- Texinfo builder * Barry Warsaw -- setup command improvements * Sebastian Wiesner -- image handling, distutils support +* Joel Wurtz -- cellspanning support in LaTeX Many thanks for all contributions! @@ -1,6 +1,50 @@ -Release 1.1 (in development) +Release 1.2 (in development) ============================ +* PR#28: Added Hungarian translation. + +* PR#35: Added Slovak translation. + + +Release 1.1.3 (in development) +============================== + +* PR#40: Fix ``safe_repr`` function to decode bytestrings with non-ASCII + characters correctly. + +* PR#37: Allow configuring sphinx-apidoc via ``SPHINX_APIDOC_OPTIONS``. + +* PR#34: Restore Python 2.4 compatibility. + +* PR#36: Make the "bibliography to TOC" fix in LaTeX output specific to + the document class. + + +Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway! +====================================================================== + +* #809: Include custom fixers in the source distribution. + + +Release 1.1.1 (Nov 1, 2011) +=========================== + +* #791: Fix QtHelp, DevHelp and HtmlHelp index entry links. + +* #792: Include "sphinx-apidoc" in the source distribution. + +* #797: Don't crash on a misformatted glossary. + +* #801: Make intersphinx work properly without SSL support. + +* #805: Make the ``Sphinx.add_index_to_domain`` method work correctly. + +* #780: Fix Python 2.5 compatibility. + + +Release 1.1 (Oct 9, 2011) +========================= + Incompatible changes -------------------- @@ -8,6 +52,12 @@ Incompatible changes value anymore. (It was the only thing that the directive did output, and therefore quite inconsistent.) +* Removed support for old dependency versions; requirements are now: + + - Pygments >= 1.2 + - Docutils >= 0.7 + - Jinja2 >= 2.3 + Features added -------------- @@ -27,17 +77,20 @@ Features added * Markup: - - #138: Add an :rst:role:`index` role, to make inline index entries. - - #454: Add more index markup capabilities: marking see/seealso entries, + - #138: Added an :rst:role:`index` role, to make inline index entries. + - #454: Added more index markup capabilities: marking see/seealso entries, and main entries for a given key. - - #460: Allow limiting the depth of section numbers for HTML using the + - #460: Allowed limiting the depth of section numbers for HTML using the :rst:dir:`toctree`\'s ``numbered`` option. - #586: Implemented improved :rst:dir:`glossary` markup which allows multiple terms per definition. - #478: Added :rst:dir:`py:decorator` directive to describe decorators. - C++ domain now supports array definitions. + - C++ domain now supports doc fields (``:param x:`` inside directives). - Section headings in :rst:dir:`only` directives are now correctly handled. + - Added ``emphasize-lines`` option to source code directives. + - #678: C++ domain now supports superclasses. * HTML builder: @@ -59,6 +112,7 @@ Features added requests and allow configuring the timeout. New config values: :confval:`linkcheck_timeout` and :confval:`linkcheck_workers`. - #521: Added :confval:`linkcheck_ignore` config value. + - #28: Support row/colspans in tables in the LaTeX builder. * Configuration and extensibility: @@ -102,10 +156,61 @@ Features added - #526: Added Iranian locale. - #694: Added Latvian locale. - Added Nepali locale. + - #714: Added Korean locale. + - #766: Added Estonian locale. +* Bugs fixed: -Release 1.0.8 (in development) -============================== + - #778: Fix "hide search matches" link on pages linked by search. + - Fix the source positions referenced by the "viewcode" extension. + + +Release 1.0.8 (Sep 23, 2011) +============================ + +* #627: Fix tracebacks for AttributeErrors in autosummary generation. + +* Fix the ``abbr`` role when the abbreviation has newlines in it. + +* #727: Fix the links to search results with custom object types. + +* #648: Fix line numbers reported in warnings about undefined + references. + +* #696, #666: Fix C++ array definitions and template arguments + that are not type names. + +* #633: Allow footnotes in section headers in LaTeX output. + +* #616: Allow keywords to be linked via intersphinx. + +* #613: Allow Unicode characters in production list token names. + +* #720: Add dummy visitors for graphviz nodes for text and man. + +* #704: Fix image file duplication bug. + +* #677: Fix parsing of multiple signatures in C++ domain. + +* #637: Ignore Emacs lock files when looking for source files. + +* #544: Allow .pyw extension for importable modules in autodoc. + +* #700: Use ``$(MAKE)`` in quickstart-generated Makefiles. + +* #734: Make sidebar search box width consistent in browsers. + +* #644: Fix spacing of centered figures in HTML output. + +* #767: Safely encode SphinxError messages when printing them to + sys.stderr. + +* #611: Fix LaTeX output error with a document with no sections but + a link target. + +* Correctly treat built-in method descriptors as methods in autodoc. + +* #706: Stop monkeypatching the Python textwrap module. * #657: viewcode now works correctly with source files that have non-ASCII encoding. @@ -123,6 +228,8 @@ Release 1.0.8 (in development) * #647: Do not apply SmartyPants in parsed-literal blocks. +* C++ domain now supports array definitions. + Release 1.0.7 (Jan 15, 2011) ============================ @@ -19,10 +19,13 @@ Documentation using the default theme * CodePy: http://documen.tician.de/codepy/ * Cython: http://docs.cython.org/ * C\\C++ Python language binding project: http://language-binding.net/index.html +* Cormoran: http://cormoran.nhopkg.org/docs/ * Director: http://packages.python.org/director/ * Dirigible: http://www.projectdirigible.com/documentation/ +* Elemental: http://elemental.googlecode.com/hg/doc/build/html/index.html * F2py: http://f2py.sourceforge.net/docs/ * GeoDjango: http://geodjango.org/docs/ +* Genomedata: http://noble.gs.washington.edu/proj/genomedata/doc/1.2.2/genomedata.html * gevent: http://www.gevent.org/ * Google Wave API: http://wave-robot-python-client.googlecode.com/svn/trunk/pydocs/index.html * GSL Shell: http://www.nongnu.org/gsl-shell/ @@ -51,6 +54,7 @@ Documentation using the default theme * PyUblas: http://documen.tician.de/pyublas/ * Quex: http://quex.sourceforge.net/doc/html/main.html * Scapy: http://www.secdev.org/projects/scapy/doc/ +* Segway: http://noble.gs.washington.edu/proj/segway/doc/1.1.0/segway.html * SimPy: http://simpy.sourceforge.net/SimPyDocs/index.html * SymPy: http://docs.sympy.org/ * WTForms: http://wtforms.simplecodes.com/docs/ @@ -114,14 +118,15 @@ Documentation using another builtin theme * C/C++ Development with Eclipse: http://eclipsebook.in/ (agogo) * Distribute: http://packages.python.org/distribute/ (nature) * Jinja: http://jinja.pocoo.org/ (scrolls) +* jsFiddle: http://doc.jsfiddle.net/ (nature) * pip: http://pip.openplans.org/ (nature) * Programmieren mit PyGTK und Glade (German): http://www.florian-diesch.de/doc/python-und-glade/online/ (agogo) -* pypol: http://pypol.altervista.org/ (nature) * Spring Python: http://springpython.webfactional.com/current/sphinx/index.html (nature) * sqlparse: http://python-sqlparse.googlecode.com/svn/docs/api/index.html (agogo) +* Sylli: http://sylli.sourceforge.net/ (nature) * libLAS: http://liblas.org/ (nature) @@ -132,8 +137,10 @@ Documentation using a custom theme/integrated in a site * Blinker: http://discorporate.us/projects/Blinker/docs/ * Classy: classy: http://classy.pocoo.org/ * Django: http://docs.djangoproject.com/ +* e-cidadania: http://e-cidadania.readthedocs.org/en/latest/ * Flask: http://flask.pocoo.org/docs/ * Flask-OpenID: http://packages.python.org/Flask-OpenID/ +* Gameduino: http://excamera.com/sphinx/gameduino/ * GeoServer: http://docs.geoserver.org/ * Glashammer: http://glashammer.org/ * MirrorBrain: http://mirrorbrain.org/docs/ @@ -145,6 +152,7 @@ Documentation using a custom theme/integrated in a site * German Plone 4.0 user manual: http://www.hasecke.com/plone-benutzerhandbuch/4.0/ * Pylons: http://pylonshq.com/docs/en/0.9.7/ * PyMOTW: http://www.doughellmann.com/PyMOTW/ +* pypol: http://pypol.altervista.org/ (celery) * qooxdoo: http://manual.qooxdoo.org/current * Roundup: http://www.roundup-tracker.org/ * Selenium: http://seleniumhq.org/docs/ @@ -164,6 +172,7 @@ Homepages and other non-documentation sites * A personal page: http://www.dehlia.in/ * Benoit Boissinot: http://bboissin.appspot.com/ * lunarsite: http://lunaryorn.de/ +* Red Hot Chili Python: http://redhotchilipython.com/ * The Wine Cellar Book: http://www.thewinecellarbook.com/doc/en/ * VOR: http://www.vor-cycling.be/ diff --git a/MANIFEST.in b/MANIFEST.in index cfc44c17..cf308103 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,6 +11,7 @@ include distribute_setup.py include sphinx-autogen.py include sphinx-build.py include sphinx-quickstart.py +include sphinx-apidoc.py recursive-include sphinx/texinputs * recursive-include sphinx/themes * @@ -18,6 +19,7 @@ recursive-include sphinx/locale * recursive-include sphinx/ext/autosummary/templates * recursive-include tests * recursive-include utils * +recursive-include custom_fixers * include sphinx/pycode/Grammar.txt recursive-include doc * diff --git a/doc/conf.py b/doc/conf.py index a1d0e8ce..6b547edd 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -36,7 +36,9 @@ epub_identifier = epub_publisher epub_pre_files = [('index.html', 'Welcome')] epub_exclude_files = ['_static/opensearch.xml', '_static/doctools.js', '_static/jquery.js', '_static/searchtools.js', '_static/underscore.js', - '_static/basic.css', 'search.html'] + '_static/basic.css', 'search.html', '_static/websupport.js'] +epub_fix_images = False +epub_max_image_width = 0 latex_documents = [('contents', 'sphinx.tex', 'Sphinx Documentation', 'Georg Brandl', 'manual', 1)] @@ -62,6 +64,8 @@ man_pages = [ '', 1), ('man/sphinx-quickstart', 'sphinx-quickstart', 'Sphinx documentation ' 'template generator', '', 1), + ('man/sphinx-apidoc', 'sphinx-apidoc', 'Sphinx API doc generator tool', + '', 1), ] texinfo_documents = [ diff --git a/doc/config.rst b/doc/config.rst index 5db7c74b..f840b289 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -372,12 +372,15 @@ documentation on :ref:`intl` for details. * ``de`` -- German * ``en`` -- English * ``es`` -- Spanish + * ``et`` -- Estonian * ``fa`` -- Iranian * ``fi`` -- Finnish * ``fr`` -- French * ``hr`` -- Croatian + * ``hu`` -- Hungarian * ``it`` -- Italian * ``ja`` -- Japanese + * ``ko`` -- Korean * ``lt`` -- Lithuanian * ``lv`` -- Latvian * ``ne`` -- Nepali @@ -385,6 +388,7 @@ documentation on :ref:`intl` for details. * ``pl`` -- Polish * ``pt_BR`` -- Brazilian Portuguese * ``ru`` -- Russian + * ``sk`` -- Slovak * ``sl`` -- Slovenian * ``sv`` -- Swedish * ``tr`` -- Turkish @@ -404,11 +408,20 @@ documentation on :ref:`intl` for details. add the directory :file:`./locale` to this settting, the message catalogs (compiled from ``.po`` format using :program:`msgfmt`) must be in :file:`./locale/{language}/LC_MESSAGES/sphinx.mo`. The text domain of - individual documents depends on their docname if they are top-level project - files and on their base directory otherwise. + individual documents depends on :confval:`gettext_compact`. The default is ``[]``. +.. confval:: gettext_compact + + .. versionadded:: 1.1 + + If true, a document's text domain is its docname if it is a top-level + project file and its very base directory otherwise. + + By default, the document ``markup/code.rst`` ends up in the ``markup`` text + domain. With this option set to ``False``, it is ``markup/code``. + .. _html-options: @@ -772,6 +785,12 @@ the `Dublin Core metadata <http://dublincore.org/>`_. output is usually not wise. This defaults to ``'epub'``, a theme designed to save visual space. +.. confval:: epub_theme_options + + A dictionary of options that influence the look and feel of the selected + theme. These are theme-specific. For the options understood by the builtin + themes, see :ref:`this section <builtin-themes>`. + .. confval:: epub_title The title of the document. It defaults to the :confval:`html_title` option @@ -871,6 +890,23 @@ the `Dublin Core metadata <http://dublincore.org/>`_. depth in one list. The default value is ``True``. +.. confval:: epub_fix_images + + This flag determines if sphinx should try to fix image formats that are not + supported by some epub readers. At the moment palette images with a small + color table are upgraded. You need the Python Image Library (PIL) installed + to use this option. The default value is ``False`` because the automatic + conversion may lose information. + +.. confval:: epub_max_image_width + + This option specifies the maximum width of images. If it is set to a value + greater than zero, images with a width larger than the given value are + scaled accordingly. If it is zero, no scaling is performed. The default + value is ``0``. You need the Python Image Library (PIL) installed to use + this option. + + .. _latex-options: Options for LaTeX output diff --git a/doc/domains.rst b/doc/domains.rst index a1e7b98e..9894caab 100644 --- a/doc/domains.rst +++ b/doc/domains.rst @@ -535,8 +535,14 @@ The following directives are available: Describe a casting operator here. + .. cpp:function:: constexpr void foo(std::string &bar[2]) noexcept + + Describe a constexpr function here. + .. cpp:member:: std::string theclass::name + .. cpp:member:: std::string theclass::name[N][M] + .. cpp:type:: theclass::const_iterator Will be rendered like this: @@ -557,8 +563,14 @@ The following directives are available: Describe a casting operator here. + .. cpp:function:: constexpr void foo(std::string &bar[2]) noexcept + + Describe a constexpr function here. + .. cpp:member:: std::string theclass::name + .. cpp:member:: std::string theclass::name[N][M] + .. cpp:type:: theclass::const_iterator .. rst:directive:: .. cpp:namespace:: namespace diff --git a/doc/ext/appapi.rst b/doc/ext/appapi.rst index 643de995..1f5c063c 100644 --- a/doc/ext/appapi.rst +++ b/doc/ext/appapi.rst @@ -115,11 +115,8 @@ the following public API: <http://docutils.sourceforge.net/docs/howto/rst-directives.html>`_ for details. - The directive class normally must inherit from the class - ``docutils.parsers.rst.Directive``. When writing a directive for usage in - a Sphinx extension, you inherit from ``sphinx.util.compat.Directive`` - instead which does the right thing even on docutils 0.4 (which doesn't - support directive classes otherwise). + The directive class must inherit from the class + ``docutils.parsers.rst.Directive``. For example, the (already existing) :rst:dir:`literalinclude` directive would be added like this: diff --git a/doc/ext/autosummary.rst b/doc/ext/autosummary.rst index 878a3c2c..e3de1835 100644 --- a/doc/ext/autosummary.rst +++ b/doc/ext/autosummary.rst @@ -29,7 +29,7 @@ The :mod:`sphinx.ext.autosummary` extension does this in two parts: .. rst:directive:: autosummary Insert a table that contains links to documented items, and a short summary - blurb (the first sentence of the docstring) for each of them. + blurb (the first sentence of the docstring) for each of them. The :rst:dir:`autosummary` directive can also optionally serve as a :rst:dir:`toctree` entry for the included items. Optionally, stub diff --git a/doc/ext/math.rst b/doc/ext/math.rst index bbefe382..434c657b 100644 --- a/doc/ext/math.rst +++ b/doc/ext/math.rst @@ -63,10 +63,10 @@ further translation is necessary when building LaTeX output. .. math:: (a + b)^2 = a^2 + 2ab + b^2 Normally, equations are not numbered. If you want your equation to get a - number, use the ``label`` option. When given, it selects a label for the - equation, by which it can be cross-referenced, and causes an equation number - to be issued. See :rst:role:`eqref` for an example. The numbering style depends - on the output format. + number, use the ``label`` option. When given, it selects an internal label + for the equation, by which it can be cross-referenced, and causes an equation + number to be issued. See :rst:role:`eqref` for an example. The numbering + style depends on the output format. There is also an option ``nowrap`` that prevents any wrapping of the given math in a math environment. When you give this option, you must make sure diff --git a/doc/faq.rst b/doc/faq.rst index 965a1986..bf2327d7 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -45,7 +45,7 @@ Using Sphinx with... Read the Docs http://readthedocs.org is a documentation hosting service based around Sphinx. They will host sphinx documentation, along with supporting a number of other - features including version support, PDF generation, and more. The `Getting + features including version support, PDF generation, and more. The `Getting Started <http://read-the-docs.readthedocs.org/en/latest/getting_started.html>`_ guide is a good place to start. diff --git a/doc/intl.rst b/doc/intl.rst index 6a5471c4..87068215 100644 --- a/doc/intl.rst +++ b/doc/intl.rst @@ -46,7 +46,7 @@ with :confval:`locale_dirs` for your :confval:`language`, Sphinx will pick them up automatically. An example: you have a document ``usage.rst`` in your Sphinx project. The -gettext builder will put its messages into ``usage.pot``. Image you have +gettext builder will put its messages into ``usage.pot``. Imagine you have Spanish translations [2]_ on your hands in ``usage.po`` --- for your builds to be translated you need to follow these instructions: diff --git a/doc/intro.rst b/doc/intro.rst index 0e6e5247..5d76dd29 100644 --- a/doc/intro.rst +++ b/doc/intro.rst @@ -24,8 +24,7 @@ This section is intended to collect helpful hints for those wanting to migrate to reStructuredText/Sphinx from other documentation systems. * Gerard Flanagan has written a script to convert pure HTML to reST; it can be - found at `BitBucket - <https://bitbucket.org/djerdo/musette/src/tip/musette/html/html2rest.py>`_. + found at the `Python Package Index <http://pypi.python.org/pypi/html2rest>`_. * For converting the old Python docs to Sphinx, a converter was written which can be found at `the Python SVN repository @@ -35,6 +34,12 @@ to reStructuredText/Sphinx from other documentation systems. * Marcin Wojdyr has written a script to convert Docbook to reST with Sphinx markup; it is at `Google Code <http://code.google.com/p/db2rst/>`_. +* Christophe de Vienne wrote a tool to convert from Open/LibreOffice documents + to Sphinx: `odt2sphinx <http://pypi.python.org/pypi/odt2sphinx/>`_. + +* To convert different markups, `Pandoc <http://johnmacfarlane.net/pandoc/>`_ is + a very helpful tool. + Use with other systems ---------------------- @@ -46,7 +51,7 @@ Prerequisites ------------- Sphinx needs at least **Python 2.4** or **Python 3.1** to run, as well as the -docutils_ and Jinja2_ libraries. Sphinx should work with docutils version 0.5 +docutils_ and Jinja2_ libraries. Sphinx should work with docutils version 0.7 or some (not broken) SVN trunk snapshot. If you like to have source code highlighting support, you must also install the Pygments_ library. diff --git a/doc/invocation.rst b/doc/invocation.rst index c8e9a61f..2c69d32f 100644 --- a/doc/invocation.rst +++ b/doc/invocation.rst @@ -14,6 +14,8 @@ you don't need to specify any *filenames*. The :program:`sphinx-build` script has several options: +.. program:: sphinx-build + .. option:: -b buildername The most important option: it selects a builder. The most common builders @@ -183,3 +185,72 @@ variables to customize behavior: .. describe:: SPHINXOPTS Additional options for :program:`sphinx-build`. + + +.. _invocation-apidoc: + +Invocation of sphinx-apidoc +=========================== + +The :program:`sphinx-apidoc` generates completely automatic API documentation +for a Python package. It is called like this:: + + $ sphinx-apidoc [options] -o outputdir packagedir [pathnames] + +where *packagedir* is the path to the package to document, and *outputdir* is +the directory where the generated sources are placed. Any *pathnames* given +are paths to be excluded ignored during generation. + +The :program:`sphinx-apidoc` script has several options: + +.. program:: sphinx-apidoc + +.. option:: -o outputdir + + Gives the directory in which to place the generated output. + +.. option:: -f, --force + + Normally, sphinx-apidoc does not overwrite any files. Use this option to + force the overwrite of all files that it generates. + +.. option:: -n, --dry-run + + With this option given, no files will be written at all. + +.. option:: -s suffix + + This option selects the file name suffix of output files. By default, this + is ``rst``. + +.. option:: -d maxdepth + + This sets the maximum depth of the table of contents, if one is generated. + +.. option:: -T, --no-toc + + This prevents the generation of a table-of-contents file ``modules.rst``. + This has no effect when :option:`--full` is given. + +.. option:: -F, --full + + This option makes sphinx-apidoc create a full Sphinx project, using the same + mechanism as :program:`sphinx-quickstart`. Most configuration values are set + to default values, but you can influence the most important ones using the + following options. + +.. option:: -H project + + Sets the project name to put in generated files (see :confval:`project`). + +.. option:: -A author + + Sets the author name(s) to put in generated files (see :confval:`copyright`). + +.. option:: -V version + + Sets the project version to put in generated files (see :confval:`version`). + +.. option:: -R release + + Sets the project release to put in generated files (see :confval:`release`). diff --git a/doc/man/sphinx-apidoc.rst b/doc/man/sphinx-apidoc.rst new file mode 100644 index 00000000..e48102de --- /dev/null +++ b/doc/man/sphinx-apidoc.rst @@ -0,0 +1,55 @@ +:orphan: + +sphinx-apidoc manual page +========================= + +Synopsis +-------- + +**sphinx-apidoc** [*options*] -o <*outputdir*> <*sourcedir*> [*pathnames* ...] + + +Description +----------- + +:program:`sphinx-apidoc` is a tool for automatic generation of Sphinx sources +that, using the autodoc extension, document a whole package in the style of +other automatic API documentation tools. + +*sourcedir* must point to a Python package. Any *pathnames* given are paths to +be excluded from the generation. + + +Options +------- + +-o <outputdir> Directory to place the output files. If it does not exist, + it is created. +-f, --force Usually, apidoc does not overwrite files, unless this option + is given. +-n, --dry-run If given, apidoc does not create any files. +-s <suffix> Suffix for the source files generated, default is ``rst``. +-d <maxdepth> Maximum depth for the generated table of contents file. +-T, --no-toc Do not create a table of contents file. +-F, --full If given, a full Sphinx project is generated (``conf.py``, + ``Makefile`` etc.) using sphinx-quickstart. + +These options are used with ``-F``: + +-H <project> Project name to put into the configuration. +-A <author> Author name(s) to put into the configuration. +-V <version> Project version. +-R <release> Project release. + + +See also +-------- + +:manpage:`sphinx-build(1)` + + +Author +------ + +Etienne Desautels, <etienne.desautels@gmail.com>, Georg Brandl +<georg@python.org> et al. diff --git a/doc/markup/code.rst b/doc/markup/code.rst index eaaf17d0..c0e7e8eb 100644 --- a/doc/markup/code.rst +++ b/doc/markup/code.rst @@ -86,6 +86,21 @@ on line numbers for the individual block:: Some more Ruby code. +Additionally, an ``emphasize-lines`` option can be given to have Pygments +emphasize particular lines:: + + .. code-block:: python + :emphasize-lines: 3,5 + + def some_function(): + interesting = False + print 'This line is highlighted.' + print 'This one is not...' + print '...but this one is.' + +.. versionchanged:: 1.1 + ``emphasize-lines`` has been added. + Includes ^^^^^^^^ @@ -107,11 +122,13 @@ Includes desired tab width. The directive also supports the ``linenos`` flag option to switch on line - numbers, and a ``language`` option to select a language different from the - current file's standard language. Example with options:: + numbers, the ``emphasize-lines`` option to emphasize particular lines, and + a ``language`` option to select a language different from the current + file's standard language. Example with options:: .. literalinclude:: example.rb :language: ruby + :emphasize-lines: 12,15-18 :linenos: Include files are assumed to be encoded in the :confval:`source_encoding`. diff --git a/doc/markup/toctree.rst b/doc/markup/toctree.rst index 0b6a46c1..625fbb61 100644 --- a/doc/markup/toctree.rst +++ b/doc/markup/toctree.rst @@ -11,6 +11,11 @@ documents into multiple output files, Sphinx uses a custom directive to add relations between the single files the documentation is made of, as well as tables of contents. The ``toctree`` directive is the central element. +.. note:: + + Simple "inclusion" of one file in another can be done with the + :dudir:`include` directive. + .. rst:directive:: toctree This directive inserts a "TOC tree" at the current location, using the diff --git a/doc/theming.rst b/doc/theming.rst index 802b211f..334f6ffe 100644 --- a/doc/theming.rst +++ b/doc/theming.rst @@ -200,10 +200,14 @@ These themes are: * **traditional** -- A theme resembling the old Python documentation. There are currently no options beyond *nosidebar* and *sidebarwidth*. -* **epub** -- A theme for the epub builder. There are currently no options. - This theme tries to save visual space which is a sparse resource on ebook - readers. - +* **epub** -- A theme for the epub builder. This theme tries to save visual + space which is a sparse resource on ebook readers. The following options + are supported: + + - **relbar1** (true or false, default true): If this is true, the + `relbar1` block is inserted in the epub output, otherwise it is omitted. + - **footer** (true or false, default true): If this is true, the + `footer` block is inserted in the epub output, otherwise it is ommitted. Creating themes --------------- diff --git a/doc/tutorial.rst b/doc/tutorial.rst index fa6ee2ab..b0e1d486 100644 --- a/doc/tutorial.rst +++ b/doc/tutorial.rst @@ -26,6 +26,9 @@ configuration values from a few questions it asks you. Just run :: and answer its questions. (Be sure to say yes to the "autodoc" extension.) +There is also an automatic "API documentation" generator called +:program:`sphinx-apidoc`; see :ref:`invocation-apidoc` for details. + Defining document structure --------------------------- @@ -125,6 +128,12 @@ to run :: to build HTML docs in the build directory you chose. Execute ``make`` without an argument to see which targets are available. +.. admonition:: How do I generate PDF documents? + + ``make latexpdf`` runs the :mod:`LaTeX builder + <sphinx.builders.latex.LaTeXBuilder>` and readily invokes the pdfTeX + toolchain for you. + Documenting objects ------------------- @@ -44,7 +44,7 @@ A development egg can be found `here <http://bitbucket.org/birkenfeld/sphinx/get/tip.gz#egg=Sphinx-dev>`_. ''' -requires = ['Pygments>=0.8', 'Jinja2>=2.2', 'docutils>=0.5'] +requires = ['Pygments>=1.2', 'Jinja2>=2.3', 'docutils>=0.7'] if sys.version_info < (2, 4): print('ERROR: Sphinx requires at least Python 2.4 to run.') @@ -182,12 +182,13 @@ setup( 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 3', 'Topic :: Documentation', 'Topic :: Text Processing', 'Topic :: Utilities', ], platforms='any', - packages=find_packages(), + packages=find_packages(exclude=['custom_fixers', 'test']), include_package_data=True, entry_points={ 'console_scripts': [ diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 468b3406..e1ffc2ed 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -15,8 +15,8 @@ import sys from os import path -__version__ = '1.1pre' -__released__ = '1.1 (hg)' # used when Sphinx builds its own docs +__version__ = '1.2pre' +__released__ = '1.2 (hg)' # used when Sphinx builds its own docs package_dir = path.abspath(path.dirname(__file__)) diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py index af404333..ec1a8a33 100644 --- a/sphinx/apidoc.py +++ b/sphinx/apidoc.py @@ -8,9 +8,10 @@ creates a modules index (named modules.<suffix>). This is derived from the "sphinx-autopackage" script, which is: - Copyright 2008 Société des arts technologiques (SAT), http://www.sat.qc.ca/. + Copyright 2008 Société des arts technologiques (SAT), + http://www.sat.qc.ca/ - :copyright: 2007-2011 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ import os @@ -19,15 +20,19 @@ import optparse from os import path # automodule options -OPTIONS = [ - 'members', - 'undoc-members', - # 'inherited-members', # disabled because there's a bug in sphinx - 'show-inheritance', -] +if 'SPHINX_APIDOC_OPTIONS' in os.environ: + OPTIONS = os.environ['SPHINX_APIDOC_OPTIONS'].split(',') +else: + OPTIONS = [ + 'members', + 'undoc-members', + # 'inherited-members', # disabled because there's a bug in sphinx + 'show-inheritance', + ] INITPY = '__init__.py' + def makename(package, module): """Join package and module with a dot.""" # Both package and module can be None/empty. @@ -39,9 +44,10 @@ def makename(package, module): name = module return name + def write_file(name, text, opts): """Write the output file for module/package <name>.""" - fname = path.join(opts.destdir, "%s.%s" % (name, opts.suffix)) + fname = path.join(opts.destdir, '%s.%s' % (name, opts.suffix)) if opts.dryrun: print 'Would create file %s.' % fname return @@ -55,11 +61,13 @@ def write_file(name, text, opts): finally: f.close() + def format_heading(level, text): """Create a heading of <level> [1, 2 or 3 supported].""" underlining = ['=', '-', '~', ][level-1] * len(text) return '%s\n%s\n\n' % (text, underlining) + def format_directive(module, package=None): """Create the automodule directive and add the options.""" directive = '.. automodule:: %s\n' % makename(package, module) @@ -67,6 +75,7 @@ def format_directive(module, package=None): directive += ' :%s:\n' % option return directive + def create_module_file(package, module, opts): """Build the text of the file and write the file.""" text = format_heading(1, '%s Module' % module) @@ -74,6 +83,7 @@ def create_module_file(package, module, opts): text += format_directive(module, package) write_file(makename(package, module), text, opts) + def create_package_file(root, master_package, subroot, py_files, opts, subs): """Build the text of the file and write the file.""" package = path.split(root)[-1] @@ -106,11 +116,10 @@ def create_package_file(root, master_package, subroot, py_files, opts, subs): write_file(makename(master_package, subroot), text, opts) -def create_modules_toc_file(master_package, modules, opts, name='modules'): - """ - Create the module's index. - """ - text = format_heading(1, '%s Modules' % opts.header) + +def create_modules_toc_file(modules, opts, name='modules'): + """Create the module's index.""" + text = format_heading(1, '%s' % opts.header) text += '.. toctree::\n' text += ' :maxdepth: %s\n\n' % opts.maxdepth @@ -125,12 +134,12 @@ def create_modules_toc_file(master_package, modules, opts, name='modules'): write_file(name, text, opts) + def shall_skip(module): - """ - Check if we want to skip this module. - """ - # skip it, if there is nothing (or just \n or \r\n) in the file - return path.getsize(module) < 3 + """Check if we want to skip this module.""" + # skip it if there is nothing (or just \n or \r\n) in the file + return path.getsize(module) <= 2 + def recurse_tree(rootpath, excludes, opts): """ @@ -139,56 +148,52 @@ def recurse_tree(rootpath, excludes, opts): """ # use absolute path for root, as relative paths like '../../foo' cause # 'if "/." in root ...' to filter out *all* modules otherwise - rootpath = os.path.abspath(rootpath) - # check if the base directory is a package and get is name + rootpath = path.normpath(path.abspath(rootpath)) + # check if the base directory is a package and get its name if INITPY in os.listdir(rootpath): - package_name = rootpath.split(path.sep)[-1] + root_package = rootpath.split(path.sep)[-1] else: - package_name = None - - toc = [] - tree = os.walk(rootpath, False) - for root, subs, files in tree: - # keep only the Python script files - py_files = sorted([f for f in files if path.splitext(f)[1] == '.py']) - if INITPY in py_files: + # otherwise, the base is a directory with packages + root_package = None + + toplevels = [] + for root, subs, files in os.walk(rootpath): + if is_excluded(root, excludes): + del subs[:] + continue + # document only Python module files + py_files = sorted([f for f in files if path.splitext(f)[1] == '.py']) + is_pkg = INITPY in py_files + if is_pkg: py_files.remove(INITPY) py_files.insert(0, INITPY) - # remove hidden ('.') and private ('_') directories - subs = sorted([sub for sub in subs if sub[0] not in ['.', '_']]) - # check if there are valid files to process - # TODO: could add check for windows hidden files - if "/." in root or "/_" in root \ - or not py_files \ - or is_excluded(root, excludes): + elif root != rootpath: + # only accept non-package at toplevel + del subs[:] continue - if INITPY in py_files: - # we are in package ... - if (# ... with subpackage(s) - subs - or - # ... with some module(s) - len(py_files) > 1 - or - # ... with a not-to-be-skipped INITPY file - not shall_skip(path.join(root, INITPY)) - ): - subroot = root[len(rootpath):].lstrip(path.sep).\ - replace(path.sep, '.') - create_package_file(root, package_name, subroot, + # remove hidden ('.') and private ('_') directories + subs[:] = sorted(sub for sub in subs if sub[0] not in ['.', '_']) + + if is_pkg: + # we are in a package with something to document + if subs or len(py_files) > 1 or not \ + shall_skip(path.join(root, INITPY)): + subpackage = root[len(rootpath):].lstrip(path.sep).\ + replace(path.sep, '.') + create_package_file(root, root_package, subpackage, py_files, opts, subs) - toc.append(makename(package_name, subroot)) - elif root == rootpath: + toplevels.append(makename(root_package, subpackage)) + else: # if we are at the root level, we don't require it to be a package + assert root == rootpath and root_package is None for py_file in py_files: if not shall_skip(path.join(rootpath, py_file)): module = path.splitext(py_file)[0] - create_module_file(package_name, module, opts) - toc.append(makename(package_name, module)) + create_module_file(root_package, module, opts) + toplevels.append(module) + + return toplevels - # create the module's index - if not opts.notoc: - create_modules_toc_file(package_name, toc, opts) def normalize_excludes(rootpath, excludes): """ @@ -197,16 +202,14 @@ def normalize_excludes(rootpath, excludes): * otherwise it is joined with rootpath * with trailing slash """ - sep = path.sep f_excludes = [] for exclude in excludes: if not path.isabs(exclude) and not exclude.startswith(rootpath): exclude = path.join(rootpath, exclude) - if not exclude.endswith(sep): - exclude += sep - f_excludes.append(exclude) + f_excludes.append(path.normpath(exclude) + path.sep) return f_excludes + def is_excluded(root, excludes): """ Check if the directory is in the exclude list. @@ -222,6 +225,7 @@ def is_excluded(root, excludes): return True return False + def main(argv=sys.argv): """ Parse and check the command line arguments. @@ -231,7 +235,7 @@ def main(argv=sys.argv): usage: %prog [options] -o <output_path> <module_path> [exclude_paths, ...] Look recursively in <module_path> for Python modules and packages and create -a reST file with automodule directives per package in the <output_path>. +one reST file with automodule directives per package in the <output_path>. Note: By default this script will not overwrite already created files.""") @@ -241,29 +245,75 @@ Note: By default this script will not overwrite already created files.""") help='Maximum depth of submodules to show in the TOC ' '(default: 4)', type='int', default=4) parser.add_option('-f', '--force', action='store_true', dest='force', - help='Overwrite all the files') + help='Overwrite all files') parser.add_option('-n', '--dry-run', action='store_true', dest='dryrun', - help='Run the script without creating the files') + help='Run the script without creating files') parser.add_option('-T', '--no-toc', action='store_true', dest='notoc', - help='Don\'t create the table of contents file') - parser.add_option('-H', '--doc-header', action='store', dest='header', - help='Documentation Header (default: Project)', - default='Project') + help='Don\'t create a table of contents file') parser.add_option('-s', '--suffix', action='store', dest='suffix', help='file suffix (default: rst)', default='rst') + parser.add_option('-F', '--full', action='store_true', dest='full', + help='Generate a full project with sphinx-quickstart') + parser.add_option('-H', '--doc-project', action='store', dest='header', + help='Project name (default: root module name)') + parser.add_option('-A', '--doc-author', action='store', dest='author', + type='str', + help='Project author(s), used when --full is given') + parser.add_option('-V', '--doc-version', action='store', dest='version', + help='Project version, used when --full is given') + parser.add_option('-R', '--doc-release', action='store', dest='release', + help='Project release, used when --full is given, ' + 'defaults to --doc-version') (opts, args) = parser.parse_args(argv[1:]) if not args: parser.error('A package path is required.') + + rootpath, excludes = args[0], args[1:] if not opts.destdir: parser.error('An output directory is required.') - rootpath, excludes = args[0], args[1:] + if opts.header is None: + opts.header = path.normpath(rootpath).split(path.sep)[-1] + if opts.suffix.startswith('.'): + opts.suffix = opts.suffix[1:] if not path.isdir(rootpath): print >>sys.stderr, '%s is not a directory.' % rootpath sys.exit(1) if not path.isdir(opts.destdir): - print '%s is not a valid output directory.' % opts.destdir - sys.exit(1) + if not opts.dryrun: + os.makedirs(opts.destdir) excludes = normalize_excludes(rootpath, excludes) - recurse_tree(rootpath, excludes, opts) + modules = recurse_tree(rootpath, excludes, opts) + if opts.full: + from sphinx import quickstart as qs + modules.sort() + prev_module = '' + text = '' + for module in modules: + if module.startswith(prev_module + '.'): + continue + prev_module = module + text += ' %s\n' % module + d = dict( + path = opts.destdir, + sep = False, + dot = '_', + project = opts.header, + author = opts.author or 'Author', + version = opts.version or '', + release = opts.release or opts.version or '', + suffix = '.' + opts.suffix, + master = 'index', + epub = True, + ext_autodoc = True, + ext_viewcode = True, + makefile = True, + batchfile = True, + mastertocmaxdepth = opts.maxdepth, + mastertoctree = text, + ) + if not opts.dryrun: + qs.generate(d, silent=True, overwrite=opts.force) + elif not opts.notoc: + create_modules_toc_file(modules, opts) diff --git a/sphinx/application.py b/sphinx/application.py index dec9c13c..bfb39a70 100644 --- a/sphinx/application.py +++ b/sphinx/application.py @@ -425,11 +425,10 @@ class Sphinx(object): raise ExtensionError('domain %s not yet registered' % domain) self.domains[domain].roles[name] = role - def add_index_to_domain(self, domain, name, localname, shortname, func): + def add_index_to_domain(self, domain, index): if domain not in self.domains: raise ExtensionError('domain %s not yet registered' % domain) - self.domains[domain].indices.append((name, localname, shortname)) - setattr(self.domains[domain], 'get_%s_index' % name, func) + self.domains[domain].indices.append(index) def add_object_type(self, directivename, rolename, indextemplate='', parse_node=None, ref_nodeclass=None, objname='', diff --git a/sphinx/builders/devhelp.py b/sphinx/builders/devhelp.py index a1b41945..62bd2237 100644 --- a/sphinx/builders/devhelp.py +++ b/sphinx/builders/devhelp.py @@ -107,12 +107,12 @@ class DevhelpBuilder(StandaloneHTMLBuilder): pass elif len(refs) == 1: etree.SubElement(functions, 'function', - name=title, link=refs[0]) + name=title, link=refs[0][1]) else: for i, ref in enumerate(refs): etree.SubElement(functions, 'function', name="[%d] %s" % (i, title), - link=ref) + link=ref[1]) if subitems: parent_title = re.sub(r'\s*\(.*\)\s*$', '', title) diff --git a/sphinx/builders/epub.py b/sphinx/builders/epub.py index 14aa99e3..acf79ec2 100644 --- a/sphinx/builders/epub.py +++ b/sphinx/builders/epub.py @@ -18,12 +18,21 @@ import codecs import zipfile from os import path +try: + from PIL import Image +except ImportError: + try: + import Image + except ImportError: + Image = None + from docutils import nodes from sphinx import addnodes from sphinx.builders.html import StandaloneHTMLBuilder -from sphinx.util.osutil import EEXIST +from sphinx.util.osutil import ensuredir, EEXIST from sphinx.util.smartypants import sphinx_smarty_pants as ssp +from sphinx.util.console import brown # (Fragment) templates from which the metainfo files content.opf, toc.ncx, @@ -171,7 +180,7 @@ class EpubBuilder(StandaloneHTMLBuilder): self.playorder = 0 def get_theme_config(self): - return self.config.epub_theme, {} + return self.config.epub_theme, self.config.epub_theme_options # generic support functions def make_id(self, name): @@ -212,11 +221,11 @@ class EpubBuilder(StandaloneHTMLBuilder): return result def get_toc(self): - """Get the total table of contents, containg the master_doc + """Get the total table of contents, containing the master_doc and pre and post files not managed by sphinx. """ doctree = self.env.get_and_resolve_doctree(self.config.master_doc, - self, prune_toctrees=False) + self, prune_toctrees=False, includehidden=True) self.refnodes = self.get_refnodes(doctree, []) master_dir = os.path.dirname(self.config.master_doc) if master_dir: @@ -307,6 +316,57 @@ class EpubBuilder(StandaloneHTMLBuilder): subentrylinks[i] = (ismain, self.fix_fragment(m.group(1), m.group(2))) + def copy_image_files_pil(self): + """Copy images using the PIL. + The method tries to read and write the files with the PIL, + converting the format and resizing the image if necessary/possible. + """ + ensuredir(path.join(self.outdir, '_images')) + for src in self.status_iterator(self.images, 'copying images... ', + brown, len(self.images)): + dest = self.images[src] + try: + img = Image.open(path.join(self.srcdir, src)) + except IOError: + self.warn('cannot read image file %r: copying it instead' % + (path.join(self.srcdir, src), )) + try: + copyfile(path.join(self.srcdir, src), + path.join(self.outdir, '_images', dest)) + except Exception, err: + self.warn('cannot copy image file %r: %s' % + (path.join(self.srcdir, src), err)) + continue + if self.config.epub_fix_images: + if img.mode in ('P',): + # See PIL documentation for Image.convert() + img = img.convert() + if self.config.epub_max_image_width > 0: + (width, height) = img.size + nw = self.config.epub_max_image_width + if width > nw: + nh = (height * nw) / width + img = img.resize((nw, nh), Image.BICUBIC) + try: + img.save(path.join(self.outdir, '_images', dest)) + except IOError, err: + self.warn('cannot write image file %r: %s' % + (path.join(self.srcdir, src), err)) + + def copy_image_files(self): + """Copy image files to destination directory. + This overwritten method can use the PIL to convert image files. + """ + if self.images: + if self.config.epub_fix_images or self.config.epub_max_image_width: + if not Image: + self.warn('PIL not found - copying image files') + super(EpubBuilder, self).copy_image_files() + else: + self.copy_image_files_pil() + else: + super(EpubBuilder, self).copy_image_files() + def handle_page(self, pagename, addctx, templatename='page.html', outfilename=None, event_arg=None): """Create a rendered page. @@ -546,7 +606,12 @@ class EpubBuilder(StandaloneHTMLBuilder): """Write the metainfo file toc.ncx.""" self.info('writing %s file...' % outname) - navpoints = self.build_navpoints(self.refnodes) + doctree = self.env.get_and_resolve_doctree(self.config.master_doc, + self, prune_toctrees=False, includehidden=False) + refnodes = self.get_refnodes(doctree, []) + if not refnodes: + refnodes = self.refnodes + navpoints = self.build_navpoints(refnodes) level = max(item['level'] for item in self.refnodes) level = min(level, self.config.epub_tocdepth) f = codecs.open(path.join(outdir, outname), 'w', 'utf-8') diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py index 1552e273..a5f71a5f 100644 --- a/sphinx/builders/gettext.py +++ b/sphinx/builders/gettext.py @@ -14,11 +14,9 @@ from codecs import open from datetime import datetime from collections import defaultdict -from docutils import nodes - from sphinx.builders import Builder from sphinx.util.nodes import extract_messages -from sphinx.util.osutil import SEP, copyfile +from sphinx.util.osutil import SEP, safe_relpath, ensuredir, find_catalog from sphinx.util.console import darkgreen POHEADER = ur""" @@ -30,7 +28,7 @@ POHEADER = ur""" #, fuzzy msgid "" msgstr "" -"Project-Id-Version: %(version)s\n" +"Project-Id-Version: %(project)s %(version)s\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: %(ctime)s\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" @@ -78,7 +76,8 @@ class I18nBuilder(Builder): return def write_doc(self, docname, doctree): - catalog = self.catalogs[docname.split(SEP, 1)[0]] + catalog = self.catalogs[find_catalog(docname, + self.config.gettext_compact)] for node, msg in extract_messages(doctree): catalog.add(msg, node) @@ -99,11 +98,15 @@ class MessageCatalogBuilder(I18nBuilder): # XXX should supply tz ctime = datetime.now().strftime('%Y-%m-%d %H:%M%z'), ) - for section, catalog in self.status_iterator( + for textdomain, catalog in self.status_iterator( self.catalogs.iteritems(), "writing message catalogs... ", - lambda (section, _):darkgreen(section), len(self.catalogs)): + lambda (textdomain, _): darkgreen(textdomain), + len(self.catalogs)): + + # noop if config.gettext_compact is set + ensuredir(path.join(self.outdir, path.dirname(textdomain))) - pofn = path.join(self.outdir, section + '.pot') + pofn = path.join(self.outdir, textdomain + '.pot') pofile = open(pofn, 'w', encoding='utf-8') try: pofile.write(POHEADER % data) @@ -113,7 +116,7 @@ class MessageCatalogBuilder(I18nBuilder): # generate "#: file1:line1\n#: file2:line2 ..." pofile.write(u"#: %s\n" % "\n#: ".join("%s:%s" % - (path.relpath(source, self.outdir), line) + (safe_relpath(source, self.outdir), line) for source, line, _ in positions)) # generate "# uuid1\n# uuid2\n ..." pofile.write(u"# %s\n" % "\n# ".join(uid for _, _, uid diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py index b6f9d133..e9099542 100644 --- a/sphinx/builders/html.py +++ b/sphinx/builders/html.py @@ -162,17 +162,19 @@ class StandaloneHTMLBuilder(Builder): old_config_hash = old_tags_hash = '' try: fp = open(path.join(self.outdir, '.buildinfo')) - version = fp.readline() - if version.rstrip() != '# Sphinx build info version 1': - raise ValueError - fp.readline() # skip commentary - cfg, old_config_hash = fp.readline().strip().split(': ') - if cfg != 'config': - raise ValueError - tag, old_tags_hash = fp.readline().strip().split(': ') - if tag != 'tags': - raise ValueError - fp.close() + try: + version = fp.readline() + if version.rstrip() != '# Sphinx build info version 1': + raise ValueError + fp.readline() # skip commentary + cfg, old_config_hash = fp.readline().strip().split(': ') + if cfg != 'config': + raise ValueError + tag, old_tags_hash = fp.readline().strip().split(': ') + if tag != 'tags': + raise ValueError + finally: + fp.close() except ValueError: self.warn('unsupported build info format in %r, building all' % path.join(self.outdir, '.buildinfo')) diff --git a/sphinx/builders/htmlhelp.py b/sphinx/builders/htmlhelp.py index 143f6df9..f09f42e9 100644 --- a/sphinx/builders/htmlhelp.py +++ b/sphinx/builders/htmlhelp.py @@ -258,7 +258,8 @@ class HTMLHelpBuilder(StandaloneHTMLBuilder): f.write('<UL>\n') def write_index(title, refs, subitems): def write_param(name, value): - item = ' <param name="%s" value="%s">\n' % (name, value) + item = ' <param name="%s" value="%s">\n' % \ + (name, value[1]) f.write(item) title = cgi.escape(title) f.write('<LI> <OBJECT type="text/sitemap">\n') diff --git a/sphinx/builders/qthelp.py b/sphinx/builders/qthelp.py index 5598aad2..b2ff26f4 100644 --- a/sphinx/builders/qthelp.py +++ b/sphinx/builders/qthelp.py @@ -256,7 +256,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder): groupdict = matchobj.groupdict() shortname = groupdict['title'] id = groupdict.get('id') -# descr = groupdict.get('descr') + #descr = groupdict.get('descr') if shortname.endswith('()'): shortname = shortname[:-2] id = '%s.%s' % (id, shortname) @@ -265,9 +265,9 @@ class QtHelpBuilder(StandaloneHTMLBuilder): if id: item = ' '*12 + '<keyword name="%s" id="%s" ref="%s"/>' % ( - name, id, ref) + name, id, ref[1]) else: - item = ' '*12 + '<keyword name="%s" ref="%s"/>' % (name, ref) + item = ' '*12 + '<keyword name="%s" ref="%s"/>' % (name, ref[1]) item.encode('ascii', 'xmlcharrefreplace') return item diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py index af780167..5340aa88 100644 --- a/sphinx/cmdline.py +++ b/sphinx/cmdline.py @@ -22,6 +22,7 @@ from sphinx.errors import SphinxError from sphinx.application import Sphinx from sphinx.util import Tee, format_exception_cut_frames, save_traceback from sphinx.util.console import red, nocolor, color_terminal +from sphinx.util.pycompat import terminal_safe def usage(argv, msg=None): @@ -190,8 +191,7 @@ def main(argv): except KeyboardInterrupt: if use_pdb: import pdb - print >>error, red('Interrupted while building, ' - 'starting debugger:') + print >>error, red('Interrupted while building, starting debugger:') traceback.print_exc() pdb.post_mortem(sys.exc_info()[2]) return 1 @@ -199,17 +199,17 @@ def main(argv): if use_pdb: import pdb print >>error, red('Exception occurred while building, ' - 'starting debugger:') + 'starting debugger:') traceback.print_exc() pdb.post_mortem(sys.exc_info()[2]) else: print >>error if isinstance(err, SystemMessage): print >>error, red('reST markup error:') - print >>error, err.args[0].encode('ascii', 'backslashreplace') + print >>error, terminal_safe(err.args[0]) elif isinstance(err, SphinxError): print >>error, red('%s:' % err.category) - print >>error, err + print >>error, terminal_safe(unicode(err)) else: print >>error, red('Exception occurred:') print >>error, format_exception_cut_frames().rstrip() diff --git a/sphinx/config.py b/sphinx/config.py index f4bee29e..2063f4b0 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -15,6 +15,7 @@ import sys from os import path from sphinx.errors import ConfigError +from sphinx.locale import l_ from sphinx.util.osutil import make_filename from sphinx.util.pycompat import bytes, b, convert_with_2to3 @@ -77,7 +78,7 @@ class Config(object): html_theme = ('default', 'html'), html_theme_path = ([], 'html'), html_theme_options = ({}, 'html'), - html_title = (lambda self: '%s %s documentation' % + html_title = (lambda self: l_('%s %s documentation') % (self.project, self.release), 'html'), html_short_title = (lambda self: self.html_title, 'html'), @@ -122,6 +123,7 @@ class Config(object): # Epub options epub_basename = (lambda self: make_filename(self.project), None), epub_theme = ('epub', 'html'), + epub_theme_options = ({}, 'html'), epub_title = (lambda self: self.html_title, 'html'), epub_author = ('unknown', 'html'), epub_language = (lambda self: self.language or 'en', 'html'), @@ -137,6 +139,8 @@ class Config(object): epub_exclude_files = ([], 'env'), epub_tocdepth = (3, 'env'), epub_tocdup = (True, 'env'), + epub_fix_images = (False, 'env'), + epub_max_image_width = (0, 'env'), # LaTeX options latex_documents = ([], None), @@ -176,6 +180,9 @@ class Config(object): linkcheck_ignore = ([], None), linkcheck_timeout = (None, None), linkcheck_workers = (5, None), + + # gettext options + gettext_compact = (True, 'gettext'), ) def __init__(self, dirname, filename, overrides, tags): @@ -192,7 +199,7 @@ class Config(object): # config file is executed os.chdir(dirname) # get config source - f = open(config_file, 'rb') + f = open(config_file, 'rU') try: source = f.read() finally: diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py index 8cedab19..c45e1b36 100644 --- a/sphinx/directives/code.py +++ b/sphinx/directives/code.py @@ -15,6 +15,7 @@ from docutils.parsers.rst import Directive, directives from sphinx import addnodes from sphinx.util import parselinenos +from sphinx.util.nodes import set_source_info class Highlight(Directive): @@ -55,14 +56,29 @@ class CodeBlock(Directive): final_argument_whitespace = False option_spec = { 'linenos': directives.flag, + 'emphasize-lines': directives.unchanged_required, } def run(self): code = u'\n'.join(self.content) + + linespec = self.options.get('emphasize-lines') + if linespec: + try: + nlines = len(self.content) + hl_lines = [x+1 for x in parselinenos(linespec, nlines)] + except ValueError, err: + document = self.state.document + return [document.reporter.warning(str(err), line=self.lineno)] + else: + hl_lines = None + literal = nodes.literal_block(code, code) literal['language'] = self.arguments[0] literal['linenos'] = 'linenos' in self.options - literal.line = self.lineno + if hl_lines is not None: + literal['highlight_args'] = {'hl_lines': hl_lines} + set_source_info(self, literal) return [literal] @@ -88,6 +104,7 @@ class LiteralInclude(Directive): 'end-before': directives.unchanged_required, 'prepend': directives.unchanged_required, 'append': directives.unchanged_required, + 'emphasize-lines': directives.unchanged_required, } def run(self): @@ -146,6 +163,15 @@ class LiteralInclude(Directive): 'Line spec %r: no lines pulled from include file %r' % (linespec, filename), line=self.lineno)] + linespec = self.options.get('emphasize-lines') + if linespec: + try: + hl_lines = [x+1 for x in parselinenos(linespec, len(lines))] + except ValueError, err: + return [document.reporter.warning(str(err), line=self.lineno)] + else: + hl_lines = None + startafter = self.options.get('start-after') endbefore = self.options.get('end-before') prepend = self.options.get('prepend') @@ -172,12 +198,13 @@ class LiteralInclude(Directive): if self.options.get('tab-width'): text = text.expandtabs(self.options['tab-width']) retnode = nodes.literal_block(text, text, source=filename) - retnode.line = 1 - retnode.attributes['line_number'] = self.lineno + set_source_info(self, retnode) if self.options.get('language', ''): retnode['language'] = self.options['language'] if 'linenos' in self.options: retnode['linenos'] = True + if hl_lines is not None: + retnode['highlight_args'] = {'hl_lines': hl_lines} env.note_dependency(rel_filename) return [retnode] diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py index 7647e738..aa4142d6 100644 --- a/sphinx/directives/other.py +++ b/sphinx/directives/other.py @@ -17,7 +17,8 @@ from docutils.parsers.rst.directives.misc import Include as BaseInclude from sphinx import addnodes from sphinx.locale import _ from sphinx.util import url_re, docname_join -from sphinx.util.nodes import explicit_title_re, process_index_entry +from sphinx.util.nodes import explicit_title_re, set_source_info, \ + process_index_entry from sphinx.util.compat import make_admonition from sphinx.util.matching import patfilter @@ -108,6 +109,7 @@ class TocTree(Directive): subnode['hidden'] = 'hidden' in self.options subnode['numbered'] = self.options.get('numbered', 0) subnode['titlesonly'] = 'titlesonly' in self.options + set_source_info(self, subnode) wrappernode = nodes.compound(classes=['toctree-wrapper']) wrappernode.append(subnode) ret.append(wrappernode) @@ -184,6 +186,7 @@ class VersionChange(Directive): def run(self): node = addnodes.versionmodified() node.document = self.state.document + set_source_info(self, node) node['type'] = self.name node['version'] = self.arguments[0] if len(self.arguments) == 2: @@ -196,7 +199,8 @@ class VersionChange(Directive): else: ret = [node] env = self.state.document.settings.env - env.note_versionchange(node['type'], node['version'], node, self.lineno) + # XXX should record node.source as well + env.note_versionchange(node['type'], node['version'], node, node.line) return ret @@ -238,7 +242,7 @@ class TabularColumns(Directive): def run(self): node = addnodes.tabular_col_spec() node['spec'] = self.arguments[0] - node.line = self.lineno + set_source_info(self, node) return [node] @@ -332,7 +336,7 @@ class Only(Directive): def run(self): node = addnodes.only() node.document = self.state.document - node.line = self.lineno + set_source_info(self, node) node['expr'] = self.arguments[0] self.state.nested_parse(self.content, self.content_offset, node, match_titles=1) diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py index b0dd332b..f1848dbd 100644 --- a/sphinx/domains/c.py +++ b/sphinx/domains/c.py @@ -159,11 +159,10 @@ class CObject(ObjectDescription): self.state.document.note_explicit_target(signode) inv = self.env.domaindata['c']['objects'] if name in inv: - self.env.warn( - self.env.docname, + self.state_machine.reporter.warning( 'duplicate C object description of %s, ' % name + 'other instance in ' + self.env.doc2path(inv[name][0]), - self.lineno) + line=self.lineno) inv[name] = (self.env.docname, self.objtype) indextext = self.get_index_text(name) diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index 2a411740..a6392c1c 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -21,6 +21,7 @@ from sphinx.domains import Domain, ObjType from sphinx.directives import ObjectDescription from sphinx.util.nodes import make_refnode from sphinx.util.compat import Directive +from sphinx.util.docfields import Field, GroupedField _identifier_re = re.compile(r'(~?\b[a-zA-Z_][a-zA-Z0-9_]*)\b') @@ -28,14 +29,15 @@ _whitespace_re = re.compile(r'\s+(?u)') _string_re = re.compile(r"[LuU8]?('([^'\\]*(?:\\.[^'\\]*)*)'" r'|"([^"\\]*(?:\\.[^"\\]*)*)")', re.S) _visibility_re = re.compile(r'\b(public|private|protected)\b') -_array_def_re = re.compile(r'\[\s*(.+?)?\s*\]') +_array_def_re = re.compile(r'\[\s*([^\]]+?)?\s*\]') +_template_arg_re = re.compile(r'(%s)|([^,>]+)' % _string_re.pattern, re.S) _operator_re = re.compile(r'''(?x) \[\s*\] | \(\s*\) - | [!<>=/*%+|&^-]=? | \+\+ | -- - | (<<|>>)=? | ~ | && | \| | \|\| | ->\*? | \, + | (<<|>>)=? | && | \|\| + | [!<>=/*%+|&^~-]=? ''') _id_shortwords = { @@ -106,24 +108,21 @@ class DefinitionError(Exception): def __init__(self, description): self.description = description - def __unicode__(self): - return self.description - def __str__(self): return unicode(self).encode('utf-8') + def __unicode__(self): + return self.description -class DefExpr(object): - def __unicode__(self): - raise NotImplementedError() +class DefExpr(object): def __eq__(self, other): if type(self) is not type(other): return False try: for key, value in self.__dict__.iteritems(): - if value != getattr(other, value): + if value != getattr(other, key): return False except AttributeError: return False @@ -165,6 +164,9 @@ class DefExpr(object): def __str__(self): return unicode(self).encode('utf-8') + def __unicode__(self): + raise NotImplementedError() + def __repr__(self): return '<%s %s>' % (self.__class__.__name__, self) @@ -222,6 +224,20 @@ class PathDefExpr(PrimaryDefExpr): return u'::'.join(map(unicode, self.path)) +class ArrayTypeSuffixDefExpr(object): + + def __init__(self, size_hint=None): + self.size_hint = size_hint + + def get_id_suffix(self): + return 'A' + + def __unicode__(self): + return u'[%s]' % ( + self.size_hint is not None and unicode(self.size_hint) or u'', + ) + + class TemplateDefExpr(PrimaryDefExpr): def __init__(self, typename, args): @@ -240,6 +256,18 @@ class TemplateDefExpr(PrimaryDefExpr): return u'%s<%s>' % (self.typename, u', '.join(map(unicode, self.args))) +class ConstantTemplateArgExpr(PrimaryDefExpr): + + def __init__(self, arg): + self.arg = arg + + def get_id(self): + return self.arg.replace(u' ', u'-') + + def __unicode__(self): + return unicode(self.arg) + + class WrappingDefExpr(DefExpr): def __init__(self, typename): @@ -274,29 +302,22 @@ class PtrDefExpr(WrappingDefExpr): return u'%s*' % self.typename -class ArrayDefExpr(WrappingDefExpr): - - def __init__(self, typename, size_hint=None): - WrappingDefExpr.__init__(self, typename) - self.size_hint = size_hint +class LValRefDefExpr(WrappingDefExpr): def get_id(self): - return self.typename.get_id() + u'A' + return self.typename.get_id() + u'R' def __unicode__(self): - return u'%s[%s]' % ( - self.typename, - self.size_hint is not None and unicode(self.size_hint) or u'' - ) + return u'%s&' % self.typename -class RefDefExpr(WrappingDefExpr): +class RValRefDefExpr(WrappingDefExpr): def get_id(self): - return self.typename.get_id() + u'R' + return self.typename.get_id() + u'RR' def __unicode__(self): - return u'%s&' % self.typename + return u'%s&&' % self.typename class ConstDefExpr(WrappingDefExpr): @@ -326,22 +347,29 @@ class CastOpDefExpr(PrimaryDefExpr): class ArgumentDefExpr(DefExpr): - def __init__(self, type, name, default=None): + def __init__(self, type, name, type_suffixes, default=None): self.name = name self.type = type + self.type_suffixes = type_suffixes self.default = default def get_name(self): return self.name.get_name() def get_id(self): - if self.type is None: - return 'X' - return self.type.get_id() + buf = [] + buf.append(self.type and self.type.get_id() or 'X') + for suffix in self.type_suffixes: + buf.append(suffix.get_id_suffix()) + return u''.join(buf) def __unicode__(self): - return (u'%s %s' % (self.type or u'', self.name or u'')).strip() + \ - (self.default is not None and u'=%s' % self.default or u'') + buf = [(u'%s %s' % (self.type or u'', self.name or u'')).strip()] + if self.default is not None: + buf.append('=%s' % self.default) + for suffix in self.type_suffixes: + buf.append(unicode(suffix)) + return u''.join(buf) class NamedDefExpr(DefExpr): @@ -354,9 +382,9 @@ class NamedDefExpr(DefExpr): def get_name(self): return self.name.get_name() - def get_modifiers(self): + def get_modifiers(self, visibility='public'): rv = [] - if self.visibility != 'public': + if self.visibility != visibility: rv.append(self.visibility) if self.static: rv.append(u'static') @@ -365,14 +393,19 @@ class NamedDefExpr(DefExpr): class TypeObjDefExpr(NamedDefExpr): - def __init__(self, name, visibility, static, typename): + def __init__(self, name, visibility, static, typename, type_suffixes): NamedDefExpr.__init__(self, name, visibility, static) self.typename = typename + self.type_suffixes = type_suffixes def get_id(self): if self.typename is None: - return self.name.get_id() - return u'%s__%s' % (self.name.get_id(), self.typename.get_id()) + buf = [self.name.get_id()] + else: + buf = [u'%s__%s' % (self.name.get_id(), self.typename.get_id())] + for suffix in self.type_suffixes: + buf.append(suffix.get_id_suffix()) + return u''.join(buf) def __unicode__(self): buf = self.get_modifiers() @@ -380,56 +413,74 @@ class TypeObjDefExpr(NamedDefExpr): buf.append(unicode(self.name)) else: buf.extend(map(unicode, (self.typename, self.name))) - return u' '.join(buf) + buf = [u' '.join(buf)] + for suffix in self.type_suffixes: + buf.append(unicode(suffix)) + return u''.join(buf) class MemberObjDefExpr(NamedDefExpr): - def __init__(self, name, visibility, static, typename, value): + def __init__(self, name, visibility, static, typename, type_suffixes, + value): NamedDefExpr.__init__(self, name, visibility, static) self.typename = typename + self.type_suffixes = type_suffixes self.value = value def get_id(self): - return u'%s__%s' % (self.name.get_id(), self.typename.get_id()) + buf = [u'%s__%s' % (self.name.get_id(), self.typename.get_id())] + for suffix in self.type_suffixes: + buf.append(suffix.get_id_suffix()) + return u''.join(buf) def __unicode__(self): buf = self.get_modifiers() - buf.append(u'%s %s' % (self.typename, self.name)) + buf.extend((unicode(self.typename), unicode(self.name))) + buf = [u' '.join(buf)] + for suffix in self.type_suffixes: + buf.append(unicode(suffix)) if self.value is not None: - buf.append(u'= %s' % self.value) - return u' '.join(buf) + buf.append(u' = %s' % self.value) + return u''.join(buf) class FuncDefExpr(NamedDefExpr): - def __init__(self, name, visibility, static, explicit, rv, - signature, const, pure_virtual): + def __init__(self, name, visibility, static, explicit, constexpr, rv, + signature, const, noexcept, pure_virtual): NamedDefExpr.__init__(self, name, visibility, static) self.rv = rv self.signature = signature self.explicit = explicit + self.constexpr = constexpr self.const = const + self.noexcept = noexcept self.pure_virtual = pure_virtual def get_id(self): - return u'%s%s%s' % ( + return u'%s%s%s%s' % ( self.name.get_id(), self.signature and u'__' + u'.'.join(x.get_id() for x in self.signature) or u'', - self.const and u'C' or u'' + self.const and u'C' or u'', + self.constexpr and 'CE' or '' ) def __unicode__(self): buf = self.get_modifiers() if self.explicit: buf.append(u'explicit') + if self.constexpr: + buf.append(u'constexpr') if self.rv is not None: buf.append(unicode(self.rv)) buf.append(u'%s(%s)' % (self.name, u', '.join( map(unicode, self.signature)))) if self.const: buf.append(u'const') + if self.noexcept: + buf.append(u'noexcept') if self.pure_virtual: buf.append(u'= 0') return u' '.join(buf) @@ -437,17 +488,24 @@ class FuncDefExpr(NamedDefExpr): class ClassDefExpr(NamedDefExpr): - def __init__(self, name, visibility, static): + def __init__(self, name, visibility, static, bases): NamedDefExpr.__init__(self, name, visibility, static) + self.bases = bases def get_id(self): return self.name.get_id() - def __unicode__(self): - buf = self.get_modifiers() + def _tostring(self, visibility='public'): + buf = self.get_modifiers(visibility) buf.append(unicode(self.name)) + if self.bases: + buf.append(u':') + buf.append(u', '.join(base._tostring('private') + for base in self.bases)) return u' '.join(buf) + def __unicode__(self): + return self._tostring('public') class DefinitionParser(object): @@ -503,6 +561,12 @@ class DefinitionParser(object): def skip_ws(self): return self.match(_whitespace_re) + def skip_word_and_ws(self, word): + if self.skip_word(word): + self.skip_ws() + return True + return False + @property def eof(self): return self.pos >= self.end @@ -544,8 +608,15 @@ class DefinitionParser(object): return CastOpDefExpr(type) def _parse_name(self): + return self._parse_name_or_template_arg(False) + + def _parse_name_or_template_arg(self, in_template): if not self.match(_identifier_re): - self.fail('expected name') + if not in_template: + self.fail('expected name') + if not self.match(_template_arg_re): + self.fail('expected name or constant template argument') + return ConstantTemplateArgExpr(self.matched_text.strip()) identifier = self.matched_text # strictly speaking, operators are not regular identifiers @@ -579,13 +650,21 @@ class DefinitionParser(object): expr = ConstDefExpr(expr) elif self.skip_string('*'): expr = PtrDefExpr(expr) - elif self.match(_array_def_re): - expr = ArrayDefExpr(expr, self.last_match.group(1)) elif self.skip_string('&'): - expr = RefDefExpr(expr) + if self.skip_string('&'): + expr = RValRefDefExpr(expr) + else: + expr = LValRefDefExpr(expr) else: return expr + def _try_parse_type_suffixes(self): + rv = [] + while self.match(_array_def_re): + rv.append(ArrayTypeSuffixDefExpr(self.last_match.group(1))) + self.skip_ws() + return rv + def _peek_const(self, path): try: path.remove('const') @@ -614,8 +693,8 @@ class DefinitionParser(object): rv = ModifierDefExpr(NameDefExpr(typename), modifiers) return self._attach_crefptr(rv, is_const) - def _parse_type_expr(self): - typename = self._parse_name() + def _parse_type_expr(self, in_template=False): + typename = self._parse_name_or_template_arg(in_template) self.skip_ws() if not self.skip_string('<'): return typename @@ -664,7 +743,7 @@ class DefinitionParser(object): (result and not self.skip_string('::')) or \ self.eof: break - result.append(self._parse_type_expr()) + result.append(self._parse_type_expr(in_template)) if not result: self.fail('expected type') @@ -713,29 +792,33 @@ class DefinitionParser(object): self.skip_ws() if self.skip_string('...'): - args.append(ArgumentDefExpr(None, '...', None)) + args.append(ArgumentDefExpr(None, '...', [], None)) if self.skip_string(')'): break else: self.fail('expected closing parenthesis after ellipses') - argtype = self._parse_type() argname = default = None + argtype = self._parse_type() self.skip_ws() + type_suffixes = self._try_parse_type_suffixes() if self.skip_string('='): - self.pos += 1 default = self._parse_default_expr() elif self.current_char not in ',)': argname = self._parse_name() self.skip_ws() + type_suffixes.extend(self._try_parse_type_suffixes()) if self.skip_string('='): default = self._parse_default_expr() + if argname is None: + argname = argtype + argtype = None - args.append(ArgumentDefExpr(argtype, argname, default)) + args.append(ArgumentDefExpr(argtype, argname, + type_suffixes, default)) self.skip_ws() - const = self.skip_word('const') - if const: - self.skip_ws() + const = self.skip_word_and_ws('const') + noexcept = self.skip_word_and_ws('noexcept') if self.skip_string('='): self.skip_ws() if not (self.skip_string('0') or \ @@ -747,10 +830,10 @@ class DefinitionParser(object): pure_virtual = True else: pure_virtual = False - return args, const, pure_virtual + return args, const, noexcept, pure_virtual def _parse_visibility_static(self): - visibility = 'public' + visibility = 'public' if self.match(_visibility_re): visibility = self.matched_text static = self.skip_word('static') @@ -765,29 +848,31 @@ class DefinitionParser(object): self.skip_ws() if not self.eof: name = self._parse_type() + type_suffixes = self._try_parse_type_suffixes() else: name = typename typename = None - return TypeObjDefExpr(name, visibility, static, typename) + type_suffixes = [] + return TypeObjDefExpr(name, visibility, static, typename, type_suffixes) def parse_member_object(self): visibility, static = self._parse_visibility_static() typename = self._parse_type() name = self._parse_type() + type_suffixes = self._try_parse_type_suffixes() self.skip_ws() if self.skip_string('='): value = self.read_rest().strip() else: value = None - return MemberObjDefExpr(name, visibility, static, typename, value) + return MemberObjDefExpr(name, visibility, static, typename, + type_suffixes, value) def parse_function(self): visibility, static = self._parse_visibility_static() - if self.skip_word('explicit'): - explicit = True - self.skip_ws() - else: - explicit = False + explicit = self.skip_word_and_ws('explicit') + constexpr = self.skip_word_and_ws('constexpr') + rv = self._parse_type() self.skip_ws() # some things just don't have return values @@ -796,12 +881,26 @@ class DefinitionParser(object): rv = None else: name = self._parse_type() - return FuncDefExpr(name, visibility, static, explicit, rv, + return FuncDefExpr(name, visibility, static, explicit, constexpr, rv, *self._parse_signature()) def parse_class(self): visibility, static = self._parse_visibility_static() - return ClassDefExpr(self._parse_type(), visibility, static) + name = self._parse_type() + bases = [] + if self.skip_string(':'): + self.skip_ws() + while 1: + access = 'private' + if self.match(_visibility_re): + access = self.matched_text + base = self._parse_type() + bases.append(ClassDefExpr(base, access, False, [])) + if self.skip_string(','): + self.skip_ws() + else: + break + return ClassDefExpr(name, visibility, static, bases) def read_rest(self): rv = self.definition[self.pos:] @@ -818,6 +917,17 @@ class DefinitionParser(object): class CPPObject(ObjectDescription): """Description of a C++ language object.""" + doc_field_types = [ + GroupedField('parameter', label=l_('Parameters'), + names=('param', 'parameter', 'arg', 'argument'), + can_collapse=True), + GroupedField('exceptions', label=l_('Throws'), rolename='cpp:class', + names=('throws', 'throw', 'exception'), + can_collapse=True), + Field('returnvalue', label=l_('Returns'), has_arg=False, + names=('returns', 'return')), + ] + def attach_name(self, node, name): owner, name = name.split_owner() varname = unicode(name) @@ -826,6 +936,10 @@ class CPPObject(ObjectDescription): node += addnodes.desc_addname(owner, owner) node += addnodes.desc_name(varname, varname) + def attach_type_suffixes(self, node, suffixes): + for suffix in suffixes: + node += nodes.Text(unicode(suffix)) + def attach_type(self, node, type): # XXX: link to c? text = unicode(type) @@ -836,14 +950,17 @@ class CPPObject(ObjectDescription): pnode += nodes.Text(text) node += pnode - def attach_modifiers(self, node, obj): - if obj.visibility != 'public': + def attach_modifiers(self, node, obj, visibility='public'): + if obj.visibility != visibility: node += addnodes.desc_annotation(obj.visibility, obj.visibility) node += nodes.Text(' ') if obj.static: node += addnodes.desc_annotation('static', 'static') node += nodes.Text(' ') + if getattr(obj, 'constexpr', False): + node += addnodes.desc_annotation('constexpr', 'constexpr') + node += nodes.Text(' ') def add_target_and_index(self, sigobj, sig, signode): theid = sigobj.get_id() @@ -886,8 +1003,7 @@ class CPPObject(ObjectDescription): rv = self.parse_definition(parser) parser.assert_end() except DefinitionError, e: - self.env.warn(self.env.docname, - e.description, self.lineno) + self.state_machine.reporter.warning(e.description, line=self.lineno) raise ValueError self.describe_signature(signode, rv) @@ -910,6 +1026,14 @@ class CPPClassObject(CPPObject): self.attach_modifiers(signode, cls) signode += addnodes.desc_annotation('class ', 'class ') self.attach_name(signode, cls.name) + if cls.bases: + signode += nodes.Text(' : ') + for base in cls.bases: + self.attach_modifiers(signode, base, 'private') + signode += nodes.emphasis(unicode(base.name), + unicode(base.name)) + signode += nodes.Text(', ') + signode.pop() # remove the trailing comma class CPPTypeObject(CPPObject): @@ -929,6 +1053,7 @@ class CPPTypeObject(CPPObject): self.attach_type(signode, obj.typename) signode += nodes.Text(' ') self.attach_name(signode, obj.name) + self.attach_type_suffixes(signode, obj.type_suffixes) class CPPMemberObject(CPPObject): @@ -946,6 +1071,7 @@ class CPPMemberObject(CPPObject): self.attach_type(signode, obj.typename) signode += nodes.Text(' ') self.attach_name(signode, obj.name) + self.attach_type_suffixes(signode, obj.type_suffixes) if obj.value is not None: signode += nodes.Text(u' = ' + obj.value) @@ -975,6 +1101,7 @@ class CPPFunctionObject(CPPObject): self.attach_type(param, arg.type) param += nodes.Text(u' ') param += nodes.emphasis(unicode(arg.name), unicode(arg.name)) + self.attach_type_suffixes(param, arg.type_suffixes) if arg.default is not None: def_ = u'=' + unicode(arg.default) param += nodes.emphasis(def_, def_) @@ -983,6 +1110,8 @@ class CPPFunctionObject(CPPObject): node += paramlist if func.const: node += addnodes.desc_addname(' const', ' const') + if func.noexcept: + node += addnodes.desc_addname(' noexcept', ' noexcept') if func.pure_virtual: node += addnodes.desc_addname(' = 0', ' = 0') @@ -1028,8 +1157,8 @@ class CPPCurrentNamespace(Directive): prefix = parser.parse_type() parser.assert_end() except DefinitionError, e: - self.env.warn(self.env.docname, - e.description, self.lineno) + self.state_machine.reporter.warning(e.description, + line=self.lineno) else: env.temp_data['cpp:prefix'] = prefix return [] @@ -1103,12 +1232,10 @@ class CPPDomain(Domain): if not parser.eof or expr is None: raise DefinitionError('') except DefinitionError: - refdoc = node.get('refdoc', fromdocname) - env.warn(refdoc, 'unparseable C++ definition: %r' % target, - node.line) + env.warn_node('unparseable C++ definition: %r' % target, node) return None - parent = node['cpp:parent'] + parent = node.get('cpp:parent', None) rv = _create_refnode(expr) if rv is not None or parent is None: diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py index 73edf451..a6f4e87c 100644 --- a/sphinx/domains/javascript.py +++ b/sphinx/domains/javascript.py @@ -34,6 +34,7 @@ class JSObject(ObjectDescription): sig = sig.strip() if '(' in sig and sig[-1:] == ')': prefix, arglist = sig.split('(', 1) + prefix = prefix.strip() arglist = arglist[:-1].strip() else: prefix = sig @@ -85,12 +86,11 @@ class JSObject(ObjectDescription): self.state.document.note_explicit_target(signode) objects = self.env.domaindata['js']['objects'] if fullname in objects: - self.env.warn( - self.env.docname, + self.state_machine.reporter.warning( 'duplicate object description of %s, ' % fullname + 'other instance in ' + self.env.doc2path(objects[fullname][0]), - self.lineno) + line=self.lineno) objects[fullname] = self.env.docname, self.objtype indextext = self.get_index_text(objectname, name_obj) @@ -127,6 +127,8 @@ class JSCallable(JSObject): can_collapse=True), Field('returnvalue', label=l_('Returns'), has_arg=False, names=('returns', 'return')), + Field('returntype', label=l_('Return type'), has_arg=False, + names=('rtype',)), ] diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py index 4004599c..779b071a 100644 --- a/sphinx/domains/python.py +++ b/sphinx/domains/python.py @@ -217,13 +217,12 @@ class PyObject(ObjectDescription): self.state.document.note_explicit_target(signode) objects = self.env.domaindata['py']['objects'] if fullname in objects: - self.env.warn( - self.env.docname, + self.state_machine.reporter.warning( 'duplicate object description of %s, ' % fullname + 'other instance in ' + self.env.doc2path(objects[fullname][0]) + ', use :noindex: for one of them', - self.lineno) + line=self.lineno) objects[fullname] = (self.env.docname, self.objtype) indextext = self.get_index_text(modname, name_cls) @@ -423,13 +422,14 @@ class PyModule(Directive): env.domaindata['py']['modules'][modname] = \ (env.docname, self.options.get('synopsis', ''), self.options.get('platform', ''), 'deprecated' in self.options) - # make a duplicate entry in 'objects' to facilitate searching for the - # module in PythonDomain.find_obj() + # make a duplicate entry in 'objects' to facilitate searching for + # the module in PythonDomain.find_obj() env.domaindata['py']['objects'][modname] = (env.docname, 'module') - targetnode = nodes.target('', '', ids=['module-' + modname], ismod=True) + targetnode = nodes.target('', '', ids=['module-' + modname], + ismod=True) self.state.document.note_explicit_target(targetnode) - # the platform and synopsis aren't printed; in fact, they are only used - # in the modindex currently + # the platform and synopsis aren't printed; in fact, they are only + # used in the modindex currently ret.append(targetnode) indextext = _('%s (module)') % modname inode = addnodes.index(entries=[('single', indextext, @@ -638,9 +638,9 @@ class PythonDomain(Domain): else: # "fuzzy" searching mode searchname = '.' + name - matches = [(name, objects[name]) for name in objects - if name.endswith(searchname) - and objects[name][1] in objtypes] + matches = [(oname, objects[oname]) for oname in objects + if oname.endswith(searchname) + and objects[oname][1] in objtypes] else: # NOTE: searching for exact match, object type is not considered if name in objects: @@ -677,11 +677,10 @@ class PythonDomain(Domain): if not matches: return None elif len(matches) > 1: - env.warn(fromdocname, - 'more than one target found for cross-reference ' - '%r: %s' % (target, - ', '.join(match[0] for match in matches)), - node.line) + env.warn_node( + 'more than one target found for cross-reference ' + '%r: %s' % (target, ', '.join(match[0] for match in matches)), + node) name, obj = matches[0] if obj[1] == 'module': diff --git a/sphinx/domains/rst.py b/sphinx/domains/rst.py index e67f827e..9a40b05f 100644 --- a/sphinx/domains/rst.py +++ b/sphinx/domains/rst.py @@ -38,12 +38,10 @@ class ReSTMarkup(ObjectDescription): objects = self.env.domaindata['rst']['objects'] key = (self.objtype, name) if key in objects: - self.env.warn(self.env.docname, - 'duplicate description of %s %s, ' % - (self.objtype, name) + - 'other instance in ' + - self.env.doc2path(objects[key]), - self.lineno) + self.state_machine.reporter.warning( + 'duplicate description of %s %s, ' % (self.objtype, name) + + 'other instance in ' + self.env.doc2path(objects[key]), + line=self.lineno) objects[key] = self.env.docname indextext = self.get_index_text(self.objtype, name) if indextext: diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py index 9d5b0b0f..1c68c449 100644 --- a/sphinx/domains/std.py +++ b/sphinx/domains/std.py @@ -259,13 +259,23 @@ class Glossary(Directive): messages.append(self.state.reporter.system_message( 2, 'glossary terms must not be separated by empty ' 'lines', source=source, line=lineno)) - entries[-1][0].append((line, source, lineno)) + if entries: + entries[-1][0].append((line, source, lineno)) + else: + messages.append(self.state.reporter.system_message( + 2, 'glossary seems to be misformatted, check ' + 'indentation', source=source, line=lineno)) else: if not in_definition: # first line of definition, determines indentation in_definition = True indent_len = len(line) - len(line.lstrip()) - entries[-1][1].append(line[indent_len:], source, lineno) + if entries: + entries[-1][1].append(line[indent_len:], source, lineno) + else: + messages.append(self.state.reporter.system_message( + 2, 'glossary seems to be misformatted, check ' + 'indentation', source=source, line=lineno)) was_empty = False # now, parse all the entries into a big definition list @@ -321,7 +331,7 @@ class Glossary(Directive): return messages + [node] -token_re = re.compile('`([a-z_][a-z0-9_]*)`') +token_re = re.compile('`(\w+)`', re.U) def token_xrefs(text): retnodes = [] @@ -392,7 +402,8 @@ class StandardDomain(Domain): object_types = { 'term': ObjType(l_('glossary term'), 'term', searchprio=-1), 'token': ObjType(l_('grammar token'), 'token', searchprio=-1), - 'label': ObjType(l_('reference label'), 'ref', searchprio=-1), + 'label': ObjType(l_('reference label'), 'ref', 'keyword', + searchprio=-1), 'envvar': ObjType(l_('environment variable'), 'envvar'), 'cmdoption': ObjType(l_('program option'), 'option'), } @@ -471,9 +482,8 @@ class StandardDomain(Domain): # link and object descriptions continue if name in labels: - env.warn(docname, 'duplicate label %s, ' % name + - 'other instance in ' + env.doc2path(labels[name][0]), - node.line) + env.warn_node('duplicate label %s, ' % name + 'other instance ' + 'in ' + env.doc2path(labels[name][0]), node) anonlabels[name] = docname, labelid if node.tagname == 'section': sectname = clean_astext(node[0]) # node[0] == title node diff --git a/sphinx/environment.py b/sphinx/environment.py index 86fb1b80..77dfbb3d 100644 --- a/sphinx/environment.py +++ b/sphinx/environment.py @@ -26,7 +26,8 @@ from itertools import izip, groupby from docutils import nodes from docutils.io import FileInput, NullOutput from docutils.core import Publisher -from docutils.utils import Reporter, relative_path, new_document +from docutils.utils import Reporter, relative_path, new_document, \ + get_source_line from docutils.readers import standalone from docutils.parsers.rst import roles, directives, Parser as RSTParser from docutils.parsers.rst.languages import en as english @@ -38,8 +39,9 @@ from docutils.transforms.parts import ContentsFilter from sphinx import addnodes from sphinx.util import url_re, get_matching_docs, docname_join, split_into, \ FilenameUniqDict -from sphinx.util.nodes import clean_astext, make_refnode, extract_messages -from sphinx.util.osutil import movefile, SEP, ustrftime +from sphinx.util.nodes import clean_astext, make_refnode, extract_messages, \ + WarningStream +from sphinx.util.osutil import movefile, SEP, ustrftime, find_catalog from sphinx.util.matching import compile_matchers from sphinx.util.pycompat import all, class_types from sphinx.util.websupport import is_commentable @@ -86,14 +88,6 @@ versioning_conditions = { } -class WarningStream(object): - def __init__(self, warnfunc): - self.warnfunc = warnfunc - def write(self, text): - if text.strip(): - self.warnfunc(text.strip(), None, '') - - class NoUri(Exception): """Raised by get_relative_uri if there is no URI available.""" pass @@ -204,13 +198,15 @@ class Locale(Transform): settings, source = self.document.settings, self.document['source'] # XXX check if this is reliable assert source.startswith(env.srcdir) - docname = os.path.splitext(source[len(env.srcdir):].lstrip(os.sep))[0] - section = docname.split(os.sep, 1)[0] + docname = path.splitext(relative_path(env.srcdir, source))[0] + textdomain = find_catalog(docname, + self.document.settings.gettext_compact) # fetch translations - dirs = [path.join(env.srcdir, x) - for x in env.config.locale_dirs] - catalog, has_catalog = init_locale(dirs, env.config.language, section) + dirs = [path.join(env.srcdir, directory) + for directory in env.config.locale_dirs] + catalog, has_catalog = init_locale(dirs, env.config.language, + textdomain) if not has_catalog: return @@ -414,6 +410,9 @@ class BuildEnvironment: # strange argument order is due to backwards compatibility self._warnfunc(msg, (docname, lineno)) + def warn_node(self, msg, node): + self._warnfunc(msg, '%s:%s' % get_source_line(node)) + def clear_doc(self, docname): """Remove all traces of a source file in the inventory.""" if docname in self.all_docs: @@ -494,7 +493,7 @@ class BuildEnvironment: config.exclude_trees + [d + config.source_suffix for d in config.unused_docs] + ['**/' + d for d in config.exclude_dirnames] + - ['**/_sources'] + ['**/_sources', '.#*'] ) self.found_docs = set(get_matching_docs( self.srcdir, config.source_suffix, exclude_matchers=matchers)) @@ -711,6 +710,7 @@ class BuildEnvironment: self.settings['input_encoding'] = self.config.source_encoding self.settings['trim_footnote_reference_space'] = \ self.config.trim_footnote_reference_space + self.settings['gettext_compact'] = self.config.gettext_compact self.patch_lookup_functions() @@ -898,8 +898,8 @@ class BuildEnvironment: rel_filename, filename = self.relfn2path(targetname, docname) self.dependencies.setdefault(docname, set()).add(rel_filename) if not os.access(filename, os.R_OK): - self.warn(docname, 'download file not readable: %s' % filename, - getattr(node, 'line', None)) + self.warn_node('download file not readable: %s' % filename, + node) continue uniquename = self.dlfiles.add_file(docname, filename) node['filename'] = uniquename @@ -914,8 +914,7 @@ class BuildEnvironment: node['candidates'] = candidates = {} imguri = node['uri'] if imguri.find('://') != -1: - self.warn(docname, 'nonlocal image URI found: %s' % imguri, - node.line) + self.warn_node('nonlocal image URI found: %s' % imguri, node) candidates['?'] = imguri continue rel_imgpath, full_imgpath = self.relfn2path(imguri, docname) @@ -936,9 +935,8 @@ class BuildEnvironment: finally: f.close() except (OSError, IOError), err: - self.warn(docname, 'image file %s not ' - 'readable: %s' % (filename, err), - node.line) + self.warn_node('image file %s not readable: %s' % + (filename, err), node) if imgtype: candidates['image/' + imgtype] = new_imgpath else: @@ -948,8 +946,8 @@ class BuildEnvironment: for imgpath in candidates.itervalues(): self.dependencies.setdefault(docname, set()).add(imgpath) if not os.access(path.join(self.srcdir, imgpath), os.R_OK): - self.warn(docname, 'image file not readable: %s' % imgpath, - node.line) + self.warn_node('image file not readable: %s' % imgpath, + node) continue self.images.add_file(docname, imgpath) @@ -1071,9 +1069,9 @@ class BuildEnvironment: for node in document.traverse(nodes.citation): label = node[0].astext() if label in self.citations: - self.warn(docname, 'duplicate citation %s, ' % label + - 'other instance in %s' % self.doc2path( - self.citations[label][0]), node.line) + self.warn_node('duplicate citation %s, ' % label + + 'other instance in %s' % self.doc2path( + self.citations[label][0]), node) self.citations[label] = (docname, node['ids'][0]) def note_toctree(self, docname, toctreenode): @@ -1219,7 +1217,7 @@ class BuildEnvironment: def get_and_resolve_doctree(self, docname, builder, doctree=None, - prune_toctrees=True): + prune_toctrees=True, includehidden=False): """Read the doctree from the pickle, resolve cross-references and toctrees and return it. """ @@ -1232,7 +1230,7 @@ class BuildEnvironment: # now, resolve all toctree nodes for toctreenode in doctree.traverse(addnodes.toctree): result = self.resolve_toctree(docname, builder, toctreenode, - prune=prune_toctrees) + prune=prune_toctrees, includehidden=includehidden) if result is None: toctreenode.replace_self([]) else: @@ -1353,15 +1351,15 @@ class BuildEnvironment: 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' % ref, toctreenode.line) + self.warn_node( + 'toctree contains reference to document %r that ' + 'doesn\'t have a title: no link will be generated' + % ref, toctreenode) except KeyError: # this is raised if the included file does not exist - self.warn(docname, 'toctree contains reference to ' - 'nonexisting document %r' % ref, - toctreenode.line) + self.warn_node( + 'toctree contains reference to nonexisting document %r' + % ref, toctreenode) else: # if titles_only is given, only keep the main title and # sub-toctrees @@ -1486,7 +1484,6 @@ class BuildEnvironment: warn = False if not warn: return - refdoc = node.get('refdoc', fromdoc) if domain and typ in domain.dangling_warnings: msg = domain.dangling_warnings[typ] elif typ == 'doc': @@ -1498,15 +1495,15 @@ class BuildEnvironment: (node['refdomain'], typ) else: msg = '%s reference target not found: %%(target)s' % typ - self.warn(refdoc, msg % {'target': target}, node.line) + self.warn_node(msg % {'target': target}, node) def process_only_nodes(self, doctree, builder, fromdocname=None): for node in doctree.traverse(addnodes.only): try: ret = builder.tags.eval_condition(node['expr']) except Exception, err: - self.warn(fromdocname, 'exception while evaluating only ' - 'directive expression: %s' % err, node.line) + self.warn_node('exception while evaluating only ' + 'directive expression: %s' % err, node) node.replace_self(node.children) else: if ret: diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index 55ac820d..f19334a0 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -912,7 +912,7 @@ class FunctionDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter): if inspect.isbuiltin(self.object) or \ inspect.ismethoddescriptor(self.object): # cannot introspect arguments of a C function or method - pass + return None try: argspec = getargspec(self.object) except TypeError: @@ -1164,7 +1164,8 @@ class AttributeDocumenter(ClassLevelDocumenter): @classmethod def can_document_member(cls, member, membername, isattr, parent): isdatadesc = isdescriptor(member) and not \ - isinstance(member, cls.method_types) + isinstance(member, cls.method_types) and not \ + type(member).__name__ == "method_descriptor" return isdatadesc or (not isinstance(parent, ModuleDocumenter) and not inspect.isroutine(member) and not isinstance(member, class_types)) diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py index 32dcc3e4..0f5c2640 100644 --- a/sphinx/ext/autosummary/__init__.py +++ b/sphinx/ext/autosummary/__init__.py @@ -296,10 +296,10 @@ class Autosummary(Directive): *items* is a list produced by :meth:`get_items`. """ table_spec = addnodes.tabular_col_spec() - table_spec['spec'] = 'LL' + table_spec['spec'] = 'll' table = autosummary_table('') - real_table = nodes.table('') + real_table = nodes.table('', classes=['longtable']) table.append(real_table) group = nodes.tgroup('', cols=2) real_table.append(group) diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py index 089d181f..faba1160 100644 --- a/sphinx/ext/autosummary/generate.py +++ b/sphinx/ext/autosummary/generate.py @@ -27,9 +27,11 @@ import optparse from jinja2 import FileSystemLoader, TemplateNotFound from jinja2.sandbox import SandboxedEnvironment +from sphinx import package_dir from sphinx.ext.autosummary import import_by_name, get_documenter from sphinx.jinja2glue import BuiltinTemplateLoader from sphinx.util.osutil import ensuredir +from sphinx.util.inspect import safe_getattr def main(argv=sys.argv): usage = """%prog [OPTIONS] SOURCEFILE ...""" @@ -77,7 +79,8 @@ def generate_autosummary_docs(sources, output_dir=None, suffix='.rst', sources = [os.path.join(base_path, filename) for filename in sources] # create our own templating environment - template_dirs = [os.path.join(os.path.dirname(__file__), 'templates')] + template_dirs = [os.path.join(package_dir, 'ext', + 'autosummary', 'templates')] if builder is not None: # allow the user to override the templates template_loader = BuiltinTemplateLoader() @@ -136,10 +139,15 @@ def generate_autosummary_docs(sources, output_dir=None, suffix='.rst', template = template_env.get_template('autosummary/base.rst') def get_members(obj, typ, include_public=[]): - items = [ - name for name in dir(obj) - if get_documenter(getattr(obj, name), obj).objtype == typ - ] + items = [] + for name in dir(obj): + try: + documenter = get_documenter(safe_getattr(obj, name), + obj) + except AttributeError: + continue + if documenter.objtype == typ: + items.append(name) public = [x for x in items if x in include_public or not x.startswith('_')] return public, items diff --git a/sphinx/ext/coverage.py b/sphinx/ext/coverage.py index 5ff81d70..5abbee09 100644 --- a/sphinx/ext/coverage.py +++ b/sphinx/ext/coverage.py @@ -228,11 +228,12 @@ class CoverageBuilder(Builder): op.write('\n') if undoc['classes']: op.write('Classes:\n') - for name, methods in sorted(undoc['classes'].iteritems()): + for name, methods in sorted( + undoc['classes'].iteritems()): if not methods: op.write(' * %s\n' % name) else: - op.write(' * %s -- missing methods:\n' % name) + op.write(' * %s -- missing methods:\n\n' % name) op.writelines(' - %s\n' % x for x in methods) op.write('\n') diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py index 2952388f..fdf4f2f4 100644 --- a/sphinx/ext/doctest.py +++ b/sphinx/ext/doctest.py @@ -23,6 +23,7 @@ from docutils import nodes from docutils.parsers.rst import directives from sphinx.builders import Builder +from sphinx.util.nodes import set_source_info from sphinx.util.compat import Directive from sphinx.util.console import bold @@ -63,7 +64,7 @@ class TestDirective(Directive): else: groups = ['default'] node = nodetype(code, code, testnodetype=self.name, groups=groups) - node.line = self.lineno + set_source_info(self, node) if test is not None: # only save if it differs from code node['test'] = test diff --git a/sphinx/ext/extlinks.py b/sphinx/ext/extlinks.py index 910354a2..9f60cded 100644 --- a/sphinx/ext/extlinks.py +++ b/sphinx/ext/extlinks.py @@ -36,10 +36,10 @@ def make_link_role(base_url, prefix): try: full_url = base_url % part except (TypeError, ValueError): - env = inliner.document.settings.env - env.warn(env.docname, 'unable to expand %s extlink with base ' - 'URL %r, please make sure the base contains \'%%s\' ' - 'exactly once' % (typ, base_url)) + inliner.reporter.warning( + 'unable to expand %s extlink with base URL %r, please make ' + 'sure the base contains \'%%s\' exactly once' + % (typ, base_url), line=lineno) full_url = base_url + part if not has_explicit_title: if prefix is None: diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py index 6b875081..dc3b2623 100644 --- a/sphinx/ext/graphviz.py +++ b/sphinx/ext/graphviz.py @@ -25,12 +25,12 @@ from docutils import nodes from docutils.parsers.rst import directives from sphinx.errors import SphinxError +from sphinx.locale import _ from sphinx.util.osutil import ensuredir, ENOENT, EPIPE, EINVAL from sphinx.util.compat import Directive mapname_re = re.compile(r'<map id="(.*?)"') -svg_dim_re = re.compile(r'<svg\swidth="(\d+)pt"\sheight="(\d+)pt"', re.M) class GraphvizError(SphinxError): @@ -168,7 +168,7 @@ def render_dot(self, code, options, format, prefix='graphviz'): # Graphviz may close standard input when an error occurs, # resulting in a broken pipe on communicate() stdout, stderr = p.communicate(code) - except OSError, err: + except (OSError, IOError), err: if err.errno != EPIPE: raise wentWrong = True @@ -187,37 +187,6 @@ def render_dot(self, code, options, format, prefix='graphviz'): return relfn, outfn -def get_svg_tag(svgref, svgfile, imgcls=None): - # Webkit can't figure out svg dimensions when using object tag - # so we need to get it from the svg file - fp = open(svgfile, 'r') - try: - for line in fp: - match = svg_dim_re.match(line) - if match: - dimensions = match.groups() - break - else: - dimensions = None - finally: - fp.close() - - # We need this hack to make WebKit show our object tag properly - def pt2px(x): - return int(ceil((96.0/72.0) * float(x))) - - if dimensions: - style = ' width="%s" height="%s"' % tuple(map(pt2px, dimensions)) - else: - style = '' - - # The object tag works fine on Firefox and WebKit - # Besides it's a hack, this strategy does not mess with templates. - imgcss = imgcls and ' class="%s"' % imgcls or '' - return '<object type="image/svg+xml" data="%s"%s%s></object>\n' % \ - (svgref, imgcss, style) - - def render_dot_html(self, node, code, options, prefix='graphviz', imgcls=None, alt=None): format = self.builder.config.graphviz_output_format @@ -242,8 +211,9 @@ def render_dot_html(self, node, code, options, prefix='graphviz', else: if alt is None: alt = node.get('alt', self.encode(code).strip()) + imgcss = imgcls and 'class="%s"' % imgcls or '' if format == 'svg': - svgtag = get_svg_tag(fname, outfn, imgcls) + svgtag = '<img src="%s" alt="%s" %s/>\n' % (fname, alt, imgcss) self.body.append(svgtag) else: mapfile = open(outfn + '.map', 'rb') @@ -251,7 +221,6 @@ def render_dot_html(self, node, code, options, prefix='graphviz', imgmap = mapfile.readlines() finally: mapfile.close() - imgcss = imgcls and 'class="%s"' % imgcls or '' if len(imgmap) == 2: # nothing in image map (the lines are <map> and </map>) self.body.append('<img src="%s" alt="%s" %s/>\n' % @@ -326,11 +295,27 @@ def texinfo_visit_graphviz(self, node): render_dot_texinfo(self, node, node['code'], node['options']) +def text_visit_graphviz(self, node): + if 'alt' in node.attributes: + self.add_text(_('[graph: %s]') % node['alt']) + self.add_text(_('[graph]')) + raise nodes.SkipNode + + +def man_visit_graphviz(self, node): + if 'alt' in node.attributes: + self.body.append(_('[graph: %s]') % node['alt'] + '\n') + self.body.append(_('[graph]')) + raise nodes.SkipNode + + def setup(app): app.add_node(graphviz, html=(html_visit_graphviz, None), latex=(latex_visit_graphviz, None), - texinfo=(texinfo_visit_graphviz, None)) + texinfo=(texinfo_visit_graphviz, None), + text=(text_visit_graphviz, None), + man=(man_visit_graphviz, None)) app.add_directive('graphviz', Graphviz) app.add_directive('graph', GraphvizSimple) app.add_directive('digraph', GraphvizSimple) diff --git a/sphinx/ext/ifconfig.py b/sphinx/ext/ifconfig.py index 5698ca28..50c7bbef 100644 --- a/sphinx/ext/ifconfig.py +++ b/sphinx/ext/ifconfig.py @@ -22,6 +22,7 @@ from docutils import nodes +from sphinx.util.nodes import set_source_info from sphinx.util.compat import Directive @@ -39,7 +40,7 @@ class IfConfig(Directive): def run(self): node = ifconfig() node.document = self.state.document - node.line = self.lineno + set_source_info(self, node) node['expr'] = self.arguments[0] self.state.nested_parse(self.content, self.content_offset, node, match_titles=1) diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py index 9bfd53fd..7a1aeb40 100644 --- a/sphinx/ext/intersphinx.py +++ b/sphinx/ext/intersphinx.py @@ -33,6 +33,7 @@ from os import path from docutils import nodes +from sphinx.locale import _ from sphinx.builders.html import INVENTORY_FILENAME from sphinx.util.pycompat import b @@ -41,7 +42,7 @@ handlers = [urllib2.ProxyHandler(), urllib2.HTTPRedirectHandler(), urllib2.HTTPHandler()] try: handlers.append(urllib2.HTTPSHandler) -except NameError: +except AttributeError: pass urllib2.install_opener(urllib2.build_opener(*handlers)) @@ -158,7 +159,7 @@ def load_mappings(app): # new format name, (uri, inv) = key, value if not name.isalnum(): - env.warn(docname=None, msg='intersphinx identifier %r is not alphanumeric' % name) + app.warn('intersphinx identifier %r is not alphanumeric' % name) else: # old format, no name name, uri, inv = None, key, value @@ -214,11 +215,12 @@ def missing_reference(app, env, node, contnode): continue proj, version, uri, dispname = inventory[objtype][target] newnode = nodes.reference('', '', internal=False, refuri=uri, - reftitle='(in %s v%s)' % (proj, version)) + reftitle=_('(in %s v%s)') % (proj, version)) if node.get('refexplicit'): # use whatever title was given newnode.append(contnode) - elif dispname == '-': + elif dispname == '-' or \ + (domain == 'std' and node['reftype'] == 'keyword'): # use whatever title was given, but strip prefix title = contnode.astext() if in_set and title.startswith(in_set+':'): diff --git a/sphinx/ext/mathbase.py b/sphinx/ext/mathbase.py index 1a2ca6af..6d080b4b 100644 --- a/sphinx/ext/mathbase.py +++ b/sphinx/ext/mathbase.py @@ -12,6 +12,7 @@ from docutils import nodes, utils from docutils.parsers.rst import directives +from sphinx.util.nodes import set_source_info from sphinx.util.compat import Directive @@ -72,7 +73,7 @@ class MathDirective(Directive): node['nowrap'] = 'nowrap' in self.options node['docname'] = self.state.document.settings.env.docname ret = [node] - node.line = self.lineno + set_source_info(self, node) if hasattr(self, 'src'): node.source = self.src if node['label']: diff --git a/sphinx/ext/oldcmarkup.py b/sphinx/ext/oldcmarkup.py index 41969c36..9dad85f4 100644 --- a/sphinx/ext/oldcmarkup.py +++ b/sphinx/ext/oldcmarkup.py @@ -32,7 +32,7 @@ class OldCDirective(Directive): def run(self): env = self.state.document.settings.env if not env.app._oldcmarkup_warned: - env.warn(env.docname, WARNING_MSG, self.lineno) + self.state_machine.reporter.warning(WARNING_MSG, line=self.lineno) env.app._oldcmarkup_warned = True newname = 'c:' + self.name[1:] newdir = env.lookup_domain_element('directive', newname)[0] @@ -46,7 +46,7 @@ def old_crole(typ, rawtext, text, lineno, inliner, options={}, content=[]): if not typ: typ = env.config.default_role if not env.app._oldcmarkup_warned: - env.warn(env.docname, WARNING_MSG) + inliner.reporter.warning(WARNING_MSG, line=lineno) env.app._oldcmarkup_warned = True newtyp = 'c:' + typ[1:] newrole = env.lookup_domain_element('role', newtyp)[0] diff --git a/sphinx/ext/todo.py b/sphinx/ext/todo.py index 6a44a9b4..4116a2d5 100644 --- a/sphinx/ext/todo.py +++ b/sphinx/ext/todo.py @@ -16,6 +16,7 @@ from docutils import nodes from sphinx.locale import _ from sphinx.environment import NoUri +from sphinx.util.nodes import set_source_info from sphinx.util.compat import Directive, make_admonition class todo_node(nodes.Admonition, nodes.Element): pass @@ -41,7 +42,7 @@ class Todo(Directive): ad = make_admonition(todo_node, self.name, [_('Todo')], self.options, self.content, self.lineno, self.content_offset, self.block_text, self.state, self.state_machine) - ad[0].line = self.lineno + set_source_info(self, ad[0]) return [targetnode] + ad @@ -61,6 +62,7 @@ def process_todos(app, doctree): targetnode = None env.todo_all_todos.append({ 'docname': env.docname, + 'source': node.source or env.doc2path(env.docname), 'lineno': node.line, 'todo': node.deepcopy(), 'target': targetnode, @@ -105,9 +107,9 @@ def process_todo_nodes(app, doctree, fromdocname): for todo_info in env.todo_all_todos: para = nodes.paragraph(classes=['todo-source']) - filename = env.doc2path(todo_info['docname'], base=None) description = _('(The <<original entry>> is located in ' - ' %s, line %d.)') % (filename, todo_info['lineno']) + ' %s, line %d.)') % \ + (todo_info['source'], todo_info['lineno']) desc1 = description[:description.find('<<')] desc2 = description[description.find('>>')+2:] para += nodes.Text(desc1, desc1) diff --git a/sphinx/ext/viewcode.py b/sphinx/ext/viewcode.py index 020db697..32840f30 100644 --- a/sphinx/ext/viewcode.py +++ b/sphinx/ext/viewcode.py @@ -98,7 +98,7 @@ def collect_pages(app): # construct a page name for the highlighted source pagename = '_modules/' + modname.replace('.', '/') # highlight the source using the builder's highlighter - highlighted = highlighter.highlight_block(code, 'python', False) + highlighted = highlighter.highlight_block(code, 'python', linenos=False) # split the code into lines lines = highlighted.splitlines() # split off wrap markup from the first line of the actual code diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py index 76bcb122..bf21ac64 100644 --- a/sphinx/highlighting.py +++ b/sphinx/highlighting.py @@ -20,7 +20,7 @@ except ImportError: # parser is not available on Jython parser = None -from sphinx.util.texescape import tex_hl_escape_map_old, tex_hl_escape_map_new +from sphinx.util.texescape import tex_hl_escape_map_new from sphinx.ext import doctest try: @@ -44,8 +44,6 @@ else: none = TextLexer(), python = PythonLexer(), pycon = PythonConsoleLexer(), - # the python3 option exists as of Pygments 1.0, - # but it doesn't do any harm in previous versions pycon3 = PythonConsoleLexer(python3=True), rest = RstLexer(), c = CLexer(), @@ -54,15 +52,15 @@ else: _lexer.add_filter('raiseonerror') -escape_hl_chars = {ord(u'@'): u'@PYGZat[]', - ord(u'['): u'@PYGZlb[]', - ord(u']'): u'@PYGZrb[]'} +escape_hl_chars = {ord(u'\\'): u'\\PYGZbs{}', + ord(u'{'): u'\\PYGZob{}', + ord(u'}'): u'\\PYGZcb{}'} # used if Pygments is not available _LATEX_STYLES = r''' -\newcommand\PYGZat{@} -\newcommand\PYGZlb{[} -\newcommand\PYGZrb{]} +\newcommand\PYGZbs{\char`\\} +\newcommand\PYGZob{\char`\{} +\newcommand\PYGZcb{\char`\}} ''' parsing_exceptions = (SyntaxError, UnicodeEncodeError) @@ -94,14 +92,16 @@ class PygmentsBridge(object): else: style = get_style_by_name(stylename) self.trim_doctest_flags = trim_doctest_flags + self.formatter_args = {'style' : style} if dest == 'html': - self.fmter = {False: self.html_formatter(style=style), - True: self.html_formatter(style=style, linenos=True)} + self.formatter = self.html_formatter else: - self.fmter = {False: self.latex_formatter(style=style, - commandprefix='PYG'), - True: self.latex_formatter(style=style, linenos=True, - commandprefix='PYG')} + self.formatter = self.latex_formatter + self.formatter_args['commandprefix'] = 'PYG' + + def get_formatter(self, **kwargs): + kwargs.update(self.formatter_args) + return self.formatter(**kwargs) def unhighlighted(self, source): if self.dest == 'html': @@ -110,8 +110,8 @@ class PygmentsBridge(object): # first, escape highlighting characters like Pygments does source = source.translate(escape_hl_chars) # then, escape all characters nonrepresentable in LaTeX - source = source.translate(tex_hl_escape_map_old) - return '\\begin{Verbatim}[commandchars=@\\[\\]]\n' + \ + source = source.translate(tex_hl_escape_map_new) + return '\\begin{Verbatim}[commandchars=\\\\\\{\\}]\n' + \ source + '\\end{Verbatim}\n' def try_parse(self, src): @@ -153,7 +153,7 @@ class PygmentsBridge(object): else: return True - def highlight_block(self, source, lang, linenos=False, warn=None): + def highlight_block(self, source, lang, warn=None, **kwargs): if not isinstance(source, unicode): source = source.decode() if not pygments: @@ -200,14 +200,12 @@ class PygmentsBridge(object): # highlight via Pygments try: + formatter = self.get_formatter(**kwargs) + hlsource = highlight(source, lexer, formatter) if self.dest == 'html': - return highlight(source, lexer, self.fmter[bool(linenos)]) + return hlsource else: - hlsource = highlight(source, lexer, self.fmter[bool(linenos)]) - if hlsource.startswith(r'\begin{Verbatim}[commandchars=\\\{\}'): - # Pygments >= 1.2 - return hlsource.translate(tex_hl_escape_map_new) - return hlsource.translate(tex_hl_escape_map_old) + return hlsource.translate(tex_hl_escape_map_new) except ErrorToken: # this is most probably not the selected language, # so let it pass unhighlighted @@ -219,11 +217,8 @@ class PygmentsBridge(object): return _LATEX_STYLES # no HTML styles needed return '' + formatter = self.get_formatter() if self.dest == 'html': - return self.fmter[0].get_style_defs('.highlight') + return formatter.get_style_defs('.highlight') else: - styledefs = self.fmter[0].get_style_defs() - # workaround for Pygments < 0.12 - if styledefs.startswith('\\newcommand\\at{@}'): - styledefs += _LATEX_STYLES - return styledefs + return formatter.get_style_defs() diff --git a/sphinx/jinja2glue.py b/sphinx/jinja2glue.py index 629bce30..ffe3a0b3 100644 --- a/sphinx/jinja2glue.py +++ b/sphinx/jinja2glue.py @@ -46,9 +46,10 @@ class idgen(object): self.id = 0 def current(self): return self.id - def next(self): + def __next__(self): self.id += 1 return self.id + next = __next__ # Python 2/Jinja compatibility class SphinxFileSystemLoader(FileSystemLoader): diff --git a/sphinx/locale/bn/LC_MESSAGES/sphinx.mo b/sphinx/locale/bn/LC_MESSAGES/sphinx.mo Binary files differindex 3f23ac2e..cb06ba98 100644 --- a/sphinx/locale/bn/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/bn/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/bn/LC_MESSAGES/sphinx.po b/sphinx/locale/bn/LC_MESSAGES/sphinx.po index c0456cbd..49549939 100644 --- a/sphinx/locale/bn/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/bn/LC_MESSAGES/sphinx.po @@ -7,28 +7,33 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 1.0pre/[?1034h2e1ab15e035e\n" "Report-Msgid-Bugs-To: nasim.haque@gmail.com\n" -"POT-Creation-Date: 2009-11-08 16:28+0100\n" -"PO-Revision-Date: 2011-01-22 14:41+0100\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2011-09-21 10:08+0200\n" "Last-Translator: Nasimul Haque <nasim.haque@gmail.com>\n" "Language-Team: Nasimul Haque <nasim.haque@gmail.com>\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" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%B %d, %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, fuzzy, python-format msgid "see %s" msgstr "আরও %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, fuzzy, python-format msgid "see also %s" msgstr "আরও দেখুন %s" @@ -67,21 +72,10 @@ msgstr "পরবর্তী" msgid "previous" msgstr "পূর্ববর্তী" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "(-" -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "ইনডেক্স" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "অনুচ্ছেদ লেখক:" @@ -146,12 +140,12 @@ msgstr "%s (C টাইপ)" msgid "%s (C variable)" msgstr "%s (C ভ্যারিয়েবল)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "ফাংশন" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 #, fuzzy msgid "member" msgstr "C মেম্বার" @@ -161,7 +155,7 @@ msgstr "C মেম্বার" msgid "macro" msgstr "C ম্যাক্রো" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 #, fuzzy msgid "type" msgstr "C টাইপ" @@ -171,28 +165,28 @@ msgstr "C টাইপ" msgid "variable" msgstr "C ভ্যারিয়েবল" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++ ক্লাসে)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ টাইপ)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ মেম্বার)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ ফাংশন)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "ক্লাস" @@ -230,11 +224,11 @@ msgstr "প্যারামিটার" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "ডাটা" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "এ্যট্রিবিউট" @@ -303,45 +297,45 @@ msgstr "%s() (%s ক্লাস মেথড)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s এ্যট্রিবিউট)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (মডিউল)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "মডিউল ইনডেক্স" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "মডিউল সমূহ" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "ডেপ্রিকেটেড" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "এক্সেপশন" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "মেথড" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "ক্লাস মেথড" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "স্ট্যাটিক মেথড" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "মডিউল" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 #, fuzzy msgid " (deprecated)" msgstr "ডেপ্রিকেটেড" @@ -395,6 +389,15 @@ msgstr "এনভায়রনমেন্ট ভ্যারিয়েবল" msgid "program option" msgstr "প্রোগ্রাম অপশন" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "ইনডেক্স" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "মডিউল ইনডেক্স" @@ -403,12 +406,12 @@ msgstr "মডিউল ইনডেক্স" msgid "Search Page" msgstr "অনুসন্ধান পাতা" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "বেস: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr ":class:`%s` এর উপনাম" @@ -733,8 +736,8 @@ msgstr "C API পরিবর্তন" msgid "Other changes" msgstr "অন্যান্য পরিবর্তন" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "এই শিরোনামের পার্মালিঙ্ক" @@ -759,48 +762,24 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "রিলিজ" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "পাদটীকা" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "পূর্ববর্তী পাতা হতে চলমান" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "পরবর্তী পাতাতে চলমান" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[ছবি]" -#~ msgid "Platforms: " -#~ msgstr "প্লাটফরম:" - -#~ msgid "Searching" -#~ msgstr "অনুসন্ধান চলছে" - -#~ msgid "Preparing search..." -#~ msgstr "অনুসন্ধানের প্রস্তুতি চলছে..." - -#~ msgid ", in " -#~ msgstr ", -" - -#~ 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 "" -#~ "আপনার অনুসন্ধানে কোন ফলাফল পাওয়া যায়নি।" -#~ " আপনার অনুসন্ধানের শব্দগুলোর সঠিক বানান" -#~ " ও বিভাগ নির্বাচন নিশ্চিত করুন।" - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "অনুসন্ধান শেষ হয়েছে, ফলাফলে %s-টি পাতা পাওয়া গেছে।" - diff --git a/sphinx/locale/ca/LC_MESSAGES/sphinx.mo b/sphinx/locale/ca/LC_MESSAGES/sphinx.mo Binary files differindex 4773faee..fc373e47 100644 --- a/sphinx/locale/ca/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/ca/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/ca/LC_MESSAGES/sphinx.po b/sphinx/locale/ca/LC_MESSAGES/sphinx.po index 89452144..c876228e 100644 --- a/sphinx/locale/ca/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/ca/LC_MESSAGES/sphinx.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 1.0\n" "Report-Msgid-Bugs-To: pau.fernandez@upc.edu\n" -"POT-Creation-Date: 2009-05-22 18:51+0200\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Pau Fernández <pau.fernandez@upc.edu>\n" "Language-Team: ca <LL@li.org>\n" @@ -15,20 +15,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, fuzzy, python-format +msgid "%s %s documentation" +msgstr "%s %s documentació" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d de %B de %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "vegeu %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "vegeu també %s" @@ -67,21 +72,10 @@ msgstr "següent" msgid "previous" msgstr "anterior" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (a " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Índex" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Autor de la secció:" @@ -146,12 +140,12 @@ msgstr "%s (tipus de C)" msgid "%s (C variable)" msgstr "%s (variable de C)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "funció" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "membre" @@ -159,7 +153,7 @@ msgstr "membre" msgid "macro" msgstr "macro" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "tipus" @@ -167,28 +161,28 @@ msgstr "tipus" msgid "variable" msgstr "variable" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (class de C++)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (tipus de C++)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (membre de C++)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (funció de C++)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "class" @@ -226,11 +220,11 @@ msgstr "Paràmetres" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "atribut" @@ -299,45 +293,45 @@ msgstr "%s() (mètode %s)" msgid "%s (%s.%s attribute)" msgstr "%s (atribut %s.%s)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (mòdul)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "Índex de Mòduls" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "mòduls" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Obsolet" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "excepció" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "mètode estàtic" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "mòdul" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (obsolet)" @@ -389,6 +383,15 @@ msgstr "variable d'entorn" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Índex" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Índex de Mòduls" @@ -397,12 +400,12 @@ msgstr "Índex de Mòduls" msgid "Search Page" msgstr "Pàgina de Cerca" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Bases: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "àlies de :class:`%s`" @@ -725,8 +728,8 @@ msgstr "Canvis a la API de C" msgid "Other changes" msgstr "Altres canvis" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Link permanent a aquest títol" @@ -751,49 +754,24 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Versió" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "ve de la pàgina anterior" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Continua a la pàgina següent" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[imatge]" -#~ msgid "Platforms: " -#~ msgstr "Plataformes: " - -#~ msgid "Searching" -#~ msgstr "Cercant" - -#~ msgid "Preparing search..." -#~ msgstr "Preparant la cerca..." - -#~ msgid ", in " -#~ msgstr ", a " - -#~ 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 teva cerca no ha donat " -#~ "resultats. Assegura't que totes les " -#~ "paraules estan ben escrites i que " -#~ "has seleccionat prou categories." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Cerca finalitzada, s'han trobat %s pàgin(a/es) de resultats." - diff --git a/sphinx/locale/cs/LC_MESSAGES/sphinx.mo b/sphinx/locale/cs/LC_MESSAGES/sphinx.mo Binary files differindex d5b560eb..ba0798db 100644 --- a/sphinx/locale/cs/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/cs/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/cs/LC_MESSAGES/sphinx.po b/sphinx/locale/cs/LC_MESSAGES/sphinx.po index 4f3f620c..9ed728ed 100644 --- a/sphinx/locale/cs/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/cs/LC_MESSAGES/sphinx.po @@ -7,7 +7,7 @@ msgid "" 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" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Pavel Kosina <pavel.kosina@gmail.com>\n" "Language-Team: Pavel Kosina <pavel.kosina@gmail.com>\n" @@ -16,20 +16,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, fuzzy, python-format +msgid "%s %s documentation" +msgstr "%s %s dokumentaci" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d.%m.%Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, fuzzy, python-format msgid "see %s" msgstr "viz %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, fuzzy, python-format msgid "see also %s" msgstr "viz také %s" @@ -41,7 +46,7 @@ msgstr "Python Enhancement Proposals; PEP %s" #: sphinx/builders/changes.py:73 msgid "Builtins" -msgstr "Vestavěné funkce " +msgstr "Vestavěné funkce" #: sphinx/builders/changes.py:75 msgid "Module level" @@ -68,21 +73,10 @@ msgstr "další" msgid "previous" msgstr "předchozí" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "(v" -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Index" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Autor sekce: " @@ -147,12 +141,12 @@ msgstr "%s (C typ)" msgid "%s (C variable)" msgstr "%s (C proměnná)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "funkce" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "člen" @@ -160,7 +154,7 @@ msgstr "člen" msgid "macro" msgstr "" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "typ" @@ -169,28 +163,28 @@ msgstr "typ" msgid "variable" msgstr "Proměnná" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++ třída)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ typ)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (člen C++)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ funkce)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "třída" @@ -228,11 +222,11 @@ msgstr "Parametry" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "atribut" @@ -301,45 +295,45 @@ msgstr "%s() (metoda %s)" msgid "%s (%s.%s attribute)" msgstr "%s() (atribut %s.%s)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (module)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "Rejstřík modulů" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "moduly" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Zastaralé" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "výjimka" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "statická metoda" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "modul" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (zastaralé)" @@ -391,6 +385,15 @@ msgstr "promměná prostředí" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Index" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Rejstřík modulů " @@ -399,12 +402,12 @@ msgstr "Rejstřík modulů " msgid "Search Page" msgstr "Vyhledávací stránka" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -726,8 +729,8 @@ msgstr "Změny API" msgid "Other changes" msgstr "Ostatní změny" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Trvalý odkaz na tento nadpis" @@ -752,50 +755,25 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Vydání" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 #, fuzzy msgid "Continued on next page" msgstr "Plný index na jedné stránce" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[obrázek]" -#~ msgid "Platforms: " -#~ msgstr "Platformy: " - -#~ msgid "Searching" -#~ msgstr "Hledám" - -#~ msgid "Preparing search..." -#~ msgstr "Připravuji vyhledávání...." - -#~ msgid ", in " -#~ msgstr ", v" - -#~ 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í." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Vyhledávání skončilo, nalezeno %s stran." - diff --git a/sphinx/locale/da/LC_MESSAGES/sphinx.mo b/sphinx/locale/da/LC_MESSAGES/sphinx.mo Binary files differindex 018ac7f0..d0006ee2 100644 --- a/sphinx/locale/da/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/da/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/da/LC_MESSAGES/sphinx.po b/sphinx/locale/da/LC_MESSAGES/sphinx.po index 752936bb..df991aec 100644 --- a/sphinx/locale/da/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/da/LC_MESSAGES/sphinx.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 1.0pre/[?1034h2e1ab15e035e\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2009-11-08 16:28+0100\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" @@ -15,20 +15,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, fuzzy, python-format +msgid "%s %s documentation" +msgstr "%s %s dokumentation" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d. %B, %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "se %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "se også %s" @@ -67,21 +72,10 @@ msgstr "næste" msgid "previous" msgstr "forrige" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (i " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Indeks" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Afsnitsforfatter: " @@ -145,12 +139,12 @@ msgstr "%s (C-type)" msgid "%s (C variable)" msgstr "%s (C-variabel)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "funktion" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "medlem" @@ -158,7 +152,7 @@ msgstr "medlem" msgid "macro" msgstr "makro" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "type" @@ -166,28 +160,28 @@ msgstr "type" msgid "variable" msgstr "variabel" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++-klasse)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++-type)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++-medlem)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++-funktion)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "klasse" @@ -224,11 +218,11 @@ msgstr "Parametre" msgid "Throws" msgstr "Kaster" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "data" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "attribut" @@ -296,44 +290,44 @@ msgstr "%s() (klassemetode i %s)" msgid "%s (%s.%s attribute)" msgstr "%s (attribut i %s.%s)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (modul)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 msgid "Python Module Index" msgstr "Python-modulindeks" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "moduler" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Forældet" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "undtagelse" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "metode" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "klassemetode" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "statisk metode" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "modul" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (forældet)" @@ -385,6 +379,15 @@ msgstr "miljøvariabel" msgid "program option" msgstr "programtilvalg" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Indeks" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Modulindeks" @@ -393,12 +396,12 @@ msgstr "Modulindeks" msgid "Search Page" msgstr "Søgeside" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Baser: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "alias for :class:`%s`" @@ -720,8 +723,8 @@ msgstr "Ændringer i C-API" msgid "Other changes" msgstr "Andre ændringer" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Permalink til denne overskrift" @@ -746,49 +749,24 @@ msgstr "Sammenfold sidebjælke" msgid "Contents" msgstr "Indhold" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Udgave" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "Fodnoter" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "fortsat fra forrige side" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Fortsættes på næste side" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[billede]" -#~ msgid "Platforms: " -#~ msgstr "Platforme: " - -#~ msgid "Searching" -#~ msgstr "Søger" - -#~ msgid "Preparing search..." -#~ msgstr "Forbereder søgning..." - -#~ msgid ", in " -#~ msgstr ", i " - -#~ 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 "" -#~ "Din søgning gav ingen resultater. " -#~ "Kontrollér venligst at alle ord er " -#~ "stavet korrekt, og at du har valgt" -#~ " nok kategorier." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Søgningen fuldført - fandt %s sider for denne søgning." - diff --git a/sphinx/locale/de/LC_MESSAGES/sphinx.mo b/sphinx/locale/de/LC_MESSAGES/sphinx.mo Binary files differindex 658a95a0..ce12882d 100644 --- a/sphinx/locale/de/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/de/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/de/LC_MESSAGES/sphinx.po b/sphinx/locale/de/LC_MESSAGES/sphinx.po index 7fd5a4c2..50ba7490 100644 --- a/sphinx/locale/de/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/de/LC_MESSAGES/sphinx.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2008-08-07 21:40+0200\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Georg Brandl <georg@python.org>\n" "Language-Team: de <LL@li.org>\n" @@ -14,20 +14,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "%s %s Dokumentation" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d. %m. %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "siehe %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "siehe auch %s" @@ -66,21 +71,10 @@ msgstr "weiter" msgid "previous" msgstr "zurück" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (in " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Stichwortverzeichnis" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Autor des Abschnitts: " @@ -144,12 +138,12 @@ msgstr "%s (C-Typ)" msgid "%s (C variable)" msgstr "%s (C-Variable)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "Funktion" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "Member" @@ -157,7 +151,7 @@ msgstr "Member" msgid "macro" msgstr "Makro" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "Typ" @@ -165,28 +159,28 @@ msgstr "Typ" msgid "variable" msgstr "Variable" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++-Klasse)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++-Typ)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++-Member)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++-Funktion)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "Klasse" @@ -223,11 +217,11 @@ msgstr "Parameter" msgid "Throws" msgstr "Wirft" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "Daten" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "Attribut" @@ -295,44 +289,44 @@ msgstr "%s() (Klassenmethode von %s)" msgid "%s (%s.%s attribute)" msgstr "%s (Attribut von %s.%s)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (Modul)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 msgid "Python Module Index" msgstr "Python-Modulindex" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "Module" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Veraltet" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "Exception" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "Methode" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "Klassenmethode" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "statische Methode" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "Module" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (veraltet)" @@ -384,6 +378,15 @@ msgstr "Umgebungsvariable" msgid "program option" msgstr "Programmoption" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Stichwortverzeichnis" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Modulindex" @@ -392,12 +395,12 @@ msgstr "Modulindex" msgid "Search Page" msgstr "Suche" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Basisklassen: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "Alias von :class:`%s`" @@ -720,8 +723,8 @@ msgstr "C API-Änderungen" msgid "Other changes" msgstr "Andere Änderungen" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Permalink zu dieser Überschrift" @@ -746,49 +749,24 @@ msgstr "Sidebar einklappen" msgid "Contents" msgstr "Inhalt" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Release" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "Fußnoten" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "Fortsetzung der vorherigen Seite" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Fortsetzung auf der nächsten Seite" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[Bild]" -#~ msgid "Platforms: " -#~ msgstr "Plattformen: " - -#~ msgid "Searching" -#~ msgstr "Suche..." - -#~ msgid "Preparing search..." -#~ msgstr "Suche wird vorbereitet..." - -#~ msgid ", in " -#~ msgstr ", in " - -#~ 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 "" -#~ "Es wurden keine zutreffenden Dokumente " -#~ "gefunden. Haben Sie alle Suchbegriffe " -#~ "richtig geschrieben und genügend Kategorien" -#~ " ausgewählt?" - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Suche beendet, %s zutreffende Seite(n) gefunden." - diff --git a/sphinx/locale/es/LC_MESSAGES/sphinx.mo b/sphinx/locale/es/LC_MESSAGES/sphinx.mo Binary files differindex b897ad43..87b44fe6 100644 --- a/sphinx/locale/es/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/es/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/es/LC_MESSAGES/sphinx.po b/sphinx/locale/es/LC_MESSAGES/sphinx.po index 52ed0b74..fbcba7d9 100644 --- a/sphinx/locale/es/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/es/LC_MESSAGES/sphinx.po @@ -7,7 +7,7 @@ msgid "" 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" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Guillem Borrell <guillem@torroja.dmt.upm.es>\n" "Language-Team: es <LL@li.org>\n" @@ -15,20 +15,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, fuzzy, python-format +msgid "%s %s documentation" +msgstr "%s %s documentación" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d de %B de %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "ver %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "ver también %s" @@ -69,21 +74,10 @@ msgstr "siguiente" msgid "previous" msgstr "anterior" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "" -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Índice" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Autor de la sección: " @@ -149,12 +143,12 @@ msgstr "%s (tipo C)" msgid "%s (C variable)" msgstr "%s (variable C)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "función" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "miembro" @@ -162,7 +156,7 @@ msgstr "miembro" msgid "macro" msgstr "" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "tipo" @@ -171,28 +165,28 @@ msgstr "tipo" msgid "variable" msgstr "Variable" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (clase C++)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (tipo C++)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, fuzzy, python-format msgid "%s (C++ member)" msgstr "%s (miembro C++)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, fuzzy, python-format msgid "%s (C++ function)" msgstr "%s (función C++)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "clase" @@ -230,11 +224,11 @@ msgstr "Parámetros" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "atributo" @@ -303,46 +297,46 @@ msgstr "%s() (%s método)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s atributo)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (módulo)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "Índice de Módulos" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "módulos" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Obsoleto" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "excepción" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 #, fuzzy msgid "class method" msgstr "%s() (%s método)" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "método estático" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "módulo" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 #, fuzzy msgid " (deprecated)" msgstr "Obsoleto" @@ -396,6 +390,15 @@ msgstr "variables de entorno" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Índice" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Índice de Módulos" @@ -404,12 +407,12 @@ msgstr "Índice de Módulos" msgid "Search Page" msgstr "Página de Búsqueda" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -733,8 +736,8 @@ msgstr "Cambios en la API C" msgid "Other changes" msgstr "Otros cambios" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Enlazar permanentemente con este título" @@ -760,54 +763,26 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 #, fuzzy msgid "Release" msgstr "Versión" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 #, fuzzy msgid "Continued on next page" msgstr "Índice completo en una página" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[imagen]" -#~ msgid "Platforms: " -#~ msgstr "Plataformas:" - -#~ msgid "Searching" -#~ msgstr "Buscando" - -#~ msgid "Preparing search..." -#~ msgstr "Preparando la búsqueda" - -#~ msgid ", in " -#~ msgstr "" - -#~ 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 búsqueda no dio ningún resultado." -#~ " Por favor asegúrese que escribió " -#~ "todas las palabras correctamente y que" -#~ " ha seleccionado suficientes categorías" - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "" -#~ "Búsqueda finalizada, se han encontrado " -#~ "%s página(s) que concuerdan con su " -#~ "consulta" - diff --git a/sphinx/locale/et/LC_MESSAGES/sphinx.js b/sphinx/locale/et/LC_MESSAGES/sphinx.js new file mode 100644 index 00000000..5f51a53a --- /dev/null +++ b/sphinx/locale/et/LC_MESSAGES/sphinx.js @@ -0,0 +1 @@ +Documentation.addTranslations({"locale": "et", "plural_expr": "(n != 1)", "messages": {"Hide Search Matches": "Varja otsingutulemused", "Permalink to this definition": "P\u00fcsilink sellele definitsioonile", "Expand sidebar": "N\u00e4ita k\u00fclgriba", "Permalink to this headline": "P\u00fcsilink sellele pealkirjale", "Collapse sidebar": "Varja k\u00fclgriba"}});
\ No newline at end of file diff --git a/sphinx/locale/et/LC_MESSAGES/sphinx.mo b/sphinx/locale/et/LC_MESSAGES/sphinx.mo Binary files differnew file mode 100644 index 00000000..14b911c0 --- /dev/null +++ b/sphinx/locale/et/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/et/LC_MESSAGES/sphinx.po b/sphinx/locale/et/LC_MESSAGES/sphinx.po new file mode 100644 index 00000000..a687f297 --- /dev/null +++ b/sphinx/locale/et/LC_MESSAGES/sphinx.po @@ -0,0 +1,770 @@ +# Estonian translations for Sphinx. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the Sphinx project. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: Sphinx 1.0pre/8b971dbc7d36\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2011-09-18 11:40+0200\n" +"Last-Translator: Aivar Annamaa <aivar.annamaa@gmail.com>\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" +"Generated-By: Babel 0.9.6\n" + +#: sphinx/config.py:81 +#, fuzzy, python-format +msgid "%s %s documentation" +msgstr "%s %s dokumentatsioon" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 +#, python-format +msgid "%B %d, %Y" +msgstr "%B %d, %Y" + +#: sphinx/environment.py:1625 +#, python-format +msgid "see %s" +msgstr "" + +#: sphinx/environment.py:1628 +#, python-format +msgid "see also %s" +msgstr "" + +#: sphinx/roles.py:175 +#, fuzzy, python-format +msgid "Python Enhancement Proposals; PEP %s" +msgstr "Python Enhancement Proposals!PEP %s" + +#: sphinx/builders/changes.py:73 +msgid "Builtins" +msgstr "Sisseehitatud" + +#: sphinx/builders/changes.py:75 +msgid "Module level" +msgstr "Mooduli tase" + +#: sphinx/builders/html.py:274 +#, python-format +msgid "%b %d, %Y" +msgstr "%b %d, %Y" + +#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30 +msgid "General Index" +msgstr "Üldindeks" + +#: sphinx/builders/html.py:293 +msgid "index" +msgstr "indeks" + +#: sphinx/builders/html.py:353 +msgid "next" +msgstr "järgmine" + +#: sphinx/builders/html.py:362 +msgid "previous" +msgstr "eelmine" + +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 +msgid " (in " +msgstr " (in " + +#: sphinx/directives/other.py:136 +msgid "Section author: " +msgstr "Sektsiooni autor:" + +#: sphinx/directives/other.py:138 +msgid "Module author: " +msgstr "Mooduli autor:" + +#: sphinx/directives/other.py:140 +msgid "Code author: " +msgstr "Koodi autor:" + +#: sphinx/directives/other.py:142 +msgid "Author: " +msgstr "Autor: " + +#: sphinx/directives/other.py:215 +msgid "See also" +msgstr "Vaata ka" + +#: sphinx/domains/__init__.py:244 +#, python-format +msgid "%s %s" +msgstr "%s %s" + +#: sphinx/domains/c.py:51 sphinx/domains/python.py:95 +msgid "Parameters" +msgstr "Parameetrid" + +#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128 +#: sphinx/domains/python.py:107 +msgid "Returns" +msgstr "Tagastab" + +#: sphinx/domains/c.py:56 sphinx/domains/python.py:109 +msgid "Return type" +msgstr "Tagastustüüp" + +#: sphinx/domains/c.py:141 +#, python-format +msgid "%s (C function)" +msgstr "%s (C funktsioon)" + +#: sphinx/domains/c.py:143 +#, python-format +msgid "%s (C member)" +msgstr "%s (C liige)" + +#: sphinx/domains/c.py:145 +#, python-format +msgid "%s (C macro)" +msgstr "%s (C makro)" + +#: sphinx/domains/c.py:147 +#, python-format +msgid "%s (C type)" +msgstr "%s (C tüüp)" + +#: sphinx/domains/c.py:149 +#, python-format +msgid "%s (C variable)" +msgstr "%s (C muutuja)" + +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 +msgid "function" +msgstr "funktsioon" + +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 +msgid "member" +msgstr "liige" + +#: sphinx/domains/c.py:206 +msgid "macro" +msgstr "makro" + +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 +msgid "type" +msgstr "tüüp" + +#: sphinx/domains/c.py:208 +msgid "variable" +msgstr "muutuja" + +#: sphinx/domains/cpp.py:904 +#, python-format +msgid "%s (C++ class)" +msgstr "%s (C++ klass)" + +#: sphinx/domains/cpp.py:919 +#, python-format +msgid "%s (C++ type)" +msgstr "%s (C++ tüüp)" + +#: sphinx/domains/cpp.py:938 +#, python-format +msgid "%s (C++ member)" +msgstr "%s (C++ liige)" + +#: sphinx/domains/cpp.py:990 +#, python-format +msgid "%s (C++ function)" +msgstr "%s (C++ funktsioon)" + +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 +msgid "class" +msgstr "klass" + +#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254 +#, python-format +msgid "%s() (built-in function)" +msgstr "%s() (sisseehitatud funktsioon)" + +#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318 +#, python-format +msgid "%s() (%s method)" +msgstr "%s() (%s meetod)" + +#: sphinx/domains/javascript.py:109 +#, fuzzy, python-format +msgid "%s() (class)" +msgstr "%s (C++ klass)" + +#: sphinx/domains/javascript.py:111 +#, python-format +msgid "%s (global variable or constant)" +msgstr "%s (globaalmuutuja või konstant)" + +#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356 +#, python-format +msgid "%s (%s attribute)" +msgstr "%s (%s atribuut)" + +#: sphinx/domains/javascript.py:122 +msgid "Arguments" +msgstr "Argumendid" + +#: sphinx/domains/javascript.py:125 +msgid "Throws" +msgstr "Throws" + +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 +msgid "data" +msgstr "andmed" + +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 +msgid "attribute" +msgstr "atribuut" + +#: sphinx/domains/python.py:100 +msgid "Variables" +msgstr "Muutujad" + +#: sphinx/domains/python.py:104 +msgid "Raises" +msgstr "Raises" + +#: sphinx/domains/python.py:255 sphinx/domains/python.py:312 +#: sphinx/domains/python.py:324 sphinx/domains/python.py:337 +#, python-format +msgid "%s() (in module %s)" +msgstr "%s() (moodulis %s)" + +#: sphinx/domains/python.py:258 +#, python-format +msgid "%s (built-in variable)" +msgstr "%s (sisseehitatud muutuja)" + +#: sphinx/domains/python.py:259 sphinx/domains/python.py:350 +#, python-format +msgid "%s (in module %s)" +msgstr "%s (moodulis %s)" + +#: sphinx/domains/python.py:275 +#, python-format +msgid "%s (built-in class)" +msgstr "%s (sisseehitatud klass)" + +#: sphinx/domains/python.py:276 +#, python-format +msgid "%s (class in %s)" +msgstr "%s (klass moodulis %s)" + +#: sphinx/domains/python.py:316 +#, python-format +msgid "%s() (%s.%s method)" +msgstr "%s() (%s.%s meetod)" + +#: sphinx/domains/python.py:328 +#, python-format +msgid "%s() (%s.%s static method)" +msgstr "%s() (%s.%s staatiline meetod)" + +#: sphinx/domains/python.py:331 +#, python-format +msgid "%s() (%s static method)" +msgstr "%s() (%s staatiline meetod)" + +#: sphinx/domains/python.py:341 +#, python-format +msgid "%s() (%s.%s class method)" +msgstr "%s() (%s.%s klassi meetod)" + +#: sphinx/domains/python.py:344 +#, python-format +msgid "%s() (%s class method)" +msgstr "%s() (%s klassi meetod)" + +#: sphinx/domains/python.py:354 +#, python-format +msgid "%s (%s.%s attribute)" +msgstr "%s (%s.%s atribuut)" + +#: sphinx/domains/python.py:434 +#, python-format +msgid "%s (module)" +msgstr "%s (moodul)" + +#: sphinx/domains/python.py:491 +msgid "Python Module Index" +msgstr "Pythoni moodulite indeks" + +#: sphinx/domains/python.py:492 +msgid "modules" +msgstr "moodulid" + +#: sphinx/domains/python.py:537 +msgid "Deprecated" +msgstr "Ebaasoovitav" + +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 +msgid "exception" +msgstr "erind" + +#: sphinx/domains/python.py:563 +msgid "method" +msgstr "meetod" + +#: sphinx/domains/python.py:564 +msgid "class method" +msgstr "klassi meetod" + +#: sphinx/domains/python.py:565 +msgid "static method" +msgstr "staatiline meetod" + +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 +msgid "module" +msgstr "moodul" + +#: sphinx/domains/python.py:695 +#, fuzzy +msgid " (deprecated)" +msgstr "Ebaasoovitav" + +#: sphinx/domains/rst.py:55 +#, python-format +msgid "%s (directive)" +msgstr "%s (direktiiv)" + +#: sphinx/domains/rst.py:57 +#, python-format +msgid "%s (role)" +msgstr "%s (roll)" + +#: sphinx/domains/rst.py:106 +msgid "directive" +msgstr "direktiiv" + +#: sphinx/domains/rst.py:107 +msgid "role" +msgstr "roll" + +#: sphinx/domains/std.py:70 sphinx/domains/std.py:86 +#, python-format +msgid "environment variable; %s" +msgstr "keskkonnamuutuja; %s" + +#: sphinx/domains/std.py:162 +#, python-format +msgid "%scommand line option; %s" +msgstr "%s käsurea valik; %s" + +#: sphinx/domains/std.py:393 +msgid "glossary term" +msgstr "termin" + +#: sphinx/domains/std.py:394 +msgid "grammar token" +msgstr "grammatika märgend" + +#: sphinx/domains/std.py:395 +msgid "reference label" +msgstr "viite pealkiri" + +#: sphinx/domains/std.py:396 +msgid "environment variable" +msgstr "keskkonnamuutuja" + +#: sphinx/domains/std.py:397 +msgid "program option" +msgstr "programmi seade" + +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Indeks" + +#: sphinx/domains/std.py:428 +msgid "Module Index" +msgstr "Mooduli indeks" + +#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25 +msgid "Search Page" +msgstr "Otsingu lehekülg" + +#: sphinx/ext/autodoc.py:1002 +#, python-format +msgid " Bases: %s" +msgstr " Baasid: %s" + +#: sphinx/ext/autodoc.py:1038 +#, python-format +msgid "alias of :class:`%s`" +msgstr "sünonüüm :class:`%s`" + +#: sphinx/ext/todo.py:41 +msgid "Todo" +msgstr "Tegemata" + +#: sphinx/ext/todo.py:109 +#, python-format +msgid "(The <<original entry>> is located in %s, line %d.)" +msgstr "(Algne kirje asub failis %s, real %d.)" + +#: sphinx/ext/todo.py:117 +msgid "original entry" +msgstr "algne kirje" + +#: sphinx/ext/viewcode.py:70 +msgid "[source]" +msgstr "[lähtekood]" + +#: sphinx/ext/viewcode.py:117 +msgid "[docs]" +msgstr "[dokumentatsioon]" + +#: sphinx/ext/viewcode.py:131 +msgid "Module code" +msgstr "Mooduli kood" + +#: sphinx/ext/viewcode.py:137 +#, python-format +msgid "<h1>Source code for %s</h1>" +msgstr "<h1>%s lähtekood</h1>" + +#: sphinx/ext/viewcode.py:164 +msgid "Overview: module code" +msgstr "Ülevaade: mooduli kood" + +#: sphinx/ext/viewcode.py:165 +msgid "<h1>All modules for which code is available</h1>" +msgstr "<h1>Kõik lähtekoodiga moodulid</h1>" + +#: sphinx/locale/__init__.py:155 +msgid "Attention" +msgstr "Tähelepanu" + +#: sphinx/locale/__init__.py:156 +msgid "Caution" +msgstr "Ettevaatust" + +#: sphinx/locale/__init__.py:157 +msgid "Danger" +msgstr "Oht" + +#: sphinx/locale/__init__.py:158 +msgid "Error" +msgstr "Viga" + +#: sphinx/locale/__init__.py:159 +msgid "Hint" +msgstr "Vihje" + +#: sphinx/locale/__init__.py:160 +msgid "Important" +msgstr "Tähtis" + +#: sphinx/locale/__init__.py:161 +msgid "Note" +msgstr "Märkus" + +#: sphinx/locale/__init__.py:162 +msgid "See Also" +msgstr "Vaata ka" + +#: sphinx/locale/__init__.py:163 +msgid "Tip" +msgstr "Nõuanne" + +#: sphinx/locale/__init__.py:164 +msgid "Warning" +msgstr "Hoiatus" + +#: sphinx/locale/__init__.py:168 +#, python-format +msgid "New in version %s" +msgstr "Uus versioonis %s" + +#: sphinx/locale/__init__.py:169 +#, python-format +msgid "Changed in version %s" +msgstr "Muudetud versioonis %s" + +#: sphinx/locale/__init__.py:170 +#, python-format +msgid "Deprecated since version %s" +msgstr "Ebasoovitav alates versioonist %s" + +#: sphinx/locale/__init__.py:176 +msgid "keyword" +msgstr "võtmesõna" + +#: sphinx/locale/__init__.py:177 +msgid "operator" +msgstr "operaator" + +#: sphinx/locale/__init__.py:178 +msgid "object" +msgstr "objekt" + +#: sphinx/locale/__init__.py:180 +msgid "statement" +msgstr "lause" + +#: sphinx/locale/__init__.py:181 +msgid "built-in function" +msgstr "sisseehitatud funktsioon" + +#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10 +#: sphinx/themes/basic/localtoc.html:11 +msgid "Table Of Contents" +msgstr "Sisukord" + +#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137 +#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20 +msgid "Search" +msgstr "Otsing" + +#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15 +msgid "Go" +msgstr "Otsi" + +#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20 +msgid "Enter search terms or a module, class or function name." +msgstr "Sisesta otsingusõna" + +#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14 +msgid "Show Source" +msgstr "Näita lähtekoodi" + +#: sphinx/themes/basic/defindex.html:11 +msgid "Overview" +msgstr "Ülevaade" + +#: sphinx/themes/basic/defindex.html:20 +msgid "Indices and tables:" +msgstr "Indeksid ja tabelid" + +#: sphinx/themes/basic/defindex.html:23 +msgid "Complete Table of Contents" +msgstr "Täielik sisukord" + +#: sphinx/themes/basic/defindex.html:24 +msgid "lists all sections and subsections" +msgstr "toob välja kõiks sektsioonid ja alamsektsioonid" + +#: sphinx/themes/basic/defindex.html:26 +msgid "search this documentation" +msgstr "otsi sellest dokumentatsioonist" + +#: sphinx/themes/basic/defindex.html:28 +msgid "Global Module Index" +msgstr "Globaalne moodulite indeks" + +#: sphinx/themes/basic/defindex.html:29 +msgid "quick access to all modules" +msgstr "kiire ligipääs kõigile moodulitele" + +#: sphinx/themes/basic/defindex.html:31 +msgid "all functions, classes, terms" +msgstr "kõik funktsioonid, klassid ja terminid" + +#: sphinx/themes/basic/genindex-single.html:35 +#, python-format +msgid "Index – %(key)s" +msgstr "Indeks – %(key)s" + +#: sphinx/themes/basic/genindex-single.html:63 +#: sphinx/themes/basic/genindex-split.html:24 +#: sphinx/themes/basic/genindex-split.html:38 +#: sphinx/themes/basic/genindex.html:74 +msgid "Full index on one page" +msgstr "Täisindeks ühel lehel" + +#: sphinx/themes/basic/genindex-split.html:16 +msgid "Index pages by letter" +msgstr "Indeksi leheküljed algustähe kaupa" + +#: sphinx/themes/basic/genindex-split.html:25 +msgid "can be huge" +msgstr "võib olla väga suur" + +#: sphinx/themes/basic/layout.html:29 +msgid "Navigation" +msgstr "Navigatsioon" + +#: sphinx/themes/basic/layout.html:122 +#, python-format +msgid "Search within %(docstitle)s" +msgstr "Otsi %(docstitle)s piires" + +#: sphinx/themes/basic/layout.html:131 +msgid "About these documents" +msgstr "Info selle dokumentatsiooni kohta" + +#: sphinx/themes/basic/layout.html:140 +msgid "Copyright" +msgstr "Copyright" + +#: sphinx/themes/basic/layout.html:189 +#, python-format +msgid "© <a href=\"%(path)s\">Copyright</a> %(copyright)s." +msgstr "© <a href=\"%(path)s\">Copyright</a> %(copyright)s." + +#: sphinx/themes/basic/layout.html:191 +#, python-format +msgid "© Copyright %(copyright)s." +msgstr "© Copyright %(copyright)s." + +#: sphinx/themes/basic/layout.html:195 +#, python-format +msgid "Last updated on %(last_updated)s." +msgstr "Viimati uuendatud %(last_updated)s." + +#: sphinx/themes/basic/layout.html:198 +#, python-format +msgid "" +"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " +"%(sphinx_version)s." +msgstr "" +"Loodud <a href=\"http://sphinx.pocoo.org/\">Sphinx-iga</a> (versioon: " +"%(sphinx_version)s)." + +#: sphinx/themes/basic/opensearch.xml:4 +#, python-format +msgid "Search %(docstitle)s" +msgstr "Otsi %(docstitle)s" + +#: sphinx/themes/basic/relations.html:11 +msgid "Previous topic" +msgstr "Eelmine teema" + +#: sphinx/themes/basic/relations.html:13 +msgid "previous chapter" +msgstr "eelmine peatükk" + +#: sphinx/themes/basic/relations.html:16 +msgid "Next topic" +msgstr "Järgmine teema" + +#: sphinx/themes/basic/relations.html:18 +msgid "next chapter" +msgstr "järgmine peatükk" + +#: sphinx/themes/basic/search.html:24 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "Otsingu võimaldamiseks tuleb aktiveerida JavaScript." + +#: sphinx/themes/basic/search.html:29 +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 "" +"Siin saad otsida käesolevast dokumentatsioonist. Sisesta otsisõned " +"allolevasse lahtrisse ning klõpsa \"Otsi\". Tulemuseks antakse " +"leheküljed, mis sisaldavad kõiki otsisõnesid." + +#: sphinx/themes/basic/search.html:36 +msgid "search" +msgstr "otsi" + +#: sphinx/themes/basic/search.html:40 +msgid "Search Results" +msgstr "Otsingutulemused" + +#: sphinx/themes/basic/search.html:42 +msgid "Your search did not match any results." +msgstr "Otsing ei andnud tulemusi" + +#: sphinx/themes/basic/searchbox.html:12 +msgid "Quick search" +msgstr "Kiirotsing" + +#: sphinx/themes/basic/sourcelink.html:11 +msgid "This Page" +msgstr "Käesolev lehekülg" + +#: sphinx/themes/basic/changes/frameset.html:5 +#: sphinx/themes/basic/changes/versionchanges.html:12 +#, python-format +msgid "Changes in Version %(version)s — %(docstitle)s" +msgstr "Muudatused versioonis %(version)s — %(docstitle)s" + +#: sphinx/themes/basic/changes/rstsource.html:5 +#, python-format +msgid "%(filename)s — %(docstitle)s" +msgstr "%(filename)s — %(docstitle)s" + +#: sphinx/themes/basic/changes/versionchanges.html:17 +#, python-format +msgid "Automatically generated list of changes in version %(version)s" +msgstr "Automaatselt genereeritud nimekiri versiooni %(version)s muudatustest" + +#: sphinx/themes/basic/changes/versionchanges.html:18 +msgid "Library changes" +msgstr "Teegi muudatused" + +#: sphinx/themes/basic/changes/versionchanges.html:23 +msgid "C API changes" +msgstr "C API muudatused" + +#: sphinx/themes/basic/changes/versionchanges.html:25 +msgid "Other changes" +msgstr "Ülejäänud muudatused" + +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 +msgid "Permalink to this headline" +msgstr "Püsilink sellele pealkirjale" + +#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92 +msgid "Permalink to this definition" +msgstr "Püsilink sellele definitsioonile" + +#: sphinx/themes/basic/static/doctools.js:189 +msgid "Hide Search Matches" +msgstr "Varja otsingutulemused" + +#: sphinx/themes/default/static/sidebar.js:69 +msgid "Expand sidebar" +msgstr "Näita külgriba" + +#: sphinx/themes/default/static/sidebar.js:82 +#: sphinx/themes/default/static/sidebar.js:110 +msgid "Collapse sidebar" +msgstr "Varja külgriba" + +#: sphinx/themes/haiku/layout.html:26 +msgid "Contents" +msgstr "Sisukord" + +#: sphinx/writers/latex.py:177 +msgid "Release" +msgstr "Väljalase" + +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 +msgid "Footnotes" +msgstr "Joonealused märkused" + +#: sphinx/writers/latex.py:676 +msgid "continued from previous page" +msgstr "jätk eelmisele leheküljele" + +#: sphinx/writers/latex.py:681 +msgid "Continued on next page" +msgstr "Jätkub järgmisel lehel" + +#: sphinx/writers/text.py:437 +msgid "[image]" +msgstr "[pilt]" + diff --git a/sphinx/locale/fa/LC_MESSAGES/sphinx.mo b/sphinx/locale/fa/LC_MESSAGES/sphinx.mo Binary files differindex 040cf00a..fe705e76 100644 --- a/sphinx/locale/fa/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/fa/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/fa/LC_MESSAGES/sphinx.po b/sphinx/locale/fa/LC_MESSAGES/sphinx.po index 8f75c591..92caf31a 100644 --- a/sphinx/locale/fa/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/fa/LC_MESSAGES/sphinx.po @@ -1,8 +1,9 @@ + msgid "" msgstr "" "Project-Id-Version: Sphinx 1.0.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2008-11-09 19:46+0100\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Omid Raha <omidraha.com@gmail.com>\n" "Language-Team: Omid Raha <omidraha.com@gmail.com>\n" @@ -10,20 +11,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" + +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, fuzzy, python-format msgid "see also %s" msgstr "همچنین ملاحظه نمائید %s" @@ -62,21 +68,10 @@ msgstr "بعدی" msgid "previous" msgstr "قبلی" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "" -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "فهرست" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr ":نویسنده این بخش" @@ -141,14 +136,14 @@ msgstr "%s (C نوع)" msgid "%s (C variable)" msgstr "%s (C متغیر)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 -#, fuzzy, python-format +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 +#, fuzzy msgid "function" msgstr "تابع" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 -#, fuzzy, python-format +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 +#, fuzzy msgid "member" msgstr "عضو" @@ -156,7 +151,7 @@ msgstr "عضو" msgid "macro" msgstr "" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "" @@ -165,28 +160,28 @@ msgstr "" msgid "variable" msgstr "متغیر" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, fuzzy, python-format msgid "%s (C++ class)" msgstr "%s (C++ کلاس در)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, fuzzy, python-format msgid "%s (C++ type)" msgstr "%s (C++ نوع)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, fuzzy, python-format msgid "%s (C++ member)" msgstr "%s (C++ عضو)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, fuzzy, python-format msgid "%s (C++ function)" msgstr "%s (C++ تابع)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "" @@ -224,12 +219,11 @@ msgstr "پارامترها" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 -#, python-format +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "" @@ -298,47 +292,45 @@ msgstr "%s() (%s متد)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s مشخصه)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (ماژول)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "فهرست ماژول ها" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "ماژول ها" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "منسوخ شده" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "استثناء" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 -#, python-format +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 -#, python-format +#: sphinx/domains/python.py:565 msgid "static method" msgstr "" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "ماژول" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 #, fuzzy msgid " (deprecated)" msgstr " (منسوخ شده)" @@ -384,7 +376,7 @@ msgid "reference label" msgstr "" #: sphinx/domains/std.py:396 -#, fuzzy, python-format +#, fuzzy msgid "environment variable" msgstr "متغیرهای عمومی؛" @@ -392,6 +384,15 @@ msgstr "متغیرهای عمومی؛" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "فهرست" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "فهرست ماژول ها" @@ -400,12 +401,12 @@ msgstr "فهرست ماژول ها" msgid "Search Page" msgstr "صفحه جستجو" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -728,8 +729,8 @@ msgstr "C API تغییرات" msgid "Other changes" msgstr "دگر تغییرات" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "لینک ثابت به این سر مقاله" @@ -754,83 +755,25 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "انتشار" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 #, fuzzy msgid "Continued on next page" msgstr "فهرست کامل در یک صفحه" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "" -#~ msgid "Python Enhancement Proposals!PEP %s" -#~ msgstr "" - -#~ msgid "Platform: %s" -#~ msgstr "%s:پلتفرم" - -#~ msgid "Platforms: " -#~ msgstr ":پلتفرم ها" - -#~ msgid "here" -#~ msgstr "اینجا" - -#~ msgid "Searching" -#~ msgstr "در حال جستجو" - -#~ msgid "Preparing search..." -#~ msgstr "...آماده جستجو" - -#~ msgid "module, in " -#~ msgstr "ماژول, در" - -#~ msgid ", in " -#~ msgstr ", در" - -#~ 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 "" -#~ ". هیچ سندی برای جستجوی شما یافت" -#~ " نشد، لطفا اطمینان حاصل نمائید که" -#~ " املای تمامی کلمات صحیح می باشد " -#~ "و همچنین موضوعات کافی را برای این" -#~ " جستجو انتخاب نموده اید" - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "جستجو انجام شد ، %s صفحه مطابق با پرس و جو پیدا شد" - -#~ msgid "Suggest Change" -#~ msgstr "" - -#~ msgid "Keyword search" -#~ msgstr "جستجو کلید واژه" - -#~ msgid "Most popular modules:" -#~ msgstr "متداول ترین ماژول ها:" - -#~ msgid "Show modules only available on these platforms" -#~ msgstr "تنها ماژول هایی که در این پلتفرم در دسترس هستند را نشان بده" - -#~ msgid "" -#~ "<strong>Note:</strong> 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/locale/fi/LC_MESSAGES/sphinx.mo b/sphinx/locale/fi/LC_MESSAGES/sphinx.mo Binary files differindex b0dfff47..497088c8 100644 --- a/sphinx/locale/fi/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/fi/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/fi/LC_MESSAGES/sphinx.po b/sphinx/locale/fi/LC_MESSAGES/sphinx.po index 1b45f690..4a329546 100644 --- a/sphinx/locale/fi/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/fi/LC_MESSAGES/sphinx.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 0.6\n" "Report-Msgid-Bugs-To: sphinx@awot.fi\n" -"POT-Creation-Date: 2009-01-24 18:39+0000\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Jukka Inkeri <sphinx@awot.fi>\n" "Language-Team: fi <sphinx@awot.fi>\n" @@ -15,20 +15,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d.%m.%Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, fuzzy, python-format msgid "see also %s" msgstr "katso myös %s" @@ -67,21 +72,10 @@ msgstr ">" msgid "previous" msgstr "<" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "" -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Sisällysluettelo" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Luvun kirjoittaja: " @@ -146,13 +140,13 @@ msgstr "" msgid "%s (C variable)" msgstr "" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 #, fuzzy msgid "function" msgstr "Varoitus" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "" @@ -160,7 +154,7 @@ msgstr "" msgid "macro" msgstr "" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "" @@ -168,28 +162,28 @@ msgstr "" msgid "variable" msgstr "" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "" @@ -226,11 +220,11 @@ msgstr "" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "" @@ -298,45 +292,45 @@ msgstr "" msgid "%s (%s.%s attribute)" msgstr "" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (moduuli)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "Moduuli sisällysluettelo" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "moduulit" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Poistettu" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "moduuli" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (poistettu)" @@ -388,6 +382,15 @@ msgstr "" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Sisällysluettelo" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Moduuli sisällysluettelo" @@ -396,12 +399,12 @@ msgstr "Moduuli sisällysluettelo" msgid "Search Page" msgstr "Etsi sivu" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -692,7 +695,7 @@ msgstr "Tämä sivu" #: sphinx/themes/basic/changes/versionchanges.html:12 #, python-format msgid "Changes in Version %(version)s — %(docstitle)s" -msgstr "Muutos versiosta %(version) — %(docstitle)" +msgstr "Muutos versiosta %(version)s — %(docstitle)s" #: sphinx/themes/basic/changes/rstsource.html:5 #, python-format @@ -702,7 +705,7 @@ msgstr "" #: sphinx/themes/basic/changes/versionchanges.html:17 #, python-format msgid "Automatically generated list of changes in version %(version)s" -msgstr "Automaattisesti luotu muutoshistoria alkaen versiosta %(version)" +msgstr "Automaattisesti luotu muutoshistoria alkaen versiosta %(version)s" #: sphinx/themes/basic/changes/versionchanges.html:18 msgid "Library changes" @@ -716,8 +719,8 @@ msgstr "" msgid "Other changes" msgstr "" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "" @@ -742,49 +745,25 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 #, fuzzy msgid "Continued on next page" msgstr "" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "" -#~ msgid "Python Enhancement Proposals!PEP %s" -#~ msgstr "" - -#~ msgid "Platforms: " -#~ msgstr "Ympäristö" - -#~ msgid "Searching" -#~ msgstr "Etsitään" - -#~ msgid "Preparing search..." -#~ msgstr "Valmistellaan etsintää..." - -#~ msgid ", in " -#~ msgstr "" - -#~ 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 "Ei löytynyt yhtään. Tarkista hakuehdot, sanahaku, ei sen osia" - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Etsintä tehty, löydetty %s sivu(a)." - diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.mo b/sphinx/locale/fr/LC_MESSAGES/sphinx.mo Binary files differindex a4d35a8b..1027a790 100644 --- a/sphinx/locale/fr/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/fr/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.po b/sphinx/locale/fr/LC_MESSAGES/sphinx.po index c4e1105c..7f51effd 100644 --- a/sphinx/locale/fr/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/fr/LC_MESSAGES/sphinx.po @@ -10,7 +10,7 @@ msgid "" 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" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Sébastien Douche <sdouche@gmail.com>\n" "Language-Team: French Translation Team <sphinx-dev@googlegroups.com>\n" @@ -18,20 +18,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, fuzzy, python-format +msgid "%s %s documentation" +msgstr "%s %s documentation" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d %B %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "voir %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "voir aussi %s" @@ -70,21 +75,10 @@ msgstr "suivant" msgid "previous" msgstr "précédent" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "(dans" -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Index" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Auteur de la section : " @@ -149,12 +143,12 @@ msgstr "%s (type C)" msgid "%s (C variable)" msgstr "%s (variable C)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "fonction" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "membre" @@ -162,7 +156,7 @@ msgstr "membre" msgid "macro" msgstr "" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "type" @@ -171,28 +165,28 @@ msgstr "type" msgid "variable" msgstr "Variable" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (classe C++)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (type C++)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (membre C++)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (fonction C++)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "classe" @@ -230,11 +224,11 @@ msgstr "Paramètres" msgid "Throws" msgstr "Lance" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "données" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "attribut" @@ -303,46 +297,44 @@ msgstr "%s() (méthode de classe %s)" msgid "%s (%s.%s attribute)" msgstr "%s (attribut %s.%s)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (module)" -#: sphinx/domains/python.py:490 -#, fuzzy +#: sphinx/domains/python.py:491 msgid "Python Module Index" -msgstr "Index du module" +msgstr "Index des modules Python" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "modules" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Obsolète" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "exception" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "méthode" -#: sphinx/domains/python.py:563 -#, fuzzy +#: sphinx/domains/python.py:564 msgid "class method" msgstr "méthode de classe" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "méthode statique" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "module" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (obsolète)" @@ -394,6 +386,15 @@ msgstr "variable d'environnement" msgid "program option" msgstr "option du programme" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Index" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Index du module" @@ -402,12 +403,12 @@ msgstr "Index du module" msgid "Search Page" msgstr "Page de recherche" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "alias de :class:`%s`" @@ -434,9 +435,8 @@ msgid "[docs]" msgstr "" #: sphinx/ext/viewcode.py:131 -#, fuzzy msgid "Module code" -msgstr "module" +msgstr "Code du module" #: sphinx/ext/viewcode.py:137 #, python-format @@ -541,9 +541,8 @@ msgid "Go" msgstr "Go" #: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20 -#, fuzzy msgid "Enter search terms or a module, class or function name." -msgstr "Saisissez un nom de module, classe ou fonction." +msgstr "Saisissez un mot clef ou un nom de module, classe ou fonction." #: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14 msgid "Show Source" @@ -667,10 +666,9 @@ msgstr "Chapitre suivant" msgid "" "Please activate JavaScript to enable the search\n" " functionality." -msgstr "Activez le JavaScript pour que la recherche fonctionne\n" +msgstr "Activez le JavaScript pour que la recherche fonctionne." #: sphinx/themes/basic/search.html:29 -#, fuzzy 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" @@ -681,7 +679,7 @@ msgstr "" "termes\n" " de votre recherche dans le champs ci-dessous et cliquez sur " "\"rechercher\". Notez que la fonctionnalité de recherche\n" -" va automatique chercher pour tous les mots. Les pages\n" +" va automatiquement chercher parmi l'ensemble les mots. Les pages\n" " contenant moins de mots n'apparaîtront pas dans la liste des " "résultats." @@ -733,8 +731,8 @@ msgstr "Modifications de l'API C" msgid "Other changes" msgstr "Autres modifications" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Lien permanent vers ce titre" @@ -759,50 +757,24 @@ msgstr "Réduire le menu" msgid "Contents" msgstr "Contenu" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Version" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "Notes de bas de page" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "Suite de la page précédente" -#: sphinx/writers/latex.py:677 -#, fuzzy +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Suite sur la page suivante" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[image]" -#~ msgid "Platforms: " -#~ msgstr "Plateformes : " - -#~ msgid "Searching" -#~ msgstr "En cours de recherche" - -#~ msgid "Preparing search..." -#~ msgstr "Préparation de la recherche..." - -#~ msgid ", in " -#~ msgstr ", dans" - -#~ 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 "" -#~ "Votre recherche ne correspond à aucun" -#~ " document. Vérifiez l'orthographe des " -#~ "termes de recherche et que vous " -#~ "avez sélectionné suffisamment de catégories." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "La recherche est terminée, %s page(s) correspond(ent) à la requête." - diff --git a/sphinx/locale/hr/LC_MESSAGES/sphinx.mo b/sphinx/locale/hr/LC_MESSAGES/sphinx.mo Binary files differindex 6e74304d..a9bdb145 100644 --- a/sphinx/locale/hr/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/hr/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/hr/LC_MESSAGES/sphinx.po b/sphinx/locale/hr/LC_MESSAGES/sphinx.po index d41dcab1..15e70346 100644 --- a/sphinx/locale/hr/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/hr/LC_MESSAGES/sphinx.po @@ -1,8 +1,9 @@ + msgid "" msgstr "" "Project-Id-Version: Sphinx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-09-11 23:58+0200\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Bojan Mihelač <bmihelac@mihelac.org>\n" "Language-Team: Bojan Mihelač <bmihelac@mihelac.org>\n" @@ -10,20 +11,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" + +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d %B, %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, fuzzy, python-format msgid "see %s" msgstr "pogledaj %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, fuzzy, python-format msgid "see also %s" msgstr "pogledaj i %s" @@ -62,21 +68,10 @@ msgstr "naprijed" msgid "previous" msgstr "nazad" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (u " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Abecedni popis" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Autor sekcije: " @@ -141,12 +136,12 @@ msgstr "%s (C tip)" msgid "%s (C variable)" msgstr "%s (C varijabla)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "funkcija" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "član" @@ -154,7 +149,7 @@ msgstr "član" msgid "macro" msgstr "" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "tip" @@ -163,28 +158,28 @@ msgstr "tip" msgid "variable" msgstr "Varijabla" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++ razred)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ tip)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ član)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ funkcija)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "razred" @@ -222,11 +217,11 @@ msgstr "Parametri" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "atribut" @@ -295,45 +290,45 @@ msgstr "%s() (%s metoda)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s atribut)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (modul)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "Popis modula" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "Moduli" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Zastarjelo" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "izuzetak" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "statična metoda" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "modul" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (zastarjelo)" @@ -385,6 +380,15 @@ msgstr "varijabla okruženja" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Abecedni popis" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Popis modula" @@ -393,12 +397,12 @@ msgstr "Popis modula" msgid "Search Page" msgstr "Tražilica" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Osnove: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "nadimak za :class:`%s`" @@ -721,8 +725,8 @@ msgstr "C API changes" msgid "Other changes" msgstr "Ostale promjene" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Link na taj naslov" @@ -747,51 +751,24 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Distribucija" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "nastavak sa prethodne stranice" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "nastavak na slijedećoj stranici" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[slika]" -#~ msgid "Platforms: " -#~ msgstr "Platforme:" - -#~ msgid "Searching" -#~ msgstr "Tražim" - -#~ msgid "Preparing search..." -#~ msgstr "Pripremam pretraživanje..." - -#~ msgid ", in " -#~ msgstr ", u " - -#~ 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 "" -#~ "Za vašu pretragu nema rezultata. Molimo" -#~ " pregledajte da li so sve riječi " -#~ "ispravno napisane i da li ste " -#~ "izbrali dovoljno kategorija." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "" -#~ "Pretraživanje je zaključeno, pronađeno %s " -#~ "stranica, koje odgovaraju traženom nizu." - diff --git a/sphinx/locale/hu/LC_MESSAGES/sphinx.js b/sphinx/locale/hu/LC_MESSAGES/sphinx.js new file mode 100644 index 00000000..2d347242 --- /dev/null +++ b/sphinx/locale/hu/LC_MESSAGES/sphinx.js @@ -0,0 +1 @@ +Documentation.addTranslations({"locale": "hu", "plural_expr": "(n != 1)", "messages": {"Hide Search Matches": "Keresési találatok elrejtése", "Permalink to this definition": "Hivatkozás erre a definícióra", "Expand sidebar": "Oldalsáv kinyitása", "Permalink to this headline": "Hivatkozás erre a fejezetcímre", "Collapse sidebar": "Oldalsáv összezárása"}});
\ No newline at end of file diff --git a/sphinx/locale/hu/LC_MESSAGES/sphinx.mo b/sphinx/locale/hu/LC_MESSAGES/sphinx.mo Binary files differnew file mode 100644 index 00000000..63c64bcb --- /dev/null +++ b/sphinx/locale/hu/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/hu/LC_MESSAGES/sphinx.po b/sphinx/locale/hu/LC_MESSAGES/sphinx.po new file mode 100644 index 00000000..8f01bdce --- /dev/null +++ b/sphinx/locale/hu/LC_MESSAGES/sphinx.po @@ -0,0 +1,592 @@ +# Translations template for PROJECT. +# Copyright (C) 2011 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: Sphinx 1.0\n" +"Report-Msgid-Bugs-To: szunyog@gmail.com\n" +"POT-Creation-Date: 2011-09-25 20:04+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Tibor Toth <szunyog@gmail.com>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" + +#: sphinx/environment.py:113 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 +#, python-format +msgid "%B %d, %Y" +msgstr "%Y. %m. %d." + +#: sphinx/environment.py:1619 +#, python-format +msgid "see %s" +msgstr "lásd %s" + +#: sphinx/environment.py:1622 +#, python-format +msgid "see also %s" +msgstr "lásd még %s" + +#: sphinx/roles.py:176 +#, python-format +msgid "Python Enhancement Proposals; PEP %s" +msgstr "Python Fejlesztési Javaslatok; PEP %s" + +#: sphinx/builders/changes.py:73 +msgid "Builtins" +msgstr "Beépített" + +#: sphinx/builders/changes.py:75 +msgid "Module level" +msgstr "Modul szint" + +#: sphinx/builders/html.py:276 +#, python-format +msgid "%b %d, %Y" +msgstr "%b %d, %Y" + +#: sphinx/builders/html.py:295 sphinx/themes/basic/defindex.html:30 +msgid "General Index" +msgstr "Általános tárgymutató" + +#: sphinx/builders/html.py:295 +msgid "index" +msgstr "nyitóoldal" + +#: sphinx/builders/html.py:355 +msgid "next" +msgstr "következő" + +#: sphinx/builders/html.py:364 +msgid "previous" +msgstr "előző" + +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 +msgid " (in " +msgstr " (" + +#: sphinx/directives/other.py:138 +msgid "Section author: " +msgstr "Fejezet szerző: " + +#: sphinx/directives/other.py:140 +msgid "Module author: " +msgstr "Modul szerző: " + +#: sphinx/directives/other.py:142 +msgid "Code author: " +msgstr "Kód szerző: " + +#: sphinx/directives/other.py:144 +msgid "Author: " +msgstr "Szerző: " + +#: sphinx/directives/other.py:219 +msgid "See also" +msgstr "Lásd még" + +#: sphinx/domains/__init__.py:244 +#, python-format +msgid "%s %s" +msgstr "%s %s" + +#: sphinx/domains/c.py:141 +#, python-format +msgid "%s (C function)" +msgstr "%s (C függvény)" + +#: sphinx/domains/c.py:143 +#, python-format +msgid "%s (C member)" +msgstr "%s (C tagváltozó)" + +#: sphinx/domains/c.py:145 +#, python-format +msgid "%s (C macro)" +msgstr "%s (C makró)" + +#: sphinx/domains/c.py:147 +#, python-format +msgid "%s (C type)" +msgstr "%s (C típus)" + +#: sphinx/domains/c.py:149 +#, python-format +msgid "%s (C variable)" +msgstr "%s (C változó)" + +#: sphinx/domains/cpp.py:999 +#, python-format +msgid "%s (C++ class)" +msgstr "%s (C++ osztály)" + +#: sphinx/domains/cpp.py:1014 +#, python-format +msgid "%s (C++ type)" +msgstr "%s (C++ típus)" + +#: sphinx/domains/cpp.py:1034 +#, python-format +msgid "%s (C++ member)" +msgstr "%s (C++ tagváltozó)" + +#: sphinx/domains/cpp.py:1090 +#, python-format +msgid "%s (C++ function)" +msgstr "%s (C++ függvény)" + +#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:253 +#, python-format +msgid "%s() (built-in function)" +msgstr "%s() (beépített függvény)" + +#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:317 +#, python-format +msgid "%s() (%s method)" +msgstr "%s() (%s metódus)" + +#: sphinx/domains/javascript.py:109 +#, python-format +msgid "%s() (class)" +msgstr "%s() (osztály)" + +#: sphinx/domains/javascript.py:111 +#, python-format +msgid "%s (global variable or constant)" +msgstr "%s (globális változó vagy konstans)" + +#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:355 +#, python-format +msgid "%s (%s attribute)" +msgstr "%s (%s attribútum)" + +#: sphinx/domains/python.py:254 sphinx/domains/python.py:311 +#: sphinx/domains/python.py:323 sphinx/domains/python.py:336 +#, python-format +msgid "%s() (in module %s)" +msgstr "%s() (%s modulban)" + +#: sphinx/domains/python.py:257 +#, python-format +msgid "%s (built-in variable)" +msgstr "%s (beépített változó)" + +#: sphinx/domains/python.py:258 sphinx/domains/python.py:349 +#, python-format +msgid "%s (in module %s)" +msgstr "%s (%s modulban)" + +#: sphinx/domains/python.py:274 +#, python-format +msgid "%s (built-in class)" +msgstr "%s (beépített osztály)" + +#: sphinx/domains/python.py:275 +#, python-format +msgid "%s (class in %s)" +msgstr "%s (osztály %s)" + +#: sphinx/domains/python.py:315 +#, python-format +msgid "%s() (%s.%s method)" +msgstr "%s() (%s.%s metódus)" + +#: sphinx/domains/python.py:327 +#, python-format +msgid "%s() (%s.%s static method)" +msgstr "%s() (%s.%s statikus metódus)" + +#: sphinx/domains/python.py:330 +#, python-format +msgid "%s() (%s static method)" +msgstr "%s() (%s statikus metódus)" + +#: sphinx/domains/python.py:340 +#, python-format +msgid "%s() (%s.%s class method)" +msgstr "%s() (%s.%s osztály metódus)" + +#: sphinx/domains/python.py:343 +#, python-format +msgid "%s() (%s class method)" +msgstr "%s() (%s osztály metódus)" + +#: sphinx/domains/python.py:353 +#, python-format +msgid "%s (%s.%s attribute)" +msgstr "%s (%s.%s attribútum)" + +#: sphinx/domains/python.py:433 +#, python-format +msgid "%s (module)" +msgstr "%s (modul)" + +#: sphinx/domains/python.py:536 +msgid "Deprecated" +msgstr "Elavult" + +#: sphinx/domains/python.py:693 +msgid " (deprecated)" +msgstr " (elavult)" + +#: sphinx/domains/rst.py:53 +#, python-format +msgid "%s (directive)" +msgstr "%s (direktíva)" + +#: sphinx/domains/rst.py:55 +#, python-format +msgid "%s (role)" +msgstr "%s (szerepkör)" + +#: sphinx/domains/std.py:86 +#, python-format +msgid "environment variable; %s" +msgstr "környezeti változó; %s" + +#: sphinx/domains/std.py:162 +#, python-format +msgid "%scommand line option; %s" +msgstr "%sparancssor opció; %s" + +#: sphinx/ext/autodoc.py:1002 +#, python-format +msgid " Bases: %s" +msgstr " Alapul: %s" + +#: sphinx/ext/autodoc.py:1038 +#, python-format +msgid "alias of :class:`%s`" +msgstr "álneve :class:`%s`" + +#: sphinx/ext/graphviz.py:300 sphinx/ext/graphviz.py:306 +#, python-format +msgid "[graph: %s]" +msgstr "[graph: %s]" + +#: sphinx/ext/graphviz.py:301 sphinx/ext/graphviz.py:307 +msgid "[graph]" +msgstr "[graph]" + +#: sphinx/ext/intersphinx.py:218 +#, python-format +msgid "(in %s v%s)" +msgstr "(%s v%s)" + +#: sphinx/ext/todo.py:42 +msgid "Todo" +msgstr "Tennivaló" + +#: sphinx/ext/todo.py:110 +#, python-format +msgid "(The <<original entry>> is located in %s, line %d.)" +msgstr "(Az <<eredeti bejegyzés>> megtalálható a(z) %s, %d sor.)" + +#: sphinx/ext/todo.py:119 +msgid "original entry" +msgstr "eredeti bejegyzés" + +#: sphinx/ext/viewcode.py:70 +msgid "[source]" +msgstr "[source]" + +#: sphinx/ext/viewcode.py:117 +msgid "[docs]" +msgstr "[docs]" + +#: sphinx/ext/viewcode.py:131 +msgid "Module code" +msgstr "Modul forráskód" + +#: sphinx/ext/viewcode.py:137 +#, python-format +msgid "<h1>Source code for %s</h1>" +msgstr "<h1>%s forráskódja</h1>" + +#: sphinx/ext/viewcode.py:164 +msgid "Overview: module code" +msgstr "Áttekintés: modul forráskód" + +#: sphinx/ext/viewcode.py:165 +msgid "<h1>All modules for which code is available</h1>" +msgstr "<h1>Az összes modul, melynek forrása elérhető</h1>" + +#: sphinx/themes/agogo/layout.html:46 sphinx/themes/basic/globaltoc.html:10 +#: sphinx/themes/basic/localtoc.html:11 +msgid "Table Of Contents" +msgstr "Tartalomjegyzék" + +#: sphinx/themes/agogo/layout.html:50 sphinx/themes/basic/layout.html:137 +#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20 +msgid "Search" +msgstr "Keresés" + +#: sphinx/themes/agogo/layout.html:53 sphinx/themes/basic/searchbox.html:15 +msgid "Go" +msgstr "Ok" + +#: sphinx/themes/agogo/layout.html:58 sphinx/themes/basic/searchbox.html:20 +msgid "Enter search terms or a module, class or function name." +msgstr "Adjon meg egy keresendő kifejezést, modul, osztály vagy funkció nevet." + +#: sphinx/themes/agogo/layout.html:79 sphinx/themes/basic/sourcelink.html:14 +msgid "Show Source" +msgstr "Forrás megtekintése" + +#: sphinx/themes/basic/defindex.html:11 +msgid "Overview" +msgstr "Áttekintés" + +#: sphinx/themes/basic/defindex.html:20 +msgid "Indices and tables:" +msgstr "Tárgymutató és táblázatok" + +#: sphinx/themes/basic/defindex.html:23 +msgid "Complete Table of Contents" +msgstr "Teljes tartalomjegyzék" + +#: sphinx/themes/basic/defindex.html:24 +msgid "lists all sections and subsections" +msgstr "kilistázza az összes fejezetet és alfejezetet" + +#: sphinx/themes/basic/defindex.html:25 +msgid "Search Page" +msgstr "Keresés" + +#: sphinx/themes/basic/defindex.html:26 +msgid "search this documentation" +msgstr "keresés ebben a dokumentációban" + +#: sphinx/themes/basic/defindex.html:28 +msgid "Global Module Index" +msgstr "Teljes modul tárgymutató" + +#: sphinx/themes/basic/defindex.html:29 +msgid "quick access to all modules" +msgstr "gyors hozzáférés az összes modulhoz" + +#: sphinx/themes/basic/defindex.html:31 +msgid "all functions, classes, terms" +msgstr "összes funkció, osztály és kifejezés" + +#: sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Tárgymutató" + +#: sphinx/themes/basic/genindex-single.html:35 +#, python-format +msgid "Index – %(key)s" +msgstr "Tárgymutató – %(key)s" + +#: sphinx/themes/basic/genindex-single.html:63 +#: sphinx/themes/basic/genindex-split.html:24 +#: sphinx/themes/basic/genindex-split.html:38 +#: sphinx/themes/basic/genindex.html:74 +msgid "Full index on one page" +msgstr "Teljes tárgymutató egy oldalon" + +#: sphinx/themes/basic/genindex-split.html:16 +msgid "Index pages by letter" +msgstr "Oldalak ABC sorrendben" + +#: sphinx/themes/basic/genindex-split.html:25 +msgid "can be huge" +msgstr "nagy lehet" + +#: sphinx/themes/basic/layout.html:29 +msgid "Navigation" +msgstr "Navigáció" + +#: sphinx/themes/basic/layout.html:122 +#, python-format +msgid "Search within %(docstitle)s" +msgstr "Keresés köztük: %(docstitle)s" + +#: sphinx/themes/basic/layout.html:131 +msgid "About these documents" +msgstr "Névjegy ezekről a dokumentumokról" + +#: sphinx/themes/basic/layout.html:140 +msgid "Copyright" +msgstr "Minden jog fenntartva" + +#: sphinx/themes/basic/layout.html:189 +#, python-format +msgid "© <a href=\"%(path)s\">Copyright</a> %(copyright)s." +msgstr "© <a href=\"%(path)s\">Minden jog fenntartva</a> %(copyright)s." + +#: sphinx/themes/basic/layout.html:191 +#, python-format +msgid "© Copyright %(copyright)s." +msgstr "© Minden jog fenntartva %(copyright)s." + +#: sphinx/themes/basic/layout.html:195 +#, python-format +msgid "Last updated on %(last_updated)s." +msgstr "Utolsó frissítés %(last_updated)s." + +#: sphinx/themes/basic/layout.html:198 +#, python-format +msgid "" +"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " +"%(sphinx_version)s." +msgstr "" +"<a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " +"%(sphinx_version)s használatával készült." + +#: sphinx/themes/basic/opensearch.xml:4 +#, python-format +msgid "Search %(docstitle)s" +msgstr "Keresés %(docstitle)s" + +#: sphinx/themes/basic/relations.html:11 +msgid "Previous topic" +msgstr "Előző témakör" + +#: sphinx/themes/basic/relations.html:13 +msgid "previous chapter" +msgstr "előző fejezet" + +#: sphinx/themes/basic/relations.html:16 +msgid "Next topic" +msgstr "Következő témakör" + +#: sphinx/themes/basic/relations.html:18 +msgid "next chapter" +msgstr "következő fejezet" + +#: sphinx/themes/basic/search.html:24 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" +"Kérem engedélyezze a JavaScriptet a kereső funkció\n" +" használatához." + +#: sphinx/themes/basic/search.html:29 +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 "" +"Erről az oldalról indíthatja kereséseit. Írja be a kulcsszavakat\n" +" az alábbi szövegdobozba, majd kattintson a \"keresés\" gombra.\n" +" Ügyeljen arra, hogy a keresés megadott kulcsszavak mindegyikét\n" +" figyelembe veszi, így azok az oldalak, melyek nem tartalmazzák az\n" +" összes kifejezést, nem jelennek meg a találati listában." + +#: sphinx/themes/basic/search.html:36 +msgid "search" +msgstr "keresés" + +#: sphinx/themes/basic/search.html:40 +msgid "Search Results" +msgstr "Keresési Eredmények" + +#: sphinx/themes/basic/search.html:42 +msgid "Your search did not match any results." +msgstr "Nincs találat." + +#: sphinx/themes/basic/searchbox.html:12 +msgid "Quick search" +msgstr "Gyorskeresés" + +#: sphinx/themes/basic/sourcelink.html:11 +msgid "This Page" +msgstr "Ez az Oldal" + +#: sphinx/themes/basic/changes/frameset.html:5 +#: sphinx/themes/basic/changes/versionchanges.html:12 +#, python-format +msgid "Changes in Version %(version)s — %(docstitle)s" +msgstr "Változások a(z) %(version)s változatban — %(docstitle)s" + +#: sphinx/themes/basic/changes/rstsource.html:5 +#, python-format +msgid "%(filename)s — %(docstitle)s" +msgstr "%(filename)s — %(docstitle)s" + +#: sphinx/themes/basic/changes/versionchanges.html:17 +#, python-format +msgid "Automatically generated list of changes in version %(version)s" +msgstr "Automatikusan generált változáslista a(z) %(version)s változathoz" + +#: sphinx/themes/basic/changes/versionchanges.html:18 +msgid "Library changes" +msgstr "Könyvtár változások" + +#: sphinx/themes/basic/changes/versionchanges.html:23 +msgid "C API changes" +msgstr "C API változások" + +#: sphinx/themes/basic/changes/versionchanges.html:25 +msgid "Other changes" +msgstr "Egyéb változások" + +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 +msgid "Permalink to this headline" +msgstr "Hivatkozás erre a fejezetcímre" + +#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92 +msgid "Permalink to this definition" +msgstr "Hivatkozás erre a definícióra" + +#: sphinx/themes/basic/static/doctools.js:189 +msgid "Hide Search Matches" +msgstr "Keresési Találatok Elrejtése" + +#: sphinx/themes/default/static/sidebar.js:69 +msgid "Expand sidebar" +msgstr "Oldalsáv kinyitása" + +#: sphinx/themes/default/static/sidebar.js:82 +#: sphinx/themes/default/static/sidebar.js:110 +msgid "Collapse sidebar" +msgstr "Oldalsáv összezárása" + +#: sphinx/themes/haiku/layout.html:26 +msgid "Contents" +msgstr "Tartalom" + +#: sphinx/writers/latex.py:177 +msgid "Release" +msgstr "Kiadás" + +#: sphinx/writers/latex.py:599 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 +msgid "Footnotes" +msgstr "Lábjegyzetek" + +#: sphinx/writers/latex.py:683 +msgid "continued from previous page" +msgstr "folytatás az előző oldalról" + +#: sphinx/writers/latex.py:689 +msgid "Continued on next page" +msgstr "A következő oldalon folytatódik" + +#: sphinx/writers/manpage.py:233 sphinx/writers/text.py:438 +#, python-format +msgid "[image: %s]" +msgstr "[image: %s]" + +#: sphinx/writers/manpage.py:234 sphinx/writers/text.py:439 +msgid "[image]" +msgstr "[image]" + +#: tests/test_build_gettext.py:81 +msgid "Testing various markup" +msgstr "Különféte leíró tesztelése" + diff --git a/sphinx/locale/it/LC_MESSAGES/sphinx.mo b/sphinx/locale/it/LC_MESSAGES/sphinx.mo Binary files differindex 09c7fdfd..a4213c8e 100644 --- a/sphinx/locale/it/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/it/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/it/LC_MESSAGES/sphinx.po b/sphinx/locale/it/LC_MESSAGES/sphinx.po index 04e2e381..ccfab24e 100644 --- a/sphinx/locale/it/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/it/LC_MESSAGES/sphinx.po @@ -6,7 +6,7 @@ msgid "" 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" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Sandro Dentella <sandro@e-den.it>\n" "Language-Team: <sphinx-dev@googlegroups.com>\n" @@ -14,20 +14,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, fuzzy, python-format +msgid "%s %s documentation" +msgstr "%s %s documentazione" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d %B %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "vedi %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "vedi anche %s" @@ -66,21 +71,10 @@ msgstr "successivo" msgid "previous" msgstr "precedente" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (in " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Indice" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Autore della sezione: " @@ -145,12 +139,12 @@ msgstr "%s (tipo C)" msgid "%s (C variable)" msgstr "%s (variabile C)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "funzione" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "membro" @@ -158,7 +152,7 @@ msgstr "membro" msgid "macro" msgstr "" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "tipo" @@ -167,28 +161,28 @@ msgstr "tipo" msgid "variable" msgstr "Variabile" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (classe C++)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (tipo C++)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (membro C++)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (funzione C++)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "" @@ -226,11 +220,11 @@ msgstr "Parametri" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "attributo" @@ -299,45 +293,45 @@ msgstr "%s() (%s metodo)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s attributo)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (modulo)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "Indice dei Moduli" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "moduli" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Deprecato" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "eccezione" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "metodo statico" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "modulo" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (deprecato)" @@ -389,6 +383,15 @@ msgstr "variabile d'ambiente" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Indice" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Indice dei Moduli" @@ -397,12 +400,12 @@ msgstr "Indice dei Moduli" msgid "Search Page" msgstr "Cerca" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "alias per :class:`%s`" @@ -725,8 +728,8 @@ msgstr "Modifiche nelle API C" msgid "Other changes" msgstr "Altre modifiche" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "link permanente per questa intestazione" @@ -751,51 +754,25 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Release" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 #, fuzzy msgid "Continued on next page" msgstr "Indice completo in una pagina" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[immagine]" -#~ msgid "Platforms: " -#~ msgstr "Piattaforme:" - -#~ msgid "Searching" -#~ msgstr "Ricerca in corso" - -#~ msgid "Preparing search..." -#~ msgstr "Preparazione della ricerca" - -#~ msgid ", in " -#~ msgstr ", in " - -#~ 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" - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Ricerca terminata, trovate %s pagine corrispondenti alla ricerca." - diff --git a/sphinx/locale/ja/LC_MESSAGES/sphinx.mo b/sphinx/locale/ja/LC_MESSAGES/sphinx.mo Binary files differindex 6a1065fd..2bbd3b24 100644 --- a/sphinx/locale/ja/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/ja/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/ja/LC_MESSAGES/sphinx.po b/sphinx/locale/ja/LC_MESSAGES/sphinx.po index 6069002a..17d26d93 100644 --- a/sphinx/locale/ja/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/ja/LC_MESSAGES/sphinx.po @@ -8,7 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 1.1pre\n" -"POT-Creation-Date: 2008-09-11 23:58+0200\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-08-27 17:50+0900\n" "Last-Translator: Akitoshi Ohta <fire.kuma8@gmail.com>\n" "Language-Team: Japanese\n" @@ -16,19 +17,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%Y 年 %m 月 %d 日" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "%sを参照" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "%sも参照" @@ -67,21 +74,10 @@ msgstr "次へ" msgid "previous" msgstr "前へ" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "" -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "索引" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "この節の作者: " @@ -145,12 +141,12 @@ msgstr "%s (C のデータ型)" msgid "%s (C variable)" msgstr "%s (C の変数)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "の関数" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "のメンバ変数" @@ -158,7 +154,7 @@ msgstr "のメンバ変数" msgid "macro" msgstr "のマクロ" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "のデータ型" @@ -166,28 +162,28 @@ msgstr "のデータ型" msgid "variable" msgstr "変数" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++ のクラス)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ のデータ型)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ のメンバ変数)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ の関数)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "クラス" @@ -224,11 +220,11 @@ msgstr "引数" msgid "Throws" msgstr "例外" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "データ" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "の属性" @@ -296,44 +292,44 @@ msgstr "%s() (%s のクラスメソッド)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s の属性)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (モジュール)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 msgid "Python Module Index" msgstr "Pythonモジュール索引" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "モジュール" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "撤廃" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "例外" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "メソッド" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "クラスメソッド" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "の静的メソッド" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "モジュール" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (撤廃)" @@ -385,6 +381,15 @@ msgstr "環境変数" msgid "program option" msgstr "プログラムオプション" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "索引" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "モジュール索引" @@ -393,12 +398,12 @@ msgstr "モジュール索引" msgid "Search Page" msgstr "検索ページ" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " ベースクラス: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr ":class:`%s` のエイリアス" @@ -714,8 +719,8 @@ msgstr "C API に関する変更" msgid "Other changes" msgstr "その多の変更" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "このヘッドラインへのパーマリンク" @@ -740,45 +745,24 @@ msgstr "サイドバーをたたむ" msgid "Contents" msgstr "コンテンツ" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "リリース" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "注記" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "前のページからの続き" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "次のページに続く" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[画像]" -#~ msgid "Platforms: " -#~ msgstr "プラットフォーム: " - -#~ msgid "Searching" -#~ msgstr "検索中" - -#~ msgid "Preparing search..." -#~ msgstr "検索の準備中..." - -#~ msgid ", in " -#~ msgstr "" - -#~ 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 "検索条件に一致するドキュメントはありませんでした。検索したい言葉を正しいつづりで入力しているか確認してください。また、正しいカテゴリの検索を行っているか確認してください。" - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "検索が終了し、条件に一致するページが %s 個みつかりました。" - diff --git a/sphinx/locale/ko/LC_MESSAGES/sphinx.js b/sphinx/locale/ko/LC_MESSAGES/sphinx.js new file mode 100644 index 00000000..0beffaa2 --- /dev/null +++ b/sphinx/locale/ko/LC_MESSAGES/sphinx.js @@ -0,0 +1 @@ +Documentation.addTranslations({"locale": "ko", "plural_expr": "0", "messages": {"Hide Search Matches": "\uac80\uc0c9 \uacb0\uacfc \uc228\uae30\uae30", "Permalink to this definition": "\uc815\uc758 \uc8fc\uc18c", "Expand sidebar": "\uc0ac\uc774\ub4dc\ubc14 \uc5f4\uae30", "Permalink to this headline": "\uc81c\ubaa9 \uc8fc\uc18c", "Collapse sidebar": "\uc0ac\uc774\ub4dc\ubc14 \ub2eb\uae30"}});
\ No newline at end of file diff --git a/sphinx/locale/ko/LC_MESSAGES/sphinx.mo b/sphinx/locale/ko/LC_MESSAGES/sphinx.mo Binary files differnew file mode 100644 index 00000000..d671331a --- /dev/null +++ b/sphinx/locale/ko/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/ko/LC_MESSAGES/sphinx.po b/sphinx/locale/ko/LC_MESSAGES/sphinx.po new file mode 100644 index 00000000..8c0dd3d8 --- /dev/null +++ b/sphinx/locale/ko/LC_MESSAGES/sphinx.po @@ -0,0 +1,777 @@ +# Koreantranslations for Sphinx. +# Copyright (C) 2008 ORGANIZATION +# This file is distributed under the same license as the Sphinx project. +# Channy Yun <channy@mozilla.or.kr> +# +msgid "" +msgstr "" +"Project-Id-Version: Sphinx 1.1pre\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2011-06-09 21:25+0900\n" +"Last-Translator: Channy Yun <channy@mozilla.or.kr>\n" +"Language-Team: Korean\n" +"Plural-Forms: nplurals=1; plural=0\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" + +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 +#, python-format +msgid "%B %d, %Y" +msgstr "%Y년 %m월 %d일" + +#: sphinx/environment.py:1625 +#, python-format +msgid "see %s" +msgstr "%s 문서" + +#: sphinx/environment.py:1628 +#, python-format +msgid "see also %s" +msgstr "%s 참조" + +#: sphinx/roles.py:175 +#, python-format +msgid "Python Enhancement Proposals; PEP %s" +msgstr "Python Enhancement Proposals; PEP %s" + +#: sphinx/builders/changes.py:73 +msgid "Builtins" +msgstr "기본" + +#: sphinx/builders/changes.py:75 +msgid "Module level" +msgstr "모듈 수준" + +#: sphinx/builders/html.py:274 +#, python-format +msgid "%b %d, %Y" +msgstr "%Y년 %m월 %d일" + +#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30 +msgid "General Index" +msgstr "전체 색인" + +#: sphinx/builders/html.py:293 +msgid "index" +msgstr "색인" + +#: sphinx/builders/html.py:353 +msgid "next" +msgstr "다음" + +#: sphinx/builders/html.py:362 +msgid "previous" +msgstr "이전" + +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 +#, fuzzy +msgid " (in " +msgstr "(" + +#: sphinx/directives/other.py:136 +#, fuzzy +msgid "Section author: " +msgstr "항목 저자:" + +#: sphinx/directives/other.py:138 +#, fuzzy +msgid "Module author: " +msgstr "모듈 개발자:" + +#: sphinx/directives/other.py:140 +#, fuzzy +msgid "Code author: " +msgstr "코드 개발자:" + +#: sphinx/directives/other.py:142 +#, fuzzy +msgid "Author: " +msgstr "저자:" + +#: sphinx/directives/other.py:215 +msgid "See also" +msgstr "더 보기" + +#: sphinx/domains/__init__.py:244 +#, python-format +msgid "%s %s" +msgstr "" + +#: sphinx/domains/c.py:51 sphinx/domains/python.py:95 +msgid "Parameters" +msgstr "매개 변수" + +#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128 +#: sphinx/domains/python.py:107 +msgid "Returns" +msgstr "반환" + +#: sphinx/domains/c.py:56 sphinx/domains/python.py:109 +msgid "Return type" +msgstr "반환 형식" + +#: sphinx/domains/c.py:141 +#, python-format +msgid "%s (C function)" +msgstr "%s (C 함수)" + +#: sphinx/domains/c.py:143 +#, python-format +msgid "%s (C member)" +msgstr "%s (C 멤버 변수)" + +#: sphinx/domains/c.py:145 +#, python-format +msgid "%s (C macro)" +msgstr "%s (C 매크로)" + +#: sphinx/domains/c.py:147 +#, python-format +msgid "%s (C type)" +msgstr "%s (C 데이터 형식)" + +#: sphinx/domains/c.py:149 +#, python-format +msgid "%s (C variable)" +msgstr "%s (C 변수)" + +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 +msgid "function" +msgstr "함수" + +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 +msgid "member" +msgstr "멤버 변수" + +#: sphinx/domains/c.py:206 +msgid "macro" +msgstr "매크로" + +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 +msgid "type" +msgstr "데이터 형식" + +#: sphinx/domains/c.py:208 +msgid "variable" +msgstr "변수" + +#: sphinx/domains/cpp.py:904 +#, python-format +msgid "%s (C++ class)" +msgstr "%s (C++ 클래스)" + +#: sphinx/domains/cpp.py:919 +#, python-format +msgid "%s (C++ type)" +msgstr "%s (C++ 데이터 형식)" + +#: sphinx/domains/cpp.py:938 +#, python-format +msgid "%s (C++ member)" +msgstr "%s (C++의 멤버 변수)" + +#: sphinx/domains/cpp.py:990 +#, python-format +msgid "%s (C++ function)" +msgstr "%s (C++ 함수)" + +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 +msgid "class" +msgstr "클래스" + +#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254 +#, python-format +msgid "%s() (built-in function)" +msgstr "%s() 내장 함수)" + +#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318 +#, python-format +msgid "%s() (%s method)" +msgstr "%s() (%s 메서드)" + +#: sphinx/domains/javascript.py:109 +#, python-format +msgid "%s() (class)" +msgstr "%s() (클래스)" + +#: sphinx/domains/javascript.py:111 +#, python-format +msgid "%s (global variable or constant)" +msgstr "%s (전역 변수 또는 상수)" + +#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356 +#, python-format +msgid "%s (%s attribute)" +msgstr "%s (%s의 속성)" + +#: sphinx/domains/javascript.py:122 +msgid "Arguments" +msgstr "인수" + +#: sphinx/domains/javascript.py:125 +msgid "Throws" +msgstr "예외" + +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 +msgid "data" +msgstr "데이터" + +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 +msgid "attribute" +msgstr "속성" + +#: sphinx/domains/python.py:100 +msgid "Variables" +msgstr "변수" + +#: sphinx/domains/python.py:104 +msgid "Raises" +msgstr "예외" + +#: sphinx/domains/python.py:255 sphinx/domains/python.py:312 +#: sphinx/domains/python.py:324 sphinx/domains/python.py:337 +#, python-format +msgid "%s() (in module %s)" +msgstr "%s() (%s 모듈)" + +#: sphinx/domains/python.py:258 +#, python-format +msgid "%s (built-in variable)" +msgstr "%s (내장 변수)" + +#: sphinx/domains/python.py:259 sphinx/domains/python.py:350 +#, python-format +msgid "%s (in module %s)" +msgstr "%s (%s 모듈)" + +#: sphinx/domains/python.py:275 +#, python-format +msgid "%s (built-in class)" +msgstr "%s (내장 변수)" + +#: sphinx/domains/python.py:276 +#, python-format +msgid "%s (class in %s)" +msgstr "%s (%s 종류)" + +#: sphinx/domains/python.py:316 +#, fuzzy, python-format +msgid "%s() (%s.%s method)" +msgstr "%s() (%s. %s 메서드)" + +#: sphinx/domains/python.py:328 +#, fuzzy, python-format +msgid "%s() (%s.%s static method)" +msgstr "%s() (%s. %s의 정적 메서드)" + +#: sphinx/domains/python.py:331 +#, python-format +msgid "%s() (%s static method)" +msgstr "%s() (%s의 정적 메서드)" + +#: sphinx/domains/python.py:341 +#, fuzzy, python-format +msgid "%s() (%s.%s class method)" +msgstr "%s() (%s. %s 클래스 메서드)" + +#: sphinx/domains/python.py:344 +#, python-format +msgid "%s() (%s class method)" +msgstr "%s() (%s 클래스 메서드)" + +#: sphinx/domains/python.py:354 +#, fuzzy, python-format +msgid "%s (%s.%s attribute)" +msgstr "%s (%s. %s의 속성)" + +#: sphinx/domains/python.py:434 +#, python-format +msgid "%s (module)" +msgstr "%s (모듈)" + +#: sphinx/domains/python.py:491 +msgid "Python Module Index" +msgstr "Python 모듈 목록" + +#: sphinx/domains/python.py:492 +msgid "modules" +msgstr "모듈" + +#: sphinx/domains/python.py:537 +msgid "Deprecated" +msgstr "폐지" + +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 +msgid "exception" +msgstr "예외" + +#: sphinx/domains/python.py:563 +msgid "method" +msgstr "메소드" + +#: sphinx/domains/python.py:564 +msgid "class method" +msgstr "클래스 메소드" + +#: sphinx/domains/python.py:565 +msgid "static method" +msgstr "정적 메서드" + +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 +msgid "module" +msgstr "모듈" + +#: sphinx/domains/python.py:695 +#, fuzzy +msgid " (deprecated)" +msgstr "(폐지)" + +#: sphinx/domains/rst.py:55 +#, python-format +msgid "%s (directive)" +msgstr "%s (지시문)" + +#: sphinx/domains/rst.py:57 +#, python-format +msgid "%s (role)" +msgstr "%s (역할)" + +#: sphinx/domains/rst.py:106 +msgid "directive" +msgstr "지시자" + +#: sphinx/domains/rst.py:107 +msgid "role" +msgstr "역할" + +#: sphinx/domains/std.py:70 sphinx/domains/std.py:86 +#, python-format +msgid "environment variable; %s" +msgstr "환경 변수; %s" + +#: sphinx/domains/std.py:162 +#, python-format +msgid "%scommand line option; %s" +msgstr "%s 명령; %s" + +#: sphinx/domains/std.py:393 +msgid "glossary term" +msgstr "용어의 항목" + +#: sphinx/domains/std.py:394 +msgid "grammar token" +msgstr "문법 토큰" + +#: sphinx/domains/std.py:395 +msgid "reference label" +msgstr "참조 레이블" + +#: sphinx/domains/std.py:396 +msgid "environment variable" +msgstr "환경 변수" + +#: sphinx/domains/std.py:397 +msgid "program option" +msgstr "프로그램 옵션" + +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "색인" + +#: sphinx/domains/std.py:428 +msgid "Module Index" +msgstr "모듈 목록" + +#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25 +msgid "Search Page" +msgstr "검색 페이지" + +#: sphinx/ext/autodoc.py:1002 +#, fuzzy, python-format +msgid " Bases: %s" +msgstr "기본 클래스: %s" + +#: sphinx/ext/autodoc.py:1038 +#, fuzzy, python-format +msgid "alias of :class:`%s`" +msgstr ": class:`%s`의 별칭" + +#: sphinx/ext/todo.py:41 +msgid "Todo" +msgstr "과제" + +#: sphinx/ext/todo.py:109 +#, fuzzy, python-format +msgid "(The <<original entry>> is located in %s, line %d.)" +msgstr "(<<원래 항목\" \"는 %s %d 번째)" + +#: sphinx/ext/todo.py:117 +msgid "original entry" +msgstr "원래 항목" + +#: sphinx/ext/viewcode.py:70 +msgid "[source]" +msgstr "[소스]" + +#: sphinx/ext/viewcode.py:117 +msgid "[docs]" +msgstr "[문서]" + +#: sphinx/ext/viewcode.py:131 +msgid "Module code" +msgstr "모듈 코드" + +#: sphinx/ext/viewcode.py:137 +#, fuzzy, python-format +msgid "<h1>Source code for %s</h1>" +msgstr "<h1>%s의 소스 코드</ h1>" + +#: sphinx/ext/viewcode.py:164 +msgid "Overview: module code" +msgstr "설명: 모듈 코드" + +#: sphinx/ext/viewcode.py:165 +#, fuzzy +msgid "<h1>All modules for which code is available</h1>" +msgstr "<h1>코드가 제공되는 모든 모듈 </ h1>" + +#: sphinx/locale/__init__.py:155 +msgid "Attention" +msgstr "주의" + +#: sphinx/locale/__init__.py:156 +msgid "Caution" +msgstr "조심" + +#: sphinx/locale/__init__.py:157 +msgid "Danger" +msgstr "위험" + +#: sphinx/locale/__init__.py:158 +msgid "Error" +msgstr "오류" + +#: sphinx/locale/__init__.py:159 +msgid "Hint" +msgstr "힌트" + +#: sphinx/locale/__init__.py:160 +msgid "Important" +msgstr "중요" + +#: sphinx/locale/__init__.py:161 +msgid "Note" +msgstr "주석" + +#: sphinx/locale/__init__.py:162 +msgid "See Also" +msgstr "더 보기" + +#: sphinx/locale/__init__.py:163 +msgid "Tip" +msgstr "참고" + +#: sphinx/locale/__init__.py:164 +msgid "Warning" +msgstr "경고" + +#: sphinx/locale/__init__.py:168 +#, python-format +msgid "New in version %s" +msgstr "버전 %s에 추가" + +#: sphinx/locale/__init__.py:169 +#, python-format +msgid "Changed in version %s" +msgstr "버전 %s으로 변경" + +#: sphinx/locale/__init__.py:170 +#, python-format +msgid "Deprecated since version %s" +msgstr "버전 %s 폐지" + +#: sphinx/locale/__init__.py:176 +msgid "keyword" +msgstr "키워드" + +#: sphinx/locale/__init__.py:177 +msgid "operator" +msgstr "연산자" + +#: sphinx/locale/__init__.py:178 +msgid "object" +msgstr "객체" + +#: sphinx/locale/__init__.py:180 +msgid "statement" +msgstr "글" + +#: sphinx/locale/__init__.py:181 +msgid "built-in function" +msgstr "내장 함수" + +#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10 +#: sphinx/themes/basic/localtoc.html:11 +msgid "Table Of Contents" +msgstr "목차" + +#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137 +#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20 +msgid "Search" +msgstr "검색" + +#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15 +msgid "Go" +msgstr "바로 가기" + +#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20 +msgid "Enter search terms or a module, class or function name." +msgstr "모듈, 클래스 또는 함수 이름을 입력하십시오." + +#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14 +msgid "Show Source" +msgstr "소스 코드를 보려면" + +#: sphinx/themes/basic/defindex.html:11 +msgid "Overview" +msgstr "개요" + +#: sphinx/themes/basic/defindex.html:20 +msgid "Indices and tables:" +msgstr "색인 및 표 목록:" + +#: sphinx/themes/basic/defindex.html:23 +msgid "Complete Table of Contents" +msgstr "종합 목차" + +#: sphinx/themes/basic/defindex.html:24 +msgid "lists all sections and subsections" +msgstr "영역별 목차" + +#: sphinx/themes/basic/defindex.html:26 +msgid "search this documentation" +msgstr "문서 검색" + +#: sphinx/themes/basic/defindex.html:28 +msgid "Global Module Index" +msgstr "모듈 총 색인" + +#: sphinx/themes/basic/defindex.html:29 +msgid "quick access to all modules" +msgstr "모든 모듈 조견표" + +#: sphinx/themes/basic/defindex.html:31 +msgid "all functions, classes, terms" +msgstr "함수, 클래스 및 용어 개관" + +#: sphinx/themes/basic/genindex-single.html:35 +#, fuzzy, python-format +msgid "Index – %(key)s" +msgstr "색인-%(key)s" + +#: sphinx/themes/basic/genindex-single.html:63 +#: sphinx/themes/basic/genindex-split.html:24 +#: sphinx/themes/basic/genindex-split.html:38 +#: sphinx/themes/basic/genindex.html:74 +msgid "Full index on one page" +msgstr "일반 색인" + +#: sphinx/themes/basic/genindex-split.html:16 +msgid "Index pages by letter" +msgstr "알파벳별 색인" + +#: sphinx/themes/basic/genindex-split.html:25 +msgid "can be huge" +msgstr "큰 경우가 있으므로 주의" + +#: sphinx/themes/basic/layout.html:29 +msgid "Navigation" +msgstr "탐색" + +#: sphinx/themes/basic/layout.html:122 +#, python-format +msgid "Search within %(docstitle)s" +msgstr "%(docstitle)s에서 찾기" + +#: sphinx/themes/basic/layout.html:131 +msgid "About these documents" +msgstr "이 문서 정보" + +#: sphinx/themes/basic/layout.html:140 +msgid "Copyright" +msgstr "저작권" + +#: sphinx/themes/basic/layout.html:189 +#, fuzzy, python-format +msgid "© <a href=\"%(path)s\">Copyright</a> %(copyright)s." +msgstr "©<a href=\"%(path)s\">Copyright</a> %(copyright)s." + +#: sphinx/themes/basic/layout.html:191 +#, fuzzy, python-format +msgid "© Copyright %(copyright)s." +msgstr "©Copyright %(copyright)s." + +#: sphinx/themes/basic/layout.html:195 +#, python-format +msgid "Last updated on %(last_updated)s." +msgstr "최종 업데이트: %(last_updated)s" + +#: sphinx/themes/basic/layout.html:198 +#, fuzzy, python-format +msgid "" +"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " +"%(sphinx_version)s." +msgstr "" +"이 문서는 <a href=\"http://sphinx.pocoo.org/\">Sphinx</a>%(sphinx_version)s로 " +"제공됩니다." + +#: sphinx/themes/basic/opensearch.xml:4 +#, python-format +msgid "Search %(docstitle)s" +msgstr "%(docstitle)s에서 찾기" + +#: sphinx/themes/basic/relations.html:11 +msgid "Previous topic" +msgstr "이전 항목" + +#: sphinx/themes/basic/relations.html:13 +msgid "previous chapter" +msgstr "이전 장" + +#: sphinx/themes/basic/relations.html:16 +msgid "Next topic" +msgstr "다음 항목" + +#: sphinx/themes/basic/relations.html:18 +msgid "next chapter" +msgstr "다음 장" + +#: sphinx/themes/basic/search.html:24 +#, fuzzy +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "검색 기능을 사용하려면 JavaScript를 활성화하십시오." + +#: sphinx/themes/basic/search.html:29 +#, fuzzy +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 "" +"이 문서에서 문서를 검색할 수 있습니다. 키워드를 아래 입력란에 입력하고 '검색'을 클릭하세요. 입력된 모든 키워드를 포함하는 " +"페이지가 검색됩니다. 일부 키워드 밖에 없는 페이지는 검색 결과에 표시되지 않으므로 주의하십시오. " + +#: sphinx/themes/basic/search.html:36 +msgid "search" +msgstr "검색" + +#: sphinx/themes/basic/search.html:40 +msgid "Search Results" +msgstr "검색 결과" + +#: sphinx/themes/basic/search.html:42 +msgid "Your search did not match any results." +msgstr "검색 조건에 일치하는 항목이 없습니다." + +#: sphinx/themes/basic/searchbox.html:12 +msgid "Quick search" +msgstr "빠른 검색" + +#: sphinx/themes/basic/sourcelink.html:11 +msgid "This Page" +msgstr "현재 문서" + +#: sphinx/themes/basic/changes/frameset.html:5 +#: sphinx/themes/basic/changes/versionchanges.html:12 +#, fuzzy, python-format +msgid "Changes in Version %(version)s — %(docstitle)s" +msgstr "버전 %(version)s의 변경 사항-%(docstitle)s" + +#: sphinx/themes/basic/changes/rstsource.html:5 +#, fuzzy, python-format +msgid "%(filename)s — %(docstitle)s" +msgstr "%(filename)s-%(docstitle)s" + +#: sphinx/themes/basic/changes/versionchanges.html:17 +#, python-format +msgid "Automatically generated list of changes in version %(version)s" +msgstr "버전 %(version)s의 변경 사항 (이 목록은 자동으로 생성합니다)" + +#: sphinx/themes/basic/changes/versionchanges.html:18 +msgid "Library changes" +msgstr "라이브러리에 대한 변경" + +#: sphinx/themes/basic/changes/versionchanges.html:23 +msgid "C API changes" +msgstr "C API에 대한 변경" + +#: sphinx/themes/basic/changes/versionchanges.html:25 +msgid "Other changes" +msgstr "다른 변경 사항" + +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 +msgid "Permalink to this headline" +msgstr "제목 주소" + +#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92 +msgid "Permalink to this definition" +msgstr "정의 주소" + +#: sphinx/themes/basic/static/doctools.js:189 +msgid "Hide Search Matches" +msgstr "검색 결과 숨기기" + +#: sphinx/themes/default/static/sidebar.js:69 +msgid "Expand sidebar" +msgstr "사이드바 열기" + +#: sphinx/themes/default/static/sidebar.js:82 +#: sphinx/themes/default/static/sidebar.js:110 +msgid "Collapse sidebar" +msgstr "사이드바 닫기" + +#: sphinx/themes/haiku/layout.html:26 +msgid "Contents" +msgstr "내용" + +#: sphinx/writers/latex.py:177 +msgid "Release" +msgstr "출시" + +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 +msgid "Footnotes" +msgstr "참고" + +#: sphinx/writers/latex.py:676 +msgid "continued from previous page" +msgstr "이전 페이지에서 계속" + +#: sphinx/writers/latex.py:681 +msgid "Continued on next page" +msgstr "일반 색인" + +#: sphinx/writers/text.py:437 +msgid "[image]" +msgstr "[그림]" + diff --git a/sphinx/locale/lt/LC_MESSAGES/sphinx.mo b/sphinx/locale/lt/LC_MESSAGES/sphinx.mo Binary files differindex c895af1f..9efc6d77 100644 --- a/sphinx/locale/lt/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/lt/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/lt/LC_MESSAGES/sphinx.po b/sphinx/locale/lt/LC_MESSAGES/sphinx.po index 6a902126..b331d52a 100644 --- a/sphinx/locale/lt/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/lt/LC_MESSAGES/sphinx.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 1.0pre/8b971dbc7d36\n" "Report-Msgid-Bugs-To: dalius@sandbox.lt\n" -"POT-Creation-Date: 2010-05-24 23:53+0200\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Dalius Dobravolskas <dalius@sandbox.lt>\n" "Language-Team: lt <LL@li.org>\n" @@ -15,20 +15,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%Y-%m-%d" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "" @@ -67,21 +72,10 @@ msgstr "kitas" msgid "previous" msgstr "praeitas" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (kuris yra " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Indeksas" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Skyriaus autorius: " @@ -145,12 +139,12 @@ msgstr "%s (C tipas)" msgid "%s (C variable)" msgstr "%s (C kintamasis)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "funkcija" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "narys" @@ -158,7 +152,7 @@ msgstr "narys" msgid "macro" msgstr "makrokomanda" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "tipas" @@ -166,28 +160,28 @@ msgstr "tipas" msgid "variable" msgstr "kintamasis" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ tipas)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ narys)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ funkcija)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "klasė" @@ -224,11 +218,11 @@ msgstr "Argumentais" msgid "Throws" msgstr "Išmeta" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "duomenys" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "atribudas" @@ -296,44 +290,44 @@ msgstr "%s() (%s klasės metodas)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s atributas)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (modulis)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 msgid "Python Module Index" msgstr "" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "moduliai" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Atmestas" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "išimtis" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "metodas" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "klasės metodas" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "statinis metodas" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "modulis" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (atmestas)" @@ -385,6 +379,15 @@ msgstr "aplinkos kintamasis" msgid "program option" msgstr "programos parinktis" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Indeksas" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Modulio indeksas" @@ -393,12 +396,12 @@ msgstr "Modulio indeksas" msgid "Search Page" msgstr "Paieškos puslapis" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Bazės: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr ":class:`%s` alternatyvus vardas" @@ -721,8 +724,8 @@ msgstr "C API pakeitimai" msgid "Other changes" msgstr "Kiti pakeitimai" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Nuoroda į šią antraštę" @@ -747,52 +750,24 @@ msgstr "Paslėpti šoninę juostą" msgid "Contents" msgstr "Turinys" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Leidimas" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "Išnašos" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "tęsinys iš praeito puslapio" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Tęsinys kitame puslapyje" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[paveiksliukas]" -#~ msgid "Python Enhancement Proposals!PEP %s" -#~ msgstr "" - -#~ msgid "Platforms: " -#~ msgstr "Platformos: " - -#~ msgid "Searching" -#~ msgstr "Ieškoma" - -#~ msgid "Preparing search..." -#~ msgstr "Ruošiama paieška..." - -#~ msgid ", in " -#~ msgstr ", kuris yra " - -#~ 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 "" -#~ "Jūsų paieška neatitiko jokių dokumentų. " -#~ "Prašom patikrinti ar visi žodžiai " -#~ "teisingai įvesti ir ar pasirinkote " -#~ "pakankamai kategorijų." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Paieška baigta, paieškos rezultatus atitiko %s puslapis(-iai,-ių)" - diff --git a/sphinx/locale/lv/LC_MESSAGES/sphinx.js b/sphinx/locale/lv/LC_MESSAGES/sphinx.js index 434a99e3..7809a810 100644 --- a/sphinx/locale/lv/LC_MESSAGES/sphinx.js +++ b/sphinx/locale/lv/LC_MESSAGES/sphinx.js @@ -1 +1 @@ -Documentation.addTranslations({"locale": "lv", "plural_expr": "(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)", "messages": {"Search Results": "Atlases rezult\u0101ti", "Preparing search...": "Sagatavojam atlasi...", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "J\u016bsu atlases rindai neatbilst neviens dokuments. L\u016bdzu, p\u0101rbaudiet, vai visi v\u0101rdi ir uzrakst\u012bti pareizi, un vai ir izv\u0113l\u0113tas pareiz\u0101s kategorijas.", "Search finished, found %s page(s) matching the search query.": "Atlase pabeigta, atrastas lapas: %s", ", in ": ", iek\u0161 ", "Expand sidebar": "Izplest s\u0101njoslu", "Permalink to this headline": "Past\u0101v\u012bga nor\u0101de \u0161o virsrakstu", "Searching": "Mekl\u0113jam", "Collapse sidebar": "Sav\u0113rst s\u0101njoslu", "Permalink to this definition": "Past\u0101v\u012bga nor\u0101de uz \u0161o defin\u012bciju", "Hide Search Matches": "Pasl\u0113pt atlases v\u0101rdus"}});
\ No newline at end of file +Documentation.addTranslations({"locale": "lv", "plural_expr": "(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)", "messages": {"Hide Search Matches": "Pasl\u0113pt atlases v\u0101rdus", "Permalink to this definition": "Past\u0101v\u012bga nor\u0101de uz \u0161o defin\u012bciju", "Expand sidebar": "Izplest s\u0101njoslu", "Permalink to this headline": "Past\u0101v\u012bga nor\u0101de \u0161o virsrakstu", "Collapse sidebar": "Sav\u0113rst s\u0101njoslu"}});
\ No newline at end of file diff --git a/sphinx/locale/lv/LC_MESSAGES/sphinx.mo b/sphinx/locale/lv/LC_MESSAGES/sphinx.mo Binary files differindex 497ce4d0..e6e713a5 100644 --- a/sphinx/locale/lv/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/lv/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/lv/LC_MESSAGES/sphinx.po b/sphinx/locale/lv/LC_MESSAGES/sphinx.po index e8409c5a..ec19bbee 100644 --- a/sphinx/locale/lv/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/lv/LC_MESSAGES/sphinx.po @@ -4,379 +4,404 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 1.0.7\n" -"POT-Creation-Date: 2010-05-24 23:53+0200\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-05-10 16:40+0200\n" "Last-Translator: alexander smishlajev <alex@gorka.lv>\n" +"Language-Team: lv <LL@li.org>\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "(n%100<10 || n%100>=20) ? 1 : 2)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:106 sphinx/writers/latex.py:184 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d.%m.%Y" -#: sphinx/roles.py:174 +#: sphinx/environment.py:1625 +#, python-format +msgid "see %s" +msgstr "" + +#: sphinx/environment.py:1628 #, python-format -msgid "Python Enhancement Proposals!PEP %s" +msgid "see also %s" msgstr "" -#: sphinx/builders/changes.py:72 +#: sphinx/roles.py:175 +#, python-format +msgid "Python Enhancement Proposals; PEP %s" +msgstr "" + +#: sphinx/builders/changes.py:73 msgid "Builtins" msgstr "Iebūvētie" -#: sphinx/builders/changes.py:74 +#: sphinx/builders/changes.py:75 msgid "Module level" msgstr "Moduļu līmenis" -#: sphinx/builders/html.py:266 +#: sphinx/builders/html.py:274 #, python-format msgid "%b %d, %Y" msgstr "%d.%m.%Y" -#: sphinx/builders/html.py:285 sphinx/themes/basic/defindex.html:30 +#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30 msgid "General Index" msgstr "Vispārējs indekss" -#: sphinx/builders/html.py:285 +#: sphinx/builders/html.py:293 msgid "index" msgstr "indekss" -#: sphinx/builders/html.py:345 +#: sphinx/builders/html.py:353 msgid "next" msgstr "nākošais" -#: sphinx/builders/html.py:354 +#: sphinx/builders/html.py:362 msgid "previous" msgstr "iepriekšējs" -#: sphinx/builders/latex.py:151 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (iekš " -#: sphinx/directives/other.py:127 +#: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Sekcijas autors: " -#: sphinx/directives/other.py:129 +#: sphinx/directives/other.py:138 msgid "Module author: " msgstr "Moduļa autors: " -#: sphinx/directives/other.py:131 +#: sphinx/directives/other.py:140 msgid "Code author: " msgstr "Koda autors: " -#: sphinx/directives/other.py:133 +#: sphinx/directives/other.py:142 msgid "Author: " msgstr "Autors: " -#: sphinx/directives/other.py:238 +#: sphinx/directives/other.py:215 msgid "See also" msgstr "Skat.arī" -#: sphinx/domains/__init__.py:253 +#: sphinx/domains/__init__.py:244 #, python-format msgid "%s %s" msgstr "%s %s" -#: sphinx/domains/c.py:51 sphinx/domains/python.py:49 +#: sphinx/domains/c.py:51 sphinx/domains/python.py:95 msgid "Parameters" msgstr "Parametri" -#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:137 -#: sphinx/domains/python.py:59 +#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128 +#: sphinx/domains/python.py:107 msgid "Returns" msgstr "Atgriež" -#: sphinx/domains/c.py:56 sphinx/domains/python.py:61 +#: sphinx/domains/c.py:56 sphinx/domains/python.py:109 msgid "Return type" msgstr "Atgriežamais tips" -#: sphinx/domains/c.py:133 +#: sphinx/domains/c.py:141 #, python-format msgid "%s (C function)" msgstr "%s (C funkcija)" -#: sphinx/domains/c.py:135 +#: sphinx/domains/c.py:143 #, python-format msgid "%s (C member)" msgstr "%s (C loceklis)" -#: sphinx/domains/c.py:137 +#: sphinx/domains/c.py:145 #, python-format msgid "%s (C macro)" msgstr "%s (C makross)" -#: sphinx/domains/c.py:139 +#: sphinx/domains/c.py:147 #, python-format msgid "%s (C type)" msgstr "%s (C tips)" -#: sphinx/domains/c.py:141 +#: sphinx/domains/c.py:149 #, python-format msgid "%s (C variable)" msgstr "%s (C mainīgais)" -#: sphinx/domains/c.py:171 sphinx/domains/cpp.py:1031 -#: sphinx/domains/javascript.py:166 sphinx/domains/python.py:497 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "funkcija" -#: sphinx/domains/c.py:172 sphinx/domains/cpp.py:1032 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "loceklis" -#: sphinx/domains/c.py:173 +#: sphinx/domains/c.py:206 msgid "macro" msgstr "makross" -#: sphinx/domains/c.py:174 sphinx/domains/cpp.py:1033 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "tips" -#: sphinx/domains/c.py:175 +#: sphinx/domains/c.py:208 msgid "variable" msgstr "mainīgais" -#: sphinx/domains/cpp.py:876 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++ klase)" -#: sphinx/domains/cpp.py:891 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ tips)" -#: sphinx/domains/cpp.py:910 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ loceklis)" -#: sphinx/domains/cpp.py:962 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ funkcija)" -#: sphinx/domains/cpp.py:1030 sphinx/domains/python.py:499 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "klase" -#: sphinx/domains/javascript.py:117 sphinx/domains/python.py:221 +#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254 #, python-format msgid "%s() (built-in function)" msgstr "%s() (iebūvēta funkcija)" -#: sphinx/domains/javascript.py:118 sphinx/domains/python.py:285 +#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318 #, python-format msgid "%s() (%s method)" msgstr "%s() (%s metods)" -#: sphinx/domains/javascript.py:120 +#: sphinx/domains/javascript.py:109 +#, fuzzy, python-format +msgid "%s() (class)" +msgstr "%s (C++ klase)" + +#: sphinx/domains/javascript.py:111 #, python-format msgid "%s (global variable or constant)" msgstr "%s (globālais mainīgais vai konstanta)" -#: sphinx/domains/javascript.py:122 sphinx/domains/python.py:323 +#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356 #, python-format msgid "%s (%s attribute)" msgstr "%s (%s atributs)" -#: sphinx/domains/javascript.py:131 +#: sphinx/domains/javascript.py:122 msgid "Arguments" msgstr "Argumenti" -#: sphinx/domains/javascript.py:134 +#: sphinx/domains/javascript.py:125 msgid "Throws" msgstr "Izmet" -#: sphinx/domains/javascript.py:167 sphinx/domains/python.py:498 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "dati" -#: sphinx/domains/javascript.py:168 sphinx/domains/python.py:504 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "atributs" -#: sphinx/domains/python.py:53 +#: sphinx/domains/python.py:100 msgid "Variables" msgstr "Mainīgie" -#: sphinx/domains/python.py:56 +#: sphinx/domains/python.py:104 msgid "Raises" msgstr "Ceļ" -#: sphinx/domains/python.py:222 sphinx/domains/python.py:279 -#: sphinx/domains/python.py:291 sphinx/domains/python.py:304 +#: sphinx/domains/python.py:255 sphinx/domains/python.py:312 +#: sphinx/domains/python.py:324 sphinx/domains/python.py:337 #, python-format msgid "%s() (in module %s)" msgstr "%s() (moduļī %s)" -#: sphinx/domains/python.py:225 +#: sphinx/domains/python.py:258 #, python-format msgid "%s (built-in variable)" msgstr "%s (iebūvētais mainīgais)" -#: sphinx/domains/python.py:226 sphinx/domains/python.py:317 +#: sphinx/domains/python.py:259 sphinx/domains/python.py:350 #, python-format msgid "%s (in module %s)" msgstr "%s (moduļī %s)" -#: sphinx/domains/python.py:242 +#: sphinx/domains/python.py:275 #, python-format msgid "%s (built-in class)" msgstr "%s (iebūvēta klase)" -#: sphinx/domains/python.py:243 +#: sphinx/domains/python.py:276 #, python-format msgid "%s (class in %s)" msgstr "%s (klase iekš %s)" -#: sphinx/domains/python.py:283 +#: sphinx/domains/python.py:316 #, python-format msgid "%s() (%s.%s method)" msgstr "%s() (%s.%s metods)" -#: sphinx/domains/python.py:295 +#: sphinx/domains/python.py:328 #, python-format msgid "%s() (%s.%s static method)" msgstr "%s() (%s.%s statiskais metods)" -#: sphinx/domains/python.py:298 +#: sphinx/domains/python.py:331 #, python-format msgid "%s() (%s static method)" msgstr "%s() (%s statiskais metods)" -#: sphinx/domains/python.py:308 +#: sphinx/domains/python.py:341 #, python-format msgid "%s() (%s.%s class method)" msgstr "%s() (%s.%s klases metods)" -#: sphinx/domains/python.py:311 +#: sphinx/domains/python.py:344 #, python-format msgid "%s() (%s class method)" msgstr "%s() (%s klases metods)" -#: sphinx/domains/python.py:321 +#: sphinx/domains/python.py:354 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s atributs)" -#: sphinx/domains/python.py:366 -msgid "Platforms: " -msgstr "Platformas: " - -#: sphinx/domains/python.py:372 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (modulis)" -#: sphinx/domains/python.py:429 +#: sphinx/domains/python.py:491 msgid "Python Module Index" msgstr "" -#: sphinx/domains/python.py:430 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "moduļi" -#: sphinx/domains/python.py:475 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Nav ieteicams" -#: sphinx/domains/python.py:500 sphinx/locale/__init__.py:162 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "izņēmums" -#: sphinx/domains/python.py:501 +#: sphinx/domains/python.py:563 msgid "method" msgstr "metods" -#: sphinx/domains/python.py:502 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "klases metods" -#: sphinx/domains/python.py:503 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "statiskais metods" -#: sphinx/domains/python.py:505 sphinx/locale/__init__.py:158 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "modulis" -#: sphinx/domains/rst.py:53 +#: sphinx/domains/python.py:695 +#, fuzzy +msgid " (deprecated)" +msgstr "Nav ieteicams" + +#: sphinx/domains/rst.py:55 #, python-format msgid "%s (directive)" msgstr "%s (direktīva)" -#: sphinx/domains/rst.py:55 +#: sphinx/domains/rst.py:57 #, python-format msgid "%s (role)" msgstr "%s (role)" -#: sphinx/domains/rst.py:103 +#: sphinx/domains/rst.py:106 msgid "directive" msgstr "direktīva" -#: sphinx/domains/rst.py:104 +#: sphinx/domains/rst.py:107 msgid "role" msgstr "role" -#: sphinx/domains/std.py:68 sphinx/domains/std.py:84 +#: sphinx/domains/std.py:70 sphinx/domains/std.py:86 #, python-format msgid "environment variable; %s" msgstr "apkārtnes mainīgais; %s" -#: sphinx/domains/std.py:160 +#: sphinx/domains/std.py:162 #, python-format msgid "%scommand line option; %s" msgstr "%skomandrindas opcija; %s" -#: sphinx/domains/std.py:328 +#: sphinx/domains/std.py:393 msgid "glossary term" msgstr "glosārija termins" -#: sphinx/domains/std.py:329 +#: sphinx/domains/std.py:394 msgid "grammar token" msgstr "gramatiskais marķieris" -#: sphinx/domains/std.py:330 +#: sphinx/domains/std.py:395 msgid "reference label" msgstr "atsauces virsraksts" -#: sphinx/domains/std.py:331 +#: sphinx/domains/std.py:396 msgid "environment variable" msgstr "apkārtnes mainīgais" -#: sphinx/domains/std.py:332 +#: sphinx/domains/std.py:397 msgid "program option" msgstr "programmas opcija" -#: sphinx/domains/std.py:360 sphinx/themes/basic/genindex-single.html:11 +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 #: sphinx/themes/basic/genindex-split.html:11 #: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:11 sphinx/themes/basic/genindex.html:14 -#: sphinx/themes/basic/genindex.html:50 sphinx/themes/basic/layout.html:125 -#: sphinx/writers/latex.py:173 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 msgid "Index" msgstr "Indekss" -#: sphinx/domains/std.py:361 +#: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Moduļu indekss" -#: sphinx/domains/std.py:362 sphinx/themes/basic/defindex.html:25 +#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25 msgid "Search Page" msgstr "Atlases lapa" -#: sphinx/ext/autodoc.py:917 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Bāzes: %s" -#: sphinx/ext/autodoc.py:950 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "aizstājvārds klasei :class:`%s`" @@ -394,103 +419,103 @@ msgstr "(<<original entry>> atrodas iekš %s, rinda %d.)" msgid "original entry" msgstr "sākotnējs ieraksts" -#: sphinx/ext/viewcode.py:66 +#: sphinx/ext/viewcode.py:70 msgid "[source]" msgstr "[kods]" -#: sphinx/ext/viewcode.py:109 +#: sphinx/ext/viewcode.py:117 msgid "[docs]" msgstr "[dokumenti]" -#: sphinx/ext/viewcode.py:123 +#: sphinx/ext/viewcode.py:131 msgid "Module code" msgstr "Moduļa teksts" -#: sphinx/ext/viewcode.py:129 +#: sphinx/ext/viewcode.py:137 #, python-format msgid "<h1>Source code for %s</h1>" msgstr "<h1>%s izejas teksts</h1>" -#: sphinx/ext/viewcode.py:156 +#: sphinx/ext/viewcode.py:164 msgid "Overview: module code" msgstr "Apskats: moduļa teksts" -#: sphinx/ext/viewcode.py:157 +#: sphinx/ext/viewcode.py:165 msgid "<h1>All modules for which code is available</h1>" msgstr "<h1>Visi moduļi, kuriem ir izejas teksti</h1>" -#: sphinx/locale/__init__.py:139 +#: sphinx/locale/__init__.py:155 msgid "Attention" msgstr "Uzmanību" -#: sphinx/locale/__init__.py:140 +#: sphinx/locale/__init__.py:156 msgid "Caution" msgstr "Uzmanies" -#: sphinx/locale/__init__.py:141 +#: sphinx/locale/__init__.py:157 msgid "Danger" msgstr "Bīstami" -#: sphinx/locale/__init__.py:142 +#: sphinx/locale/__init__.py:158 msgid "Error" msgstr "Kļūda" -#: sphinx/locale/__init__.py:143 +#: sphinx/locale/__init__.py:159 msgid "Hint" msgstr "Mājiens" -#: sphinx/locale/__init__.py:144 +#: sphinx/locale/__init__.py:160 msgid "Important" msgstr "Svarīgi" -#: sphinx/locale/__init__.py:145 +#: sphinx/locale/__init__.py:161 msgid "Note" msgstr "Piezīme" -#: sphinx/locale/__init__.py:146 +#: sphinx/locale/__init__.py:162 msgid "See Also" msgstr "Skat.arī" -#: sphinx/locale/__init__.py:147 +#: sphinx/locale/__init__.py:163 msgid "Tip" msgstr "Padoms" -#: sphinx/locale/__init__.py:148 +#: sphinx/locale/__init__.py:164 msgid "Warning" msgstr "Brīdinājums" -#: sphinx/locale/__init__.py:152 +#: sphinx/locale/__init__.py:168 #, python-format msgid "New in version %s" msgstr "Jauns versijā %s" -#: sphinx/locale/__init__.py:153 +#: sphinx/locale/__init__.py:169 #, python-format msgid "Changed in version %s" msgstr "Mainīts versijā %s" -#: sphinx/locale/__init__.py:154 +#: sphinx/locale/__init__.py:170 #, python-format msgid "Deprecated since version %s" msgstr "Neieteicams no versijas %s" -#: sphinx/locale/__init__.py:159 +#: sphinx/locale/__init__.py:176 msgid "keyword" msgstr "atslēgas vārds" -#: sphinx/locale/__init__.py:160 +#: sphinx/locale/__init__.py:177 msgid "operator" msgstr "operators" -#: sphinx/locale/__init__.py:161 +#: sphinx/locale/__init__.py:178 msgid "object" msgstr "objekts" -#: sphinx/locale/__init__.py:163 +#: sphinx/locale/__init__.py:180 msgid "statement" msgstr "priekšraksts" -#: sphinx/locale/__init__.py:164 +#: sphinx/locale/__init__.py:181 msgid "built-in function" msgstr "iebūvēta funkcija" @@ -499,8 +524,8 @@ msgstr "iebūvēta funkcija" msgid "Table Of Contents" msgstr "Saturs" -#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:128 -#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:14 +#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137 +#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20 msgid "Search" msgstr "Meklēt" @@ -548,15 +573,15 @@ msgstr "ātra piekļuve visiem moduliem" msgid "all functions, classes, terms" msgstr "visas funkcijas, klases un termini" -#: sphinx/themes/basic/genindex-single.html:14 +#: sphinx/themes/basic/genindex-single.html:35 #, python-format msgid "Index – %(key)s" msgstr "Indekss – %(key)s" -#: sphinx/themes/basic/genindex-single.html:46 +#: sphinx/themes/basic/genindex-single.html:63 #: sphinx/themes/basic/genindex-split.html:24 #: sphinx/themes/basic/genindex-split.html:38 -#: sphinx/themes/basic/genindex.html:56 +#: sphinx/themes/basic/genindex.html:74 msgid "Full index on one page" msgstr "Pilns indekss vienā lappusē" @@ -568,39 +593,39 @@ msgstr "Lappušu indekss pēc burtiem" msgid "can be huge" msgstr "var būt milzīgs" -#: sphinx/themes/basic/layout.html:23 +#: sphinx/themes/basic/layout.html:29 msgid "Navigation" msgstr "Navigācija" -#: sphinx/themes/basic/layout.html:113 +#: sphinx/themes/basic/layout.html:122 #, python-format msgid "Search within %(docstitle)s" msgstr "Meklēt iekš %(docstitle)s" -#: sphinx/themes/basic/layout.html:122 +#: sphinx/themes/basic/layout.html:131 msgid "About these documents" msgstr "Par šiem dokumentiem" -#: sphinx/themes/basic/layout.html:131 +#: sphinx/themes/basic/layout.html:140 msgid "Copyright" msgstr "Copyright" -#: sphinx/themes/basic/layout.html:180 +#: sphinx/themes/basic/layout.html:189 #, python-format msgid "© <a href=\"%(path)s\">Copyright</a> %(copyright)s." msgstr "© <a href=\"%(path)s\">Copyright</a> %(copyright)s." -#: sphinx/themes/basic/layout.html:182 +#: sphinx/themes/basic/layout.html:191 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/themes/basic/layout.html:186 +#: sphinx/themes/basic/layout.html:195 #, python-format msgid "Last updated on %(last_updated)s." msgstr "Pēdējas izmaiņas %(last_updated)s." -#: sphinx/themes/basic/layout.html:189 +#: sphinx/themes/basic/layout.html:198 #, python-format msgid "" "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " @@ -630,14 +655,13 @@ msgstr "nākoša tēma" msgid "next chapter" msgstr "nākoša sadaļa" -#: sphinx/themes/basic/search.html:18 +#: sphinx/themes/basic/search.html:24 msgid "" "Please activate JavaScript to enable the search\n" " functionality." -msgstr "" -"Lai iespējotu meklēšanu, lūdzu aktivizēt JavaScript." +msgstr "Lai iespējotu meklēšanu, lūdzu aktivizēt JavaScript." -#: sphinx/themes/basic/search.html:23 +#: sphinx/themes/basic/search.html:29 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" @@ -650,16 +674,15 @@ msgstr "" " visi ievadītie vārdi. Dokumenti, kuros ir tikai daļa no ievadītiem\n" " vārdiem, netiks atlasīti." -#: sphinx/themes/basic/search.html:30 +#: sphinx/themes/basic/search.html:36 msgid "search" msgstr "meklēt" -#: sphinx/themes/basic/search.html:34 -#: sphinx/themes/basic/static/searchtools.js:489 +#: sphinx/themes/basic/search.html:40 msgid "Search Results" msgstr "Atlases rezultāti" -#: sphinx/themes/basic/search.html:36 +#: sphinx/themes/basic/search.html:42 msgid "Your search did not match any results." msgstr "Nav rezultātu, atbilstošu Jūsu atlasei." @@ -699,12 +722,12 @@ msgstr "Izmaiņas iekš C API" msgid "Other changes" msgstr "Citas izmaiņas" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:482 -#: sphinx/writers/html.py:487 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Pastāvīga norāde šo virsrakstu" -#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:87 +#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92 msgid "Permalink to this definition" msgstr "Pastāvīga norāde uz šo definīciju" @@ -712,35 +735,12 @@ msgstr "Pastāvīga norāde uz šo definīciju" msgid "Hide Search Matches" msgstr "Paslēpt atlases vārdus" -#: sphinx/themes/basic/static/searchtools.js:285 -msgid "Searching" -msgstr "Meklējam" - -#: sphinx/themes/basic/static/searchtools.js:290 -msgid "Preparing search..." -msgstr "Sagatavojam atlasi..." - -#: sphinx/themes/basic/static/searchtools.js:364 -msgid ", in " -msgstr ", iekš " - -#: sphinx/themes/basic/static/searchtools.js:491 -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 "Jūsu atlases rindai neatbilst neviens dokuments. Lūdzu, pārbaudiet, vai visi vārdi ir uzrakstīti pareizi, un vai ir izvēlētas pareizās kategorijas." - -#: sphinx/themes/basic/static/searchtools.js:493 -#, python-format -msgid "Search finished, found %s page(s) matching the search query." -msgstr "Atlase pabeigta, atrastas lapas: %s" - -#: sphinx/themes/default/static/sidebar.js:66 +#: sphinx/themes/default/static/sidebar.js:69 msgid "Expand sidebar" msgstr "Izplest sānjoslu" -#: sphinx/themes/default/static/sidebar.js:79 -#: sphinx/themes/default/static/sidebar.js:106 +#: sphinx/themes/default/static/sidebar.js:82 +#: sphinx/themes/default/static/sidebar.js:110 msgid "Collapse sidebar" msgstr "Savērst sānjoslu" @@ -748,23 +748,24 @@ msgstr "Savērst sānjoslu" msgid "Contents" msgstr "Saturs" -#: sphinx/writers/latex.py:171 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Izlaidums" -#: sphinx/writers/latex.py:572 sphinx/writers/manpage.py:178 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "Vēres" -#: sphinx/writers/latex.py:641 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "turpinājums no iepriekšējās lappuses" -#: sphinx/writers/latex.py:646 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Turpnājums nākošā lappusē" -#: sphinx/writers/text.py:422 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[attēls]" diff --git a/sphinx/locale/ne/LC_MESSAGES/sphinx.mo b/sphinx/locale/ne/LC_MESSAGES/sphinx.mo Binary files differindex 84546b90..05be753d 100644 --- a/sphinx/locale/ne/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/ne/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/ne/LC_MESSAGES/sphinx.po b/sphinx/locale/ne/LC_MESSAGES/sphinx.po index 0b7e6665..5cb11e20 100644 --- a/sphinx/locale/ne/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/ne/LC_MESSAGES/sphinx.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 1.1pre/47a94f723e80+\n" "Report-Msgid-Bugs-To: sharma.arati11@gmail.com\n" -"POT-Creation-Date: 2011-05-26 13:47-0400\n" -"PO-Revision-Date: 2011-06-02 13:38+0545\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2011-09-21 10:13+0200\n" "Last-Translator: Tika Karki <tikaraj.karki@olenepal.org>\n" "Language-Team: ne_NP <LL@li.org>\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -17,20 +17,23 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 -#: sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 -#: sphinx/writers/texinfo.py:202 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%B %d, %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "%s हेर्नुहोस्" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "%s पनि हेर्नुहोस् " @@ -53,8 +56,7 @@ msgstr "मडुलको तह" msgid "%b %d, %Y" msgstr "%b %d, %Y" -#: sphinx/builders/html.py:293 -#: sphinx/themes/basic/defindex.html:30 +#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30 msgid "General Index" msgstr "सामान्य अनुसुची" @@ -70,8 +72,7 @@ msgstr "पछिल्लो" msgid "previous" msgstr "अघिल्लो" -#: sphinx/builders/latex.py:141 -#: sphinx/builders/texinfo.py:196 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "(in" @@ -100,19 +101,16 @@ msgstr "पनि हेर्नुहोस" msgid "%s %s" msgstr "%s %s" -#: sphinx/domains/c.py:51 -#: sphinx/domains/python.py:95 +#: sphinx/domains/c.py:51 sphinx/domains/python.py:95 msgid "Parameters" msgstr "Parameters" -#: sphinx/domains/c.py:54 -#: sphinx/domains/javascript.py:128 +#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128 #: sphinx/domains/python.py:107 msgid "Returns" msgstr "Returns" -#: sphinx/domains/c.py:56 -#: sphinx/domains/python.py:109 +#: sphinx/domains/c.py:56 sphinx/domains/python.py:109 msgid "Return type" msgstr "Return type" @@ -141,15 +139,12 @@ msgstr "%s (C किसिम)" msgid "%s (C variable)" msgstr "%s (C चल)" -#: sphinx/domains/c.py:204 -#: sphinx/domains/cpp.py:1060 -#: sphinx/domains/javascript.py:162 -#: sphinx/domains/python.py:559 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "फन्क्सन" -#: sphinx/domains/c.py:205 -#: sphinx/domains/cpp.py:1061 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "सदस्य" @@ -157,8 +152,7 @@ msgstr "सदस्य" msgid "macro" msgstr "बृहत" -#: sphinx/domains/c.py:207 -#: sphinx/domains/cpp.py:1062 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "किसिम" @@ -186,20 +180,17 @@ msgstr "%s (C++ सदस्य)" msgid "%s (C++ function)" msgstr "%s (C++कार्य)" -#: sphinx/domains/cpp.py:1059 -#: sphinx/domains/javascript.py:163 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 #: sphinx/domains/python.py:561 msgid "class" msgstr "कक्षा" -#: sphinx/domains/javascript.py:106 -#: sphinx/domains/python.py:254 +#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254 #, python-format msgid "%s() (built-in function)" msgstr "%s() (built-in function)" -#: sphinx/domains/javascript.py:107 -#: sphinx/domains/python.py:318 +#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318 #, python-format msgid "%s() (%s method)" msgstr "%s() (%s विधी)" @@ -214,8 +205,7 @@ msgstr "%s() (कक्षा)" msgid "%s (global variable or constant)" msgstr "%s (global variable or constant)" -#: sphinx/domains/javascript.py:113 -#: sphinx/domains/python.py:356 +#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356 #, python-format msgid "%s (%s attribute)" msgstr "%s (%s attribute)" @@ -228,13 +218,11 @@ msgstr "Arguments" msgid "Throws" msgstr "Throws" -#: sphinx/domains/javascript.py:164 -#: sphinx/domains/python.py:560 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "data" -#: sphinx/domains/javascript.py:165 -#: sphinx/domains/python.py:566 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "attribute" @@ -246,10 +234,8 @@ msgstr "चलहरू" msgid "Raises" msgstr "Raises" -#: sphinx/domains/python.py:255 -#: sphinx/domains/python.py:312 -#: sphinx/domains/python.py:324 -#: sphinx/domains/python.py:337 +#: sphinx/domains/python.py:255 sphinx/domains/python.py:312 +#: sphinx/domains/python.py:324 sphinx/domains/python.py:337 #, python-format msgid "%s() (in module %s)" msgstr "%s() (in मडुल %s)" @@ -259,8 +245,7 @@ msgstr "%s() (in मडुल %s)" msgid "%s (built-in variable)" msgstr "%s (built-in चल)" -#: sphinx/domains/python.py:259 -#: sphinx/domains/python.py:350 +#: sphinx/domains/python.py:259 sphinx/domains/python.py:350 #, python-format msgid "%s (in module %s)" msgstr "%s (in मडुल %s)" @@ -322,8 +307,7 @@ msgstr "modules" msgid "Deprecated" msgstr "Deprecated" -#: sphinx/domains/python.py:562 -#: sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "अपबाद" @@ -339,8 +323,7 @@ msgstr "कक्षा विधी" msgid "static method" msgstr "static विधी" -#: sphinx/domains/python.py:567 -#: sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "मडुल" @@ -366,8 +349,7 @@ msgstr "निर्देशिक" msgid "role" msgstr "भूमिका" -#: sphinx/domains/std.py:70 -#: sphinx/domains/std.py:86 +#: sphinx/domains/std.py:70 sphinx/domains/std.py:86 #, python-format msgid "environment variable; %s" msgstr "environment variable; %s" @@ -397,16 +379,12 @@ msgstr "environment variable" msgid "program option" msgstr "कार्यक्रमका बिकल्प" -#: sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 #: sphinx/themes/basic/genindex-split.html:11 #: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 -#: sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 -#: sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -#: sphinx/writers/texinfo.py:447 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 msgid "Index" msgstr "अनुसुची" @@ -414,8 +392,7 @@ msgstr "अनुसुची" msgid "Module Index" msgstr "मडुल अनुसुची" -#: sphinx/domains/std.py:429 -#: sphinx/themes/basic/defindex.html:25 +#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25 msgid "Search Page" msgstr "पानामा खोज्नुहोस्" @@ -542,31 +519,25 @@ msgstr "भनाई" msgid "built-in function" msgstr "built-in फन्क्सन" -#: sphinx/themes/agogo/layout.html:45 -#: sphinx/themes/basic/globaltoc.html:10 +#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10 #: sphinx/themes/basic/localtoc.html:11 msgid "Table Of Contents" msgstr "विषयसूची" -#: sphinx/themes/agogo/layout.html:49 -#: sphinx/themes/basic/layout.html:137 -#: sphinx/themes/basic/search.html:11 -#: sphinx/themes/basic/search.html:20 +#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137 +#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20 msgid "Search" msgstr "खोज्नुहोस् " -#: sphinx/themes/agogo/layout.html:52 -#: sphinx/themes/basic/searchbox.html:15 +#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15 msgid "Go" msgstr "जानुहोस्" -#: sphinx/themes/agogo/layout.html:57 -#: sphinx/themes/basic/searchbox.html:20 +#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20 msgid "Enter search terms or a module, class or function name." msgstr "खोज्ने टर्मस् अथवा एक मडुल्, कक्षा अथवा फन्क्सनको नाम लेख्नुहोस " -#: sphinx/themes/agogo/layout.html:78 -#: sphinx/themes/basic/sourcelink.html:14 +#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14 msgid "Show Source" msgstr "स्रोत देखाउनुहोस् " @@ -656,7 +627,9 @@ msgstr "यो भन्दा अगाडी %(last_updated)s मा अपड #: sphinx/themes/basic/layout.html:198 #, python-format -msgid "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s." +msgid "" +"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " +"%(sphinx_version)s." msgstr "<a href=\"http://sphinx.pocoo.org/\">Sphinx</a> प्रयोग गरेर बनाइएको" #: sphinx/themes/basic/opensearch.xml:4 @@ -746,14 +719,12 @@ msgstr "C API का परिवर्तनहरु " msgid "Other changes" msgstr "अरु परिवर्तनहरु " -#: sphinx/themes/basic/static/doctools.js:154 -#: sphinx/writers/html.py:506 -#: sphinx/writers/html.py:512 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "यो शिर्षकको लागि पर्मालिन्क । " -#: sphinx/themes/basic/static/doctools.js:160 -#: sphinx/writers/html.py:92 +#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92 msgid "Permalink to this definition" msgstr "यो अर्थको लागि पर्मालिन्क" @@ -774,25 +745,24 @@ msgstr "साइडबर सानो बनाउनुहोस्" msgid "Contents" msgstr "विषयसूची" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "रीलीज" -#: sphinx/writers/latex.py:590 -#: sphinx/writers/manpage.py:182 -#: sphinx/writers/texinfo.py:580 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "फूट्नोट्स" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "अघिल्लो पानासँग जोडीएको" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "अर्को पानासँग जोडीएको" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[चित्र]" diff --git a/sphinx/locale/nl/LC_MESSAGES/sphinx.mo b/sphinx/locale/nl/LC_MESSAGES/sphinx.mo Binary files differindex f7afad06..05ee5662 100644 --- a/sphinx/locale/nl/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/nl/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/nl/LC_MESSAGES/sphinx.po b/sphinx/locale/nl/LC_MESSAGES/sphinx.po index c9065504..473baadc 100644 --- a/sphinx/locale/nl/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/nl/LC_MESSAGES/sphinx.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 0.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2009-08-06 23:04+0200\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Marijn van der Zee <marijn.vanderzee@gmail.com>\n" "Language-Team: nl <LL@li.org>\n" @@ -14,20 +14,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "%s %s documentatie" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d. %B %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "zie %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "zie %s" @@ -66,21 +71,10 @@ msgstr "volgende" msgid "previous" msgstr "vorige" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "" -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Index" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Auteur van deze sectie: " @@ -145,12 +139,12 @@ msgstr "%s (C type)" msgid "%s (C variable)" msgstr "%s (C-variabele)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "functie" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "member" @@ -158,7 +152,7 @@ msgstr "member" msgid "macro" msgstr "macro" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "type" @@ -166,28 +160,28 @@ msgstr "type" msgid "variable" msgstr "variabele" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++ klasse)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ type)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ member)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ functie)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "klasse" @@ -225,11 +219,11 @@ msgstr "Parameters" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "attribuut" @@ -298,45 +292,45 @@ msgstr "%s() (%s methode)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s attribuut)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (module)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "Module-index" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "modules" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Verouderd" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "exceptie" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "statische methode" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "module" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (verouderd)" @@ -389,6 +383,15 @@ msgstr "omgevingsvariabele" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Index" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Module-index" @@ -397,12 +400,12 @@ msgstr "Module-index" msgid "Search Page" msgstr "Zoekpagina" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -724,8 +727,8 @@ msgstr "Veranderingen in de C-API" msgid "Other changes" msgstr "Andere veranderingen" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Permalink naar deze titel" @@ -750,49 +753,24 @@ msgstr "" msgid "Contents" msgstr "Inhoud" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Release" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "Voetnoten" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "Vervolgd van vorige pagina" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Vervolgd op volgende pagina" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[afbeelding]" -#~ msgid "Platforms: " -#~ msgstr "Platformen: " - -#~ msgid "Searching" -#~ msgstr "Zoeken" - -#~ msgid "Preparing search..." -#~ msgstr "Het zoeken wordt voorbereid..." - -#~ msgid ", in " -#~ msgstr ", in " - -#~ 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 "" -#~ "Uw zoekopdracht leverde geen resultaten " -#~ "op. Controleer of alle woorden correct" -#~ " gespeld zijn en dat u genoeg " -#~ "categoriën hebt geselecteerd." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Zoeken voltooid, %s pagina(s) gevonden." - diff --git a/sphinx/locale/pl/LC_MESSAGES/sphinx.mo b/sphinx/locale/pl/LC_MESSAGES/sphinx.mo Binary files differindex 4f91a8c7..bdceda43 100644 --- a/sphinx/locale/pl/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/pl/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/pl/LC_MESSAGES/sphinx.po b/sphinx/locale/pl/LC_MESSAGES/sphinx.po index adf4f3cc..957d23e9 100644 --- a/sphinx/locale/pl/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/pl/LC_MESSAGES/sphinx.po @@ -1,9 +1,10 @@ + msgid "" 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: 2011-01-22 14:41+0100\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2011-09-21 10:14+0200\n" "Last-Translator: Michał Kandulski <michal.kandulski@gmail.com>\n" "Language-Team: \n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && " @@ -11,20 +12,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" + +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%B %d %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, fuzzy, python-format msgid "see %s" msgstr "zobacz %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, fuzzy, python-format msgid "see also %s" msgstr "zobacz także %s" @@ -63,21 +69,10 @@ msgstr "dalej" msgid "previous" msgstr "wstecz" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (w " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Indeks" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Autor rozdziału: " @@ -141,12 +136,12 @@ msgstr "%s (typ C)" msgid "%s (C variable)" msgstr "%s (zmienna C)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "funkcja" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "pole" @@ -154,7 +149,7 @@ msgstr "pole" msgid "macro" msgstr "makro" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "typ" @@ -162,28 +157,28 @@ msgstr "typ" msgid "variable" msgstr "zmienna" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (klasa C++)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (typ C++)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (pole C++)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (funkcja C++)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "klasa" @@ -220,11 +215,11 @@ msgstr "Argumenty" msgid "Throws" msgstr "Wyrzuca" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "dane" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "atrybut" @@ -292,44 +287,44 @@ msgstr "%s() (%s metoda klasy)" msgid "%s (%s.%s attribute)" msgstr "%s (atrybut %s.%s)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (moduł)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 msgid "Python Module Index" msgstr "Indeks modułów pythona" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "moduły" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Niezalecane" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "wyjątek" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "metoda" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "metoda klasy" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "statyczna metoda" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "moduł" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (niezalecane)" @@ -339,6 +334,7 @@ msgid "%s (directive)" msgstr "%s (dyrektywa)" #: sphinx/domains/rst.py:57 +#, python-format msgid "%s (role)" msgstr "%s (rola)" @@ -380,6 +376,15 @@ msgstr "zmienna środowiskowa" msgid "program option" msgstr "opcja programu" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Indeks" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Indeks modułów" @@ -388,12 +393,12 @@ msgstr "Indeks modułów" msgid "Search Page" msgstr "Wyszukiwanie" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Klasy bazowe: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "alias klasy :class:`%s`" @@ -403,6 +408,7 @@ msgid "Todo" msgstr "Todo" #: sphinx/ext/todo.py:109 +#, python-format msgid "(The <<original entry>> is located in %s, line %d.)" msgstr "(<<Oryginalny wpis>> znajduje się w pliku %s, w linii %d.)" @@ -714,8 +720,8 @@ msgstr "Zmiany w C API" msgid "Other changes" msgstr "Inne zmiany" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Stały odnośnik do tego nagłówka" @@ -740,49 +746,24 @@ msgstr "Zwiń pasek boczny" msgid "Contents" msgstr "Treść" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Wydanie" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "Przypisy" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "kontynuacja poprzedniej strony" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Kontynuacja na następnej stronie" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[obraz]" -#~ msgid "Platforms: " -#~ msgstr "Platformy: " - -#~ msgid "Searching" -#~ msgstr "Wyszukiwanie" - -#~ msgid "Preparing search..." -#~ msgstr "Przygotowanie wyszukiwania..." - -#~ msgid ", in " -#~ msgstr ", w " - -#~ 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 "" -#~ "Nie znaleziono żadnych pasujących dokumentów." -#~ " Upewnij się, że wszystkie słowa są" -#~ " poprawnie wpisane i że wybrałeś " -#~ "wystarczającą liczbę kategorii." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Przeszukiwanie zakończone, znaleziono %s pasujących stron." - diff --git a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo Binary files differindex bb7d8d20..3016d5ef 100644 --- a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po index 1906a7c7..b41b5ad1 100644 --- a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po @@ -7,7 +7,7 @@ msgid "" 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" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Roger Demetrescu <roger.demetrescu@gmail.com>\n" "Language-Team: pt_BR <roger.demetrescu@gmail.com>\n" @@ -15,20 +15,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, fuzzy, python-format +msgid "%s %s documentation" +msgstr "%s %s documentação" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d/%m/%Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, fuzzy, python-format msgid "see %s" msgstr "veja %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, fuzzy, python-format msgid "see also %s" msgstr "veja também %s" @@ -67,21 +72,10 @@ msgstr "próximo" msgid "previous" msgstr "anterior" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (em " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Índice" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Autor da seção: " @@ -145,12 +139,12 @@ msgstr "%s (tipo C)" msgid "%s (C variable)" msgstr "%s (variável C)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "função" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "membro" @@ -158,7 +152,7 @@ msgstr "membro" msgid "macro" msgstr "macro" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "tipo" @@ -166,28 +160,28 @@ msgstr "tipo" msgid "variable" msgstr "variável" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (classe C++)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (tipo C++)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (membro C++)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (função C++)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "classe" @@ -224,11 +218,11 @@ msgstr "Parâmetros" msgid "Throws" msgstr "Gera" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "dado" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "atributo" @@ -296,44 +290,44 @@ msgstr "%s() (método de classe %s)" msgid "%s (%s.%s attribute)" msgstr "%s (atributo %s.%s)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (módulo)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 msgid "Python Module Index" msgstr "Índice de Módulos do Python" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "módulos" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Obsoleto" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "exceção" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "método" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "método de classe" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "método estático" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "módulo" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (obsoleto)" @@ -385,6 +379,15 @@ msgstr "váriavel de ambiente" msgid "program option" msgstr "opção de programa" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Índice" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Índice do Módulo" @@ -393,12 +396,12 @@ msgstr "Índice do Módulo" msgid "Search Page" msgstr "Página de Pesquisa" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Bases: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "apelido de :class:`%s`" @@ -720,8 +723,8 @@ msgstr "Alterações na API C" msgid "Other changes" msgstr "Outras alterações" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Link permanente para este título" @@ -746,53 +749,24 @@ msgstr "Recolher painel lateral" msgid "Contents" msgstr "Conteúdo" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Versão" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "Notas de rodapé" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "continuação da página anterior" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Continua na próxima página" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[imagem]" -#~ msgid "Platforms: " -#~ msgstr "Plataformas: " - -#~ msgid "Searching" -#~ msgstr "Pesquisando" - -#~ msgid "Preparing search..." -#~ msgstr "Preparando pesquisa..." - -#~ msgid ", in " -#~ msgstr ", em " - -#~ 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 "" -#~ "Sua pesquisa não encontrou nenhum " -#~ "documento. Por favor assegure-se de " -#~ "que todas as palavras foram digitadas" -#~ " corretamente e de que você tenha " -#~ "selecionado o mínimo de categorias." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "" -#~ "Pesquisa finalizada, foram encontrada(s) %s" -#~ " página(s) que conferem com o " -#~ "critério de pesquisa." - diff --git a/sphinx/locale/ru/LC_MESSAGES/sphinx.mo b/sphinx/locale/ru/LC_MESSAGES/sphinx.mo Binary files differindex dae20a23..593350d3 100644 --- a/sphinx/locale/ru/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/ru/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/ru/LC_MESSAGES/sphinx.po b/sphinx/locale/ru/LC_MESSAGES/sphinx.po index 327152d1..b6374d81 100644 --- a/sphinx/locale/ru/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/ru/LC_MESSAGES/sphinx.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 0.6b1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2009-01-24 18:39+0000\n" -"PO-Revision-Date: 2011-01-22 14:41+0100\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2011-09-21 10:14+0200\n" "Last-Translator: alexander smishlajev <alex@tycobka.lv>\n" "Language-Team: ru <LL@li.org>\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " @@ -15,20 +15,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d %B %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "" @@ -67,21 +72,10 @@ msgstr "следующий" msgid "previous" msgstr "предыдущий" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (в " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Алфавитный указатель" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Автор секции: " @@ -146,12 +140,12 @@ msgstr "%s (тип C)" msgid "%s (C variable)" msgstr "%s (переменная C)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "функция" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "поле" @@ -159,7 +153,7 @@ msgstr "поле" msgid "macro" msgstr "" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "тип" @@ -168,28 +162,28 @@ msgstr "тип" msgid "variable" msgstr "Переменная" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (класс C++)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (тип C++)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (поле C++)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (функция C++)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "класс" @@ -227,11 +221,11 @@ msgstr "Параметры" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "атрибут" @@ -300,45 +294,45 @@ msgstr "%s() (метод %s)" msgid "%s (%s.%s attribute)" msgstr "%s (атрибут %s.%s)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (модуль)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "Состав модуля" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "модули" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Не рекомендуется" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "исключение" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "статический метод" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "модуль" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 #, fuzzy msgid " (deprecated)" msgstr " (не рекомендуется)" @@ -391,6 +385,15 @@ msgstr "переменная окружения" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Алфавитный указатель" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Состав модуля" @@ -399,12 +402,12 @@ msgstr "Состав модуля" msgid "Search Page" msgstr "Поиск" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Базовые классы: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "псевдоним класса :class:`%s`" @@ -726,8 +729,8 @@ msgstr "Изменения в C API" msgid "Other changes" msgstr "Другие изменения" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Ссылка на этот заголовок" @@ -752,50 +755,25 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Выпуск" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 #, fuzzy msgid "Continued on next page" msgstr "Полный алфавитный указатель на одной странице" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[рисунок]" -#~ msgid "Platforms: " -#~ msgstr "Платформы: " - -#~ msgid "Searching" -#~ msgstr "Поиск" - -#~ msgid "Preparing search..." -#~ msgstr "Подготовка к поиску..." - -#~ msgid ", in " -#~ msgstr ", в " - -#~ 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 "" -#~ "Нет документов, соответствующих вашему " -#~ "запросу. Проверьте, правильно ли выбраны " -#~ "категории и нет ли опечаток в " -#~ "запросе." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Поиск окончен, найдено страниц: %s." - diff --git a/sphinx/locale/sk/LC_MESSAGES/sphinx.js b/sphinx/locale/sk/LC_MESSAGES/sphinx.js new file mode 100644 index 00000000..2d210b54 --- /dev/null +++ b/sphinx/locale/sk/LC_MESSAGES/sphinx.js @@ -0,0 +1 @@ +Documentation.addTranslations({"locale": "sk", "plural_expr": "(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)", "messages": {"Hide Search Matches": "Skr\u00fdt v\u00fdsledky vyhled\u00e1v\u00e1n\u00ed", "Permalink to this definition": "Trval\u00fd odkaz na tuto definici", "Expand sidebar": "", "Permalink to this headline": "Trval\u00fd odkaz na tento nadpis", "Collapse sidebar": ""}}); diff --git a/sphinx/locale/sk/LC_MESSAGES/sphinx.mo b/sphinx/locale/sk/LC_MESSAGES/sphinx.mo Binary files differnew file mode 100644 index 00000000..8a4ac3a8 --- /dev/null +++ b/sphinx/locale/sk/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/sk/LC_MESSAGES/sphinx.po b/sphinx/locale/sk/LC_MESSAGES/sphinx.po new file mode 100644 index 00000000..77f12023 --- /dev/null +++ b/sphinx/locale/sk/LC_MESSAGES/sphinx.po @@ -0,0 +1,778 @@ +# Slovak translations for Sphinx. +# Copyright (C) 2008 ORGANIZATION +# This file is distributed under the same license as the Sphinx project. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: Sphinx 0.5\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2011-11-26 13:53+0200\n" +"PO-Revision-Date: 2011-11-26 14:00+0100\n" +"Last-Translator: Jozef Sevcik <sevcik@codescale.net>\n" +"Language-Team: Jozef Sevcik <sevcik@codescale.net>\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-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" + +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "%s %s dokumentácia" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 +#, python-format +msgid "%B %d, %Y" +msgstr "%d.%m.%Y" + +#: sphinx/environment.py:1625 +#, fuzzy, python-format +msgid "see %s" +msgstr "viz %s" + +#: sphinx/environment.py:1628 +#, fuzzy, python-format +msgid "see also %s" +msgstr "viz tiež %s" + +#: sphinx/roles.py:175 +#, python-format +msgid "Python Enhancement Proposals; PEP %s" +msgstr "Python Enhancement Proposals; PEP %s" + +#: sphinx/builders/changes.py:73 +msgid "Builtins" +msgstr "Zabudované funkcie" + +#: sphinx/builders/changes.py:75 +msgid "Module level" +msgstr "Úroveň modulov" + +#: sphinx/builders/html.py:274 +#, python-format +msgid "%b %d, %Y" +msgstr "%d.%m.%Y" + +#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30 +msgid "General Index" +msgstr "Register indexov" + +#: sphinx/builders/html.py:293 +msgid "index" +msgstr "index" + +#: sphinx/builders/html.py:353 +msgid "next" +msgstr "ďalší" + +#: sphinx/builders/html.py:362 +msgid "previous" +msgstr "predchádzajúci" + +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 +msgid " (in " +msgstr "(v" + +#: sphinx/directives/other.py:136 +msgid "Section author: " +msgstr "Autor sekcie: " + +#: sphinx/directives/other.py:138 +msgid "Module author: " +msgstr "Autor modulu: " + +#: sphinx/directives/other.py:140 +#, fuzzy +msgid "Code author: " +msgstr "Autor modulu: " + +#: sphinx/directives/other.py:142 +msgid "Author: " +msgstr "Autor: " + +#: sphinx/directives/other.py:215 +msgid "See also" +msgstr "Viz tiež" + +#: sphinx/domains/__init__.py:244 +#, python-format +msgid "%s %s" +msgstr "" + +#: sphinx/domains/c.py:51 sphinx/domains/python.py:95 +msgid "Parameters" +msgstr "Parametre" + +#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128 +#: sphinx/domains/python.py:107 +msgid "Returns" +msgstr "Vracia" + +#: sphinx/domains/c.py:56 sphinx/domains/python.py:109 +msgid "Return type" +msgstr "Typ návratovej hodnoty" + +#: sphinx/domains/c.py:141 +#, python-format +msgid "%s (C function)" +msgstr "%s (C funkcia)" + +#: sphinx/domains/c.py:143 +#, python-format +msgid "%s (C member)" +msgstr "%s (člen C)" + +#: sphinx/domains/c.py:145 +#, python-format +msgid "%s (C macro)" +msgstr "%s (C makro)" + +#: sphinx/domains/c.py:147 +#, python-format +msgid "%s (C type)" +msgstr "%s (C typ)" + +#: sphinx/domains/c.py:149 +#, python-format +msgid "%s (C variable)" +msgstr "%s (C premenná)" + +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 +msgid "function" +msgstr "funkcia" + +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 +msgid "member" +msgstr "člen" + +#: sphinx/domains/c.py:206 +msgid "macro" +msgstr "" + +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 +msgid "type" +msgstr "typ" + +#: sphinx/domains/c.py:208 +#, fuzzy +msgid "variable" +msgstr "Premenná" + +#: sphinx/domains/cpp.py:904 +#, python-format +msgid "%s (C++ class)" +msgstr "%s (C++ trieda)" + +#: sphinx/domains/cpp.py:919 +#, python-format +msgid "%s (C++ type)" +msgstr "%s (C++ typ)" + +#: sphinx/domains/cpp.py:938 +#, python-format +msgid "%s (C++ member)" +msgstr "%s (člen C++)" + +#: sphinx/domains/cpp.py:990 +#, python-format +msgid "%s (C++ function)" +msgstr "%s (C++ funkcia)" + +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 +msgid "class" +msgstr "trieda" + +#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254 +#, python-format +msgid "%s() (built-in function)" +msgstr "%s() (zabudovaná funkcia)" + +#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318 +#, python-format +msgid "%s() (%s method)" +msgstr "%s() (metóda %s)" + +#: sphinx/domains/javascript.py:109 +#, python-format +msgid "%s() (class)" +msgstr "%s() (trieda)" + +#: sphinx/domains/javascript.py:111 +#, python-format +msgid "%s (global variable or constant)" +msgstr "" + +#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356 +#, python-format +msgid "%s (%s attribute)" +msgstr "%s() (atribút %s)" + +#: sphinx/domains/javascript.py:122 +#, fuzzy +msgid "Arguments" +msgstr "Parametre" + +#: sphinx/domains/javascript.py:125 +msgid "Throws" +msgstr "" + +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 +msgid "data" +msgstr "" + +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 +msgid "attribute" +msgstr "atribút" + +#: sphinx/domains/python.py:100 +#, fuzzy +msgid "Variables" +msgstr "Premenná" + +#: sphinx/domains/python.py:104 +msgid "Raises" +msgstr "Vyvolá" + +#: sphinx/domains/python.py:255 sphinx/domains/python.py:312 +#: sphinx/domains/python.py:324 sphinx/domains/python.py:337 +#, python-format +msgid "%s() (in module %s)" +msgstr "%s() (v module %s)" + +#: sphinx/domains/python.py:258 +#, python-format +msgid "%s (built-in variable)" +msgstr "%s() (zabudovaná premenná)" + +#: sphinx/domains/python.py:259 sphinx/domains/python.py:350 +#, python-format +msgid "%s (in module %s)" +msgstr "%s() (v module %s)" + +#: sphinx/domains/python.py:275 +#, python-format +msgid "%s (built-in class)" +msgstr "%s () (zabudovaná premenná)" + +#: sphinx/domains/python.py:276 +#, python-format +msgid "%s (class in %s)" +msgstr "%s() (trieda v %s)" + +#: sphinx/domains/python.py:316 +#, python-format +msgid "%s() (%s.%s method)" +msgstr "%s() (metoda %s.%s)" + +#: sphinx/domains/python.py:328 +#, python-format +msgid "%s() (%s.%s static method)" +msgstr "%s() (statická metóda %s.%s)" + +#: sphinx/domains/python.py:331 +#, python-format +msgid "%s() (%s static method)" +msgstr "%s() (statická metóda %s)" + +#: sphinx/domains/python.py:341 +#, fuzzy, python-format +msgid "%s() (%s.%s class method)" +msgstr "%s() (metóda %s.%s)" + +#: sphinx/domains/python.py:344 +#, fuzzy, python-format +msgid "%s() (%s class method)" +msgstr "%s() (metóda %s)" + +#: sphinx/domains/python.py:354 +#, python-format +msgid "%s (%s.%s attribute)" +msgstr "%s() (atribút %s.%s)" + +#: sphinx/domains/python.py:434 +#, python-format +msgid "%s (module)" +msgstr "%s (module)" + +#: sphinx/domains/python.py:491 +#, fuzzy +msgid "Python Module Index" +msgstr "Register modulov" + +#: sphinx/domains/python.py:492 +msgid "modules" +msgstr "moduly" + +#: sphinx/domains/python.py:537 +msgid "Deprecated" +msgstr "Zastaralé" + +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 +msgid "exception" +msgstr "výnimka" + +#: sphinx/domains/python.py:563 +msgid "method" +msgstr "" + +#: sphinx/domains/python.py:564 +msgid "class method" +msgstr "" + +#: sphinx/domains/python.py:565 +msgid "static method" +msgstr "statická metóda" + +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 +msgid "module" +msgstr "modul" + +#: sphinx/domains/python.py:695 +msgid " (deprecated)" +msgstr " (zastaralé)" + +#: sphinx/domains/rst.py:55 +#, python-format +msgid "%s (directive)" +msgstr "" + +#: sphinx/domains/rst.py:57 +#, python-format +msgid "%s (role)" +msgstr "" + +#: sphinx/domains/rst.py:106 +msgid "directive" +msgstr "" + +#: sphinx/domains/rst.py:107 +msgid "role" +msgstr "" + +#: sphinx/domains/std.py:70 sphinx/domains/std.py:86 +#, python-format +msgid "environment variable; %s" +msgstr "premenná prostredia, %s" + +#: sphinx/domains/std.py:162 +#, python-format +msgid "%scommand line option; %s" +msgstr "%s parametre príkazového riadku; %s" + +#: sphinx/domains/std.py:393 +msgid "glossary term" +msgstr "" + +#: sphinx/domains/std.py:394 +msgid "grammar token" +msgstr "" + +#: sphinx/domains/std.py:395 +msgid "reference label" +msgstr "" + +#: sphinx/domains/std.py:396 +msgid "environment variable" +msgstr "premenná prostredia" + +#: sphinx/domains/std.py:397 +msgid "program option" +msgstr "" + +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Index" + +#: sphinx/domains/std.py:428 +msgid "Module Index" +msgstr "Register modulov" + +#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25 +msgid "Search Page" +msgstr "Vyhľadávacia stránka" + +#: sphinx/ext/autodoc.py:1002 +#, python-format +msgid " Bases: %s" +msgstr "" + +#: sphinx/ext/autodoc.py:1038 +#, python-format +msgid "alias of :class:`%s`" +msgstr "" + +#: sphinx/ext/todo.py:41 +msgid "Todo" +msgstr "Todo" + +#: sphinx/ext/todo.py:109 +#, fuzzy, python-format +msgid "(The <<original entry>> is located in %s, line %d.)" +msgstr "(Pôvodný záznam je v %s, riadok %d.)" + +#: sphinx/ext/todo.py:117 +msgid "original entry" +msgstr "" + +#: sphinx/ext/viewcode.py:70 +msgid "[source]" +msgstr "" + +#: sphinx/ext/viewcode.py:117 +msgid "[docs]" +msgstr "" + +#: sphinx/ext/viewcode.py:131 +#, fuzzy +msgid "Module code" +msgstr "modul" + +#: sphinx/ext/viewcode.py:137 +#, python-format +msgid "<h1>Source code for %s</h1>" +msgstr "" + +#: sphinx/ext/viewcode.py:164 +msgid "Overview: module code" +msgstr "" + +#: sphinx/ext/viewcode.py:165 +msgid "<h1>All modules for which code is available</h1>" +msgstr "" + +#: sphinx/locale/__init__.py:155 +msgid "Attention" +msgstr "Výstraha" + +#: sphinx/locale/__init__.py:156 +msgid "Caution" +msgstr "Upozornenie" + +#: sphinx/locale/__init__.py:157 +msgid "Danger" +msgstr "Nebezpečenstvo" + +#: sphinx/locale/__init__.py:158 +msgid "Error" +msgstr "Chyba" + +#: sphinx/locale/__init__.py:159 +msgid "Hint" +msgstr "Rada" + +#: sphinx/locale/__init__.py:160 +msgid "Important" +msgstr "Dôležité" + +#: sphinx/locale/__init__.py:161 +msgid "Note" +msgstr "Poznámka" + +#: sphinx/locale/__init__.py:162 +msgid "See Also" +msgstr "Viz tiež" + +#: sphinx/locale/__init__.py:163 +msgid "Tip" +msgstr "Tip" + +#: sphinx/locale/__init__.py:164 +msgid "Warning" +msgstr "Varovanie" + +#: sphinx/locale/__init__.py:168 +#, python-format +msgid "New in version %s" +msgstr "Nové vo verzii %s" + +#: sphinx/locale/__init__.py:169 +#, python-format +msgid "Changed in version %s" +msgstr "Zmenené vo verzii %s" + +#: sphinx/locale/__init__.py:170 +#, python-format +msgid "Deprecated since version %s" +msgstr "Zastaralé od verzie %s" + +#: sphinx/locale/__init__.py:176 +msgid "keyword" +msgstr "klúčové slovo" + +#: sphinx/locale/__init__.py:177 +msgid "operator" +msgstr "operátor" + +#: sphinx/locale/__init__.py:178 +msgid "object" +msgstr "objekt" + +#: sphinx/locale/__init__.py:180 +msgid "statement" +msgstr "príkaz" + +#: sphinx/locale/__init__.py:181 +msgid "built-in function" +msgstr "zabudovaná funkcia" + +#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10 +#: sphinx/themes/basic/localtoc.html:11 +msgid "Table Of Contents" +msgstr "Obsah" + +#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137 +#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20 +msgid "Search" +msgstr "Hľadanie" + +#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15 +msgid "Go" +msgstr "OK" + +#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20 +msgid "Enter search terms or a module, class or function name." +msgstr "Zadaj názov modulu, triedy alebo funkcie." + +#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14 +msgid "Show Source" +msgstr "Ukázať zdroj" + +#: sphinx/themes/basic/defindex.html:11 +msgid "Overview" +msgstr "Prehľad" + +#: sphinx/themes/basic/defindex.html:20 +msgid "Indices and tables:" +msgstr "Register a tabuľky:" + +#: sphinx/themes/basic/defindex.html:23 +msgid "Complete Table of Contents" +msgstr "Celkový obsah" + +#: sphinx/themes/basic/defindex.html:24 +msgid "lists all sections and subsections" +msgstr "zoznam všetkých sekcií a podsekcií" + +#: sphinx/themes/basic/defindex.html:26 +msgid "search this documentation" +msgstr "prehľadaj túto dokumentáciu" + +#: sphinx/themes/basic/defindex.html:28 +msgid "Global Module Index" +msgstr "Celkový register modulov" + +#: sphinx/themes/basic/defindex.html:29 +msgid "quick access to all modules" +msgstr "rýchly prístup ku všetkým modulom" + +#: sphinx/themes/basic/defindex.html:31 +msgid "all functions, classes, terms" +msgstr "všetky funkcie, triedy, termíny" + +#: sphinx/themes/basic/genindex-single.html:35 +#, python-format +msgid "Index – %(key)s" +msgstr "Index – %(key)s" + +#: sphinx/themes/basic/genindex-single.html:63 +#: sphinx/themes/basic/genindex-split.html:24 +#: sphinx/themes/basic/genindex-split.html:38 +#: sphinx/themes/basic/genindex.html:74 +msgid "Full index on one page" +msgstr "Celý index na jednej stránke" + +#: sphinx/themes/basic/genindex-split.html:16 +msgid "Index pages by letter" +msgstr "Index podľa písmena" + +#: sphinx/themes/basic/genindex-split.html:25 +msgid "can be huge" +msgstr "môže byť obrovský" + +#: sphinx/themes/basic/layout.html:29 +msgid "Navigation" +msgstr "Navigácia" + +#: sphinx/themes/basic/layout.html:122 +#, python-format +msgid "Search within %(docstitle)s" +msgstr "Hľadanie v %(docstitle)s" + +#: sphinx/themes/basic/layout.html:131 +msgid "About these documents" +msgstr "O týchto dokumentoch" + +#: sphinx/themes/basic/layout.html:140 +msgid "Copyright" +msgstr "Všetky práva vyhradené" + +#: sphinx/themes/basic/layout.html:189 +#, python-format +msgid "© <a href=\"%(path)s\">Copyright</a> %(copyright)s." +msgstr "© <a href=\"%(path)s\">Copyright</a> %(copyright)s." + +#: sphinx/themes/basic/layout.html:191 +#, python-format +msgid "© Copyright %(copyright)s." +msgstr "© Copyright %(copyright)s." + +#: sphinx/themes/basic/layout.html:195 +#, python-format +msgid "Last updated on %(last_updated)s." +msgstr "Aktualizované dňa %(last_updated)s." + +#: sphinx/themes/basic/layout.html:198 +#, python-format +msgid "" +"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " +"%(sphinx_version)s." +msgstr "" +"Vytvorené pomocou <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " +"%(sphinx_version)s." + +#: sphinx/themes/basic/opensearch.xml:4 +#, python-format +msgid "Search %(docstitle)s" +msgstr "Prehľadať %(docstitle)s" + +#: sphinx/themes/basic/relations.html:11 +msgid "Previous topic" +msgstr "Predchádzajúca téma" + +#: sphinx/themes/basic/relations.html:13 +msgid "previous chapter" +msgstr "predchádzajúca kapitola" + +#: sphinx/themes/basic/relations.html:16 +msgid "Next topic" +msgstr "Ďalšia téma" + +#: sphinx/themes/basic/relations.html:18 +msgid "next chapter" +msgstr "dalšia kapitola" + +#: sphinx/themes/basic/search.html:24 +msgid "" +"Please activate JavaScript to enable the search\n" +" functionality." +msgstr "" + +#: sphinx/themes/basic/search.html:29 +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 vyhľadávacia stránka. Zadajte kľúčové slová a kliknete na " +"\"hľadaj\". \n" +"Vyhľadávanie hľadá automaticky všetky slová. Nebudú teda nájdené " +"stránky obsahujúce menej slov." + +#: sphinx/themes/basic/search.html:36 +msgid "search" +msgstr "hľadaj" + +#: sphinx/themes/basic/search.html:40 +msgid "Search Results" +msgstr "Výsledky vyhľadávania" + +#: sphinx/themes/basic/search.html:42 +msgid "Your search did not match any results." +msgstr "Nič nebolo nájdené." + +#: sphinx/themes/basic/searchbox.html:12 +msgid "Quick search" +msgstr "Rýchle vyhľadávanie" + +#: sphinx/themes/basic/sourcelink.html:11 +msgid "This Page" +msgstr "Táto stránka" + +#: sphinx/themes/basic/changes/frameset.html:5 +#: sphinx/themes/basic/changes/versionchanges.html:12 +#, python-format +msgid "Changes in Version %(version)s — %(docstitle)s" +msgstr "Zmeny vo verzii %(version)s — %(docstitle)s" + +#: sphinx/themes/basic/changes/rstsource.html:5 +#, python-format +msgid "%(filename)s — %(docstitle)s" +msgstr "%(filename)s — %(docstitle)s" + +#: sphinx/themes/basic/changes/versionchanges.html:17 +#, python-format +msgid "Automatically generated list of changes in version %(version)s" +msgstr "Automaticky generovaný zoznam zmien vo verzii %(version)s" + +#: sphinx/themes/basic/changes/versionchanges.html:18 +msgid "Library changes" +msgstr "Zmeny v knižniciach" + +#: sphinx/themes/basic/changes/versionchanges.html:23 +msgid "C API changes" +msgstr "Zmeny API" + +#: sphinx/themes/basic/changes/versionchanges.html:25 +msgid "Other changes" +msgstr "Ostatné zmeny" + +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 +msgid "Permalink to this headline" +msgstr "Trvalý odkaz na tento nadpis" + +#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92 +msgid "Permalink to this definition" +msgstr "Trvalý odkaz na túto definíciu" + +#: sphinx/themes/basic/static/doctools.js:189 +msgid "Hide Search Matches" +msgstr "Skryť výsledky vyhľadávania" + +#: sphinx/themes/default/static/sidebar.js:69 +msgid "Expand sidebar" +msgstr "" + +#: sphinx/themes/default/static/sidebar.js:82 +#: sphinx/themes/default/static/sidebar.js:110 +msgid "Collapse sidebar" +msgstr "" + +#: sphinx/themes/haiku/layout.html:26 +msgid "Contents" +msgstr "" + +#: sphinx/writers/latex.py:177 +msgid "Release" +msgstr "Vydanie" + +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 +msgid "Footnotes" +msgstr "" + +#: sphinx/writers/latex.py:676 +msgid "continued from previous page" +msgstr "" + +#: sphinx/writers/latex.py:681 +#, fuzzy +msgid "Continued on next page" +msgstr "Celý index na jednej stránke" + +#: sphinx/writers/text.py:437 +msgid "[image]" +msgstr "[obrázok]" + diff --git a/sphinx/locale/sl/LC_MESSAGES/sphinx.mo b/sphinx/locale/sl/LC_MESSAGES/sphinx.mo Binary files differindex 0535cf6e..79f7f4eb 100644 --- a/sphinx/locale/sl/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/sl/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/sl/LC_MESSAGES/sphinx.po b/sphinx/locale/sl/LC_MESSAGES/sphinx.po index ad0ef432..6f6e49ac 100644 --- a/sphinx/locale/sl/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/sl/LC_MESSAGES/sphinx.po @@ -1,29 +1,35 @@ + msgid "" 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: 2011-01-22 14:41+0100\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2011-09-21 10:14+0200\n" "Last-Translator: Luka Marinko <luka.marinko@simt.si>\n" "Language-Team: Rok Garbas <rok.garbas@gmail.com>\n" "Plural-Forms: nplurals=1; plural=0\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" + +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d %B, %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "" @@ -62,21 +68,10 @@ msgstr "naprej" msgid "previous" msgstr "nazaj" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (v " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Abecedni seznam" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Avtor sekcije: " @@ -141,12 +136,12 @@ msgstr "%s (C tip)" msgid "%s (C variable)" msgstr "%s (C spremenljivka)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "funkcija" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "član" @@ -154,7 +149,7 @@ msgstr "član" msgid "macro" msgstr "" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "tip" @@ -163,28 +158,28 @@ msgstr "tip" msgid "variable" msgstr "Spremenljivka" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++ razred)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ tip)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ član)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ funkcija)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "razred" @@ -222,11 +217,11 @@ msgstr "Parametri" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "atribut" @@ -295,45 +290,45 @@ msgstr "%s() (%s metoda)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s atribut)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (modul)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "Seznam modulov" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "Moduli" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Zastarelo" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "izjema" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "statična metoda" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "modul" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (zastarelo)" @@ -385,6 +380,15 @@ msgstr "okoljska spremenljivka" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Abecedni seznam" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Seznam modulov" @@ -393,12 +397,12 @@ msgstr "Seznam modulov" msgid "Search Page" msgstr "Iskalnik" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Baza: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "vzdevek za :class:`%s`" @@ -721,8 +725,8 @@ msgstr "C API spremembe" msgid "Other changes" msgstr "Ostale spremembe" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Povezava na naslov" @@ -747,49 +751,24 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Izdaja" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "Opombe" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "nadaljevanje iz prejšnje strani" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Nadaljevanje na naslednji strani" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[slika]" -#~ msgid "Platforms: " -#~ msgstr "Platforme:" - -#~ msgid "Searching" -#~ msgstr "Iščem" - -#~ msgid "Preparing search..." -#~ msgstr "Pripravljam iskanje..." - -#~ msgid ", in " -#~ msgstr ", v " - -#~ 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 "" -#~ "Za vaše iskanje ni rezultatov. Prosimo" -#~ " preglejte ali so vse besede pravilno" -#~ " črkovane in ali ste izbrali dovolj" -#~ " kategorij." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Iskanje končano, najdeno %s strani, ki ustrezajo iskalnemu nizu." - diff --git a/sphinx/locale/sphinx.pot b/sphinx/locale/sphinx.pot index 1b9ea2f3..9ddde4c2 100644 --- a/sphinx/locale/sphinx.pot +++ b/sphinx/locale/sphinx.pot @@ -6,29 +6,34 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Sphinx 1.1pre/339c7a794c1a\n" +"Project-Id-Version: Sphinx 1.1pre/9523af9ba9aa+\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2011-01-22 14:40+0100\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "" @@ -67,21 +72,10 @@ msgstr "" msgid "previous" msgstr "" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "" -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "" @@ -145,12 +139,12 @@ msgstr "" msgid "%s (C variable)" msgstr "" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "" @@ -158,7 +152,7 @@ msgstr "" msgid "macro" msgstr "" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "" @@ -166,28 +160,28 @@ msgstr "" msgid "variable" msgstr "" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "" @@ -224,11 +218,11 @@ msgstr "" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "" @@ -296,44 +290,44 @@ msgstr "" msgid "%s (%s.%s attribute)" msgstr "" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 msgid "Python Module Index" msgstr "" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr "" @@ -385,6 +379,15 @@ msgstr "" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "" @@ -393,12 +396,12 @@ msgstr "" msgid "Search Page" msgstr "" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -712,8 +715,8 @@ msgstr "" msgid "Other changes" msgstr "" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "" @@ -738,23 +741,24 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "" diff --git a/sphinx/locale/sv/LC_MESSAGES/sphinx.mo b/sphinx/locale/sv/LC_MESSAGES/sphinx.mo Binary files differindex aed6bf5c..11b18023 100644 --- a/sphinx/locale/sv/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/sv/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/sv/LC_MESSAGES/sphinx.po b/sphinx/locale/sv/LC_MESSAGES/sphinx.po index 42aaa5fe..9967bdd7 100644 --- a/sphinx/locale/sv/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/sv/LC_MESSAGES/sphinx.po @@ -1,29 +1,35 @@ + msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-05-24 23:53+0200\n" -"PO-Revision-Date: 2011-01-22 14:41+0100\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2011-09-21 10:14+0200\n" "Last-Translator: Henrik Holmboe <henrik@holmboe.se>\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" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" + +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%B %d, %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "se %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "se även %s" @@ -62,21 +68,10 @@ msgstr "nästa" msgid "previous" msgstr "föregående" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "(i " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Index" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Sektionsförfattare" @@ -140,12 +135,12 @@ msgstr "%s (C-typ)" msgid "%s (C variable)" msgstr "%s (C-variabel)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "funktion" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "medlem" @@ -153,7 +148,7 @@ msgstr "medlem" msgid "macro" msgstr "makro" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "typ" @@ -161,28 +156,28 @@ msgstr "typ" msgid "variable" msgstr "variabel" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++-klass)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++-typ)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++-medlem)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++-funktion)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "klass" @@ -219,11 +214,11 @@ msgstr "Argument" msgid "Throws" msgstr "Kastar" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "data" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "attribut" @@ -291,44 +286,44 @@ msgstr "%s() (%s klassmetod)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s attribut)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (modul)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 msgid "Python Module Index" msgstr "Python Modulindex" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "moduler" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Ersatt" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "undantag" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "metod" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "klassmetod" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "statisk metod" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "modul" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 #, fuzzy msgid " (deprecated)" msgstr " (ersatt)" @@ -381,6 +376,15 @@ msgstr "miljövariabel" msgid "program option" msgstr "programväxel" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Index" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Modulindex" @@ -389,12 +393,12 @@ msgstr "Modulindex" msgid "Search Page" msgstr "Söksida" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Baserad: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "alias för :class:`%s`" @@ -713,8 +717,8 @@ msgstr "Förändringar i C-API" msgid "Other changes" msgstr "Övriga förändringar" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Permalink till denna rubrik" @@ -739,48 +743,24 @@ msgstr "Dölj sidolist" msgid "Contents" msgstr "Innehåll" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Utgåva" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "Fotnoter" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "fortsättning från föregående sida" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Fortsätter på nästa sida" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[image]" -#~ msgid "Platforms: " -#~ msgstr "Plattformar:" - -#~ msgid "Searching" -#~ msgstr "Söker" - -#~ msgid "Preparing search..." -#~ msgstr "Förbereder sökning..." - -#~ msgid ", in " -#~ msgstr ", i " - -#~ 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 "" -#~ "Din sökning gav inga resultat. Kolla " -#~ "stavning och att du valt tillräckligt" -#~ " med kategorier." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Sökning färdig, hittade %s träffar." - diff --git a/sphinx/locale/tr/LC_MESSAGES/sphinx.mo b/sphinx/locale/tr/LC_MESSAGES/sphinx.mo Binary files differindex cbe9b252..812b7cd9 100644 --- a/sphinx/locale/tr/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/tr/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/tr/LC_MESSAGES/sphinx.po b/sphinx/locale/tr/LC_MESSAGES/sphinx.po index 2fe3043a..bf5fd568 100644 --- a/sphinx/locale/tr/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/tr/LC_MESSAGES/sphinx.po @@ -1,4 +1,4 @@ -# Translations template for Sphinx. +# Turkish translations for Sphinx. # Copyright (C) 2011 ORGANIZATION # This file is distributed under the same license as the Sphinx project. # FIRST AUTHOR <EMAIL@ADDRESS>, 2011. @@ -7,28 +7,33 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 1.1pre/339c7a794c1a\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2011-01-22 14:40+0100\n" -"PO-Revision-Date: 2011-04-04 00:42+0200\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2011-09-21 10:14+0200\n" "Last-Translator: Firat Ozgul <ozgulfirat@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"Language-Team: tr <LL@li.org>\n" +"Plural-Forms: nplurals=1; plural=0\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 -#: sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%d %B %Y" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "bkz. %s" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "ayrıca bkz. %s" @@ -51,8 +56,7 @@ msgstr "Modül düzeyi" msgid "%b %d, %Y" msgstr "%d %b %Y" -#: sphinx/builders/html.py:293 -#: sphinx/themes/basic/defindex.html:30 +#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30 msgid "General Index" msgstr "Genel Dizin" @@ -68,26 +72,10 @@ msgstr "sonraki" msgid "previous" msgstr "önceki" -#: sphinx/builders/latex.py:141 -#: sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (şunun içinde: " -#: sphinx/builders/texinfo.py:151 -#: sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 -#: sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 -#: sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 -#: sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Dizin" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Bölümü yazan: " @@ -113,19 +101,16 @@ msgstr "Ayrıca bkz." msgid "%s %s" msgstr "%s %s" -#: sphinx/domains/c.py:51 -#: sphinx/domains/python.py:95 +#: sphinx/domains/c.py:51 sphinx/domains/python.py:95 msgid "Parameters" msgstr "Parametreler" -#: sphinx/domains/c.py:54 -#: sphinx/domains/javascript.py:128 +#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128 #: sphinx/domains/python.py:107 msgid "Returns" msgstr "Dönüş değeri:" -#: sphinx/domains/c.py:56 -#: sphinx/domains/python.py:109 +#: sphinx/domains/c.py:56 sphinx/domains/python.py:109 msgid "Return type" msgstr "Dönüş tipi" @@ -154,15 +139,12 @@ msgstr "%s (C tipi)" msgid "%s (C variable)" msgstr "%s (C değişkeni)" -#: sphinx/domains/c.py:204 -#: sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 -#: sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "fonksiyonu" -#: sphinx/domains/c.py:205 -#: sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "öğesi" @@ -170,8 +152,7 @@ msgstr "öğesi" msgid "macro" msgstr "makrosu" -#: sphinx/domains/c.py:207 -#: sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "tipi" @@ -179,40 +160,37 @@ msgstr "tipi" msgid "variable" msgstr "değişkeni" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++ sınıfı)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ tipi)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ öğesi)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ fonksiyonu)" -#: sphinx/domains/cpp.py:1052 -#: sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "sınıfı" -#: sphinx/domains/javascript.py:106 -#: sphinx/domains/python.py:254 +#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254 #, python-format msgid "%s() (built-in function)" msgstr "%s() (gömülü fonksiyon)" -#: sphinx/domains/javascript.py:107 -#: sphinx/domains/python.py:318 +#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318 #, python-format msgid "%s() (%s method)" msgstr "%s() (%s metodu)" @@ -227,8 +205,7 @@ msgstr "%s() (sınıfı)" msgid "%s (global variable or constant)" msgstr "%s (global değişken veya sabit)" -#: sphinx/domains/javascript.py:113 -#: sphinx/domains/python.py:356 +#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356 #, python-format msgid "%s (%s attribute)" msgstr "%s (%s niteliği)" @@ -241,13 +218,11 @@ msgstr "Argümanlar" msgid "Throws" msgstr "Şunu verir: " -#: sphinx/domains/javascript.py:164 -#: sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "verisi" -#: sphinx/domains/javascript.py:165 -#: sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "niteliği" @@ -259,10 +234,8 @@ msgstr "Değişkenler" msgid "Raises" msgstr "Şunu üretir:" -#: sphinx/domains/python.py:255 -#: sphinx/domains/python.py:312 -#: sphinx/domains/python.py:324 -#: sphinx/domains/python.py:337 +#: sphinx/domains/python.py:255 sphinx/domains/python.py:312 +#: sphinx/domains/python.py:324 sphinx/domains/python.py:337 #, python-format msgid "%s() (in module %s)" msgstr "%s() (%s modülü içinde)" @@ -272,8 +245,7 @@ msgstr "%s() (%s modülü içinde)" msgid "%s (built-in variable)" msgstr "%s (gömülü değişken)" -#: sphinx/domains/python.py:259 -#: sphinx/domains/python.py:350 +#: sphinx/domains/python.py:259 sphinx/domains/python.py:350 #, python-format msgid "%s (in module %s)" msgstr "%s (%s modülü içinde)" @@ -318,46 +290,44 @@ msgstr "%s() (%s sınıf metodu)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s niteliği)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (modül)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 msgid "Python Module Index" msgstr "Python Modül Dizini" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "modüller" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Önerilmiyor" -#: sphinx/domains/python.py:561 -#: sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "istisnası" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "metodu" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "sınıf metodu" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "statik metodu" -#: sphinx/domains/python.py:566 -#: sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "modülü" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (önerilmiyor)" @@ -379,8 +349,7 @@ msgstr "yönergesi" msgid "role" msgstr "rolü" -#: sphinx/domains/std.py:70 -#: sphinx/domains/std.py:86 +#: sphinx/domains/std.py:70 sphinx/domains/std.py:86 #, python-format msgid "environment variable; %s" msgstr "çevre değişkeni; %s" @@ -410,21 +379,29 @@ msgstr "çevre değişkeni" msgid "program option" msgstr "program seçeneği" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Dizin" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Modül Dizini" -#: sphinx/domains/std.py:429 -#: sphinx/themes/basic/defindex.html:25 +#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25 msgid "Search Page" msgstr "Arama Sayfası" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Taban: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "şunun takma adı: :class:`%s`" @@ -542,31 +519,25 @@ msgstr "deyim" msgid "built-in function" msgstr "gömülü fonksiyon" -#: sphinx/themes/agogo/layout.html:45 -#: sphinx/themes/basic/globaltoc.html:10 +#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10 #: sphinx/themes/basic/localtoc.html:11 msgid "Table Of Contents" msgstr "İçindekiler Tablosu" -#: sphinx/themes/agogo/layout.html:49 -#: sphinx/themes/basic/layout.html:137 -#: sphinx/themes/basic/search.html:11 -#: sphinx/themes/basic/search.html:20 +#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137 +#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20 msgid "Search" msgstr "Ara" -#: sphinx/themes/agogo/layout.html:52 -#: sphinx/themes/basic/searchbox.html:15 +#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15 msgid "Go" msgstr "Git" -#: sphinx/themes/agogo/layout.html:57 -#: sphinx/themes/basic/searchbox.html:20 +#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20 msgid "Enter search terms or a module, class or function name." msgstr "Aranacak terimleri veya modül, sınıf ya da fonksiyon adını yazınız" -#: sphinx/themes/agogo/layout.html:78 -#: sphinx/themes/basic/sourcelink.html:14 +#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14 msgid "Show Source" msgstr "Kaynağı Göster" @@ -656,8 +627,12 @@ msgstr "Son güncelleme: %(last_updated)s." #: sphinx/themes/basic/layout.html:198 #, python-format -msgid "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s." -msgstr "<a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s ile oluşturulmuştur." +msgid "" +"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " +"%(sphinx_version)s." +msgstr "" +"<a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s ile " +"oluşturulmuştur." #: sphinx/themes/basic/opensearch.xml:4 #, python-format @@ -748,14 +723,12 @@ msgstr "C API'sindeki değişiklikler" msgid "Other changes" msgstr "Diğer değişiklikler" -#: sphinx/themes/basic/static/doctools.js:154 -#: sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Bu başlığın kalıcı bağlantısı" -#: sphinx/themes/basic/static/doctools.js:160 -#: sphinx/writers/html.py:92 +#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92 msgid "Permalink to this definition" msgstr "Bu tanımın kalıcı bağlantısı" @@ -776,24 +749,24 @@ msgstr "Yan çubuğu daralt" msgid "Contents" msgstr "İçindekiler" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Sürüm" -#: sphinx/writers/latex.py:590 -#: sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "Dipnotları" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "önceki sayfadan devam" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "Devamı sonraki sayfada" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[resim]" diff --git a/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.mo b/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.mo Binary files differindex 92c00ca1..4bc58ee1 100644 --- a/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po b/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po index 7667314f..32ce1dc4 100644 --- a/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po @@ -7,8 +7,8 @@ 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" -"PO-Revision-Date: 2011-01-22 14:41+0100\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2011-09-21 10:15+0200\n" "Last-Translator: Petro Sasnyk <petro@sasnyk.name>\n" "Language-Team: uk_UA <LL@li.org>\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " @@ -16,20 +16,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, fuzzy, python-format msgid "see also %s" msgstr "дивись також %s" @@ -68,21 +73,10 @@ msgstr "наступний" msgid "previous" msgstr "попередній" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr " (в " -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "Індекс" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Автор секції: " @@ -147,12 +141,12 @@ msgstr "%s (C тип)" msgid "%s (C variable)" msgstr "%s (C змінна)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "функція" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "член" @@ -160,7 +154,7 @@ msgstr "член" msgid "macro" msgstr "макрос" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "тип" @@ -169,28 +163,28 @@ msgstr "тип" msgid "variable" msgstr "Змінна" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "%s (C++ клас)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ тип)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ член)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ функція)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "клас" @@ -228,11 +222,11 @@ msgstr "Параметри" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "атрибут" @@ -301,45 +295,45 @@ msgstr "%s() (%s метод)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s атрибут)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (модуль)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "Індекс модулів" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "модулі" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "Застарілий" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "виняткова ситуація" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "статичний метод" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "модуль" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 msgid " (deprecated)" msgstr " (застарілий)" @@ -391,6 +385,15 @@ msgstr "змінна оточення" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "Індекс" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "Індекс модулів" @@ -399,12 +402,12 @@ msgstr "Індекс модулів" msgid "Search Page" msgstr "Сторінка пошуку" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr " Базовий: %s" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "синонім :class:`%s`" @@ -580,7 +583,7 @@ msgstr "всі функції, класи, терміни" #: sphinx/themes/basic/genindex-single.html:35 #, python-format msgid "Index – %(key)s" -msgstr "Індекс – %(key)" +msgstr "Індекс – %(key)s" #: sphinx/themes/basic/genindex-single.html:63 #: sphinx/themes/basic/genindex-split.html:24 @@ -704,17 +707,17 @@ msgstr "Ця сторінка" #: sphinx/themes/basic/changes/versionchanges.html:12 #, python-format msgid "Changes in Version %(version)s — %(docstitle)s" -msgstr "Зміни в Версії %(version)s — %(docstitle)" +msgstr "Зміни в Версії %(version)s — %(docstitle)s" #: sphinx/themes/basic/changes/rstsource.html:5 #, python-format msgid "%(filename)s — %(docstitle)s" -msgstr "%(filename) — %(docstitle)" +msgstr "%(filename)s — %(docstitle)s" #: sphinx/themes/basic/changes/versionchanges.html:17 #, python-format msgid "Automatically generated list of changes in version %(version)s" -msgstr "Автоматичного згенерований список змін в версії %(version)" +msgstr "Автоматичного згенерований список змін в версії %(version)s" #: sphinx/themes/basic/changes/versionchanges.html:18 msgid "Library changes" @@ -728,8 +731,8 @@ msgstr "зміни C API" msgid "Other changes" msgstr "Інші зміни" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "Постійне посилання на цей заголовок" @@ -754,50 +757,25 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "Реліз" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 #, fuzzy msgid "Continued on next page" msgstr "Повний індекс на одній сторінці" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "" -#~ msgid "Platforms: " -#~ msgstr "Платформи: " - -#~ msgid "Searching" -#~ msgstr "Шукаю" - -#~ msgid "Preparing search..." -#~ msgstr "Підготовка до пошуку..." - -#~ msgid ", in " -#~ msgstr ", в " - -#~ 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 "" -#~ "Ваш пошук не виявив жодного співпадіння." -#~ " Будь-ласка переконайтеся що всі слова " -#~ "набрані правильно і ви обрали достатньо" -#~ " категорій." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "Пошук закінчено, знайдено %s сторінок які співпали з пошуковим запитом." - diff --git a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo Binary files differindex efcfb651..3d9dac2b 100644 --- a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po index 323aa069..cb7b3e6f 100644 --- a/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po @@ -8,28 +8,33 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 0.6\n" "Report-Msgid-Bugs-To: zhutao.iscas@gmail.com\n" -"POT-Creation-Date: 2009-03-09 19:46+0120\n" -"PO-Revision-Date: 2011-01-22 14:41+0100\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2011-09-21 10:15+0200\n" "Last-Translator: Tower Joo<zhutao.iscas@gmail.com>\n" "Language-Team: cn <LL@li.org>\n" "Plural-Forms: nplurals=1; plural=0\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%Y 年 %m 月 %d 日" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "也可以参考 %s" @@ -68,21 +73,10 @@ msgstr "下一页" msgid "previous" msgstr "上一页" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "" -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "索引" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Section 作者：" @@ -147,12 +141,12 @@ msgstr "%s (C 类型)" msgid "%s (C variable)" msgstr "%s (C 变量)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "函数" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "成员" @@ -160,7 +154,7 @@ msgstr "成员" msgid "macro" msgstr "" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "" @@ -169,28 +163,28 @@ msgstr "" msgid "variable" msgstr "变量" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, fuzzy, python-format msgid "%s (C++ class)" msgstr "%s (C++ 內置类)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ 类型)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ 成员)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ 函数)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "" @@ -228,11 +222,11 @@ msgstr "参数" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "属性" @@ -301,45 +295,45 @@ msgstr "%s() (%s 方法)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s 属性)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (模块)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "模块索引" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "模块" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "已移除" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "例外" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "静态方法" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "模块" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 #, fuzzy msgid " (deprecated)" msgstr " (已移除)" @@ -392,6 +386,15 @@ msgstr "环境变量" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "索引" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "模块索引" @@ -400,12 +403,12 @@ msgstr "模块索引" msgid "Search Page" msgstr "搜索页面" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -618,7 +621,7 @@ msgstr "版权所有" #: sphinx/themes/basic/layout.html:189 #, python-format msgid "© <a href=\"%(path)s\">Copyright</a> %(copyright)s." -msgstr "© <a href=\"%(path)s\">版权所有</a> % (copyright)s." +msgstr "© <a href=\"%(path)s\">版权所有</a> %(copyright)s." #: sphinx/themes/basic/layout.html:191 #, python-format @@ -720,8 +723,8 @@ msgstr "C API 更改" msgid "Other changes" msgstr "其他更改" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "永久链接至标题" @@ -746,46 +749,25 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "发布" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 #, fuzzy msgid "Continued on next page" msgstr "一页的全部索引" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[图片]" -#~ msgid "Platforms: " -#~ msgstr "平台" - -#~ msgid "Searching" -#~ msgstr "搜索中" - -#~ msgid "Preparing search..." -#~ msgstr "准备搜索..." - -#~ msgid ", in " -#~ msgstr ", 位于" - -#~ 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 "你的搜索没有匹配到任何文档。请确认你所搜索的关键字." - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "搜索完成， 找到了 %s 页匹配所搜索的关键字" - diff --git a/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.mo b/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.mo Binary files differindex 13c61e9a..9dd86da5 100644 --- a/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.mo +++ b/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.mo diff --git a/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po b/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po index d75b4547..2a4fbef0 100644 --- a/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po @@ -7,7 +7,7 @@ msgid "" 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" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" "PO-Revision-Date: 2011-01-22 14:41+0100\n" "Last-Translator: Fred Lin <gasolin@gmail.com>\n" "Language-Team: tw <LL@li.org>\n" @@ -15,20 +15,25 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:120 sphinx/writers/latex.py:189 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%Y 年 %m 月 %d 日" -#: sphinx/environment.py:1624 +#: sphinx/environment.py:1625 #, python-format msgid "see %s" msgstr "" -#: sphinx/environment.py:1627 +#: sphinx/environment.py:1628 #, python-format msgid "see also %s" msgstr "" @@ -67,21 +72,10 @@ msgstr "下一頁" msgid "previous" msgstr "上一頁" -#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:208 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "" -#: sphinx/builders/texinfo.py:151 sphinx/builders/texinfo.py:152 -#: sphinx/builders/texinfo.py:153 sphinx/domains/std.py:427 -#: sphinx/themes/basic/genindex-single.html:32 -#: sphinx/themes/basic/genindex-split.html:11 -#: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 -#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 -#: sphinx/writers/latex.py:178 -msgid "Index" -msgstr "索引" - #: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Section 作者：" @@ -146,12 +140,12 @@ msgstr "%s (C 類別)" msgid "%s (C variable)" msgstr "%s (C 變數)" -#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1053 -#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:558 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "函式" -#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1054 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "成員" @@ -159,7 +153,7 @@ msgstr "成員" msgid "macro" msgstr "巨集" -#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1055 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "類別" @@ -168,28 +162,28 @@ msgstr "類別" msgid "variable" msgstr "變數" -#: sphinx/domains/cpp.py:897 +#: sphinx/domains/cpp.py:904 #, fuzzy, python-format msgid "%s (C++ class)" msgstr "%s (內建類別)" -#: sphinx/domains/cpp.py:912 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ 類別)" -#: sphinx/domains/cpp.py:931 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ 成員)" -#: sphinx/domains/cpp.py:983 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ 函式)" -#: sphinx/domains/cpp.py:1052 sphinx/domains/javascript.py:163 -#: sphinx/domains/python.py:560 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "" @@ -227,11 +221,11 @@ msgstr "參數" msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:559 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:565 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "屬性" @@ -300,46 +294,46 @@ msgstr "%s() (%s 方法)" msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s 屬性)" -#: sphinx/domains/python.py:433 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (模組)" -#: sphinx/domains/python.py:490 +#: sphinx/domains/python.py:491 #, fuzzy msgid "Python Module Index" msgstr "模組索引" -#: sphinx/domains/python.py:491 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "模組" -#: sphinx/domains/python.py:536 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "已移除" -#: sphinx/domains/python.py:561 sphinx/locale/__init__.py:179 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "例外" -#: sphinx/domains/python.py:562 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:563 +#: sphinx/domains/python.py:564 #, fuzzy msgid "class method" msgstr "%s() (%s 方法)" -#: sphinx/domains/python.py:564 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "靜態方法" -#: sphinx/domains/python.py:566 sphinx/locale/__init__.py:175 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "模組" -#: sphinx/domains/python.py:694 +#: sphinx/domains/python.py:695 #, fuzzy msgid " (deprecated)" msgstr "已移除" @@ -393,6 +387,15 @@ msgstr "環境變數" msgid "program option" msgstr "" +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 +#: sphinx/themes/basic/genindex-split.html:11 +#: sphinx/themes/basic/genindex-split.html:14 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 +msgid "Index" +msgstr "索引" + #: sphinx/domains/std.py:428 msgid "Module Index" msgstr "模組索引" @@ -401,12 +404,12 @@ msgstr "模組索引" msgid "Search Page" msgstr "搜尋頁面" -#: sphinx/ext/autodoc.py:998 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:1034 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -722,8 +725,8 @@ msgstr "C API 改變" msgid "Other changes" msgstr "其他改變：" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:505 -#: sphinx/writers/html.py:511 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "" @@ -748,45 +751,24 @@ msgstr "" msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:176 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "釋出" -#: sphinx/writers/latex.py:590 sphinx/writers/manpage.py:182 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:672 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "" -#: sphinx/writers/latex.py:677 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "" -#: sphinx/writers/text.py:430 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[圖片]" -#~ msgid "Platforms: " -#~ msgstr "平台" - -#~ msgid "Searching" -#~ msgstr "搜尋中" - -#~ msgid "Preparing search..." -#~ msgstr "準備搜尋..." - -#~ msgid ", in " -#~ msgstr "" - -#~ 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 "" - -#~ msgid "Search finished, found %s page(s) matching the search query." -#~ msgstr "" - diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py index bf51e740..ef626f6d 100644 --- a/sphinx/pycode/__init__.py +++ b/sphinx/pycode/__init__.py @@ -9,21 +9,19 @@ :license: BSD, see LICENSE for details. """ -import re -import sys from os import path -from cStringIO import StringIO +from sphinx import package_dir from sphinx.errors import PycodeError from sphinx.pycode import nodes from sphinx.pycode.pgen2 import driver, token, tokenize, parse, literals from sphinx.util import get_module_source, detect_encoding -from sphinx.util.pycompat import next +from sphinx.util.pycompat import next, StringIO, BytesIO, TextIOWrapper from sphinx.util.docstrings import prepare_docstring, prepare_commentdoc # load the Python grammar -_grammarfile = path.join(path.dirname(__file__), 'Grammar.txt') +_grammarfile = path.join(package_dir, 'pycode', 'Grammar.txt') pygrammar = driver.load_grammar(_grammarfile) pydriver = driver.Driver(pygrammar, convert=nodes.convert) @@ -172,14 +170,16 @@ class ModuleAnalyzer(object): @classmethod def for_string(cls, string, modname, srcname='<string>'): - return cls(StringIO(string), modname, srcname) + if isinstance(string, bytes): + return cls(BytesIO(string), modname, srcname) + return cls(StringIO(string), modname, srcname, decoded=True) @classmethod def for_file(cls, filename, modname): if ('file', filename) in cls.cache: return cls.cache['file', filename] try: - fileobj = open(filename, 'r') + fileobj = open(filename, 'rb') except Exception, err: raise PycodeError('error opening %r' % filename, err) obj = cls(fileobj, modname, filename) @@ -206,7 +206,7 @@ class ModuleAnalyzer(object): cls.cache['module', modname] = obj return obj - def __init__(self, source, modname, srcname): + def __init__(self, source, modname, srcname, decoded=False): # name of the module self.modname = modname # name of the source file @@ -216,9 +216,16 @@ class ModuleAnalyzer(object): # cache the source code as well pos = self.source.tell() - self.encoding = detect_encoding(self.source.readline) - self.code = self.source.read() - self.source.seek(pos) + if not decoded: + self.encoding = detect_encoding(self.source.readline) + self.source.seek(pos) + self.code = self.source.read().decode(self.encoding) + self.source.seek(pos) + self.source = TextIOWrapper(self.source, self.encoding) + else: + self.encoding = None + self.code = self.source.read() + self.source.seek(pos) # will be filled by tokenize() self.tokens = None diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index 876e7182..172382ad 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -253,7 +253,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('%(master_str)s', '%(project_manpage)s', u'%(project_doc)s', + ('%(master_str)s', '%(project_manpage)s', u'%(project_doc_str)s', [u'%(author_str)s'], 1) ] @@ -267,8 +267,9 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('%(master_str)s', '%(project_fn)s', u'%(project_doc)s', u'%(author_str)s', - '%(project_fn)s', 'One line description of project.', 'Miscellaneous'), + ('%(master_str)s', '%(project_fn)s', u'%(project_doc_str)s', + u'%(author_str)s', '%(project_fn)s', 'One line description of project.', + 'Miscellaneous'), ] # Documents to append as an appendix to all manuals. @@ -324,6 +325,12 @@ epub_copyright = u'%(copyright_str)s' # Allow duplicate toc entries. #epub_tocdup = True + +# Fix unsupported image types using the PIL. +#epub_fix_images = False + +# Scale large images. +#epub_max_image_width = 0 ''' INTERSPHINX_CONFIG = ''' @@ -339,12 +346,14 @@ MASTER_FILE = '''\ contain the root `toctree` directive. Welcome to %(project)s's documentation! -===========%(underline)s================= +===========%(project_underline)s================= Contents: .. toctree:: - :maxdepth: 2 + :maxdepth: %(mastertocmaxdepth)s + +%(mastertoctree)s Indices and tables ================== @@ -467,7 +476,7 @@ latex: latexpdf: \t$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex \t@echo "Running LaTeX files through pdflatex..." -\tmake -C $(BUILDDIR)/latex all-pdf +\t$(MAKE) -C $(BUILDDIR)/latex all-pdf \t@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." text: @@ -793,18 +802,25 @@ if sys.version_info >= (3, 0): del _unicode_string_re, _convert_python_source -def inner_main(args): - d = {} - texescape.init() +def ask_user(d): + """Ask the user for quickstart values missing from *d*. - if not color_terminal(): - nocolor() + Values are: - if len(args) > 3: - print 'Usage: sphinx-quickstart [root]' - sys.exit(1) - elif len(args) == 2: - d['path'] = args[1] + * path: root path + * sep: separate source and build dirs (bool) + * dot: replacement for dot in _templates etc. + * project: project name + * author: author names + * version: version of project + * release: release of project + * suffix: source file suffix + * master: master document name + * epub: use epub (bool) + * ext_*: extensions to use (bools) + * makefile: make Makefile + * batchfile: make command file + """ print bold('Welcome to the Sphinx %s quickstart utility.') % __version__ print ''' @@ -831,42 +847,53 @@ Enter the root path for documentation.''' if not d['path']: sys.exit(1) - print ''' + if 'sep' not in d: + print ''' You have two options for placing the build directory for Sphinx output. Either, you use a directory "_build" within the root path, or you separate "source" and "build" directories within the root path.''' - do_prompt(d, 'sep', 'Separate source and build directories (y/N)', 'n', - boolean) + do_prompt(d, 'sep', 'Separate source and build directories (y/N)', 'n', + boolean) - print ''' + if 'dot' not in d: + print ''' Inside the root directory, two more directories will be created; "_templates" for custom HTML templates and "_static" for custom stylesheets and other static files. You can enter another prefix (such as ".") to replace the underscore.''' - do_prompt(d, 'dot', 'Name prefix for templates and static dir', '_', ok) + do_prompt(d, 'dot', 'Name prefix for templates and static dir', '_', ok) - print ''' + if 'project' not in d: + print ''' The project name will occur in several places in the built documentation.''' - do_prompt(d, 'project', 'Project name') - do_prompt(d, 'author', 'Author name(s)') - print ''' + do_prompt(d, 'project', 'Project name') + if 'author' not in d: + do_prompt(d, 'author', 'Author name(s)') + + if 'version' not in d: + print ''' Sphinx has the notion of a "version" and a "release" for the software. Each version can have multiple releases. For example, for Python the version is something like 2.5 or 3.0, while the release is something like 2.5.1 or 3.0a1. If you don't need this dual structure, just set both to the same value.''' - do_prompt(d, 'version', 'Project version') - do_prompt(d, 'release', 'Project release', d['version']) - print ''' + do_prompt(d, 'version', 'Project version') + if 'release' not in d: + do_prompt(d, 'release', 'Project release', d['version']) + + if 'suffix' not in d: + print ''' The file name suffix for source files. Commonly, this is either ".txt" or ".rst". Only files with this suffix are considered documents.''' - do_prompt(d, 'suffix', 'Source file suffix', '.rst', suffix) - print ''' + do_prompt(d, 'suffix', 'Source file suffix', '.rst', suffix) + + if 'master' not in d: + print ''' One document is special in that it is considered the top node of the "contents tree", that is, it is the root of the hierarchical structure of the documents. Normally, this is "index", but if your "index" document is a custom template, you can also set this to another filename.''' - do_prompt(d, 'master', 'Name of your master document (without suffix)', - 'index') + do_prompt(d, 'master', 'Name of your master document (without suffix)', + 'index') while path.isfile(path.join(d['path'], d['master']+d['suffix'])) or \ path.isfile(path.join(d['path'], 'source', d['master']+d['suffix'])): @@ -878,51 +905,76 @@ document is a custom template, you can also set this to another filename.''' do_prompt(d, 'master', 'Please enter a new file name, or rename the ' 'existing file and press Enter', d['master']) - print ''' + if 'epub' not in d: + print ''' Sphinx can also add configuration for epub output:''' - do_prompt(d, 'epub', 'Do you want to use the epub builder (y/N)', - 'n', boolean) + do_prompt(d, 'epub', 'Do you want to use the epub builder (y/N)', + 'n', boolean) - print ''' + if 'ext_autodoc' not in d: + print ''' Please indicate if you want to use one of the following Sphinx extensions:''' - do_prompt(d, 'ext_autodoc', 'autodoc: automatically insert docstrings ' - 'from modules (y/N)', 'n', boolean) - do_prompt(d, 'ext_doctest', 'doctest: automatically test code snippets ' - 'in doctest blocks (y/N)', 'n', boolean) - do_prompt(d, 'ext_intersphinx', 'intersphinx: link between Sphinx ' - 'documentation of different projects (y/N)', 'n', boolean) - do_prompt(d, 'ext_todo', 'todo: write "todo" entries ' - 'that can be shown or hidden on build (y/N)', 'n', boolean) - do_prompt(d, 'ext_coverage', 'coverage: checks for documentation ' - 'coverage (y/N)', 'n', boolean) - do_prompt(d, 'ext_pngmath', 'pngmath: include math, rendered ' - 'as PNG images (y/N)', 'n', boolean) - do_prompt(d, 'ext_jsmath', 'jsmath: include math, rendered in the ' - 'browser by JSMath (y/N)', 'n', boolean) - if d['ext_pngmath'] and d['ext_jsmath']: - print '''Note: pngmath and jsmath cannot be enabled at the same time. + do_prompt(d, 'ext_autodoc', 'autodoc: automatically insert docstrings ' + 'from modules (y/N)', 'n', boolean) + if 'ext_doctest' not in d: + do_prompt(d, 'ext_doctest', 'doctest: automatically test code snippets ' + 'in doctest blocks (y/N)', 'n', boolean) + if 'ext_intersphinx' not in d: + do_prompt(d, 'ext_intersphinx', 'intersphinx: link between Sphinx ' + 'documentation of different projects (y/N)', 'n', boolean) + if 'ext_todo' not in d: + do_prompt(d, 'ext_todo', 'todo: write "todo" entries ' + 'that can be shown or hidden on build (y/N)', 'n', boolean) + if 'ext_coverage' not in d: + do_prompt(d, 'ext_coverage', 'coverage: checks for documentation ' + 'coverage (y/N)', 'n', boolean) + if 'ext_pngmath' not in d: + do_prompt(d, 'ext_pngmath', 'pngmath: include math, rendered ' + 'as PNG images (y/N)', 'n', boolean) + if 'ext_mathjax' not in d: + do_prompt(d, 'ext_mathjax', 'mathjax: include math, rendered in the ' + 'browser by MathJax (y/N)', 'n', boolean) + if d['ext_pngmath'] and d['ext_mathjax']: + print '''Note: pngmath and mathjax cannot be enabled at the same time. pngmath has been deselected.''' - do_prompt(d, 'ext_ifconfig', 'ifconfig: conditional inclusion of ' - 'content based on config values (y/N)', 'n', boolean) - do_prompt(d, 'ext_viewcode', 'viewcode: include links to the source code ' - 'of documented Python objects (y/N)', 'n', boolean) - print ''' + if 'ext_ifconfig' not in d: + do_prompt(d, 'ext_ifconfig', 'ifconfig: conditional inclusion of ' + 'content based on config values (y/N)', 'n', boolean) + if 'ext_viewcode' not in d: + do_prompt(d, 'ext_viewcode', 'viewcode: include links to the source ' + 'code of documented Python objects (y/N)', 'n', boolean) + + if 'makefile' not in d: + print ''' A Makefile and a Windows command file can be generated for you so that you only have to run e.g. `make html' instead of invoking sphinx-build directly.''' - do_prompt(d, 'makefile', 'Create Makefile? (Y/n)', 'y', boolean) - do_prompt(d, 'batchfile', 'Create Windows command file? (Y/n)', - 'y', boolean) + do_prompt(d, 'makefile', 'Create Makefile? (Y/n)', 'y', boolean) + if 'batchfile' not in d: + do_prompt(d, 'batchfile', 'Create Windows command file? (Y/n)', + 'y', boolean) + print + + +def generate(d, overwrite=True, silent=False): + """Generate project based on values in *d*.""" + + texescape.init() + + if 'mastertoctree' not in d: + d['mastertoctree'] = '' + if 'mastertocmaxdepth' not in d: + d['mastertocmaxdepth'] = 2 d['project_fn'] = make_filename(d['project']) d['project_manpage'] = d['project_fn'].lower() d['now'] = time.asctime() - d['underline'] = len(d['project']) * '=' + d['project_underline'] = len(d['project']) * '=' d['extensions'] = ', '.join( repr('sphinx.ext.' + name) for name in ('autodoc', 'doctest', 'intersphinx', 'todo', 'coverage', - 'pngmath', 'jsmath', 'ifconfig', 'viewcode') - if d['ext_' + name]) + 'pngmath', 'mathjax', 'ifconfig', 'viewcode') + if d.get('ext_' + name)) d['copyright'] = time.strftime('%Y') + ', ' + d['author'] d['author_texescaped'] = unicode(d['author']).\ translate(texescape.tex_escape_map) @@ -932,8 +984,9 @@ directly.''' # escape backslashes and single quotes in strings that are put into # a Python string literal - for key in ('project', 'copyright', 'author', 'author_texescaped', - 'project_doc_texescaped', 'version', 'release', 'master'): + for key in ('project', 'project_doc', 'project_doc_texescaped', + 'author', 'author_texescaped', 'copyright', + 'version', 'release', 'master'): d[key + '_str'] = d[key].replace('\\', '\\\\').replace("'", "\\'") if not path.isdir(d['path']): @@ -952,36 +1005,41 @@ directly.''' mkdir_p(path.join(srcdir, d['dot'] + 'templates')) mkdir_p(path.join(srcdir, d['dot'] + 'static')) + def write_file(fpath, mode, content): + if overwrite or not path.isfile(fpath): + print 'Creating file %s.' % fpath + f = open(fpath, mode, encoding='utf-8') + try: + f.write(content) + finally: + f.close() + else: + print 'File %s already exists, skipping.' % fpath + conf_text = QUICKSTART_CONF % d if d['epub']: conf_text += EPUB_CONFIG % d - if d['ext_intersphinx']: + if d.get('ext_intersphinx'): conf_text += INTERSPHINX_CONFIG - f = open(path.join(srcdir, 'conf.py'), 'w', encoding='utf-8') - f.write(conf_text) - f.close() + write_file(path.join(srcdir, 'conf.py'), 'w', conf_text) masterfile = path.join(srcdir, d['master'] + d['suffix']) - f = open(masterfile, 'w', encoding='utf-8') - f.write(MASTER_FILE % d) - f.close() + write_file(masterfile, 'w', MASTER_FILE % d) if d['makefile']: d['rsrcdir'] = d['sep'] and 'source' or '.' d['rbuilddir'] = d['sep'] and 'build' or d['dot'] + 'build' # use binary mode, to avoid writing \r\n on Windows - f = open(path.join(d['path'], 'Makefile'), 'wb', encoding='utf-8') - f.write(MAKEFILE % d) - f.close() + write_file(path.join(d['path'], 'Makefile'), 'wb', MAKEFILE % d) if d['batchfile']: d['rsrcdir'] = d['sep'] and 'source' or '.' d['rbuilddir'] = d['sep'] and 'build' or d['dot'] + 'build' - f = open(path.join(d['path'], 'make.bat'), 'w', encoding='utf-8') - f.write(BATCHFILE % d) - f.close() + write_file(path.join(d['path'], 'make.bat'), 'w', BATCHFILE % d) + if silent: + return print print bold('Finished: An initial directory structure has been created.') print ''' @@ -998,9 +1056,19 @@ where "builder" is one of the supported builders, e.g. html, latex or linkcheck. def main(argv=sys.argv): + if not color_terminal(): + nocolor() + + d = {} + if len(argv) > 3: + print 'Usage: sphinx-quickstart [root]' + sys.exit(1) + elif len(argv) == 2: + d['path'] = argv[1] try: - return inner_main(argv) + ask_user(d) except (KeyboardInterrupt, EOFError): print print '[Interrupted.]' return + generate(d) diff --git a/sphinx/roles.py b/sphinx/roles.py index 30743914..312eec3f 100644 --- a/sphinx/roles.py +++ b/sphinx/roles.py @@ -18,7 +18,8 @@ from docutils.parsers.rst import roles from sphinx import addnodes from sphinx.locale import _ from sphinx.util import ws_re -from sphinx.util.nodes import split_explicit_title, process_index_entry +from sphinx.util.nodes import split_explicit_title, process_index_entry, \ + set_role_source_info generic_docroles = { @@ -126,7 +127,7 @@ class XRefRole(object): refnode = self.nodeclass(rawtext, reftype=role, refdomain=domain, refexplicit=has_explicit_title) # we may need the line number for warnings - refnode.line = lineno + set_role_source_info(inliner, lineno, refnode) title, target = self.process_link( env, refnode, has_explicit_title, title, target) # now that the target and title are finally determined, set them @@ -257,7 +258,7 @@ def emph_literal_role(typ, rawtext, text, lineno, inliner, return [retnode], [] -_abbr_re = re.compile('\((.*)\)$') +_abbr_re = re.compile('\((.*)\)$', re.S) def abbr_role(typ, rawtext, text, lineno, inliner, options={}, content=[]): text = utils.unescape(text) diff --git a/sphinx/search/__init__.py b/sphinx/search/__init__.py index 645ebfc8..6e9610a4 100644 --- a/sphinx/search/__init__.py +++ b/sphinx/search/__init__.py @@ -164,7 +164,7 @@ class IndexBuilder(object): self._mapping = {} # objtype -> index self._objtypes = {} - # objtype index -> objname (localized) + # objtype index -> (domain, type, objname (localized)) self._objnames = {} # add language-specific SearchLanguage instance self.lang = languages[lang](options) @@ -205,21 +205,27 @@ class IndexBuilder(object): continue if prio < 0: continue - # XXX splitting at dot is kind of Python specific prefix, name = rpartition(fullname, '.') pdict = rv.setdefault(prefix, {}) try: - i = otypes[domainname, type] + typeindex = otypes[domainname, type] except KeyError: - i = len(otypes) - otypes[domainname, type] = i + typeindex = len(otypes) + otypes[domainname, type] = typeindex otype = domain.object_types.get(type) if otype: # use unicode() to fire translation proxies - onames[i] = unicode(domain.get_type_name(otype)) + onames[typeindex] = (domainname, type, + unicode(domain.get_type_name(otype))) else: - onames[i] = type - pdict[name] = (fn2index[docname], i, prio) + onames[typeindex] = (domainname, type, type) + if anchor == fullname: + shortanchor = '' + elif anchor == type + '-' + fullname: + shortanchor = '-' + else: + shortanchor = anchor + pdict[name] = (fn2index[docname], typeindex, prio, shortanchor) return rv def get_terms(self, fn2index): diff --git a/sphinx/texinputs/Makefile b/sphinx/texinputs/Makefile index f219a2fe..76e7c3e2 100644 --- a/sphinx/texinputs/Makefile +++ b/sphinx/texinputs/Makefile @@ -14,15 +14,16 @@ all-pdf: $(ALLPDF) all-dvi: $(ALLDVI) all-ps: all-dvi for f in *.dvi; do dvips $$f; done -all-pdf-ja: $(wildcard *.tex) - ebb $(wildcard *.pdf *.png *.gif *.jpeg) - platex -kanji=utf8 $(LATEXOPTS) '$<' - platex -kanji=utf8 $(LATEXOPTS) '$<' - platex -kanji=utf8 $(LATEXOPTS) '$<' - -mendex -U -f -d '$(basename $<).dic' -s python.ist '$(basename $<).idx' - platex -kanji=utf8 $(LATEXOPTS) '$<' - platex -kanji=utf8 $(LATEXOPTS) '$<' - dvipdfmx '$(basename $<).dvi' + +all-pdf-ja: + for f in *.pdf *.png *.gif *.jpg *.jpeg; do ebb $$f; done + for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done + for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done + for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done + for f in *.idx; do mendex -U -f -d "`basename $$f .idx`.dic" -s python.ist $$f; done + for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done + for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done + for f in *.dvi; do dvipdfmx $$f; done zip: all-$(FMT) mkdir $(ARCHIVEPREFIX)docs-$(FMT) @@ -61,4 +62,5 @@ clean: rm -f *.dvi *.log *.ind *.aux *.toc *.syn *.idx *.out *.ilg *.pla .PHONY: all all-pdf all-dvi all-ps clean +.PHONY: all-pdf-ja diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index 21a3d894..08adec9e 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -128,7 +128,6 @@ \newcommand{\strong}[1]{{\bf #1}} \newcommand{\code}[1]{\texttt{#1}} \newcommand{\bfcode}[1]{\code{\bfseries#1}} -\newcommand{\samp}[1]{`\code{#1}'} \newcommand{\email}[1]{\textsf{#1}} % Redefine the Verbatim environment to allow border and background colors. @@ -403,10 +402,15 @@ } -% Fix the index and bibliography environments to add an entry to the Table of +% Fix the index environment to add an entry to the Table of % Contents; this is much nicer than just having to jump to the end of the book % and flip around, especially with multiple indexes. % +% A similiar fix must be done to the bibliography environment, although +% dependant on document class. In particular, the '\addcontentsline' command +% should use 'chapter' for a report and 'section' for an article. +% See sphinxmanual.cls and sphinxhowto.cls for specific fixes. +% \let\py@OldTheindex=\theindex \renewcommand{\theindex}{ \cleardoublepage @@ -415,14 +419,6 @@ \addcontentsline{toc}{chapter}{\indexname} } -\let\py@OldThebibliography=\thebibliography -\renewcommand{\thebibliography}[1]{ - \cleardoublepage - \phantomsection - \py@OldThebibliography{1} - \addcontentsline{toc}{chapter}{\bibname} -} - % Include hyperref last. \RequirePackage[colorlinks,breaklinks, linkcolor=InnerLinkColor,filecolor=OuterLinkColor, @@ -462,3 +458,21 @@ } {\endlist} }{} + + +% From footmisc.sty: allows footnotes in titles +\let\FN@sf@@footnote\footnote +\def\footnote{\ifx\protect\@typeset@protect + \expandafter\FN@sf@@footnote + \else + \expandafter\FN@sf@gobble@opt + \fi +} +\edef\FN@sf@gobble@opt{\noexpand\protect + \expandafter\noexpand\csname FN@sf@gobble@opt \endcsname} +\expandafter\def\csname FN@sf@gobble@opt \endcsname{% + \@ifnextchar[%] + \FN@sf@gobble@twobracket + \@gobble +} +\def\FN@sf@gobble@twobracket[#1]#2{} diff --git a/sphinx/texinputs/sphinxhowto.cls b/sphinx/texinputs/sphinxhowto.cls index 1ebdd434..f4e3d2f4 100644 --- a/sphinx/texinputs/sphinxhowto.cls +++ b/sphinx/texinputs/sphinxhowto.cls @@ -79,3 +79,14 @@ \pagenumbering{arabic} % ToC & chapters \thispagestyle{empty} + +% Fix the bibliography environment to add an entry to the Table of +% Contents. +% For an article document class this environment is a section, +% so no page break before it. +\let\py@OldThebibliography=\thebibliography +\renewcommand{\thebibliography}[1]{ + \phantomsection + \py@OldThebibliography{1} + \addcontentsline{toc}{section}{\bibname} +} diff --git a/sphinx/texinputs/sphinxmanual.cls b/sphinx/texinputs/sphinxmanual.cls index 57517798..57fad1a9 100644 --- a/sphinx/texinputs/sphinxmanual.cls +++ b/sphinx/texinputs/sphinxmanual.cls @@ -120,3 +120,14 @@ % \renewcommand*\l@section{\@dottedtocline{1}{1.5em}{2.6em}} \renewcommand*\l@subsection{\@dottedtocline{2}{4.1em}{3.5em}} + +% Fix the bibliography environment to add an entry to the Table of +% Contents. +% For a report document class this environment is a chapter. +\let\py@OldThebibliography=\thebibliography +\renewcommand{\thebibliography}[1]{ + \cleardoublepage + \phantomsection + \py@OldThebibliography{1} + \addcontentsline{toc}{chapter}{\bibname} +} diff --git a/sphinx/themes/agogo/layout.html b/sphinx/themes/agogo/layout.html index 6668a7f6..d063194a 100644 --- a/sphinx/themes/agogo/layout.html +++ b/sphinx/themes/agogo/layout.html @@ -19,7 +19,8 @@ </a></p> {%- endif %} {%- block headertitle %} - <h1><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a></h1> + <div class="headertitle"><a + href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a></div> {%- endblock %} <div class="rel"> {%- for rellink in rellinks|reverse %} @@ -48,7 +49,7 @@ {%- block sidebarsearch %} <h3 style="margin-top: 1.5em;">{{ _('Search') }}</h3> <form class="search" action="{{ pathto('search') }}" method="get"> - <input type="text" name="q" size="18" /> + <input type="text" name="q" /> <input type="submit" value="{{ _('Go') }}" /> <input type="hidden" name="check_keywords" value="yes" /> <input type="hidden" name="area" value="default" /> diff --git a/sphinx/themes/agogo/static/agogo.css_t b/sphinx/themes/agogo/static/agogo.css_t index 904fd7be..b069bd22 100644 --- a/sphinx/themes/agogo/static/agogo.css_t +++ b/sphinx/themes/agogo/static/agogo.css_t @@ -128,14 +128,15 @@ div.header { padding-bottom: 10px; } -div.header h1 { +div.header .headertitle { font-family: {{ theme_headerfont }}; font-weight: normal; font-size: 180%; letter-spacing: .08em; + margin-bottom: .8em; } -div.header h1 a { +div.header .headertitle a { color: white; } @@ -175,6 +176,10 @@ div.body { text-align: {{ theme_textalign }}; } +div.document h1 { + line-height: 120%; +} + div.document ul { margin: 1.5em; list-style-type: square; @@ -300,6 +305,14 @@ div.sidebar li.toctree-l1.current li.toctree-l2 a { border-right: none; } +div.sidebar input[type="text"] { + width: 170px; +} + +div.sidebar input[type="submit"] { + width: 30px; +} + /* Footer */ @@ -349,7 +362,6 @@ img.align-center, .figure.align-center, object.align-center { } .align-center { - clear: both; text-align: center; } diff --git a/sphinx/themes/basic/searchbox.html b/sphinx/themes/basic/searchbox.html index 88edac5a..13b453c4 100644 --- a/sphinx/themes/basic/searchbox.html +++ b/sphinx/themes/basic/searchbox.html @@ -11,7 +11,7 @@ <div id="searchbox" style="display: none"> <h3>{{ _('Quick search') }}</h3> <form class="search" action="{{ pathto('search') }}" method="get"> - <input type="text" name="q" size="18" /> + <input type="text" name="q" /> <input type="submit" value="{{ _('Go') }}" /> <input type="hidden" name="check_keywords" value="yes" /> <input type="hidden" name="area" value="default" /> diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t index 1be37284..2937fa49 100644 --- a/sphinx/themes/basic/static/basic.css_t +++ b/sphinx/themes/basic/static/basic.css_t @@ -79,6 +79,14 @@ div.sphinxsidebar input { font-size: 1em; } +div.sphinxsidebar #searchbox input[type="text"] { + width: 170px; +} + +div.sphinxsidebar #searchbox input[type="submit"] { + width: 30px; +} + img { border: 0; } @@ -236,7 +244,6 @@ img.align-center, .figure.align-center, object.align-center { } .align-center { - clear: both; text-align: center; } @@ -440,6 +447,11 @@ dl.glossary dt { font-style: oblique; } +abbr, acronym { + border-bottom: dotted 1px; + cursor: help; +} + /* -- code displays --------------------------------------------------------- */ pre { diff --git a/sphinx/themes/basic/static/doctools.js b/sphinx/themes/basic/static/doctools.js index 8b9bd2c0..d4619fdf 100644 --- a/sphinx/themes/basic/static/doctools.js +++ b/sphinx/themes/basic/static/doctools.js @@ -2,7 +2,7 @@ * doctools.js * ~~~~~~~~~~~ * - * Sphinx JavaScript utilties for all documentation. + * Sphinx JavaScript utilities for all documentation. * * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. @@ -185,9 +185,9 @@ var Documentation = { body.highlightText(this.toLowerCase(), 'highlighted'); }); }, 10); - $('<li class="highlight-link"><a href="javascript:Documentation.' + - 'hideSearchWords()">' + _('Hide Search Matches') + '</a></li>') - .appendTo($('.sidebar .this-page-menu')); + $('<p class="highlight-link"><a href="javascript:Documentation.' + + 'hideSearchWords()">' + _('Hide Search Matches') + '</a></p>') + .appendTo($('#searchbox')); } }, @@ -213,7 +213,7 @@ var Documentation = { * helper function to hide the search marks again */ hideSearchWords : function() { - $('.sidebar .this-page-menu li.highlight-link').fadeOut(300); + $('#searchbox .highlight-link').fadeOut(300); $('span.highlighted').removeClass('highlighted'); }, diff --git a/sphinx/themes/basic/static/searchtools.js_t b/sphinx/themes/basic/static/searchtools.js_t index c3f9adc9..45989c6a 100644 --- a/sphinx/themes/basic/static/searchtools.js_t +++ b/sphinx/themes/basic/static/searchtools.js_t @@ -175,7 +175,7 @@ var Search = { // lookup as object for (var i = 0; i < objectterms.length; i++) { var others = [].concat(objectterms.slice(0,i), - objectterms.slice(i+1, objectterms.length)) + objectterms.slice(i+1, objectterms.length)) var results = this.performObjectSearch(objectterms[i], others); // Assume first word is most likely to be the object, // other words more likely to be in description. @@ -322,12 +322,13 @@ var Search = { var fullname = (prefix ? prefix + '.' : '') + name; if (fullname.toLowerCase().indexOf(object) > -1) { var match = objects[prefix][name]; - var objname = objnames[match[1]]; + var objname = objnames[match[1]][2]; var title = titles[match[0]]; // If more than one term searched for, we require other words to be // found in the name/title/description if (otherterms.length > 0) { - var haystack = (prefix + ' ' + name + ' ' + objname + ' ' + title).toLowerCase(); + var haystack = (prefix + ' ' + name + ' ' + + objname + ' ' + title).toLowerCase(); var allfound = true; for (var i = 0; i < otherterms.length; i++) { if (haystack.indexOf(otherterms[i]) == -1) { @@ -340,9 +341,12 @@ var Search = { } } var descr = objname + _(', in ') + title; - // XXX the generated anchors are not generally correct - // XXX there may be custom prefixes - result = [filenames[match[0]], fullname, '#'+fullname, descr]; + anchor = match[3]; + if (anchor == '') + anchor = fullname; + else if (anchor == '-') + anchor = objnames[match[1]][1] + '-' + fullname; + result = [filenames[match[0]], fullname, '#'+anchor, descr]; switch (match[2]) { case 1: objectResults.push(result); break; case 0: importantResults.push(result); break; diff --git a/sphinx/themes/basic/static/websupport.js b/sphinx/themes/basic/static/websupport.js index cbb60923..e9bd1b85 100644 --- a/sphinx/themes/basic/static/websupport.js +++ b/sphinx/themes/basic/static/websupport.js @@ -566,7 +566,7 @@ var context = $.extend({}, opts, comment); var div = $(renderTemplate(commentTemplate, context)); - // If the user has voted on this comment, highblight the correct arrow. + // If the user has voted on this comment, highlight the correct arrow. if (comment.vote) { var direction = (comment.vote == 1) ? 'u' : 'd'; div.find('#' + direction + 'v' + comment.id).hide(); diff --git a/sphinx/themes/epub/layout.html b/sphinx/themes/epub/layout.html index 24395a66..1f5ad077 100644 --- a/sphinx/themes/epub/layout.html +++ b/sphinx/themes/epub/layout.html @@ -14,3 +14,12 @@ {% block sidebar2 %}{% endblock %} {% block relbar2 %}{% endblock %} {% block linktags %}{% endblock %} + +{# redefine relbar1 and footer to only call super if options are true #} +{%- block relbar1 %} +{% if theme_relbar1|tobool %}{{ super() }}{% endif %} +{%- endblock %} +{%- block footer %} +{% if theme_footer|tobool %}{{ super() }}{% endif %} +{%- endblock %} + diff --git a/sphinx/themes/epub/theme.conf b/sphinx/themes/epub/theme.conf index d5806ec5..11f098ec 100644 --- a/sphinx/themes/epub/theme.conf +++ b/sphinx/themes/epub/theme.conf @@ -2,3 +2,7 @@ inherit = basic stylesheet = epub.css pygments_style = none + +[options] +relbar1 = true +footer = true diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py index b1a3a0d7..0d67da82 100644 --- a/sphinx/util/__init__.py +++ b/sphinx/util/__init__.py @@ -112,11 +112,11 @@ class FilenameUniqDict(dict): return uniquename def purge_doc(self, docname): - for filename, (docs, _) in self.items(): + for filename, (docs, unique) in self.items(): docs.discard(docname) if not docs: del self[filename] - self._existing.discard(filename) + self._existing.discard(unique) def __getstate__(self): return self._existing @@ -209,6 +209,8 @@ def get_module_source(modname): lfilename = filename.lower() if lfilename.endswith('.pyo') or lfilename.endswith('.pyc'): filename = filename[:-1] + if not path.isfile(filename) and path.isfile(filename + 'w'): + filename += 'w' elif not (lfilename.endswith('.py') or lfilename.endswith('.pyw')): raise PycodeError('source is not a .py file: %r' % filename) if not path.isfile(filename): diff --git a/sphinx/util/compat.py b/sphinx/util/compat.py index 1a263cff..bdb00845 100644 --- a/sphinx/util/compat.py +++ b/sphinx/util/compat.py @@ -11,7 +11,6 @@ from docutils import nodes -# function missing in docutils 0.5 def make_admonition(node_class, name, arguments, options, content, lineno, content_offset, block_text, state, state_machine): #if not content: diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py index ff6c222d..f5c8911d 100644 --- a/sphinx/util/inspect.py +++ b/sphinx/util/inspect.py @@ -15,6 +15,8 @@ import sys # relatively import this module inspect = __import__('inspect') +from sphinx.util import force_decode + if sys.version_info >= (2, 5): from functools import partial @@ -87,4 +89,4 @@ def safe_repr(object): s = repr(object) except Exception: raise ValueError - return s.replace('\n', ' ') + return force_decode(s, None).replace('\n', ' ') diff --git a/sphinx/util/nodes.py b/sphinx/util/nodes.py index 682ea77b..c2b7edf4 100644 --- a/sphinx/util/nodes.py +++ b/sphinx/util/nodes.py @@ -15,7 +15,18 @@ from docutils import nodes from sphinx import addnodes from sphinx.locale import pairindextypes -from sphinx.util.pycompat import class_types + + +class WarningStream(object): + + def __init__(self, warnfunc): + self.warnfunc = warnfunc + self._re = re.compile(r'\((DEBUG|INFO|WARNING|ERROR|SEVERE)/[0-4]\)') + + def write(self, text): + text = text.strip() + if text: + self.warnfunc(self._re.sub(r'\1:', text), None, '') # \x00 means the "<" was backslash-escaped @@ -162,39 +173,14 @@ def make_refnode(builder, fromdocname, todocname, targetid, child, title=None): node.append(child) return node -# monkey-patch Node.traverse to get more speed -# traverse() is called so many times during a build that it saves -# on average 20-25% overall build time! - -def _all_traverse(self, result): - """Version of Node.traverse() that doesn't need a condition.""" - result.append(self) - for child in self.children: - child._all_traverse(result) - return result - -def _fast_traverse(self, cls, result): - """Version of Node.traverse() that only supports instance checks.""" - if isinstance(self, cls): - result.append(self) - for child in self.children: - child._fast_traverse(cls, result) - return result - -def _new_traverse(self, condition=None, - include_self=1, descend=1, siblings=0, ascend=0): - if include_self and descend and not siblings and not ascend: - if condition is None: - return self._all_traverse([]) - elif isinstance(condition, class_types): - return self._fast_traverse(condition, []) - return self._old_traverse(condition, include_self, - descend, siblings, ascend) - -nodes.Node._old_traverse = nodes.Node.traverse -nodes.Node._all_traverse = _all_traverse -nodes.Node._fast_traverse = _fast_traverse -nodes.Node.traverse = _new_traverse + +def set_source_info(directive, node): + node.source, node.line = \ + directive.state_machine.get_source_and_line(directive.lineno) + +def set_role_source_info(inliner, lineno, node): + node.source, node.line = \ + inliner.reporter.locator(lineno) # monkey-patch Node.__contains__ to get consistent "in" operator behavior # across docutils versions diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py index b7a12cda..5becc37d 100644 --- a/sphinx/util/osutil.py +++ b/sphinx/util/osutil.py @@ -133,3 +133,18 @@ if sys.version_info < (3, 0): .decode('utf-8') else: ustrftime = time.strftime + + +def safe_relpath(path, start=None): + try: + return os.path.relpath(path, start) + except ValueError: + return path + +def find_catalog(docname, compaction): + if compaction: + ret = docname.split(SEP, 1)[0] + else: + ret = docname + + return ret diff --git a/sphinx/util/pycompat.py b/sphinx/util/pycompat.py index a95c9332..cd9f6e2f 100644 --- a/sphinx/util/pycompat.py +++ b/sphinx/util/pycompat.py @@ -25,6 +25,11 @@ if sys.version_info >= (3, 0): bytes = bytes # prefix for Unicode strings u = '' + # StringIO/BytesIO classes + from io import StringIO, BytesIO, TextIOWrapper + # safely encode a string for printing to the terminal + def terminal_safe(s): + return s.encode('ascii', 'backslashreplace').decode('ascii') # support for running 2to3 over config files def convert_with_2to3(filepath): from lib2to3.refactor import RefactoringTool, get_fixers_from_package @@ -48,8 +53,15 @@ else: b = str bytes = str u = 'u' + from StringIO import StringIO + BytesIO = StringIO # no need to refactor on 2.x versions convert_with_2to3 = None + def TextIOWrapper(stream, encoding): + return codecs.lookup(encoding or 'ascii')[2](stream) + # safely encode a string for printing to the terminal + def terminal_safe(s): + return s.encode('ascii', 'backslashreplace') # ------------------------------------------------------------------------------ diff --git a/sphinx/util/texescape.py b/sphinx/util/texescape.py index f968f2e4..1f6f76e6 100644 --- a/sphinx/util/texescape.py +++ b/sphinx/util/texescape.py @@ -100,9 +100,7 @@ tex_replacements = [ tex_escape_map = {} tex_replace_map = {} -tex_hl_escape_map_old = {} # replacement map for Pygments <= 1.1 -tex_hl_escape_map_new = {} # replacement map for Pygments >= 1.2 -_old_cmd_chars = {ord(u'\\'): u'@', ord(u'{'): u'[', ord(u'}'): u']'} +tex_hl_escape_map_new = {} def init(): for a, b in tex_replacements: @@ -112,4 +110,3 @@ def init(): for a, b in tex_replacements: if a in u'[]{}\\': continue tex_hl_escape_map_new[ord(a)] = b - tex_hl_escape_map_old[ord(a)] = b.translate(_old_cmd_chars) diff --git a/sphinx/websupport/__init__.py b/sphinx/websupport/__init__.py index e054812e..61b63cab 100644 --- a/sphinx/websupport/__init__.py +++ b/sphinx/websupport/__init__.py @@ -87,7 +87,7 @@ class WebSupport(object): def _init_templating(self): import sphinx - template_path = path.join(path.dirname(sphinx.__file__), + template_path = path.join(sphinx.package_dir, 'themes', 'basic') loader = FileSystemLoader(template_path) self.template_env = Environment(loader=loader) diff --git a/sphinx/websupport/storage/sqlalchemy_db.py b/sphinx/websupport/storage/sqlalchemy_db.py index dc2ec6a7..67136d1a 100644 --- a/sphinx/websupport/storage/sqlalchemy_db.py +++ b/sphinx/websupport/storage/sqlalchemy_db.py @@ -77,7 +77,10 @@ class Node(Base): comments = [] list_stack = [comments] for r in results: - comment, vote = r if username else (r, 0) + if username: + comment, vote = r + else: + comment, vote = (r, 0) inheritance_chain = comment.path.split('.')[1:] @@ -176,7 +179,10 @@ class Comment(Base): path = self.path.split('.') node = path[0] - parent = path[-2] if len(path) > 2 else None + if len(path) > 2: + parent = path[-2] + else: + parent = None return {'text': self.text, 'username': self.username or 'Anonymous', @@ -201,8 +207,16 @@ class Comment(Base): minutes = seconds / 60 if days == 0: - dt = (minutes, 'minute') if hours == 0 else (hours, 'hour') + if hours == 0: + dt = (minutes, 'minute') + else: + dt = (hours, 'hour') else: dt = (days, 'day') - return '%s %s ago' % dt if dt[0] == 1 else '%s %ss ago' % dt + if dt[0] == 1: + ret = '%s %s ago' % dt + else: + ret = '%s %ss ago' % dt + + return ret diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py index 99d621c6..787b3105 100644 --- a/sphinx/writers/html.py +++ b/sphinx/writers/html.py @@ -238,10 +238,12 @@ class HTMLTranslator(BaseTranslator): lang = node['language'] if node.has_key('linenos'): linenos = node['linenos'] + highlight_args = node.get('highlight_args', {}) def warner(msg): self.builder.warn(msg, (self.builder.current_docname, node.line)) highlighted = self.highlighter.highlight_block( - node.rawsource, lang, linenos, warn=warner) + node.rawsource, lang, warn=warner, linenos=linenos, + **highlight_args) starttag = self.starttag(node, 'div', suffix='', CLASS='highlight-%s' % lang) self.body.append(starttag + highlighted + '</div>\n') @@ -336,22 +338,20 @@ class HTMLTranslator(BaseTranslator): if node['uri'].lower().endswith('svg') or \ node['uri'].lower().endswith('svgz'): - atts = {'data': node['uri'], 'type': 'image/svg+xml'} + atts = {'src': node['uri']} if node.has_key('width'): atts['width'] = node['width'] if node.has_key('height'): atts['height'] = node['height'] + if node.has_key('alt'): + atts['alt'] = node['alt'] if node.has_key('align'): self.body.append('<div align="%s" class="align-%s">' % (node['align'], node['align'])) self.context.append('</div>\n') else: self.context.append('') - embatts = atts.copy() - embatts['src'] = embatts.pop('data') - self.body.append(self.starttag(node, 'object', '', **atts)) - self.body.append(self.emptytag(node, 'embed', '', **embatts)) - self.body.append('</object>\n') + self.body.append(self.emptytag(node, 'img', '', **atts)) return if node.has_key('scale'): @@ -428,8 +428,6 @@ class HTMLTranslator(BaseTranslator): encoded = self.bulk_text_processor(encoded) self.body.append(encoded) - # these are all for docutils 0.5 compatibility - def visit_note(self, node): self.visit_admonition(node, 'note') def depart_note(self, node): diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index ccd7a8bf..c9a5381e 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -40,6 +40,7 @@ HEADER = r'''%% Generated by Sphinx. %(fncychap)s %(longtable)s \usepackage{sphinx} +\usepackage{multirow} %(preamble)s \title{%(title)s} @@ -195,19 +196,21 @@ class LaTeXTranslator(nodes.NodeVisitor): lang = babel.get_language() if lang: self.elements['classoptions'] += ',' + babel.get_language() - elif builder.config.language == 'ja': - self.elements['classoptions'] += ',english,dvipdfm' - # not elements of babel, but this should be above sphinx.sty. - # because pTeX (Japanese TeX) cannot handle this count. - self.elements['babel'] += r'\newcount\pdfoutput\pdfoutput=0' - # to make the pdf with correct encoded hyperref bookmarks - self.elements['preamble'] += \ - r'\AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}' else: self.builder.warn('no Babel option known for language %r' % builder.config.language) self.elements['shorthandoff'] = babel.get_shorthandoff() self.elements['fncychap'] = '\\usepackage[Sonny]{fncychap}' + + # pTeX (Japanese TeX) for support + if builder.config.language == 'ja': + self.elements['classoptions'] = ',dvipdfm' + # found elements of babel, but this should be above sphinx.sty. + # because pTeX (Japanese TeX) cannot handle this count. + self.elements['babel'] = r'\newcount\pdfoutput\pdfoutput=0' + # to make the pdf with correct encoded hyperref bookmarks + self.elements['preamble'] += \ + r'\AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}' else: self.elements['classoptions'] += ',english' # allow the user to override them all @@ -251,6 +254,9 @@ class LaTeXTranslator(nodes.NodeVisitor): self.no_contractions = 0 self.compact_list = 0 self.first_param = 0 + self.previous_spanning_row = 0 + self.previous_spanning_column = 0 + self.remember_multirow = {} def astext(self): return (HEADER % self.elements + @@ -273,7 +279,9 @@ class LaTeXTranslator(nodes.NodeVisitor): return '\\autopageref*{%s}' % self.idescape(id) def idescape(self, id): - return str(unicode(id).translate(tex_replace_map)) + return unicode(id).translate(tex_replace_map).\ + encode('ascii', 'backslashreplace').decode('ascii').\ + replace('\\', '_') def generate_indices(self): def generate(content, collapsed): @@ -515,7 +523,7 @@ class LaTeXTranslator(nodes.NodeVisitor): else: self.body.append(r'\pysigline{') def depart_desc_signature(self, node): - self.body.append('}{}') + self.body.append('}') def visit_desc_addname(self, node): self.body.append(r'\code{') @@ -530,9 +538,9 @@ class LaTeXTranslator(nodes.NodeVisitor): pass def visit_desc_returns(self, node): - self.body.append(r'}{ $\rightarrow$ ') + self.body.append(r'{ $\rightarrow$ ') def depart_desc_returns(self, node): - pass + self.body.append(r'}') def visit_desc_name(self, node): self.body.append(r'\bfcode{') @@ -542,10 +550,12 @@ class LaTeXTranslator(nodes.NodeVisitor): self.literal_whitespace -= 1 def visit_desc_parameterlist(self, node): + # close name, open parameterlist self.body.append('}{') self.first_param = 1 def depart_desc_parameterlist(self, node): - pass + # close parameterlist, open return annotation + self.body.append('}{') def visit_desc_parameter(self, node): if not self.first_param: @@ -622,6 +632,7 @@ class LaTeXTranslator(nodes.NodeVisitor): self.table = Table() self.table.longtable = 'longtable' in node['classes'] self.tablebody = [] + self.tableheaders = [] # Redirect body output until table is finished. self._body = self.body self.body = self.tablebody @@ -630,7 +641,7 @@ class LaTeXTranslator(nodes.NodeVisitor): self.table.longtable = True self.body = self._body if not self.table.longtable and self.table.caption is not None: - self.body.append(u'\n\\begin{threeparttable}\n' + self.body.append(u'\n\n\\begin{threeparttable}\n' u'\\capstart\\caption{%s}\n' % self.table.caption) if self.table.longtable: self.body.append('\n\\begin{longtable}') @@ -666,11 +677,13 @@ class LaTeXTranslator(nodes.NodeVisitor): self.next_table_ids.clear() if self.table.longtable: self.body.append('\\hline\n') + self.body.extend(self.tableheaders) self.body.append('\\endfirsthead\n\n') self.body.append('\\multicolumn{%s}{c}%%\n' % self.table.colcount) self.body.append(r'{{\bfseries \tablename\ \thetable{} -- %s}} \\' % _('continued from previous page')) self.body.append('\n\\hline\n') + self.body.extend(self.tableheaders) self.body.append('\\endhead\n\n') self.body.append(ur'\hline \multicolumn{%s}{|r|}{{%s}} \\ \hline' % (self.table.colcount, @@ -680,6 +693,7 @@ class LaTeXTranslator(nodes.NodeVisitor): self.body.append('\\endlastfoot\n\n') else: self.body.append('\\hline\n') + self.body.extend(self.tableheaders) self.body.extend(self.tablebody) self.body.append(endmacro) if not self.table.longtable and self.table.caption is not None: @@ -698,39 +712,61 @@ class LaTeXTranslator(nodes.NodeVisitor): pass def visit_thead(self, node): + self.table.had_head = True if self.next_table_colspec: self.table.colspec = '{%s}\n' % self.next_table_colspec self.next_table_colspec = None - # self.body.append('\\hline\n') - # self.table.had_head = True + # Redirect head output until header is finished. see visit_tbody. + self.body = self.tableheaders def depart_thead(self, node): pass def visit_tbody(self, node): if not self.table.had_head: self.visit_thead(node) + self.body = self.tablebody def depart_tbody(self, node): pass def visit_row(self, node): self.table.col = 0 def depart_row(self, node): - self.body.append('\\\\\\hline\n') + if self.previous_spanning_row == 1: + self.previous_spanning_row = 0 + self.body.append('\\\\\n') + else: + self.body.append('\\\\\\hline\n') self.table.rowcount += 1 def visit_entry(self, node): - if 'morerows' in node or 'morecols' in node: - raise UnsupportedError('%s:%s: column or row spanning cells are ' - 'not yet implemented.' % - (self.curfilestack[-1], node.line or '')) + if self.remember_multirow.get(0, 0) > 1: + self.body.append(' & ') if self.table.col > 0: self.body.append(' & ') self.table.col += 1 + context = '' + if 'morerows' in node: + self.body.append(' \multirow{') + self.previous_spanning_row = 1 + self.body.append(str(node.get('morerows') + 1)) + self.body.append('}{*}{') + context += '}' + self.remember_multirow[self.table.col] = node.get('morerows') + 1 + if 'morecols' in node: + self.body.append(' \multicolumn{') + self.body.append(str(node.get('morecols') + 1)) + if self.table.col == 1: + self.body.append('}{|l|}{') + else: + self.body.append('}{l|}{') + context += '}' if isinstance(node.parent.parent, nodes.thead): self.body.append('\\textbf{') - self.context.append('}') - else: - self.context.append('') + context += '}' + if self.remember_multirow.get(self.table.col + 1, 0) > 1: + self.remember_multirow[self.table.col + 1] -= 1 + context += ' & ' + self.context.append(context) def depart_entry(self, node): self.body.append(self.context.pop()) # header @@ -1025,8 +1061,12 @@ class LaTeXTranslator(nodes.NodeVisitor): next = node.parent[parindex+1] except IndexError: # last node in parent, look at next after parent - # (for section of equal level) - next = node.parent.parent[node.parent.parent.index(node.parent)] + # (for section of equal level) if it exists + if node.parent.parent is not None: + next = node.parent.parent[ + node.parent.parent.index(node.parent)] + else: + raise if isinstance(next, nodes.section): if node.get('refid'): self.next_section_ids.add(node['refid']) @@ -1131,7 +1171,8 @@ class LaTeXTranslator(nodes.NodeVisitor): # references to labels in the same document id = self.curfilestack[-1] + ':' + uri[1:] self.body.append(self.hyperlink(id)) - if self.builder.config.latex_show_pagerefs: + if self.builder.config.latex_show_pagerefs and not \ + self.in_productionlist: self.context.append('}} (%s)' % self.hyperpageref(id)) else: self.context.append('}}') @@ -1223,15 +1264,13 @@ class LaTeXTranslator(nodes.NodeVisitor): def visit_literal(self, node): self.no_contractions += 1 - content = self.encode(node.astext().strip()) - self.no_contractions -= 1 if self.in_title: - self.body.append(r'\texttt{%s}' % content) - elif node.get('role') == 'samp': - self.body.append(r'\samp{%s}' % content) + self.body.append(r'\texttt{') else: - self.body.append(r'\code{%s}' % content) - raise nodes.SkipNode + self.body.append(r'\code{') + def depart_literal(self, node): + self.no_contractions -= 1 + self.body.append('}') def visit_footnote_reference(self, node): num = node.astext().strip() @@ -1265,10 +1304,11 @@ class LaTeXTranslator(nodes.NodeVisitor): lang = node['language'] if 'linenos' in node: linenos = node['linenos'] + highlight_args = node.get('highlight_args', {}) def warner(msg): self.builder.warn(msg, (self.curfilestack[-1], node.line)) - hlcode = self.highlighter.highlight_block(code, lang, linenos, - warn=warner) + hlcode = self.highlighter.highlight_block(code, lang, warn=warner, + linenos=linenos, **highlight_args) # workaround for Unicode issue hlcode = hlcode.replace(u'€', u'@texteuro[]') # must use original Verbatim environment and "tabular" environment @@ -1448,7 +1488,9 @@ class LaTeXTranslator(nodes.NodeVisitor): self.verbatim += node.astext() else: text = self.encode(node.astext()) - self.body.append(educate_quotes_latex(text)) + if not self.no_contractions: + text = educate_quotes_latex(text) + self.body.append(text) def depart_Text(self, node): pass diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py index 620873bb..81f2988b 100644 --- a/sphinx/writers/manpage.py +++ b/sphinx/writers/manpage.py @@ -230,8 +230,8 @@ class ManualPageTranslator(BaseTranslator): # overwritten -- don't emit a warning for images def visit_image(self, node): if 'alt' in node.attributes: - self.body.append('[image: %s]\n' % node['alt']) - self.body.append('[image]\n') + self.body.append(_('[image: %s]') % node['alt'] + '\n') + self.body.append(_('[image]') + '\n') raise nodes.SkipNode # overwritten -- don't visit inner marked up nodes diff --git a/sphinx/writers/text.py b/sphinx/writers/text.py index 1a7d2a7d..e5ab070c 100644 --- a/sphinx/writers/text.py +++ b/sphinx/writers/text.py @@ -18,6 +18,24 @@ from sphinx import addnodes from sphinx.locale import admonitionlabels, versionlabels, _ +class TextWrapper(textwrap.TextWrapper): + """Custom subclass that uses a different word separator regex.""" + + wordsep_re = re.compile( + r'(\s+|' # any whitespace + r'(?<=\s)(?::[a-z-]+:)?`\S+|' # interpreted text start + r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|' # hyphenated words + r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))') # em-dash + + +MAXWIDTH = 70 +STDINDENT = 3 + +def my_wrap(text, width=MAXWIDTH, **kwargs): + w = TextWrapper(width=width, **kwargs) + return w.wrap(text) + + class TextWriter(writers.Writer): supported = ('text',) settings_spec = ('No options here.', '', ()) @@ -34,17 +52,6 @@ class TextWriter(writers.Writer): self.document.walkabout(visitor) self.output = visitor.body -# monkey-patch... -new_wordsep_re = re.compile( - r'(\s+|' # any whitespace - r'(?<=\s)(?::[a-z-]+:)?`\S+|' # interpreted text start - r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|' # hyphenated words - r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))') # em-dash -textwrap.TextWrapper.wordsep_re = new_wordsep_re - -MAXWIDTH = 70 -STDINDENT = 3 - class TextTranslator(nodes.NodeVisitor): sectionchars = '*=-~"+`' @@ -81,7 +88,7 @@ class TextTranslator(nodes.NodeVisitor): if not toformat: return if wrap: - res = textwrap.wrap(''.join(toformat), width=MAXWIDTH-maxindent) + res = my_wrap(''.join(toformat), width=MAXWIDTH-maxindent) else: res = ''.join(toformat).splitlines() if end: @@ -381,7 +388,7 @@ class TextTranslator(nodes.NodeVisitor): else: cells = [] for i, cell in enumerate(line): - par = textwrap.wrap(cell, width=colwidths[i]) + par = my_wrap(cell, width=colwidths[i]) if par: maxwidth = max(map(len, par)) else: @@ -427,6 +434,8 @@ class TextTranslator(nodes.NodeVisitor): raise nodes.SkipNode def visit_image(self, node): + if 'alt' in node.attributes: + self.add_text(_('[image: %s]') % node['alt']) self.add_text(_('[image]')) raise nodes.SkipNode diff --git a/tests/root/autosummary.txt b/tests/root/autosummary.txt index 82cec7fd..fc1a35a0 100644 --- a/tests/root/autosummary.txt +++ b/tests/root/autosummary.txt @@ -4,7 +4,7 @@ Autosummary test .. autosummary:: :toctree: generated - sphinx.application.TemplateBridge + sphinx.application.Sphinx .. currentmodule:: sphinx.application diff --git a/tests/root/markup.txt b/tests/root/markup.txt index 71197689..dde13a6b 100644 --- a/tests/root/markup.txt +++ b/tests/root/markup.txt @@ -169,6 +169,18 @@ Tables | 2 | Empty cells: | | +----+----------------+----+ +Table with multicol: + +.. only:: latex + + +----+---------------------+ + | 1 | test! | + +----+---------+------+----+ + | 2 | col | col | c | + | y +---------+------+----+ + | x | test | + +----+---------------------+ + Figures ------- diff --git a/tests/root/objects.txt b/tests/root/objects.txt index 51ecee91..533bdae3 100644 --- a/tests/root/objects.txt +++ b/tests/root/objects.txt @@ -169,6 +169,4 @@ CPP domain .. cpp:class:: n::Array<T,d> .. cpp:function:: T& operator[]( unsigned j ) - - .. cpp:function:: const T& operator[]( unsigned j ) const - + const T& operator[]( unsigned j ) const diff --git a/tests/test_build_html.py b/tests/test_build_html.py index f544403d..4e25167f 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -33,12 +33,12 @@ html_warnfile = StringIO() ENV_WARNINGS = """\ %(root)s/autodoc_fodder.py:docstring of autodoc_fodder\\.MarkupError:2: \ -\\(WARNING/2\\) Explicit markup ends without a blank line; unexpected \ +WARNING: Explicit markup ends without a blank line; unexpected \ unindent\\.\\n? %(root)s/images.txt:9: WARNING: image file not readable: foo.png %(root)s/images.txt:23: WARNING: nonlocal image URI found: \ http://www.python.org/logo.png -%(root)s/includes.txt:\\d*: \\(WARNING/2\\) Encoding 'utf-8-sig' used for \ +%(root)s/includes.txt:\\d*: WARNING: Encoding 'utf-8-sig' used for \ reading included file u'.*?wrongenc.inc' seems to be wrong, try giving an \ :encoding: option\\n? %(root)s/includes.txt:4: WARNING: download file not readable: .*?nonexisting.png @@ -74,8 +74,7 @@ HTML_XPATH = { (".//img[@src='_images/img.png']", ''), (".//img[@src='_images/img1.png']", ''), (".//img[@src='_images/simg.png']", ''), - (".//object[@data='_images/svgimg.svg']", ''), - (".//embed[@src='_images/svgimg.svg']", ''), + (".//img[@src='_images/svgimg.svg']", ''), ], 'subdir/images.html': [ (".//img[@src='../_images/img1.png']", ''), diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py index 68a8c07c..4e1e9f70 100644 --- a/tests/test_build_latex.py +++ b/tests/test_build_latex.py @@ -42,7 +42,7 @@ def test_latex(app): LaTeXTranslator.ignore_missing_images = True app.builder.build_all() latex_warnings = latex_warnfile.getvalue().replace(os.sep, '/') - latex_warnings_exp = LATEX_WARNINGS % {'root': app.srcdir} + latex_warnings_exp = LATEX_WARNINGS % {'root': re.escape(app.srcdir)} assert re.match(latex_warnings_exp + '$', latex_warnings), \ 'Warnings don\'t match:\n' + \ '--- Expected (regex):\n' + latex_warnings_exp + \ diff --git a/tests/test_build_texinfo.py b/tests/test_build_texinfo.py index eedfd1fc..c626c976 100644 --- a/tests/test_build_texinfo.py +++ b/tests/test_build_texinfo.py @@ -41,7 +41,7 @@ def test_texinfo(app): TexinfoTranslator.ignore_missing_images = True app.builder.build_all() texinfo_warnings = texinfo_warnfile.getvalue().replace(os.sep, '/') - texinfo_warnings_exp = TEXINFO_WARNINGS % {'root': app.srcdir} + texinfo_warnings_exp = TEXINFO_WARNINGS % {'root': re.escape(app.srcdir)} assert re.match(texinfo_warnings_exp + '$', texinfo_warnings), \ 'Warnings don\'t match:\n' + \ '--- Expected (regex):\n' + texinfo_warnings_exp + \ diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py index 84649fd1..3ab8ece4 100644 --- a/tests/test_cpp_domain.py +++ b/tests/test_cpp_domain.py @@ -25,6 +25,9 @@ def test_type_definitions(): rv = parse('member_object', ' const std::string & name leftover') assert unicode(rv) == 'const std::string& name' + rv = parse('member_object', ' const std::string & name [n] leftover') + assert unicode(rv) == 'const std::string& name[n]' + rv = parse('member_object', 'const std::vector< unsigned int, long> &name') assert unicode(rv) == 'const std::vector<unsigned int, long>& name' @@ -45,6 +48,51 @@ def test_type_definitions(): assert unicode(parse('type_object', 'long long int foo')) == 'long long foo' + x = 'void operator()(const boost::array<VertexID, 2>& v) const' + assert unicode(parse('function', x)) == x + + x = 'void operator()(const boost::array<VertexID, 2, "foo, bar">& v) const' + assert unicode(parse('function', x)) == x + + x = 'MyClass::MyClass(MyClass::MyClass&&)' + assert unicode(parse('function', x)) == x + + x = 'constexpr int get_value()' + assert unicode(parse('function', x)) == x + + x = 'int get_value() const noexcept' + assert unicode(parse('function', x)) == x + + x = 'int main(int argc, char* argv[][])' + assert unicode(parse('function', x)) == x + + x = 'std::vector<std::pair<std::string, int>>& module::test(register ' \ + 'foo, bar[n], std::string baz="foobar, blah, bleh") const = 0' + assert unicode(parse('function', x)) == x + + x = 'module::myclass foo[n]' + assert unicode(parse('member_object', x)) == x + + +def test_bases(): + x = 'A' + assert unicode(parse('class', x)) == x + + x = 'A : B' + assert unicode(parse('class', x)) == x + + x = 'A : private B' + assert unicode(parse('class', x)) == 'A : B' + + x = 'A : public B' + assert unicode(parse('class', x)) == x + + x = 'A : B, C' + assert unicode(parse('class', x)) == x + + x = 'A : B, protected C, D' + assert unicode(parse('class', x)) == x + def test_operators(): x = parse('function', 'void operator new [ ] ()') diff --git a/tests/test_intersphinx.py b/tests/test_intersphinx.py index 563750f6..e1f4e827 100644 --- a/tests/test_intersphinx.py +++ b/tests/test_intersphinx.py @@ -167,7 +167,8 @@ def test_load_mappings_warnings(tempdir, app): 'http://docs.python.org/': inv_file, 'py3k': ('http://docs.python.org/py3k/', inv_file), 'repoze.workflow': ('http://docs.repoze.org/workflow/', inv_file), - 'django-taggit': ('http://django-taggit.readthedocs.org/en/latest/', inv_file) + 'django-taggit': ('http://django-taggit.readthedocs.org/en/latest/', + inv_file) } app.config.intersphinx_cache_limit = 0 diff --git a/tests/test_markup.py b/tests/test_markup.py index 09f617f4..4c8e7264 100644 --- a/tests/test_markup.py +++ b/tests/test_markup.py @@ -84,14 +84,14 @@ def test_inline(): _html = ('<p><tt class="(samp )?docutils literal"><span class="pre">' 'code</span> <span class="pre">sample</span></tt></p>') yield verify_re, '``code sample``', _html, r'\\code{code sample}' - yield verify_re, ':samp:`code sample`', _html, r'\\samp{code sample}' + yield verify_re, ':samp:`code sample`', _html, r'\\code{code sample}' # interpolation of braces in samp and file roles (HTML only) yield (verify, ':samp:`a{b}c`', '<p><tt class="samp docutils literal"><span class="pre">a</span>' '<em><span class="pre">b</span></em>' '<span class="pre">c</span></tt></p>', - '\\samp{abc}') + '\\code{a\\emph{b}c}') # interpolation of arrows in menuselection yield (verify, ':menuselection:`a --> b`', @@ -127,9 +127,9 @@ def test_latex_escaping(): yield (verify, u'Γ\\\\∞$', None, ur'\(\Gamma\)\textbackslash{}\(\infty\)\$') # in verbatim code fragments - yield (verify, u'::\n\n @Γ\\∞$[]', None, - u'\\begin{Verbatim}[commandchars=@\\[\\]]\n' - u'@PYGZat[]@(@Gamma@)\\@(@infty@)@$@PYGZlb[]@PYGZrb[]\n' + yield (verify, u'::\n\n @Γ\\∞${}', None, + u'\\begin{Verbatim}[commandchars=\\\\\\{\\}]\n' + u'@\\(\\Gamma\\)\\PYGZbs{}\\(\\infty\\)\\$\\PYGZob{}\\PYGZcb{}\n' u'\\end{Verbatim}') # in URIs yield (verify_re, u'`test <http://example.com/~me/>`_', None, diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py index 798d8d56..26064117 100644 --- a/tests/test_quickstart.py +++ b/tests/test_quickstart.py @@ -11,7 +11,6 @@ import sys import time -import __builtin__ from util import * @@ -85,7 +84,9 @@ def test_quickstart_defaults(tempdir): 'Project version': '0.1', } qs.term_input = mock_raw_input(answers) - qs.inner_main([]) + d = {} + qs.ask_user(d) + qs.generate(d) conffile = tempdir / 'conf.py' assert conffile.isfile() @@ -134,7 +135,7 @@ def test_quickstart_all_answers(tempdir): 'todo': 'n', 'coverage': 'no', 'pngmath': 'N', - 'jsmath': 'no', + 'mathjax': 'no', 'ifconfig': 'no', 'viewcode': 'no', 'Create Makefile': 'no', @@ -143,7 +144,9 @@ def test_quickstart_all_answers(tempdir): } qs.term_input = mock_raw_input(answers, needanswer=True) qs.TERM_ENCODING = 'utf-8' - qs.inner_main([]) + d = {} + qs.ask_user(d) + qs.generate(d) conffile = tempdir / 'source' / 'conf.py' assert conffile.isfile() diff --git a/tests/test_websupport.py b/tests/test_websupport.py index 9cf64338..d7b5fb32 100644 --- a/tests/test_websupport.py +++ b/tests/test_websupport.py @@ -18,15 +18,13 @@ except ImportError: # functools is new in 2.5 wraps = lambda f: (lambda w: w) -from nose import SkipTest - from sphinx.websupport import WebSupport from sphinx.websupport.errors import * from sphinx.websupport.storage import StorageBackend from sphinx.websupport.storage.differ import CombinedHtmlDiff try: from sphinx.websupport.storage.sqlalchemystorage import Session, \ - SQLAlchemyStorage, Comment, CommentVote + Comment, CommentVote from sphinx.websupport.storage.sqlalchemy_db import Node sqlalchemy_missing = False except ImportError: @@ -119,18 +117,18 @@ def test_comments(support): comments = data['comments'] children = comments[0]['children'] assert len(comments) == 2 - assert comments[1]['text'] == 'Hidden comment' + assert comments[1]['text'] == '<p>Hidden comment</p>\n' assert len(children) == 2 - assert children[1]['text'] == 'Hidden child test comment' + assert children[1]['text'] == '<p>Hidden child test comment</p>\n' # Access the comments without being a moderator. data = support.get_data(first_node.id) comments = data['comments'] children = comments[0]['children'] assert len(comments) == 1 - assert comments[0]['text'] == 'First test comment' + assert comments[0]['text'] == '<p>First test comment</p>\n' assert len(children) == 1 - assert children[0]['text'] == 'Child test comment' + assert children[0]['text'] == '<p>Child test comment</p>\n' @skip_if(sqlalchemy_missing, 'needs sqlalchemy') @@ -216,9 +214,7 @@ def test_moderator_delete_comments(support): comment = get_comment() support.delete_comment(comment['id'], username='user_two', moderator=True) - comment = get_comment() - assert comment['username'] == '[deleted]' - assert comment['text'] == '[deleted]' + raises(IndexError, get_comment) @skip_if(sqlalchemy_missing, 'needs sqlalchemy') @@ -230,14 +226,14 @@ def test_update_username(support): filter(Comment.username == 'user_two').all() assert len(comments) == 0 votes = session.query(CommentVote).\ - filter(CommentVote.username == 'user_two') - assert len(comments) == 0 + filter(CommentVote.username == 'user_two').all() + assert len(votes) == 0 comments = session.query(Comment).\ filter(Comment.username == 'new_user_two').all() assert len(comments) == 1 votes = session.query(CommentVote).\ - filter(CommentVote.username == 'new_user_two') - assert len(comments) == 1 + filter(CommentVote.username == 'new_user_two').all() + assert len(votes) == 0 called = False @@ -255,15 +251,15 @@ def test_moderation(support): session.close() accepted = support.add_comment('Accepted Comment', node_id=node.id, displayed=False) - rejected = support.add_comment('Rejected comment', node_id=node.id, + deleted = support.add_comment('Comment to delete', node_id=node.id, displayed=False) # Make sure the moderation_callback is called. assert called == True # Make sure the user must be a moderator. raises(UserNotAuthorizedError, support.accept_comment, accepted['id']) - raises(UserNotAuthorizedError, support.reject_comment, accepted['id']) + raises(UserNotAuthorizedError, support.delete_comment, deleted['id']) support.accept_comment(accepted['id'], moderator=True) - support.reject_comment(rejected['id'], moderator=True) + support.delete_comment(deleted['id'], moderator=True) comments = support.get_data(node.id)['comments'] assert len(comments) == 1 comments = support.get_data(node.id, moderator=True)['comments'] @@ -1,8 +1,9 @@ [tox] -envlist=py24,py25,py26,py27,py31,pypy,du07,du06,du05 +envlist=py24,py25,py26,py27,py31,py32,pypy,du08,du07,du06,du05 [testenv] -deps=nose +deps= + nose commands= nosetests sphinx-build -W -b html -d {envtmpdir}/doctrees doc {envtmpdir}/html @@ -12,14 +13,6 @@ deps= nose simplejson -[testenv:py25] -deps= - nose - simplejson - -[testenv:py31] -deps=https://bitbucket.org/jpellerin/nose3/get/tip.zip - [testenv:pypy] deps= nose @@ -39,3 +32,8 @@ deps= deps= nose docutils==0.7 + +[testenv:du08] +deps= + nose + docutils==0.8.1 |