[Python-checkins] r66258 - in doctools/trunk: babel.cfg setup.py sphinx/__init__.py sphinx/builder.py sphinx/directives/desc.py sphinx/locale/cs/LC_MESSAGES/sphinx.js sphinx/locale/cs/LC_MESSAGES/sphinx.mo sphinx/locale/cs/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/fr/LC_MESSAGES/sphinx.js sphinx/locale/fr/LC_MESSAGES/sphinx.mo sphinx/locale/fr/LC_MESSAGES/sphinx.po sphinx/locale/pl/LC_MESSAGES/sphinx.js sphinx/locale/pl/LC_MESSAGES/sphinx.mo sphinx/locale/pl/LC_MESSAGES/sphinx.po sphinx/locale/sphinx.pot sphinx/static/doctools.js sphinx/static/searchtools.js

georg.brandl python-checkins at python.org
Sat Sep 6 19:36:26 CEST 2008


Author: georg.brandl
Date: Sat Sep  6 19:36:25 2008
New Revision: 66258

Log:
Add translation of strings in JavaScript files.


Added:
   doctools/trunk/sphinx/locale/cs/LC_MESSAGES/sphinx.js   (contents, props changed)
   doctools/trunk/sphinx/locale/de/LC_MESSAGES/sphinx.js   (contents, props changed)
   doctools/trunk/sphinx/locale/fr/LC_MESSAGES/sphinx.js   (contents, props changed)
   doctools/trunk/sphinx/locale/pl/LC_MESSAGES/sphinx.js   (contents, props changed)
Modified:
   doctools/trunk/babel.cfg
   doctools/trunk/setup.py
   doctools/trunk/sphinx/__init__.py
   doctools/trunk/sphinx/builder.py
   doctools/trunk/sphinx/directives/desc.py
   doctools/trunk/sphinx/locale/cs/LC_MESSAGES/sphinx.mo
   doctools/trunk/sphinx/locale/cs/LC_MESSAGES/sphinx.po
   doctools/trunk/sphinx/locale/de/LC_MESSAGES/sphinx.mo
   doctools/trunk/sphinx/locale/de/LC_MESSAGES/sphinx.po
   doctools/trunk/sphinx/locale/fr/LC_MESSAGES/sphinx.mo
   doctools/trunk/sphinx/locale/fr/LC_MESSAGES/sphinx.po
   doctools/trunk/sphinx/locale/pl/LC_MESSAGES/sphinx.mo
   doctools/trunk/sphinx/locale/pl/LC_MESSAGES/sphinx.po
   doctools/trunk/sphinx/locale/sphinx.pot
   doctools/trunk/sphinx/static/doctools.js
   doctools/trunk/sphinx/static/searchtools.js

