[Python-modules-commits] [sphinx] 03/08: Import sphinx_1.4.1.orig.tar.gz
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sun May 1 18:50:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository sphinx.
commit 6f627510ec8e2966f2f5f8081d7acb1a10de4b4f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sun May 1 21:48:13 2016 +0300
Import sphinx_1.4.1.orig.tar.gz
---
CHANGES | 38 +++
PKG-INFO | 2 +-
Sphinx.egg-info/PKG-INFO | 2 +-
Sphinx.egg-info/SOURCES.txt | 16 +
doc/config.rst | 29 +-
doc/domains.rst | 19 +-
doc/markup/code.rst | 6 +-
sphinx/__init__.py | 6 +-
sphinx/builders/epub.py | 3 +-
sphinx/builders/html.py | 5 +-
sphinx/config.py | 2 +-
sphinx/directives/patches.py | 7 +-
sphinx/domains/cpp.py | 105 +++++-
sphinx/locale/bn/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/bn/LC_MESSAGES/sphinx.mo | Bin 14049 -> 13904 bytes
sphinx/locale/bn/LC_MESSAGES/sphinx.po | 68 ++--
sphinx/locale/ca/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/ca/LC_MESSAGES/sphinx.mo | Bin 10780 -> 10846 bytes
sphinx/locale/ca/LC_MESSAGES/sphinx.po | 67 ++--
sphinx/locale/cs/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/cs/LC_MESSAGES/sphinx.mo | Bin 10875 -> 10993 bytes
sphinx/locale/cs/LC_MESSAGES/sphinx.po | 71 ++--
sphinx/locale/cy/LC_MESSAGES/sphinx.js | 1 +
sphinx/locale/cy/LC_MESSAGES/sphinx.mo | Bin 0 -> 10905 bytes
sphinx/locale/{fi => cy}/LC_MESSAGES/sphinx.po | 296 ++++++++---------
sphinx/locale/da/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/da/LC_MESSAGES/sphinx.mo | Bin 10617 -> 10738 bytes
sphinx/locale/da/LC_MESSAGES/sphinx.po | 106 +++---
sphinx/locale/de/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/de/LC_MESSAGES/sphinx.mo | Bin 10946 -> 11054 bytes
sphinx/locale/de/LC_MESSAGES/sphinx.po | 73 ++---
sphinx/locale/el/LC_MESSAGES/sphinx.js | 1 +
sphinx/locale/el/LC_MESSAGES/sphinx.mo | Bin 0 -> 14388 bytes
sphinx/locale/{ca => el}/LC_MESSAGES/sphinx.po | 419 ++++++++++++------------
sphinx/locale/eo/LC_MESSAGES/sphinx.js | 1 +
sphinx/locale/eo/LC_MESSAGES/sphinx.mo | Bin 0 -> 10675 bytes
sphinx/locale/{mk => eo}/LC_MESSAGES/sphinx.po | 155 ++++-----
sphinx/locale/es/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/es/LC_MESSAGES/sphinx.mo | Bin 11260 -> 11406 bytes
sphinx/locale/es/LC_MESSAGES/sphinx.po | 91 ++---
sphinx/locale/et/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/et/LC_MESSAGES/sphinx.mo | Bin 10748 -> 10873 bytes
sphinx/locale/et/LC_MESSAGES/sphinx.po | 73 ++---
sphinx/locale/eu/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/eu/LC_MESSAGES/sphinx.mo | Bin 10932 -> 10931 bytes
sphinx/locale/eu/LC_MESSAGES/sphinx.po | 65 ++--
sphinx/locale/fa/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/fa/LC_MESSAGES/sphinx.mo | Bin 11464 -> 11418 bytes
sphinx/locale/fa/LC_MESSAGES/sphinx.po | 55 ++--
sphinx/locale/fi/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/fi/LC_MESSAGES/sphinx.mo | Bin 10590 -> 10489 bytes
sphinx/locale/fi/LC_MESSAGES/sphinx.po | 49 ++-
sphinx/locale/fr/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/fr/LC_MESSAGES/sphinx.mo | Bin 11209 -> 11350 bytes
sphinx/locale/fr/LC_MESSAGES/sphinx.po | 88 ++---
sphinx/locale/he/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/he/LC_MESSAGES/sphinx.mo | Bin 11155 -> 11250 bytes
sphinx/locale/he/LC_MESSAGES/sphinx.po | 60 ++--
sphinx/locale/hi/LC_MESSAGES/sphinx.js | 1 +
sphinx/locale/hi/LC_MESSAGES/sphinx.mo | Bin 0 -> 10768 bytes
sphinx/locale/{mk => hi}/LC_MESSAGES/sphinx.po | 137 ++++----
sphinx/locale/hr/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/hr/LC_MESSAGES/sphinx.mo | Bin 10927 -> 10863 bytes
sphinx/locale/hr/LC_MESSAGES/sphinx.po | 167 +++++-----
sphinx/locale/hu/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/hu/LC_MESSAGES/sphinx.mo | Bin 11241 -> 11350 bytes
sphinx/locale/hu/LC_MESSAGES/sphinx.po | 76 ++---
sphinx/locale/id/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/id/LC_MESSAGES/sphinx.mo | Bin 10621 -> 10744 bytes
sphinx/locale/id/LC_MESSAGES/sphinx.po | 79 ++---
sphinx/locale/it/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/it/LC_MESSAGES/sphinx.mo | Bin 10991 -> 11105 bytes
sphinx/locale/it/LC_MESSAGES/sphinx.po | 89 ++---
sphinx/locale/ja/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/ja/LC_MESSAGES/sphinx.mo | Bin 11569 -> 11715 bytes
sphinx/locale/ja/LC_MESSAGES/sphinx.po | 69 ++--
sphinx/locale/ko/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/ko/LC_MESSAGES/sphinx.mo | Bin 10703 -> 10705 bytes
sphinx/locale/ko/LC_MESSAGES/sphinx.po | 54 ++-
sphinx/locale/lt/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/lt/LC_MESSAGES/sphinx.mo | Bin 11055 -> 11167 bytes
sphinx/locale/lt/LC_MESSAGES/sphinx.po | 72 ++--
sphinx/locale/lv/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/lv/LC_MESSAGES/sphinx.mo | Bin 10955 -> 11067 bytes
sphinx/locale/lv/LC_MESSAGES/sphinx.po | 67 ++--
sphinx/locale/mk/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/mk/LC_MESSAGES/sphinx.mo | Bin 11061 -> 10989 bytes
sphinx/locale/mk/LC_MESSAGES/sphinx.po | 49 ++-
sphinx/locale/nb_NO/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/nb_NO/LC_MESSAGES/sphinx.mo | Bin 10439 -> 10566 bytes
sphinx/locale/nb_NO/LC_MESSAGES/sphinx.po | 60 ++--
sphinx/locale/ne/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/ne/LC_MESSAGES/sphinx.mo | Bin 13399 -> 13412 bytes
sphinx/locale/ne/LC_MESSAGES/sphinx.po | 62 ++--
sphinx/locale/nl/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/nl/LC_MESSAGES/sphinx.mo | Bin 10687 -> 10811 bytes
sphinx/locale/nl/LC_MESSAGES/sphinx.po | 68 ++--
sphinx/locale/pl/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/pl/LC_MESSAGES/sphinx.mo | Bin 10954 -> 11052 bytes
sphinx/locale/pl/LC_MESSAGES/sphinx.po | 86 ++---
sphinx/locale/pt_BR/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo | Bin 11141 -> 11150 bytes
sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po | 161 ++++-----
sphinx/locale/pt_PT/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/pt_PT/LC_MESSAGES/sphinx.mo | Bin 11086 -> 11199 bytes
sphinx/locale/pt_PT/LC_MESSAGES/sphinx.po | 80 ++---
sphinx/locale/ro/LC_MESSAGES/sphinx.js | 1 +
sphinx/locale/ro/LC_MESSAGES/sphinx.mo | Bin 0 -> 11193 bytes
sphinx/locale/{id => ro}/LC_MESSAGES/sphinx.po | 411 +++++++++++------------
sphinx/locale/ru/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/ru/LC_MESSAGES/sphinx.mo | Bin 13452 -> 13829 bytes
sphinx/locale/ru/LC_MESSAGES/sphinx.po | 96 +++---
sphinx/locale/si/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/si/LC_MESSAGES/sphinx.mo | Bin 11576 -> 11504 bytes
sphinx/locale/si/LC_MESSAGES/sphinx.po | 49 ++-
sphinx/locale/sk/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/sk/LC_MESSAGES/sphinx.mo | Bin 10876 -> 10997 bytes
sphinx/locale/sk/LC_MESSAGES/sphinx.po | 90 ++---
sphinx/locale/sl/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/sl/LC_MESSAGES/sphinx.mo | Bin 10841 -> 10811 bytes
sphinx/locale/sl/LC_MESSAGES/sphinx.po | 66 ++--
sphinx/locale/sv/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/sv/LC_MESSAGES/sphinx.mo | Bin 10486 -> 10615 bytes
sphinx/locale/sv/LC_MESSAGES/sphinx.po | 64 ++--
sphinx/locale/tr/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/tr/LC_MESSAGES/sphinx.mo | Bin 11063 -> 11185 bytes
sphinx/locale/tr/LC_MESSAGES/sphinx.po | 83 ++---
sphinx/locale/uk_UA/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/uk_UA/LC_MESSAGES/sphinx.mo | Bin 12477 -> 12384 bytes
sphinx/locale/uk_UA/LC_MESSAGES/sphinx.po | 68 ++--
sphinx/locale/vi/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/vi/LC_MESSAGES/sphinx.mo | Bin 11292 -> 11232 bytes
sphinx/locale/vi/LC_MESSAGES/sphinx.po | 60 ++--
sphinx/locale/zh_CN/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/zh_CN/LC_MESSAGES/sphinx.mo | Bin 10191 -> 10309 bytes
sphinx/locale/zh_CN/LC_MESSAGES/sphinx.po | 70 ++--
sphinx/locale/zh_TW/LC_MESSAGES/sphinx.js | 2 +-
sphinx/locale/zh_TW/LC_MESSAGES/sphinx.mo | Bin 10653 -> 10487 bytes
sphinx/locale/zh_TW/LC_MESSAGES/sphinx.po | 309 +++++++++--------
sphinx/quickstart.py | 16 +
sphinx/texinputs/sphinx.sty | 26 +-
sphinx/themes/basic/genindex-single.html | 2 +-
sphinx/transforms.py | 5 +-
sphinx/util/i18n.py | 56 +++-
sphinx/writers/latex.py | 31 +-
sphinx/writers/manpage.py | 3 +-
sphinx/writers/texinfo.py | 3 +-
tests/roots/test-directive-code/caption.rst | 35 +-
tests/roots/test-directive-code/conf.py | 2 +
tests/roots/test-directive-code/namedblocks.rst | 28 ++
tests/roots/test-image-glob/index.rst | 2 +
tests/test_build_latex.py | 40 +--
tests/test_config.py | 4 +-
tests/test_directive_code.py | 44 +++
tests/test_domain_cpp.py | 7 +
tests/test_intl.py | 2 +-
tests/test_util_i18n.py | 27 ++
utils/release-checklist | 17 +-
158 files changed, 2390 insertions(+), 2757 deletions(-)
diff --git a/CHANGES b/CHANGES
index 83f560f..25506a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,41 @@
+Release 1.4.1 (released Apr 12, 2016)
+=====================================
+
+Incompatible changes
+--------------------
+
+* The default format of `today_fmt` and `html_last_updated_fmt` is back to
+ strftime format again. Locale Date Markup Language is also supported for
+ backward compatibility until Sphinx-1.5.
+
+Translations
+------------
+
+* Added Welsh translation, thanks to Geraint Palmer.
+* Added Greek translation, thanks to Stelios Vitalis.
+* Added Esperanto translation, thanks to Dinu Gherman.
+* Added Hindi translation, thanks to Purnank H. Ghumalia.
+* Added Romanian translation, thanks to Razvan Stefanescu.
+
+Bugs fixed
+----------
+
+* C++, added support for ``extern`` and ``thread_local``.
+* C++, type declarations are now using the prefixes ``typedef``, ``using``, and ``type``,
+ depending on the style of declaration.
+* #2413: C++, fix crash on duplicate declarations
+* #2394: Sphinx crashes when html_last_updated_fmt is invalid
+* #2408: dummy builder not available in Makefile and make.bat
+* #2412: hyperlink targets are broken in LaTeX builder
+* figure directive crashes if non paragraph item is given as caption
+* #2418: time formats no longer allowed in today_fmt
+* #2395: Sphinx crashes if unicode character in image filename
+* #2396: "too many values to unpack" in genindex-single
+* #2405: numref link in PDF jumps to the wrong location
+* #2414: missing number in PDF hyperlinks to code listings
+* #2440: wrong import for gmtime. Thanks to Uwe L. Korn.
+
+
Release 1.4 (released Mar 28, 2016)
===================================
diff --git a/PKG-INFO b/PKG-INFO
index a597f22..8e23682 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Sphinx
-Version: 1.4
+Version: 1.4.1
Summary: Python documentation generator
Home-page: http://sphinx-doc.org/
Author: Georg Brandl
diff --git a/Sphinx.egg-info/PKG-INFO b/Sphinx.egg-info/PKG-INFO
index a597f22..8e23682 100644
--- a/Sphinx.egg-info/PKG-INFO
+++ b/Sphinx.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Sphinx
-Version: 1.4
+Version: 1.4.1
Summary: Python documentation generator
Home-page: http://sphinx-doc.org/
Author: Georg Brandl
diff --git a/Sphinx.egg-info/SOURCES.txt b/Sphinx.egg-info/SOURCES.txt
index 85ac24b..834447b 100644
--- a/Sphinx.egg-info/SOURCES.txt
+++ b/Sphinx.egg-info/SOURCES.txt
@@ -214,12 +214,21 @@ sphinx/locale/ca/LC_MESSAGES/sphinx.po
sphinx/locale/cs/LC_MESSAGES/sphinx.js
sphinx/locale/cs/LC_MESSAGES/sphinx.mo
sphinx/locale/cs/LC_MESSAGES/sphinx.po
+sphinx/locale/cy/LC_MESSAGES/sphinx.js
+sphinx/locale/cy/LC_MESSAGES/sphinx.mo
+sphinx/locale/cy/LC_MESSAGES/sphinx.po
sphinx/locale/da/LC_MESSAGES/sphinx.js
sphinx/locale/da/LC_MESSAGES/sphinx.mo
sphinx/locale/da/LC_MESSAGES/sphinx.po
sphinx/locale/de/LC_MESSAGES/sphinx.js
sphinx/locale/de/LC_MESSAGES/sphinx.mo
sphinx/locale/de/LC_MESSAGES/sphinx.po
+sphinx/locale/el/LC_MESSAGES/sphinx.js
+sphinx/locale/el/LC_MESSAGES/sphinx.mo
+sphinx/locale/el/LC_MESSAGES/sphinx.po
+sphinx/locale/eo/LC_MESSAGES/sphinx.js
+sphinx/locale/eo/LC_MESSAGES/sphinx.mo
+sphinx/locale/eo/LC_MESSAGES/sphinx.po
sphinx/locale/es/LC_MESSAGES/sphinx.js
sphinx/locale/es/LC_MESSAGES/sphinx.mo
sphinx/locale/es/LC_MESSAGES/sphinx.po
@@ -241,6 +250,9 @@ sphinx/locale/fr/LC_MESSAGES/sphinx.po
sphinx/locale/he/LC_MESSAGES/sphinx.js
sphinx/locale/he/LC_MESSAGES/sphinx.mo
sphinx/locale/he/LC_MESSAGES/sphinx.po
+sphinx/locale/hi/LC_MESSAGES/sphinx.js
+sphinx/locale/hi/LC_MESSAGES/sphinx.mo
+sphinx/locale/hi/LC_MESSAGES/sphinx.po
sphinx/locale/hr/LC_MESSAGES/sphinx.js
sphinx/locale/hr/LC_MESSAGES/sphinx.mo
sphinx/locale/hr/LC_MESSAGES/sphinx.po
@@ -286,6 +298,9 @@ sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po
sphinx/locale/pt_PT/LC_MESSAGES/sphinx.js
sphinx/locale/pt_PT/LC_MESSAGES/sphinx.mo
sphinx/locale/pt_PT/LC_MESSAGES/sphinx.po
+sphinx/locale/ro/LC_MESSAGES/sphinx.js
+sphinx/locale/ro/LC_MESSAGES/sphinx.mo
+sphinx/locale/ro/LC_MESSAGES/sphinx.po
sphinx/locale/ru/LC_MESSAGES/sphinx.js
sphinx/locale/ru/LC_MESSAGES/sphinx.mo
sphinx/locale/ru/LC_MESSAGES/sphinx.po
@@ -674,6 +689,7 @@ tests/roots/test-directive-code/lineno_match.rst
tests/roots/test-directive-code/lineno_start.rst
tests/roots/test-directive-code/linenos.rst
tests/roots/test-directive-code/literal.inc
+tests/roots/test-directive-code/namedblocks.rst
tests/roots/test-directive-code/python.rst
tests/roots/test-directive-code/target.py
tests/roots/test-directive-only/conf.py
diff --git a/doc/config.rst b/doc/config.rst
index c87db8d..9fc0869 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -330,13 +330,12 @@ Project information
replacement for ``|today|``.
* If you set :confval:`today` to a non-empty value, it is used.
- * Otherwise, the current time is formatted using `Locale Data Markup Language
- <http://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns>`_
- and the format given in :confval:`today_fmt`.
+ * Otherwise, the current time is formatted using :func:`time.strftime` and
+ the format given in :confval:`today_fmt`.
- The default is no :confval:`today` and a :confval:`today_fmt` of ``'MMMM dd,
- YYYY'`` (or, if translation is enabled with :confval:`language`, an
- equivalent %format for the selected locale).
+ The default is no :confval:`today` and a :confval:`today_fmt` of ``'%B %d,
+ %Y'`` (or, if translation is enabled with :confval:`language`, an equivalent
+ format for the selected locale).
.. versionchanged:: 1.4
@@ -344,6 +343,12 @@ Project information
Language. strftime format is also supported for backward compatibility
until Sphinx-1.5.
+ .. versionchanged:: 1.4.1
+
+ Format specification was changed again from Locale Data Markup Language
+ to strftime. LDML format is also supported for backward compatibility
+ until Sphinx-1.5.
+
.. confval:: highlight_language
The default language to highlight source code in. The default is
@@ -696,9 +701,8 @@ that use Sphinx's HTMLWriter class.
.. confval:: html_last_updated_fmt
If this is not None, a 'Last updated on:' timestamp is inserted
- at every page bottom, using the given `Locale Data Markup Language
- <http://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns>`_
- format. The empty string is equivalent to ``'MMM dd, YYYY'`` (or a
+ at every page bottom, using the given :func:`strftime` format.
+ The empty string is equivalent to ``'%b %d, %Y'`` (or a
locale-dependent equivalent).
.. versionchanged:: 1.4
@@ -707,6 +711,13 @@ that use Sphinx's HTMLWriter class.
Language. strftime format is also supported for backward compatibility
until Sphinx-1.5.
+ .. versionchanged:: 1.4.1
+
+ Format specification was changed again from Locale Data Markup Language
+ to strftime. LDML format is also supported for backward compatibility
+ until Sphinx-1.5.
+
+
.. confval:: html_use_smartypants
If true, `SmartyPants <http://daringfireball.net/projects/smartypants/>`_
diff --git a/doc/domains.rst b/doc/domains.rst
index 803a434..2aaf218 100644
--- a/doc/domains.rst
+++ b/doc/domains.rst
@@ -629,9 +629,26 @@ a visibility statement (``public``, ``private`` or ``protected``).
A type alias can also be templated::
- .. cpp:type:: template<typename T>
+ .. cpp:type:: template<typename T> \
MyContainer = std::vector<T>
+ The example are rendered as follows.
+
+ .. cpp:type:: std::vector<int> MyList
+
+ A typedef-like declaration of a type.
+
+ .. cpp:type:: MyContainer::const_iterator
+
+ Declaration of a type alias with unspecified type.
+
+ .. cpp:type:: MyType = std::unordered_map<int, std::string>
+
+ Declaration of a type alias.
+
+ .. cpp:type:: template<typename T> \
+ MyContainer = std::vector<T>
+
.. rst:directive:: .. cpp:enum:: unscoped enum declaration
.. cpp:enum-struct:: scoped enum declaration
diff --git a/doc/markup/code.rst b/doc/markup/code.rst
index c767264..6e8028f 100644
--- a/doc/markup/code.rst
+++ b/doc/markup/code.rst
@@ -21,8 +21,8 @@ an "unused" primary prompt; this is an example of what *not* to do::
2
>>>
-Syntax highlighting is done with `Pygments <http://pygments.org>`_ (if it's
-installed) and handled in a smart way:
+Syntax highlighting is done with `Pygments <http://pygments.org>`_ and handled
+in a smart way:
* There is a "highlighting language" for each source file. Per default, this is
``'python'`` as the majority of files will have to highlight Python snippets,
@@ -77,7 +77,7 @@ installed) and handled in a smart way:
Line numbers
^^^^^^^^^^^^
-If installed, Pygments can generate line numbers for code blocks. For
+Pygments can generate line numbers for code blocks. For
automatically-highlighted blocks (those started by ``::``), line numbers must be
switched on in a :rst:dir:`highlight` directive, with the ``linenothreshold``
option::
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index e6e5c3d..16ec7a4 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -15,13 +15,13 @@
import sys
from os import path
-__version__ = '1.4'
-__released__ = '1.4' # used when Sphinx builds its own docs
+__version__ = '1.4.1'
+__released__ = '1.4.1' # used when Sphinx builds its own docs
# version info for better programmatic use
# possible values for 3rd element: 'alpha', 'beta', 'rc', 'final'
# 'final' has 0 as the last element
-version_info = (1, 4, 0, 'final', 0)
+version_info = (1, 4, 1, 'final', 0)
package_dir = path.abspath(path.dirname(__file__))
diff --git a/sphinx/builders/epub.py b/sphinx/builders/epub.py
index d1610bd..cc839d7 100644
--- a/sphinx/builders/epub.py
+++ b/sphinx/builders/epub.py
@@ -530,7 +530,8 @@ class EpubBuilder(StandaloneHTMLBuilder):
metadata['copyright'] = self.esc(self.config.epub_copyright)
metadata['scheme'] = self.esc(self.config.epub_scheme)
metadata['id'] = self.esc(self.config.epub_identifier)
- metadata['date'] = self.esc(format_date('YYYY-MM-dd', language=self.config.language))
+ metadata['date'] = self.esc(format_date('%Y-%m-%d', language=self.config.language,
+ warn=self.warn))
metadata['files'] = files
metadata['spine'] = spine
metadata['guide'] = guide
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index 367e28b..f541daa 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -292,8 +292,9 @@ class StandaloneHTMLBuilder(Builder):
# typically doesn't include the time of day
lufmt = self.config.html_last_updated_fmt
if lufmt is not None:
- self.last_updated = format_date(lufmt or _('MMM dd, YYYY'),
- language=self.config.language)
+ self.last_updated = format_date(lufmt or _('%b %d, %Y'),
+ language=self.config.language,
+ warn=self.warn)
else:
self.last_updated = None
diff --git a/sphinx/config.py b/sphinx/config.py
index 73f442c..e199e7d 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -58,7 +58,7 @@ class Config(object):
language = (None, 'env', string_classes),
locale_dirs = ([], 'env'),
- figure_language_filename = ('{root}.{language}{ext}', 'env', [str]),
+ figure_language_filename = (u'{root}.{language}{ext}', 'env', [str]),
master_doc = ('contents', 'env'),
source_suffix = (['.rst'], 'env'),
diff --git a/sphinx/directives/patches.py b/sphinx/directives/patches.py
index 7e00bc8..dcdc41a 100644
--- a/sphinx/directives/patches.py
+++ b/sphinx/directives/patches.py
@@ -19,10 +19,11 @@ class Figure(images.Figure):
def run(self):
name = self.options.pop('name', None)
- (figure_node,) = images.Figure.run(self)
- if isinstance(figure_node, nodes.system_message):
- return [figure_node]
+ result = images.Figure.run(self)
+ if len(result) == 2 or isinstance(result[0], nodes.system_message):
+ return result
+ (figure_node,) = result
if name:
self.options['name'] = name
self.add_name(figure_node)
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index a932227..6847d5a 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -26,7 +26,9 @@ from sphinx.util.pycompat import UnicodeMixin
from sphinx.util.docfields import Field, GroupedField
"""
- Important note on ids:
+ Important note on ids
+ ----------------------------------------------------------------------------
+
Multiple id generation schemes are used due to backwards compatibility.
- v1: 1.2.3 <= version < 1.3
The style used before the rewrite.
@@ -38,6 +40,19 @@ from sphinx.util.docfields import Field, GroupedField
All versions are generated and attached to elements. The newest is used for
the index. All of the versions should work as permalinks.
+
+ Tagnames
+ ----------------------------------------------------------------------------
+
+ Each desc_signature node will have the attribute 'sphinx_cpp_tagname' set to
+ - 'templateParams', if the line is on the form 'template<...>',
+ - 'declarator', if the line contains the name of the declared object.
+ No other desc_signature nodes should exist (so far).
+
+
+ Grammar
+ ----------------------------------------------------------------------------
+
See http://www.nongnu.org/hcb/ for the grammar,
or https://github.com/cplusplus/draft/blob/master/source/grammar.tex
for the newest grammar.
@@ -75,8 +90,13 @@ from sphinx.util.docfields import Field, GroupedField
decl-specifier ->
storage-class-specifier ->
- "static" (only for member_object and function_object)
+ ( "static" (only for member_object and function_object)
+ | "extern" (only for member_object and function_object)
| "register"
+ )
+ thread_local[opt] (only for member_object)
+ (it can also appear before the others)
+
| type-specifier -> trailing-type-specifier
| function-specifier -> "inline" | "virtual" | "explicit" (only
for function_object)
@@ -456,6 +476,17 @@ class DefinitionError(UnicodeMixin, Exception):
return self.description
+class _DuplicateSymbolError(UnicodeMixin, Exception):
+ def __init__(self, symbol, candSymbol):
+ assert symbol
+ assert candSymbol
+ self.symbol = symbol
+ self.candSymbol = candSymbol
+
+ def __unicode__(self):
+ return "Internal C++ duplicate symbol error:\n%s" % self.symbol.dump(0)
+
+
class ASTBase(UnicodeMixin):
def __eq__(self, other):
if type(self) is not type(other):
@@ -755,6 +786,7 @@ class ASTTemplateDeclarationPrefix(ASTBase):
_verify_description_mode(mode)
for t in self.templates:
templateNode = addnodes.desc_signature()
+ templateNode.sphinx_cpp_tagname = 'templateParams'
t.describe_signature(templateNode, 'lastIsName', env, symbol)
signode += templateNode
@@ -1223,9 +1255,10 @@ class ASTParametersQualifiers(ASTBase):
class ASTDeclSpecsSimple(ASTBase):
- def __init__(self, storage, inline, virtual, explicit,
+ def __init__(self, storage, threadLocal, inline, virtual, explicit,
constexpr, volatile, const, friend):
self.storage = storage
+ self.threadLocal = threadLocal
self.inline = inline
self.virtual = virtual
self.explicit = explicit
@@ -1238,6 +1271,7 @@ class ASTDeclSpecsSimple(ASTBase):
if not other:
return self
return ASTDeclSpecsSimple(self.storage or other.storage,
+ self.threadLocal or other.threadLocal,
self.inline or other.inline,
self.virtual or other.virtual,
self.explicit or other.explicit,
@@ -1250,6 +1284,8 @@ class ASTDeclSpecsSimple(ASTBase):
res = []
if self.storage:
res.append(self.storage)
+ if self.threadLocal:
+ res.append('thread_local')
if self.inline:
res.append('inline')
if self.friend:
@@ -1273,6 +1309,8 @@ class ASTDeclSpecsSimple(ASTBase):
modifiers.append(addnodes.desc_annotation(text, text))
if self.storage:
_add(modifiers, self.storage)
+ if self.threadLocal:
+ _add(modifiers, 'thread_local')
if self.inline:
_add(modifiers, 'inline')
if self.friend:
@@ -1906,6 +1944,12 @@ class ASTType(ASTBase):
res.append(text_type(self.decl))
return u''.join(res)
+ def get_type_declaration_prefix(self):
+ if self.declSpecs.trailingTypeSpec:
+ return 'typedef'
+ else:
+ return 'type'
+
def describe_signature(self, signode, mode, env, symbol):
_verify_description_mode(mode)
self.declSpecs.describe_signature(signode, 'markType', env, symbol)
@@ -1970,6 +2014,9 @@ class ASTTypeUsing(ASTBase):
res.append(text_type(self.type))
return u''.join(res)
+ def get_type_declaration_prefix(self):
+ return 'using'
+
def describe_signature(self, signode, mode, env, symbol):
_verify_description_mode(mode)
self.name.describe_signature(signode, mode, env, symbol=symbol)
@@ -2172,6 +2219,7 @@ class ASTDeclaration(ASTBase):
# let's pop it so we can add templates before that
parentNode = signode.parent
mainDeclNode = signode
+ mainDeclNode.sphinx_cpp_tagname = 'declarator'
parentNode.pop()
assert self.symbol
@@ -2182,7 +2230,9 @@ class ASTDeclaration(ASTBase):
mainDeclNode += addnodes.desc_annotation(self.visibility + " ",
self.visibility + " ")
if self.objectType == 'type':
- mainDeclNode += addnodes.desc_annotation('type ', 'type ')
+ prefix = self.declaration.get_type_declaration_prefix()
+ prefix += ' '
+ mainDeclNode += addnodes.desc_annotation(prefix, prefix)
elif self.objectType == 'member':
pass
elif self.objectType == 'function':
@@ -2429,14 +2479,23 @@ class Symbol(object):
# .. class:: Test
symbol._fill_empty(declaration, docname)
return symbol
- # it may simply be a functin overload
- # TODO: it could be a duplicate but let's just insert anyway
- # the id generation will warn about it
- symbol = Symbol(parent=parentSymbol, identifier=identifier,
- templateParams=templateParams,
- templateArgs=templateArgs,
- declaration=declaration,
- docname=docname)
+ # It may simply be a functin overload, so let's compare ids.
+ candSymbol = Symbol(parent=parentSymbol, identifier=identifier,
+ templateParams=templateParams,
+ templateArgs=templateArgs,
+ declaration=declaration,
+ docname=docname)
+ newId = declaration.get_newest_id()
+ oldId = symbol.declaration.get_newest_id()
+ if newId != oldId:
+ # we already inserted the symbol, so return the new one
+ symbol = candSymbol
+ else:
+ # Redeclaration of the same symbol.
+ # Let the new one be there, but raise an error to the client
+ # so it can use the real symbol as subscope.
+ # This will probably result in a duplicate id warning.
+ raise _DuplicateSymbolError(symbol, candSymbol)
else:
symbol = Symbol(parent=parentSymbol, identifier=identifier,
templateParams=templateParams,
@@ -3022,6 +3081,7 @@ class DefinitionParser(object):
def _parse_decl_specs_simple(self, outer, typed):
"""Just parse the simple ones."""
storage = None
+ threadLocal = None
inline = None
virtual = None
explicit = None
@@ -3036,6 +3096,9 @@ class DefinitionParser(object):
if self.skip_word('static'):
storage = 'static'
continue
+ if self.skip_word('extern'):
+ storage = 'extern'
+ continue
if outer == 'member':
if self.skip_word('mutable'):
storage = 'mutable'
@@ -3043,6 +3106,10 @@ class DefinitionParser(object):
if self.skip_word('register'):
storage = 'register'
continue
+ if not threadLocal and outer == 'member':
+ threadLocal = self.skip_word('thread_local')
+ if threadLocal:
+ continue
if outer == 'function':
# function-specifiers
@@ -3076,8 +3143,8 @@ class DefinitionParser(object):
if const:
continue
break
- return ASTDeclSpecsSimple(storage, inline, virtual, explicit, constexpr,
- volatile, const, friend)
+ return ASTDeclSpecsSimple(storage, threadLocal, inline, virtual,
+ explicit, constexpr, volatile, const, friend)
def _parse_decl_specs(self, outer, typed=True):
if outer:
@@ -3718,8 +3785,14 @@ class CPPObject(ObjectDescription):
symbol = parentSymbol.add_name(name)
self.env.ref_context['cpp:lastSymbol'] = symbol
raise ValueError
- symbol = parentSymbol.add_declaration(ast, docname=self.env.docname)
- self.env.ref_context['cpp:lastSymbol'] = symbol
+
+ try:
+ symbol = parentSymbol.add_declaration(ast, docname=self.env.docname)
+ self.env.ref_context['cpp:lastSymbol'] = symbol
+ except _DuplicateSymbolError as e:
+ # Assume we are actually in the old symbol,
+ # instead of the newly created duplicate.
+ self.env.ref_context['cpp:lastSymbol'] = e.symbol
if ast.objectType == 'enumerator':
self._add_enumerator_to_parent(ast)
diff --git a/sphinx/locale/bn/LC_MESSAGES/sphinx.js b/sphinx/locale/bn/LC_MESSAGES/sphinx.js
index 5624e41..e758ee2 100644
--- a/sphinx/locale/bn/LC_MESSAGES/sphinx.js
+++ b/sphinx/locale/bn/LC_MESSAGES/sphinx.js
@@ -1 +1 @@
-Documentation.addTranslations({"locale": "bn", "messages": {"%(filename)s — %(docstitle)s": "%(filename)s — %(docstitle)s", "© <a href=\"%(path)s\">Copyright</a> %(copyright)s.": "© <a href=\"%(path)s\">\u0995\u09aa\u09bf\u09b0\u09be\u0987\u099f</a> %(copyright)s.", "© Copyright %(copyright)s.": "© \u0995\u09aa\u09bf\u09b0\u09be\u0987\u099f %(copyright)s.", ", in ": "", "About these documents": "\u098f\u0987 \u09a1\u0995\u09c1\u09ae\u09c7\u09a8\u09cd\u099f [...]
\ No newline at end of file
+Documentation.addTranslations({"locale": "bn", "messages": {"%(filename)s — %(docstitle)s": "%(filename)s — %(docstitle)s", "© <a href=\"%(path)s\">Copyright</a> %(copyright)s.": "© <a href=\"%(path)s\">\u0995\u09aa\u09bf\u09b0\u09be\u0987\u099f</a> %(copyright)s.", "© Copyright %(copyright)s.": "© \u0995\u09aa\u09bf\u09b0\u09be\u0987\u099f %(copyright)s.", ", in ": "", "About these documents": "\u098f\u0987 \u09a1\u0995\u09c1\u09ae\u09c7\u09a8\u09cd\u099f [...]
\ No newline at end of file
diff --git a/sphinx/locale/bn/LC_MESSAGES/sphinx.mo b/sphinx/locale/bn/LC_MESSAGES/sphinx.mo
index ae40e01..f2bc637 100644
Binary files a/sphinx/locale/bn/LC_MESSAGES/sphinx.mo and b/sphinx/locale/bn/LC_MESSAGES/sphinx.mo differ
diff --git a/sphinx/locale/bn/LC_MESSAGES/sphinx.po b/sphinx/locale/bn/LC_MESSAGES/sphinx.po
index 1ba3098..4c941e1 100644
--- a/sphinx/locale/bn/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/bn/LC_MESSAGES/sphinx.po
@@ -1,23 +1,23 @@
-# Bengali translations for Sphinx.
+# Translations template for Sphinx.
# Copyright (C) 2016 ORGANIZATION
# This file is distributed under the same license as the Sphinx project.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2016.
-#
+#
+# Translators:
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009
msgid ""
msgstr ""
-"Project-Id-Version: Sphinx\n"
+"Project-Id-Version: Sphinx\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2016-03-06 21:58+0900\n"
-"PO-Revision-Date: 2015-03-08 14:35+0000\n"
+"PO-Revision-Date: 2016-03-06 13:01+0000\n"
"Last-Translator: Takayuki Shimizukawa <shimizukawa at gmail.com>\n"
-"Language: bn\n"
-"Language-Team: Bengali "
-"(http://www.transifex.com/projects/p/sphinx-1/language/bn/)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language-Team: Bengali (http://www.transifex.com/sphinx-doc/sphinx-1/language/bn/)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.2.0\n"
+"Language: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: sphinx/config.py:91
#, python-format
@@ -178,9 +178,8 @@ msgid "variable"
msgstr ""
#: sphinx/domains/cpp.py:3608
-#, fuzzy
msgid "Template Parameters"
-msgstr "প্যারামিটার"
+msgstr ""
#: sphinx/domains/cpp.py:3611 sphinx/domains/javascript.py:125
msgid "Throws"
@@ -698,9 +697,7 @@ msgstr "%(last_updated)s সর্বশেষ পরিবর্তন কর
msgid ""
"Created using <a href=\"http://sphinx-doc.org/\">Sphinx</a> "
"%(sphinx_version)s."
-msgstr ""
-"<a href=\"http://sphinx-doc.org/\">Sphinx</a> %(sphinx_version)s দিয়ে "
-"তৈরী।"
+msgstr "<a href=\"http://sphinx-doc.org/\">Sphinx</a> %(sphinx_version)s দিয়ে তৈরী।"
#: sphinx/themes/basic/opensearch.xml:4
#, python-format
@@ -727,9 +724,7 @@ msgstr "পরবর্তী অধ্যায়"
msgid ""
"Please activate JavaScript to enable the search\n"
" functionality."
-msgstr ""
-"অনুসন্ধান করার জন্য অনুগ্রহপূর্বক জাভাস্ক্রিপ্ট \n"
-" সক্রিয় করুন।"
+msgstr "অনুসন্ধান করার জন্য অনুগ্রহপূর্বক জাভাস্ক্রিপ্ট \n সক্রিয় করুন।"
#: sphinx/themes/basic/search.html:32
msgid ""
@@ -737,28 +732,25 @@ msgid ""
" 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 ""
-"এখান থেকে এই নথিগুলোতে আপনি অনুসন্ধান করতে পারবেন। \n"
-" আপনার কাঙ্ক্ষিত শব্দসমূহ নিচের বাক্সে লিখুন এবং \"অনুসন্ধান\" বাটনে "
-"ক্লিক করুন।\n"
-" উল্লেখ্য, সকল শব্দসমূহের উপস্থিতি নিয়ে অনুসন্ধান করা হবে। যেসব পাতায় "
-"সকল\n"
-" শব্দ নেই সেগুলো বাদ দেয়া হবে।"
+msgstr "এখান থেকে এই নথিগুলোতে আপনি অনুসন্ধান করতে পারবেন। \n আপনার কাঙ্ক্ষিত শব্দসমূহ নিচের বাক্সে লিখুন এবং \"অনুসন্ধান\" বাটনে ক্লিক করুন।\n উল্লেখ্য, সকল শব্দসমূহের উপস্থিতি নিয়ে অনুসন্ধান করা হবে। যেসব পাতায় সকল\n শব্দ নেই সেগুলো বাদ দেয়া হবে।"
-#: sphinx/themes/basic/search.html:39 sphinx/themes/basic/searchresults.html:17
+#: sphinx/themes/basic/search.html:39
+#: sphinx/themes/basic/searchresults.html:17
msgid "search"
msgstr "খুঁজুন"
-#: sphinx/themes/basic/search.html:43 sphinx/themes/basic/searchresults.html:21
+#: sphinx/themes/basic/search.html:43
+#: sphinx/themes/basic/searchresults.html:21
#: sphinx/themes/basic/static/searchtools.js_t:282
msgid "Search Results"
msgstr "অনুসন্ধানের ফলাফল"
-#: sphinx/themes/basic/search.html:45 sphinx/themes/basic/searchresults.html:23
+#: sphinx/themes/basic/search.html:45
+#: sphinx/themes/basic/searchresults.html:23
#: sphinx/themes/basic/static/searchtools.js_t:284
msgid ""
-"Your search did not match any documents. Please make sure that all words "
-"are spelled correctly and that you've selected enough categories."
+"Your search did not match any documents. Please make sure that all words are"
+" spelled correctly and that you've selected enough categories."
msgstr ""
#: sphinx/themes/basic/searchbox.html:12
@@ -861,9 +853,8 @@ msgid "Release"
msgstr "রিলিজ"
#: sphinx/writers/latex.py:427
-#, fuzzy
msgid "page"
-msgstr "বিপজ্জনক"
+msgstr ""
#: sphinx/writers/latex.py:920 sphinx/writers/manpage.py:233
#: sphinx/writers/texinfo.py:620
@@ -886,16 +877,3 @@ msgstr ""
#: sphinx/writers/manpage.py:283 sphinx/writers/text.py:583
msgid "[image]"
msgstr "[ছবি]"
-
-#~ msgid "%B %d, %Y"
-#~ msgstr "%B %d, %Y"
-
-#~ msgid "%b %d, %Y"
-#~ msgstr "%b %d, %Y"
-
-#~ msgid "(The <<original entry>> is located in %s, line %d.)"
-#~ msgstr ""
-
-#~ msgid "Enter search terms or a module, class or function name."
-#~ msgstr "অনুসন্ধানের জন্য টার্ম, মডিউল, ক্লাস অথবা ফাংশনের নাম দিন।"
-
diff --git a/sphinx/locale/ca/LC_MESSAGES/sphinx.js b/sphinx/locale/ca/LC_MESSAGES/sphinx.js
index c8cdc2b..d3ba424 100644
--- a/sphinx/locale/ca/LC_MESSAGES/sphinx.js
+++ b/sphinx/locale/ca/LC_MESSAGES/sphinx.js
@@ -1 +1 @@
-Documentation.addTranslations({"locale": "ca", "messages": {"%(filename)s — %(docstitle)s": "%(filename)s — %(docstitle)s", "© <a href=\"%(path)s\">Copyright</a> %(copyright)s.": "© <a href=\\\"%(path)s\\\">Copyright</a> %(copyright)s.", "© Copyright %(copyright)s.": "© Copyright %(copyright)s.", ", in ": "", "About these documents": "Quant a aquests documents", "Automatically generated list of changes in version %(version)s": "Llista de canvis de la versi [...]
\ No newline at end of file
+Documentation.addTranslations({"locale": "ca", "messages": {"%(filename)s — %(docstitle)s": "%(filename)s — %(docstitle)s", "© <a href=\"%(path)s\">Copyright</a> %(copyright)s.": "© <a href=\\\"%(path)s\\\">Copyright</a> %(copyright)s.", "© Copyright %(copyright)s.": "© Copyright %(copyright)s.", ", in ": "", "About these documents": "Quant a aquests documents", "Automatically generated list of changes in version %(version)s": "Llista de canvis de la versi [...]
\ No newline at end of file
diff --git a/sphinx/locale/ca/LC_MESSAGES/sphinx.mo b/sphinx/locale/ca/LC_MESSAGES/sphinx.mo
index 41b83e6..373cb2c 100644
Binary files a/sphinx/locale/ca/LC_MESSAGES/sphinx.mo and b/sphinx/locale/ca/LC_MESSAGES/sphinx.mo differ
diff --git a/sphinx/locale/ca/LC_MESSAGES/sphinx.po b/sphinx/locale/ca/LC_MESSAGES/sphinx.po
index cbe0404..73ab50a 100644
--- a/sphinx/locale/ca/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/ca/LC_MESSAGES/sphinx.po
@@ -1,23 +1,23 @@
-# Catalan translations for Sphinx.
+# Translations template for Sphinx.
# Copyright (C) 2016 ORGANIZATION
# This file is distributed under the same license as the Sphinx project.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2016.
-#
+#
+# Translators:
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009
msgid ""
msgstr ""
-"Project-Id-Version: Sphinx\n"
+"Project-Id-Version: Sphinx\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2016-03-06 21:58+0900\n"
-"PO-Revision-Date: 2015-03-08 14:35+0000\n"
+"PO-Revision-Date: 2016-03-06 13:01+0000\n"
"Last-Translator: Takayuki Shimizukawa <shimizukawa at gmail.com>\n"
-"Language: ca\n"
-"Language-Team: Catalan "
-"(http://www.transifex.com/projects/p/sphinx-1/language/ca/)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language-Team: Catalan (http://www.transifex.com/sphinx-doc/sphinx-1/language/ca/)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.2.0\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: sphinx/config.py:91
#, python-format
@@ -178,9 +178,8 @@ msgid "variable"
msgstr "variable"
#: sphinx/domains/cpp.py:3608
-#, fuzzy
msgid "Template Parameters"
-msgstr "Paràmetres"
+msgstr ""
#: sphinx/domains/cpp.py:3611 sphinx/domains/javascript.py:125
msgid "Throws"
@@ -474,9 +473,9 @@ msgid "<<original entry>>"
msgstr ""
#: sphinx/ext/todo.py:132
-#, fuzzy, python-format
+#, python-format
msgid "(The <<original entry>> is located in %s, line %d.)"
-msgstr "(La <<entrada original>> està a %s, línia %d i.)"
+msgstr ""
#: sphinx/ext/todo.py:141
msgid "original entry"
@@ -698,9 +697,7 @@ msgstr "Última actualització el %(last_updated)s."
msgid ""
"Created using <a href=\"http://sphinx-doc.org/\">Sphinx</a> "
"%(sphinx_version)s."
-msgstr ""
-"Creat amb <a href=\"http://sphinx-doc.org/\">Sphinx</a> "
-"%(sphinx_version)s."
+msgstr "Creat amb <a href=\"http://sphinx-doc.org/\">Sphinx</a> %(sphinx_version)s."
#: sphinx/themes/basic/opensearch.xml:4
#, python-format
@@ -727,9 +724,7 @@ msgstr "capítol següent"
msgid ""
"Please activate JavaScript to enable the search\n"
" functionality."
-msgstr ""
-"Activa JavaScript per utilitzar la funcionalitat\n"
-"de cerca."
+msgstr "Activa JavaScript per utilitzar la funcionalitat\nde cerca."
#: sphinx/themes/basic/search.html:32
msgid ""
@@ -737,26 +732,25 @@ msgid ""
" 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 ""
-"Des d'aquí pots fer cerques en aquests documents. Entra les \n"
-"paraules de la teva cerca i clica el botó \"cerca\". Tingues en compte\n"
-"que la cerca inclourà totes les paraules que posis. Les pàgines que no\n"
-"tenen totes les paraules no sortiràn."
+msgstr "Des d'aquí pots fer cerques en aquests documents. Entra les \nparaules de la teva cerca i clica el botó \"cerca\". Tingues en compte\nque la cerca inclourà totes les paraules que posis. Les pàgines que no\ntenen totes les paraules no sortiràn."
-#: sphinx/themes/basic/search.html:39 sphinx/themes/basic/searchresults.html:17
+#: sphinx/themes/basic/search.html:39
+#: sphinx/themes/basic/searchresults.html:17
msgid "search"
msgstr "cerca"
-#: sphinx/themes/basic/search.html:43 sphinx/themes/basic/searchresults.html:21
+#: sphinx/themes/basic/search.html:43
+#: sphinx/themes/basic/searchresults.html:21
... 11647 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx.git
More information about the Python-modules-commits
mailing list