Modified: doctools/trunk/babel.cfg
==============================================================================
--- doctools/trunk/babel.cfg	(original)
+++ doctools/trunk/babel.cfg	Sat Sep  6 19:36:25 2008
@@ -3,3 +3,4 @@
 [python: **.py]
 [jinja: **/templates/**.html]
 [jinja: **/templates/**.xml]
+[javascript: **.js]

Modified: doctools/trunk/setup.py
==============================================================================
--- doctools/trunk/setup.py	(original)
+++ doctools/trunk/setup.py	Sat Sep  6 19:36:25 2008
@@ -2,6 +2,7 @@
 import ez_setup
 ez_setup.use_setuptools()
 
+import os
 import sys
 from setuptools import setup
 
@@ -53,6 +54,102 @@
     else:
         del requires[-1]
 
+
+# Provide a "compile_catalog" command that also creates the translated
+# JavaScript files if Babel is available.
+
+cmdclass = {}
+
+try:
+    from babel.messages.pofile import read_po
+    from babel.messages.frontend import compile_catalog
+    from simplejson import dump
+    from distutils import log
+except ImportError:
+    class compile_catalog_plusjs(compile_catalog):
+        def run(self):
+            compile_catalog.run(self)
+            log.warning('simplejson or babel is not available; not writing '
+                        'JavaScript translation files.')
+else:
+    class compile_catalog_plusjs(compile_catalog):
+        """
+        An extended command that writes all message strings that occur in
+        JavaScript files to a JavaScript file along with the .mo file.
+
+        Unfortunately, babel's setup command isn't built very extensible, so
+        most of the run() code is duplicated here.
+        """
+
+        def run(self):
+            compile_catalog.run(self)
+
+            po_files = []
+            js_files = []
+
+            if not self.input_file:
+                if self.locale:
+                    po_files.append((self.locale,
+                                     os.path.join(self.directory, self.locale,
+                                                  'LC_MESSAGES',
+                                                  self.domain + '.po')))
+                    js_files.append(os.path.join(self.directory, self.locale,
+                                                 'LC_MESSAGES',
+                                                 self.domain + '.js'))
+                else:
+                    for locale in os.listdir(self.directory):
+                        po_file = os.path.join(self.directory, locale,
+                                               'LC_MESSAGES', self.domain + '.po')
+                        if os.path.exists(po_file):
+                            po_files.append((locale, po_file))
+                            js_files.append(os.path.join(self.directory, locale,
+                                                         'LC_MESSAGES',
+                                                         self.domain + '.js'))
+            else:
+                po_files.append((self.locale, self.input_file))
+                if self.output_file:
+                    js_files.append(self.output_file)
+                else:
+                    js_files.append(os.path.join(self.directory, self.locale,
+                                                 'LC_MESSAGES',
+                                                 self.domain + '.js'))
+
+            for js_file, (locale, po_file) in zip(js_files, po_files):
+                infile = open(po_file, 'r')
+                try:
+                    catalog = read_po(infile, locale)
+                finally:
+                    infile.close()
+
+                if catalog.fuzzy and not self.use_fuzzy:
+                    continue
+
+                log.info('writing JavaScript strings in catalog %r to %r',
+                         po_file, js_file)
+
+                jscatalog = {}
+                for message in catalog:
+                    if any(x[0].endswith('.js') for x in message.locations):
+                        msgid = message.id
+                        if isinstance(msgid, (list, tuple)):
+                            msgid = msgid[0]
+                        jscatalog[msgid] = message.string
+
+                outfile = open(js_file, 'wb')
+                try:
+                    outfile.write('Documentation.addTranslations(');
+                    dump(dict(
+                        messages=jscatalog,
+                        plural_expr=catalog.plural_expr,
+                        locale=str(catalog.locale)
+                        ), outfile)
+                    outfile.write(');')
+                finally:
+                    outfile.close()
+
+cmdclass['compile_catalog'] = compile_catalog_plusjs
+
+
 setup(
     name='Sphinx',
     version=sphinx.__version__,
@@ -78,8 +175,6 @@
     platforms='any',
     packages=['sphinx'],
     include_package_data=True,
-    # replaced by the entry points
-    #scripts=['sphinx-build.py', 'sphinx-quickstart.py'],
     entry_points={
         'console_scripts': [
             'sphinx-build = sphinx:main',
@@ -90,4 +185,5 @@
         ],
     },
     install_requires=requires,
+    cmdclass=cmdclass,
 )

Modified: doctools/trunk/sphinx/__init__.py
==============================================================================
--- doctools/trunk/sphinx/__init__.py	(original)
+++ doctools/trunk/sphinx/__init__.py	Sat Sep  6 19:36:25 2008
@@ -21,7 +21,7 @@
 
 __revision__ = '$Revision$'
 __version__ = '0.5'
-__released__ = '0.5'
+__released__ = '0.5 (SVN)'
 
 
 def usage(argv, msg=None):

Modified: doctools/trunk/sphinx/builder.py
==============================================================================
--- doctools/trunk/sphinx/builder.py	(original)
+++ doctools/trunk/sphinx/builder.py	Sat Sep  6 19:36:25 2008
@@ -339,13 +339,15 @@
     copysource = True
     out_suffix = '.html'
     indexer_format = json
-    script_files = ['_static/jquery.js', '_static/doctools.js']
     supported_image_types = ['image/svg+xml', 'image/png', 'image/gif',
                              'image/jpeg']
     searchindex_filename = 'searchindex.json'
     add_header_links = True
     add_definition_links = True
 
+    # This is a class attribute because it is mutated by Sphinx.add_javascript.
+    script_files = ['_static/jquery.js', '_static/doctools.js']
+
     def init(self):
         """Load templates."""
         self.init_templates()
@@ -353,6 +355,12 @@
         if self.config.html_file_suffix:
             self.out_suffix = self.config.html_file_suffix
 
+        if self.config.language is not None:
+            jsfile = path.join(path.dirname(__file__), 'locale', self.config.language,
+                               'LC_MESSAGES', 'sphinx.js')
+            if path.isfile(jsfile):
+                self.script_files.append('_static/translations.js')
+
     def init_translator_class(self):
         if self.config.html_translator_class:
             self.translator_class = self.app.import_object(
@@ -644,6 +652,13 @@
                     if path.exists(targetname):
                         shutil.rmtree(targetname)
                     shutil.copytree(fullname, targetname)
+        # add translations JavaScript file
+        if self.config.language is not None:
+            jsfile = path.join(path.dirname(__file__), 'locale', self.config.language,
+                               'LC_MESSAGES', 'sphinx.js')
+            if path.isfile(jsfile):
+                shutil.copyfile(jsfile, path.join(self.outdir, '_static',
+                                                  'translations.js'))
         # copy logo file (handled differently)
         if self.config.html_logo:
             logobase = path.basename(self.config.html_logo)

Modified: doctools/trunk/sphinx/directives/desc.py
==============================================================================
--- doctools/trunk/sphinx/directives/desc.py	(original)
+++ doctools/trunk/sphinx/directives/desc.py	Sat Sep  6 19:36:25 2008
@@ -523,7 +523,7 @@
                      content_offset, block_text, state, state_machine):
     """Generic target for user-defined cross-reference types."""
     env = state.document.settings.env
-    rolename, indextemplate, _ = additional_xref_types[targettype]
+    rolename, indextemplate, foo = additional_xref_types[targettype]
     # normalize whitespace in fullname like xfileref_role does
     fullname = ws_re.sub('', arguments[0].strip())
     targetname = '%s-%s' % (rolename, fullname)

Added: doctools/trunk/sphinx/locale/cs/LC_MESSAGES/sphinx.js
==============================================================================
--- (empty file)
+++ doctools/trunk/sphinx/locale/cs/LC_MESSAGES/sphinx.js	Sat Sep  6 19:36:25 2008
@@ -0,0 +1 @@
+Documentation.addTranslations({"locale": "cs", "plural_expr": "(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)", "messages": {"Search Results": "V\u00fdsledky hled\u00e1n\u00ed", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "", "Getting search index...": "", "Permalink to this headline": "Trval\u00fd odkaz na tento nadpis", "Searching": "hledej", "Permalink to this definition": "Trval\u00fd odkaz na tuto definici", "Hide Search Matches": "", "Search finished, found %s page(s) matching the search query.": ""}});
\ No newline at end of file

Modified: doctools/trunk/sphinx/locale/cs/LC_MESSAGES/sphinx.mo
==============================================================================
Binary files doctools/trunk/sphinx/locale/cs/LC_MESSAGES/sphinx.mo	(original) and doctools/trunk/sphinx/locale/cs/LC_MESSAGES/sphinx.mo	Sat Sep  6 19:36:25 2008 differ

Modified: doctools/trunk/sphinx/locale/cs/LC_MESSAGES/sphinx.po
==============================================================================
--- doctools/trunk/sphinx/locale/cs/LC_MESSAGES/sphinx.po	(original)
+++ doctools/trunk/sphinx/locale/cs/LC_MESSAGES/sphinx.po	Sat Sep  6 19:36:25 2008
@@ -1,4 +1,4 @@
-# Translations template for Sphinx.
+# Czech translations for Sphinx.
 # Copyright (C) 2008 ORGANIZATION
 # This file is distributed under the same license as the Sphinx project.
 # FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
@@ -8,23 +8,22 @@
 "Project-Id-Version: Sphinx 0.5\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
 "POT-Creation-Date: 2008-08-10 11:43+0000\n"
-"PO-Revision-Date: 2008-08-18 08:44+0100\n"
+"PO-Revision-Date: 2008-09-06 19:10+0200\n"
 "Last-Translator: Pavel Kosina <pavel.kosina at gmail.com>\n"
 "Language-Team: Pavel Kosina <pavel.kosina at gmail.com>\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.3\n"
-"X-Poedit-Language: Czech\n"
-"X-Poedit-Country: CZECH REPUBLIC\n"
 
 #: sphinx/builder.py:391
 #, python-format
 msgid "%b %d, %Y"
 msgstr "%d.%m.%Y"
 
-#: sphinx/builder.py:410
-#: sphinx/templates/defindex.html:21
+#: sphinx/builder.py:410 sphinx/templates/defindex.html:21
 msgid "General Index"
 msgstr "Rejstřík indexů"
 
@@ -32,11 +31,9 @@
 msgid "index"
 msgstr "index"
 
-#: sphinx/builder.py:412
-#: sphinx/htmlhelp.py:155
-#: sphinx/templates/defindex.html:19
-#: sphinx/templates/modindex.html:2
-#: sphinx/templates/modindex.html:12
+#: sphinx/builder.py:412 sphinx/htmlhelp.py:155
+#: sphinx/templates/defindex.html:19 sphinx/templates/modindex.html:2
+#: sphinx/templates/modindex.html:13
 msgid "Global Module Index"
 msgstr "Rejstřík modulů"
 
@@ -52,55 +49,48 @@
 msgid "previous"
 msgstr "předchozí"
 
-#: sphinx/builder.py:1089
+#: sphinx/builder.py:1092
 msgid "Builtins"
 msgstr "Vestavěné funkce"
 
-#: sphinx/builder.py:1091
+#: sphinx/builder.py:1094
 msgid "Module level"
 msgstr "Úroveň modulů"
 
-#: sphinx/environment.py:108
-#: sphinx/latexwriter.py:114
+#: sphinx/environment.py:108 sphinx/latexwriter.py:129
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d.%m.%Y"
 
-#: sphinx/htmlwriter.py:73
+#: sphinx/htmlwriter.py:73 sphinx/static/doctools.js:143
 msgid "Permalink to this definition"
 msgstr "Trvalý odkaz na tuto definici"
 
-#: sphinx/htmlwriter.py:379
+#: sphinx/htmlwriter.py:379 sphinx/static/doctools.js:136
 msgid "Permalink to this headline"
 msgstr "Trvalý odkaz na tento nadpis"
 
-#: sphinx/latexwriter.py:128
+#: sphinx/latexwriter.py:143
 msgid "Release"
 msgstr "Vydání"
 
-#: sphinx/latexwriter.py:171
+#: sphinx/latexwriter.py:188
 msgid "Module index"
 msgstr "Rejstřík modulů"
 
-#: sphinx/latexwriter.py:173
-#: sphinx/templates/genindex-single.html:2
+#: sphinx/latexwriter.py:190 sphinx/templates/genindex-single.html:2
 #: sphinx/templates/genindex-split.html:2
-#: sphinx/templates/genindex-split.html:5
-#: sphinx/templates/genindex.html:2
-#: sphinx/templates/genindex.html:5
-#: sphinx/templates/genindex.html:48
+#: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2
+#: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48
 msgid "Index"
 msgstr "Index"
 
-#: sphinx/roles.py:52
-#: sphinx/roles.py:55
-#: sphinx/directives/desc.py:519
+#: sphinx/roles.py:52 sphinx/directives/desc.py:514
 #, python-format
 msgid "environment variable; %s"
 msgstr "promměná prostředí, %s"
 
-#: sphinx/roles.py:61
-#: sphinx/roles.py:64
+#: sphinx/roles.py:59
 #, python-format
 msgid "Python Enhancement Proposals!PEP %s"
 msgstr "Python Enhancement Proposals!PEP %s"
@@ -119,8 +109,7 @@
 msgid "%s() (built-in function)"
 msgstr "%s() (vestavěná funkce)"
 
-#: sphinx/directives/desc.py:27
-#: sphinx/directives/desc.py:41
+#: sphinx/directives/desc.py:27 sphinx/directives/desc.py:41
 #: sphinx/directives/desc.py:53
 #, python-format
 msgid "%s() (in module %s)"
@@ -131,8 +120,7 @@
 msgid "%s (built-in variable)"
 msgstr "%s() (vestavěná proměnná)"
 
-#: sphinx/directives/desc.py:31
-#: sphinx/directives/desc.py:65
+#: sphinx/directives/desc.py:31 sphinx/directives/desc.py:65
 #, python-format
 msgid "%s (in module %s)"
 msgstr "%s() (v modulu %s)"
@@ -218,7 +206,6 @@
 msgstr "Parametry"
 
 #: sphinx/directives/desc.py:402
-#: sphinx/directives/desc.py:404
 #, python-format
 msgid "command line option; %s"
 msgstr "parametry příkazového řádku; %s"
@@ -232,19 +219,19 @@
 msgid "%s (module)"
 msgstr "%s (module)"
 
-#: sphinx/directives/other.py:148
+#: sphinx/directives/other.py:147
 msgid "Section author: "
 msgstr "Autor sekce: "
 
-#: sphinx/directives/other.py:150
+#: sphinx/directives/other.py:149
 msgid "Module author: "
 msgstr "Autor modulu: "
 
-#: sphinx/directives/other.py:152
+#: sphinx/directives/other.py:151
 msgid "Author: "
 msgstr "Autor: "
 
-#: sphinx/directives/other.py:238
+#: sphinx/directives/other.py:233
 msgid "See also"
 msgstr "Viz také"
 
@@ -331,6 +318,34 @@
 msgid "built-in function"
 msgstr "vestavěná funkce"
 
+#: sphinx/static/doctools.js:172
+msgid "Hide Search Matches"
+msgstr ""
+
+#: sphinx/static/searchtools.js:242
+#, fuzzy
+msgid "Searching"
+msgstr "hledej"
+
+#: sphinx/static/searchtools.js:246
+msgid "Getting search index..."
+msgstr ""
+
+#: sphinx/static/searchtools.js:384 sphinx/templates/search.html:18
+msgid "Search Results"
+msgstr "Výsledky hledání"
+
+#: sphinx/static/searchtools.js:386
+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 ""
+
+#: sphinx/static/searchtools.js:389
+#, python-format
+msgid "Search finished, found %s page(s) matching the search query."
+msgstr ""
+
 #: sphinx/templates/defindex.html:2
 msgid "Overview"
 msgstr "Přehled"
@@ -370,8 +385,7 @@
 
 #: sphinx/templates/genindex-single.html:44
 #: sphinx/templates/genindex-split.html:14
-#: sphinx/templates/genindex-split.html:27
-#: sphinx/templates/genindex.html:54
+#: sphinx/templates/genindex-split.html:27 sphinx/templates/genindex.html:54
 msgid "Full index on one page"
 msgstr "Plný index na jedné stránce"
 
@@ -415,8 +429,7 @@
 msgid "Suggest Change"
 msgstr "Návrh změnu"
 
-#: sphinx/templates/layout.html:60
-#: sphinx/templates/layout.html:62
+#: sphinx/templates/layout.html:60 sphinx/templates/layout.html:62
 msgid "Show Source"
 msgstr "Ukázat zdroj"
 
@@ -453,8 +466,7 @@
 msgid "Global index"
 msgstr "Celkový index"
 
-#: sphinx/templates/layout.html:131
-#: sphinx/templates/search.html:2
+#: sphinx/templates/layout.html:131 sphinx/templates/search.html:2
 #: sphinx/templates/search.html:5
 msgid "Search"
 msgstr "Hledání"
@@ -480,18 +492,22 @@
 
 #: sphinx/templates/layout.html:186
 #, python-format
-msgid "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
-msgstr "Vytvořeno pomocí <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 ""
+"Vytvořeno pomocí <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
+"%(sphinx_version)s."
 
-#: sphinx/templates/modindex.html:14
+#: sphinx/templates/modindex.html:15
 msgid "Most popular modules:"
 msgstr "Nejpopulárnější moduly:"
 
-#: sphinx/templates/modindex.html:23
+#: sphinx/templates/modindex.html:24
 msgid "Show modules only available on these platforms"
 msgstr "Zobrazit moduly dostupné na této platformě"
 
-#: sphinx/templates/modindex.html:55
+#: sphinx/templates/modindex.html:56
 msgid "Deprecated"
 msgstr "Zastaralé"
 
@@ -501,8 +517,14 @@
 msgstr "Prohledat %(docstitle)s"
 
 #: sphinx/templates/page.html:8
-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 "<strong>Poznámka:</strong> Stránka, kterou hledáte, neexistuje.<br>Snažili jsme se najít nové umístění této stránky, ale nepovedlo se."
+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 ""
+"<strong>Poznámka:</strong> Stránka, kterou hledáte, "
+"neexistuje.<br>Snažili jsme se najít nové umístění této stránky, ale "
+"nepovedlo se."
 
 #: sphinx/templates/search.html:7
 msgid ""
@@ -511,17 +533,15 @@
 "    function will automatically search for all of the words. Pages\n"
 "    containing less words won't appear in the result list."
 msgstr ""
-"Toto je vyhledávací stránka. Zadejte klíčová slova    do pole níže a klikněte na \"hledej\". \n"
-"Prohledávání funkcí  hledá automaticky všechna slova. Stránky obsahující    slov méně, nebudou nalezeny."
+"Toto je vyhledávací stránka. Zadejte klíčová slova    do pole níže a "
+"klikněte na \"hledej\". \n"
+"Prohledávání funkcí  hledá automaticky všechna slova. Stránky obsahující"
+"    slov méně, nebudou nalezeny."
 
 #: sphinx/templates/search.html:14
 msgid "search"
 msgstr "hledej"
 
-#: sphinx/templates/search.html:18
-msgid "Search Results"
-msgstr "Výsledky hledání"
-
 #: sphinx/templates/search.html:20
 msgid "Your search did not match any results."
 msgstr "Nic jsme nenašli."
@@ -554,6 +574,3 @@
 msgid "Other changes"
 msgstr "Ostatní změny"
 
-#~ msgid "Link"
-#~ msgstr "Odkaz"
-

Added: doctools/trunk/sphinx/locale/de/LC_MESSAGES/sphinx.js
==============================================================================
--- (empty file)
+++ doctools/trunk/sphinx/locale/de/LC_MESSAGES/sphinx.js	Sat Sep  6 19:36:25 2008
@@ -0,0 +1 @@
+Documentation.addTranslations({"locale": "de", "plural_expr": "(n != 1)", "messages": {"Search Results": "Suchergebnisse", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Es wurden keine Dokumente gefunden. Haben Sie alle Suchworte richtig geschrieben und gen\u00fcgend Kategorien ausgew\u00e4hlt?", "Getting search index...": "Suchindex wird geladen...", "Permalink to this headline": "Permalink zu dieser \u00dcberschrift", "Searching": "Suchen...", "Permalink to this definition": "Permalink zu dieser Definition", "Hide Search Matches": "Suchergebnisse ausblenden", "Search finished, found %s page(s) matching the search query.": "Suche beendet, %s Seite(n) mit Ergebnissen wurden gefunden."}});
\ No newline at end of file

Modified: doctools/trunk/sphinx/locale/de/LC_MESSAGES/sphinx.mo
==============================================================================
Binary files. No diff available.

Modified: doctools/trunk/sphinx/locale/de/LC_MESSAGES/sphinx.po
==============================================================================
--- doctools/trunk/sphinx/locale/de/LC_MESSAGES/sphinx.po	(original)
+++ doctools/trunk/sphinx/locale/de/LC_MESSAGES/sphinx.po	Sat Sep  6 19:36:25 2008
@@ -7,7 +7,7 @@
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
 "POT-Creation-Date: 2008-08-07 21:40+0200\n"
-"PO-Revision-Date: 2008-08-10 12:01+0000\n"
+"PO-Revision-Date: 2008-09-06 19:13+0200\n"
 "Last-Translator: Horst Gutmann <zerok at zerokspot.com>\n"
 "Language-Team: de <LL at li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -31,7 +31,7 @@
 
 #: sphinx/builder.py:412 sphinx/htmlhelp.py:155
 #: sphinx/templates/defindex.html:19 sphinx/templates/modindex.html:2
-#: sphinx/templates/modindex.html:12
+#: sphinx/templates/modindex.html:13
 msgid "Global Module Index"
 msgstr "Globaler Modulindex"
 
@@ -47,48 +47,48 @@
 msgid "previous"
 msgstr "zurück"
 
-#: sphinx/builder.py:1089
+#: sphinx/builder.py:1092
 msgid "Builtins"
 msgstr "Builtins"
 
-#: sphinx/builder.py:1091
+#: sphinx/builder.py:1094
 msgid "Module level"
 msgstr "Modulebene"
 
-#: sphinx/environment.py:108 sphinx/latexwriter.py:114
+#: sphinx/environment.py:108 sphinx/latexwriter.py:129
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d. %m. %Y"
 
-#: sphinx/htmlwriter.py:73
+#: sphinx/htmlwriter.py:73 sphinx/static/doctools.js:143
 msgid "Permalink to this definition"
 msgstr "Permalink zu dieser Definition"
 
-#: sphinx/htmlwriter.py:379
+#: sphinx/htmlwriter.py:379 sphinx/static/doctools.js:136
 msgid "Permalink to this headline"
 msgstr "Permalink zu dieser Überschrift"
 
-#: sphinx/latexwriter.py:128
+#: sphinx/latexwriter.py:143
 msgid "Release"
 msgstr "Release"
 
-#: sphinx/latexwriter.py:171
+#: sphinx/latexwriter.py:188
 msgid "Module index"
 msgstr "Modulindex"
 
-#: sphinx/latexwriter.py:173 sphinx/templates/genindex-single.html:2
+#: sphinx/latexwriter.py:190 sphinx/templates/genindex-single.html:2
 #: sphinx/templates/genindex-split.html:2
 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2
 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48
 msgid "Index"
 msgstr "Stichwortverzeichnis"
 
-#: sphinx/roles.py:52 sphinx/roles.py:55 sphinx/directives/desc.py:519
+#: sphinx/roles.py:52 sphinx/directives/desc.py:514
 #, python-format
 msgid "environment variable; %s"
 msgstr "Umgebungsvariable; %s"
 
-#: sphinx/roles.py:61 sphinx/roles.py:64
+#: sphinx/roles.py:59
 #, python-format
 msgid "Python Enhancement Proposals!PEP %s"
 msgstr "Python Enhancement Proposals!PEP %s"
@@ -203,7 +203,7 @@
 msgid "Parameters"
 msgstr "Parameter"
 
-#: sphinx/directives/desc.py:402 sphinx/directives/desc.py:404
+#: sphinx/directives/desc.py:402
 #, python-format
 msgid "command line option; %s"
 msgstr "Kommandozeilenoption; %s"
@@ -217,19 +217,19 @@
 msgid "%s (module)"
 msgstr "%s (Modul)"
 
-#: sphinx/directives/other.py:148
+#: sphinx/directives/other.py:147
 msgid "Section author: "
 msgstr "Autor des Abschnitts: "
 
-#: sphinx/directives/other.py:150
+#: sphinx/directives/other.py:149
 msgid "Module author: "
 msgstr "Autor des Moduls: "
 
-#: sphinx/directives/other.py:152
+#: sphinx/directives/other.py:151
 msgid "Author: "
 msgstr "Autor: "
 
-#: sphinx/directives/other.py:238
+#: sphinx/directives/other.py:233
 msgid "See also"
 msgstr "Siehe auch"
 
@@ -316,6 +316,34 @@
 msgid "built-in function"
 msgstr "eingebaute Funktion"
 
+#: sphinx/static/doctools.js:172
+msgid "Hide Search Matches"
+msgstr "Suchergebnisse ausblenden"
+
+#: sphinx/static/searchtools.js:242
+#, fuzzy
+msgid "Searching"
+msgstr "Suchen..."
+
+#: sphinx/static/searchtools.js:246
+msgid "Getting search index..."
+msgstr "Suchindex wird geladen..."
+
+#: sphinx/static/searchtools.js:384 sphinx/templates/search.html:18
+msgid "Search Results"
+msgstr "Suchergebnisse"
+
+#: sphinx/static/searchtools.js:386
+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 Dokumente gefunden. Haben Sie alle Suchworte richtig geschrieben und genügend Kategorien ausgewählt?"
+
+#: sphinx/static/searchtools.js:389
+#, python-format
+msgid "Search finished, found %s page(s) matching the search query."
+msgstr "Suche beendet, %s Seite(n) mit Ergebnissen wurden gefunden."
+
 #: sphinx/templates/defindex.html:2
 msgid "Overview"
 msgstr "Übersicht"
@@ -469,15 +497,15 @@
 "Mit <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s "
 "erstellt."
 
-#: sphinx/templates/modindex.html:14
+#: sphinx/templates/modindex.html:15
 msgid "Most popular modules:"
 msgstr "Beliebteste Module:"
 
-#: sphinx/templates/modindex.html:23
+#: sphinx/templates/modindex.html:24
 msgid "Show modules only available on these platforms"
 msgstr "Zeige nur Module, die auf diesen Plattformen verfügbar sind"
 
-#: sphinx/templates/modindex.html:55
+#: sphinx/templates/modindex.html:56
 msgid "Deprecated"
 msgstr "Veraltet"
 
@@ -513,10 +541,6 @@
 msgid "search"
 msgstr "suchen"
 
-#: sphinx/templates/search.html:18
-msgid "Search Results"
-msgstr "Suchergebnisse"
-
 #: sphinx/templates/search.html:20
 msgid "Your search did not match any results."
 msgstr "Deine Suche ergab leider keine Treffer."

Added: doctools/trunk/sphinx/locale/fr/LC_MESSAGES/sphinx.js
==============================================================================
--- (empty file)
+++ doctools/trunk/sphinx/locale/fr/LC_MESSAGES/sphinx.js	Sat Sep  6 19:36:25 2008
@@ -0,0 +1 @@
+Documentation.addTranslations({"locale": "fr", "plural_expr": "(n > 1)", "messages": {"Search Results": "R\u00e9sultats de la recherche", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "", "Getting search index...": "", "Permalink to this headline": "Lien permanent vers ce titre", "Searching": "rechercher", "Permalink to this definition": "Lien permanent vers cette d\u00e9finition", "Hide Search Matches": "", "Search finished, found %s page(s) matching the search query.": ""}});
\ No newline at end of file

Modified: doctools/trunk/sphinx/locale/fr/LC_MESSAGES/sphinx.mo
==============================================================================
Binary files. No diff available.

Modified: doctools/trunk/sphinx/locale/fr/LC_MESSAGES/sphinx.po
==============================================================================
--- doctools/trunk/sphinx/locale/fr/LC_MESSAGES/sphinx.po	(original)
+++ doctools/trunk/sphinx/locale/fr/LC_MESSAGES/sphinx.po	Sat Sep  6 19:36:25 2008
@@ -8,7 +8,7 @@
 "Project-Id-Version: Sphinx 0.5\n"
 "Report-Msgid-Bugs-To: larlet at gmail.com\n"
 "POT-Creation-Date: 2008-08-08 12:39+0000\n"
-"PO-Revision-Date: 2008-08-10 12:01+0000\n"
+"PO-Revision-Date: 2008-09-06 19:10+0200\n"
 "Last-Translator: David Larlet <larlet at gmail.com>\n"
 "Language-Team: fr <LL at li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
@@ -32,7 +32,7 @@
 
 #: sphinx/builder.py:412 sphinx/htmlhelp.py:155
 #: sphinx/templates/defindex.html:19 sphinx/templates/modindex.html:2
-#: sphinx/templates/modindex.html:12
+#: sphinx/templates/modindex.html:13
 msgid "Global Module Index"
 msgstr "Index général des modules"
 
@@ -48,50 +48,50 @@
 msgid "previous"
 msgstr "précédent"
 
-#: sphinx/builder.py:1089
+#: sphinx/builder.py:1092
 msgid "Builtins"
 msgstr "Fonctions de base"
 
-#: sphinx/builder.py:1091
+#: sphinx/builder.py:1094
 #, fuzzy
 msgid "Module level"
 msgstr "Modules"
 
-#: sphinx/environment.py:108 sphinx/latexwriter.py:114
+#: sphinx/environment.py:108 sphinx/latexwriter.py:129
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%d %B %Y"
 
-#: sphinx/htmlwriter.py:73
+#: sphinx/htmlwriter.py:73 sphinx/static/doctools.js:143
 msgid "Permalink to this definition"
 msgstr "Lien permanent vers cette définition"
 
-#: sphinx/htmlwriter.py:379
+#: sphinx/htmlwriter.py:379 sphinx/static/doctools.js:136
 msgid "Permalink to this headline"
 msgstr "Lien permanent vers ce titre"
 
-#: sphinx/latexwriter.py:128
+#: sphinx/latexwriter.py:143
 msgid "Release"
 msgstr "Release"
 
-#: sphinx/latexwriter.py:171
+#: sphinx/latexwriter.py:188
 #, fuzzy
 msgid "Module index"
 msgstr "Index général des modules"
 
-#: sphinx/latexwriter.py:173 sphinx/templates/genindex-single.html:2
+#: sphinx/latexwriter.py:190 sphinx/templates/genindex-single.html:2
 #: sphinx/templates/genindex-split.html:2
 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2
 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48
 msgid "Index"
 msgstr "Index"
 
-#: sphinx/roles.py:52 sphinx/roles.py:55 sphinx/directives/desc.py:519
+#: sphinx/roles.py:52 sphinx/directives/desc.py:514
 #, python-format
 msgid "environment variable; %s"
 msgstr "variable d'environnement; %s"
 
-#: sphinx/roles.py:61 sphinx/roles.py:64
+#: sphinx/roles.py:59
 #, python-format
 msgid "Python Enhancement Proposals!PEP %s"
 msgstr "Python Enhancement Proposals!PEP %s"
@@ -206,7 +206,7 @@
 msgid "Parameters"
 msgstr "Paramètres"
 
-#: sphinx/directives/desc.py:402 sphinx/directives/desc.py:404
+#: sphinx/directives/desc.py:402
 #, python-format
 msgid "command line option; %s"
 msgstr "option de ligne de commande; %s"
@@ -220,19 +220,19 @@
 msgid "%s (module)"
 msgstr "%s (module)"
 
-#: sphinx/directives/other.py:148
+#: sphinx/directives/other.py:147
 msgid "Section author: "
 msgstr "Auteur de la section : "
 
-#: sphinx/directives/other.py:150
+#: sphinx/directives/other.py:149
 msgid "Module author: "
 msgstr "Auteur du module : "
 
-#: sphinx/directives/other.py:152
+#: sphinx/directives/other.py:151
 msgid "Author: "
 msgstr "Auteur : "
 
-#: sphinx/directives/other.py:238
+#: sphinx/directives/other.py:233
 msgid "See also"
 msgstr "Voir aussi"
 
@@ -319,6 +319,34 @@
 msgid "built-in function"
 msgstr "fonction de base"
 
+#: sphinx/static/doctools.js:172
+msgid "Hide Search Matches"
+msgstr ""
+
+#: sphinx/static/searchtools.js:242
+#, fuzzy
+msgid "Searching"
+msgstr "rechercher"
+
+#: sphinx/static/searchtools.js:246
+msgid "Getting search index..."
+msgstr ""
+
+#: sphinx/static/searchtools.js:384 sphinx/templates/search.html:18
+msgid "Search Results"
+msgstr "Résultats de la recherche"
+
+#: sphinx/static/searchtools.js:386
+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 ""
+
+#: sphinx/static/searchtools.js:389
+#, python-format
+msgid "Search finished, found %s page(s) matching the search query."
+msgstr ""
+
 #: sphinx/templates/defindex.html:2
 msgid "Overview"
 msgstr "Résumé"
@@ -472,15 +500,15 @@
 "Créé avec <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
 "%(sphinx_version)s."
 
-#: sphinx/templates/modindex.html:14
+#: sphinx/templates/modindex.html:15
 msgid "Most popular modules:"
 msgstr "Modules les plus utilisés :"
 
-#: sphinx/templates/modindex.html:23
+#: sphinx/templates/modindex.html:24
 msgid "Show modules only available on these platforms"
 msgstr "N'afficher que les modules disponibles sur ces plateformes"
 
-#: sphinx/templates/modindex.html:55
+#: sphinx/templates/modindex.html:56
 msgid "Deprecated"
 msgstr "Obsolète"
 
@@ -518,10 +546,6 @@
 msgid "search"
 msgstr "rechercher"
 
-#: sphinx/templates/search.html:18
-msgid "Search Results"
-msgstr "Résultats de la recherche"
-
 #: sphinx/templates/search.html:20
 msgid "Your search did not match any results."
 msgstr "Votre recherche n'a retourné aucun résultat"

Added: doctools/trunk/sphinx/locale/pl/LC_MESSAGES/sphinx.js
==============================================================================
--- (empty file)
+++ doctools/trunk/sphinx/locale/pl/LC_MESSAGES/sphinx.js	Sat Sep  6 19:36:25 2008
@@ -0,0 +1 @@
+Documentation.addTranslations({"locale": "pl", "plural_expr": "(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)", "messages": {"Search Results": "Wyniki wyszukiwania", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "", "Getting search index...": "", "Permalink to this headline": "Sta\u0142y odno\u015bnik do tego nag\u0142\u00f3wka", "Searching": "Szukaj", "Permalink to this definition": "Sta\u0142y odno\u015bnik do tej definicji", "Hide Search Matches": "", "Search finished, found %s page(s) matching the search query.": ""}});
\ No newline at end of file

Modified: doctools/trunk/sphinx/locale/pl/LC_MESSAGES/sphinx.mo
==============================================================================
Binary files. No diff available.

Modified: doctools/trunk/sphinx/locale/pl/LC_MESSAGES/sphinx.po
==============================================================================
--- doctools/trunk/sphinx/locale/pl/LC_MESSAGES/sphinx.po	(original)
+++ doctools/trunk/sphinx/locale/pl/LC_MESSAGES/sphinx.po	Sat Sep  6 19:36:25 2008
@@ -1,26 +1,25 @@
+
 msgid ""
 msgstr ""
-"Project-Id-Version: sphinx\n"
+"Project-Id-Version:  sphinx\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
 "POT-Creation-Date: 2008-08-10 11:43+0000\n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2008-09-06 19:10+0200\n"
 "Last-Translator: Michał Kandulski <Michal.Kandulski at poczta.onet.pl>\n"
 "Language-Team: \n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && "
+"(n%100<10 || n%100>=20) ? 1 : 2)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: POLAND\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Basepath: c:\\Python25\\Lib\\site-packages\\Sphinx-0.5dev_20080905-py2.5.egg\n"
+"Generated-By: Babel 0.9.3\n"
 
 #: sphinx/builder.py:391
 #, python-format
 msgid "%b %d, %Y"
 msgstr "%b %d %Y"
 
-#: sphinx/builder.py:410
-#: sphinx/templates/defindex.html:21
+#: sphinx/builder.py:410 sphinx/templates/defindex.html:21
 msgid "General Index"
 msgstr "Indeks ogólny"
 
@@ -28,11 +27,9 @@
 msgid "index"
 msgstr "indeks"
 
-#: sphinx/builder.py:412
-#: sphinx/htmlhelp.py:155
-#: sphinx/templates/defindex.html:19
-#: sphinx/templates/modindex.html:2
-#: sphinx/templates/modindex.html:12
+#: sphinx/builder.py:412 sphinx/htmlhelp.py:155
+#: sphinx/templates/defindex.html:19 sphinx/templates/modindex.html:2
+#: sphinx/templates/modindex.html:13
 msgid "Global Module Index"
 msgstr "Indeks modułów"
 
@@ -48,55 +45,48 @@
 msgid "previous"
 msgstr "wstecz"
 
-#: sphinx/builder.py:1089
+#: sphinx/builder.py:1092
 msgid "Builtins"
 msgstr "Wbudowane"
 
-#: sphinx/builder.py:1091
+#: sphinx/builder.py:1094
 msgid "Module level"
 msgstr "Poziom modułu"
 
-#: sphinx/environment.py:108
-#: sphinx/latexwriter.py:114
+#: sphinx/environment.py:108 sphinx/latexwriter.py:129
 #, python-format
 msgid "%B %d, %Y"
 msgstr "%B %d %Y"
 
-#: sphinx/htmlwriter.py:73
+#: sphinx/htmlwriter.py:73 sphinx/static/doctools.js:143
 msgid "Permalink to this definition"
 msgstr "Stały odnośnik do tej definicji"
 
-#: sphinx/htmlwriter.py:379
+#: sphinx/htmlwriter.py:379 sphinx/static/doctools.js:136
 msgid "Permalink to this headline"
 msgstr "Stały odnośnik do tego nagłówka"
 
-#: sphinx/latexwriter.py:128
+#: sphinx/latexwriter.py:143
 msgid "Release"
 msgstr "Wydanie"
 
-#: sphinx/latexwriter.py:171
+#: sphinx/latexwriter.py:188
 msgid "Module index"
 msgstr "Indeks modułów"
 
-#: sphinx/latexwriter.py:173
-#: sphinx/templates/genindex-single.html:2
+#: sphinx/latexwriter.py:190 sphinx/templates/genindex-single.html:2
 #: sphinx/templates/genindex-split.html:2
-#: sphinx/templates/genindex-split.html:5
-#: sphinx/templates/genindex.html:2
-#: sphinx/templates/genindex.html:5
-#: sphinx/templates/genindex.html:48
+#: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2
+#: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48
 msgid "Index"
 msgstr "Indeks"
 
-#: sphinx/roles.py:52
-#: sphinx/roles.py:55
-#: sphinx/directives/desc.py:519
+#: sphinx/roles.py:52 sphinx/directives/desc.py:514
 #, python-format
 msgid "environment variable; %s"
 msgstr "zmienna środowiskowa; %s"
 
-#: sphinx/roles.py:61
-#: sphinx/roles.py:64
+#: sphinx/roles.py:59
 #, python-format
 msgid "Python Enhancement Proposals!PEP %s"
 msgstr "Python Enhancement Proposals!PEP %s"
@@ -115,8 +105,7 @@
 msgid "%s() (built-in function)"
 msgstr "%s() (funkcja wbudowana)"
 
-#: sphinx/directives/desc.py:27
-#: sphinx/directives/desc.py:41
+#: sphinx/directives/desc.py:27 sphinx/directives/desc.py:41
 #: sphinx/directives/desc.py:53
 #, python-format
 msgid "%s() (in module %s)"
@@ -127,8 +116,7 @@
 msgid "%s (built-in variable)"
 msgstr "%s (zmienna wbudowana)"
 
-#: sphinx/directives/desc.py:31
-#: sphinx/directives/desc.py:65
+#: sphinx/directives/desc.py:31 sphinx/directives/desc.py:65
 #, python-format
 msgid "%s (in module %s)"
 msgstr "%s (w module %s)"
@@ -214,7 +202,6 @@
 msgstr "Parametry"
 
 #: sphinx/directives/desc.py:402
-#: sphinx/directives/desc.py:404
 #, python-format
 msgid "command line option; %s"
 msgstr "opcja linii komend; %s"
@@ -228,19 +215,19 @@
 msgid "%s (module)"
 msgstr "%s (moduł)"
 
-#: sphinx/directives/other.py:148
+#: sphinx/directives/other.py:147
 msgid "Section author: "
 msgstr "Autor rozdziału: "
 
-#: sphinx/directives/other.py:150
+#: sphinx/directives/other.py:149
 msgid "Module author: "
 msgstr "Autor modułu: "
 
-#: sphinx/directives/other.py:152
+#: sphinx/directives/other.py:151
 msgid "Author: "
 msgstr "Autor: "
 
-#: sphinx/directives/other.py:238
+#: sphinx/directives/other.py:233
 msgid "See also"
 msgstr "Zobacz także"
 
@@ -327,6 +314,34 @@
 msgid "built-in function"
 msgstr "funkcja wbudowana"
 
+#: sphinx/static/doctools.js:172
+msgid "Hide Search Matches"
+msgstr ""
+
+#: sphinx/static/searchtools.js:242
+#, fuzzy
+msgid "Searching"
+msgstr "Szukaj"
+
+#: sphinx/static/searchtools.js:246
+msgid "Getting search index..."
+msgstr ""
+
+#: sphinx/static/searchtools.js:384 sphinx/templates/search.html:18
+msgid "Search Results"
+msgstr "Wyniki wyszukiwania"
+
+#: sphinx/static/searchtools.js:386
+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 ""
+
+#: sphinx/static/searchtools.js:389
+#, python-format
+msgid "Search finished, found %s page(s) matching the search query."
+msgstr ""
+
 #: sphinx/templates/defindex.html:2
 msgid "Overview"
 msgstr "Przegląd"
@@ -366,8 +381,7 @@
 
 #: sphinx/templates/genindex-single.html:44
 #: sphinx/templates/genindex-split.html:14
-#: sphinx/templates/genindex-split.html:27
-#: sphinx/templates/genindex.html:54
+#: sphinx/templates/genindex-split.html:27 sphinx/templates/genindex.html:54
 msgid "Full index on one page"
 msgstr "Cały indeks na jednej stronie"
 
@@ -411,8 +425,7 @@
 msgid "Suggest Change"
 msgstr "Zasugeruj zmianę"
 
-#: sphinx/templates/layout.html:60
-#: sphinx/templates/layout.html:62
+#: sphinx/templates/layout.html:60 sphinx/templates/layout.html:62
 msgid "Show Source"
 msgstr "Pokaż źródło"
 
@@ -449,8 +462,7 @@
 msgid "Global index"
 msgstr "Globalny indeks"
 
-#: sphinx/templates/layout.html:131
-#: sphinx/templates/search.html:2
+#: sphinx/templates/layout.html:131 sphinx/templates/search.html:2
 #: sphinx/templates/search.html:5
 msgid "Search"
 msgstr "Szukaj"
@@ -476,18 +488,22 @@
 
 #: sphinx/templates/layout.html:186
 #, python-format
-msgid "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
-msgstr "Utworzone przy pomocy <a href=\"http://sphinx.pocoo.org/\">Sphinx</a>'a %(sphinx_version)s."
+msgid ""
+"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
+"%(sphinx_version)s."
+msgstr ""
+"Utworzone przy pomocy <a href=\"http://sphinx.pocoo.org/\">Sphinx</a>'a "
+"%(sphinx_version)s."
 
-#: sphinx/templates/modindex.html:14
+#: sphinx/templates/modindex.html:15
 msgid "Most popular modules:"
 msgstr "Najbardziej popularne moduły:"
 
-#: sphinx/templates/modindex.html:23
+#: sphinx/templates/modindex.html:24
 msgid "Show modules only available on these platforms"
 msgstr "Pokaż moduły dostępne tylko na tych platformach"
 
-#: sphinx/templates/modindex.html:55
+#: sphinx/templates/modindex.html:56
 msgid "Deprecated"
 msgstr "Niezalecane"
 
@@ -497,8 +513,16 @@
 msgstr "Przeszukaj %(docstitle)s"
 
 #: sphinx/templates/page.html:8
-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 "<strong>Uwaga:</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.Zażądałeś przedawnionego URL'a z tego serwera. Nastąpiła próba przekierowania do nowej lokalizacji, ale może ona być niewłaściwa"
+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 ""
+"<strong>Uwaga:</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.Zażądałeś przedawnionego URL'a z tego "
+"serwera. Nastąpiła próba przekierowania do nowej lokalizacji, ale może "
+"ona być niewłaściwa"
 
 #: sphinx/templates/search.html:7
 msgid ""
@@ -509,17 +533,14 @@
 msgstr ""
 "Stąd możesz przeszukać dokumentację. Wprowadź szukane\n"
 "    słowa w poniższym okienku i kliknij \"Szukaj\". Zwróć uwagę, że\n"
-"    funkcja szukająca będzie automatycznie szukała wszystkich słów. Strony\n"
+"    funkcja szukająca będzie automatycznie szukała wszystkich słów. "
+"Strony\n"
 "    nie zawierające wszystkich słów nie znajdą się na wynikowej liście."
 
 #: sphinx/templates/search.html:14
 msgid "search"
 msgstr "Szukaj"
 
-#: sphinx/templates/search.html:18
-msgid "Search Results"
-msgstr "Wyniki wyszukiwania"
-
 #: sphinx/templates/search.html:20
 msgid "Your search did not match any results."
 msgstr "Nie znaleziono żadnych pasujących stron."
@@ -552,4 +573,3 @@
 msgid "Other changes"
 msgstr "Inne zmiany"
 
-

Modified: doctools/trunk/sphinx/locale/sphinx.pot
==============================================================================
--- doctools/trunk/sphinx/locale/sphinx.pot	(original)
+++ doctools/trunk/sphinx/locale/sphinx.pot	Sat Sep  6 19:36:25 2008
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Sphinx 0.5\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-08-10 11:43+0000\n"
+"POT-Creation-Date: 2008-09-06 19:09+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -32,7 +32,7 @@
 
 #: sphinx/builder.py:412 sphinx/htmlhelp.py:155
 #: sphinx/templates/defindex.html:19 sphinx/templates/modindex.html:2
-#: sphinx/templates/modindex.html:12
+#: sphinx/templates/modindex.html:13
 msgid "Global Module Index"
 msgstr ""
 
@@ -48,48 +48,48 @@
 msgid "previous"
 msgstr ""
 
-#: sphinx/builder.py:1089
+#: sphinx/builder.py:1092
 msgid "Builtins"
 msgstr ""
 
-#: sphinx/builder.py:1091
+#: sphinx/builder.py:1094
 msgid "Module level"
 msgstr ""
 
-#: sphinx/environment.py:108 sphinx/latexwriter.py:114
+#: sphinx/environment.py:108 sphinx/latexwriter.py:129
 #, python-format
 msgid "%B %d, %Y"
 msgstr ""
 
-#: sphinx/htmlwriter.py:73
+#: sphinx/htmlwriter.py:73 sphinx/static/doctools.js:143
 msgid "Permalink to this definition"
 msgstr ""
 
-#: sphinx/htmlwriter.py:379
+#: sphinx/htmlwriter.py:379 sphinx/static/doctools.js:136
 msgid "Permalink to this headline"
 msgstr ""
 
-#: sphinx/latexwriter.py:128
+#: sphinx/latexwriter.py:143
 msgid "Release"
 msgstr ""
 
-#: sphinx/latexwriter.py:171
+#: sphinx/latexwriter.py:188
 msgid "Module index"
 msgstr ""
 
-#: sphinx/latexwriter.py:173 sphinx/templates/genindex-single.html:2
+#: sphinx/latexwriter.py:190 sphinx/templates/genindex-single.html:2
 #: sphinx/templates/genindex-split.html:2
 #: sphinx/templates/genindex-split.html:5 sphinx/templates/genindex.html:2
 #: sphinx/templates/genindex.html:5 sphinx/templates/genindex.html:48
 msgid "Index"
 msgstr ""
 
-#: sphinx/roles.py:52 sphinx/roles.py:55 sphinx/directives/desc.py:519
+#: sphinx/roles.py:52 sphinx/directives/desc.py:514
 #, python-format
 msgid "environment variable; %s"
 msgstr ""
 
-#: sphinx/roles.py:61 sphinx/roles.py:64
+#: sphinx/roles.py:59
 #, python-format
 msgid "Python Enhancement Proposals!PEP %s"
 msgstr ""
@@ -204,7 +204,7 @@
 msgid "Parameters"
 msgstr ""
 
-#: sphinx/directives/desc.py:402 sphinx/directives/desc.py:404
+#: sphinx/directives/desc.py:402
 #, python-format
 msgid "command line option; %s"
 msgstr ""
@@ -218,19 +218,19 @@
 msgid "%s (module)"
 msgstr ""
 
-#: sphinx/directives/other.py:148
+#: sphinx/directives/other.py:147
 msgid "Section author: "
 msgstr ""
 
-#: sphinx/directives/other.py:150
+#: sphinx/directives/other.py:149
 msgid "Module author: "
 msgstr ""
 
-#: sphinx/directives/other.py:152
+#: sphinx/directives/other.py:151
 msgid "Author: "
 msgstr ""
 
-#: sphinx/directives/other.py:238
+#: sphinx/directives/other.py:233
 msgid "See also"
 msgstr ""
 
@@ -317,6 +317,33 @@
 msgid "built-in function"
 msgstr ""
 
+#: sphinx/static/doctools.js:172
+msgid "Hide Search Matches"
+msgstr ""
+
+#: sphinx/static/searchtools.js:242
+msgid "Searching"
+msgstr ""
+
+#: sphinx/static/searchtools.js:246
+msgid "Getting search index..."
+msgstr ""
+
+#: sphinx/static/searchtools.js:384 sphinx/templates/search.html:18
+msgid "Search Results"
+msgstr ""
+
+#: sphinx/static/searchtools.js:386
+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 ""
+
+#: sphinx/static/searchtools.js:389
+#, python-format
+msgid "Search finished, found %s page(s) matching the search query."
+msgstr ""
+
 #: sphinx/templates/defindex.html:2
 msgid "Overview"
 msgstr ""
@@ -468,15 +495,15 @@
 "%(sphinx_version)s."
 msgstr ""
 
-#: sphinx/templates/modindex.html:14
+#: sphinx/templates/modindex.html:15
 msgid "Most popular modules:"
 msgstr ""
 
-#: sphinx/templates/modindex.html:23
+#: sphinx/templates/modindex.html:24
 msgid "Show modules only available on these platforms"
 msgstr ""
 
-#: sphinx/templates/modindex.html:55
+#: sphinx/templates/modindex.html:56
 msgid "Deprecated"
 msgstr ""
 
@@ -504,10 +531,6 @@
 msgid "search"
 msgstr ""
 
-#: sphinx/templates/search.html:18
-msgid "Search Results"
-msgstr ""
-
 #: sphinx/templates/search.html:20
 msgid "Your search did not match any results."
 msgstr ""

Modified: doctools/trunk/sphinx/static/doctools.js
==============================================================================
--- doctools/trunk/sphinx/static/doctools.js	(original)
+++ doctools/trunk/sphinx/static/doctools.js	Sat Sep  6 19:36:25 2008
@@ -102,6 +102,34 @@
   },
 
   /**
+   * i18n support
+   */
+  TRANSLATIONS : {},
+  PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
+  LOCALE : 'unknown',
+
+  gettext : function(string) {
+    var translated = Documentation.TRANSLATIONS[string];
+    if (typeof translated == 'undefined')
+      return string;
+    return (typeof translated == 'string') ? translated : translated[0];
+  },
+
+  ngettext : function(singular, plural, n) {
+    var translated = Documentation.TRANSLATIONS[singular];
+    if (typeof translated == 'undefined')
+      return (n == 1) ? singular : plural;
+    return translated[Documentation.PLURALEXPR(n)];
+  },
+
+  addTranslations : function(catalog) {
+    for (var key in catalog.messages)
+      this.TRANSLATIONS[key] = catalog.messages[key];
+    this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')');
+    this.LOCALE = catalog.locale;
+  },
+
+  /**
    * add context elements like header anchor links
    */
   addContextElements : function() {
@@ -109,14 +137,14 @@
       $('h' + i + '[@id]').each(function() {
         $('<a class="headerlink">\u00B6</a>').
         attr('href', '#' + this.id).
-        attr('title', 'Permalink to this headline').
+        attr('title', _('Permalink to this headline')).
         appendTo(this);
       });
     }
     $('dt[@id]').each(function() {
       $('<a class="headerlink">\u00B6</a>').
       attr('href', '#' + this.id).
-      attr('title', 'Permalink to this definition').
+      attr('title', _('Permalink to this definition')).
       appendTo(this);
     });
   },
@@ -145,7 +173,7 @@
         });
       }, 10);
       $('<li class="highlight-link"><a href="javascript:Documentation.' +
-        'hideSearchWords()">Hide Search Matches</a></li>')
+        'hideSearchWords()">' + _('Hide Search Matches') + '</a></li>')
           .appendTo($('.sidebar .this-page-menu'));
     }
   },
@@ -346,6 +374,8 @@
   })()
 };
 
+// quick alias for translations
+_ = Documentation.gettext;
 
 $(document).ready(function() {
   Documentation.init();

Modified: doctools/trunk/sphinx/static/searchtools.js
==============================================================================
--- doctools/trunk/sphinx/static/searchtools.js	(original)
+++ doctools/trunk/sphinx/static/searchtools.js	Sat Sep  6 19:36:25 2008
@@ -239,11 +239,11 @@
     performSearch : function(query) {
         // create the required interface elements
         var out = $('#search-results');
-        var title = $('<h2>Searching</h2>').appendTo(out);
+        var title = $('<h2>' + _('Searching') + '</h2>').appendTo(out);
         var dots = $('<span></span>').appendTo(title);
         var status = $('<p style="display: none"></p>').appendTo(out);
         var output = $('<ul class="search"/>').appendTo(out);
-        $('#search-progress').text('Getting search index...')
+        $('#search-progress').text(_('Getting search index...'));
 
         // spawn a background runner for updating the dots
         // until the search has finished
@@ -381,17 +381,12 @@
                     // search finished, update title and status message
                     else {
                         pulseStatus = -1;
-                        title.text('Search Results');
+                        title.text(_('Search Results'));
                         if (!resultCount) {
-                            status.text('Your search did not match any documents. ' +
-                                        'Please make sure that all words are spelled ' +
-                                        'correctly and that you\'ve selected enough ' +
-                                        'categories.');
+                            status.text(_('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.'));
                         }
                         else {
-                            status.text('Search finished, found ' + resultCount +
-                                        ' page' + (resultCount != 1 ? 's' : '') +
-                                        ' matching the search query.');
+                            status.text(_('Search finished, found %s page(s) matching the search query.').replace('%s', resultCount));
                         }
                         status.fadeIn(500);
                     }


More information about the Python-checkins mailing list