IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with 0.6

Browse Source
This commit is contained in:
Georg Brandl 2009-06-16 19:56:53 +02:00
commit 57514d06da
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sphinx/cmdline.py
View File

@ -21,7 +21,7 @@ from sphinx import __version__
from sphinx.errors import SphinxError from sphinx.errors import SphinxError
from sphinx.application import Sphinx from sphinx.application import Sphinx
from sphinx.util import Tee, format_exception_cut_frames, save_traceback from sphinx.util import Tee, format_exception_cut_frames, save_traceback
from sphinx.util.console import darkred, nocolor, color_terminal from sphinx.util.console import red, nocolor, color_terminal
def usage(argv, msg=None): def usage(argv, msg=None):
@ -174,7 +174,7 @@ def main(argv):
except KeyboardInterrupt: except KeyboardInterrupt:
if use_pdb: if use_pdb:
import pdb import pdb
print >>error, darkred('Interrupted while building, ' print >>error, red('Interrupted while building, '
'starting debugger:') 'starting debugger:')
traceback.print_exc() traceback.print_exc()
pdb.post_mortem(sys.exc_info()[2]) pdb.post_mortem(sys.exc_info()[2])
@ -182,22 +182,23 @@ def main(argv):
except Exception, err: except Exception, err:
if use_pdb: if use_pdb:
import pdb import pdb
print >>error, darkred('Exception occurred while building, ' print >>error, red('Exception occurred while building, '
'starting debugger:') 'starting debugger:')
traceback.print_exc() traceback.print_exc()
pdb.post_mortem(sys.exc_info()[2]) pdb.post_mortem(sys.exc_info()[2])
else: else:
print >>error
if isinstance(err, SystemMessage): if isinstance(err, SystemMessage):
print >>error, darkred('reST markup error:') print >>error, red('reST markup error:')
print >>error, err.args[0].encode('ascii', 'backslashreplace') print >>error, err.args[0].encode('ascii', 'backslashreplace')
elif isinstance(err, SphinxError): elif isinstance(err, SphinxError):
print >>error, darkred('%s:' % err.category) print >>error, red('%s:' % err.category)
print >>error, err print >>error, err
else: else:
print >>error, darkred('Exception occurred:') print >>error, red('Exception occurred:')
print >>error, format_exception_cut_frames().rstrip() print >>error, format_exception_cut_frames().rstrip()
tbpath = save_traceback() tbpath = save_traceback()
print >>error, darkred('The full traceback has been saved ' print >>error, red('The full traceback has been saved '
'in %s, if you want to report the ' 'in %s, if you want to report the '
'issue to the author.' % tbpath) 'issue to the author.' % tbpath)
print >>error, ('Please also report this if it was a user ' print >>error, ('Please also report this if it was a user '

2
sphinx/ext/autodoc.py
View File

@ -330,7 +330,7 @@ class Documenter(object):
obj = self.get_attr(obj, part) obj = self.get_attr(obj, part)
self.object = obj self.object = obj
return True return True
except (ImportError, AttributeError), err: except (SyntaxError, ImportError, AttributeError), err:
self.directive.warn( self.directive.warn(
'autodoc can\'t import/find %s %r, it reported error: ' 'autodoc can\'t import/find %s %r, it reported error: '
'"%s", please check your spelling and sys.path' % '"%s", please check your spelling and sys.path' %

2
sphinx/locale/de/LC_MESSAGES/sphinx.js
View File

@ -1 +1 @@
Documentation.addTranslations({"locale": "de", "plural_expr": "(n != 1)", "messages": {"module, in ": "Modul, in ", "Preparing search...": "Suche wird vorbereitet...", "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?", "Search finished, found %s page(s) matching the search query.": "Suche beendet, %s Seite(n) mit Ergebnissen wurden gefunden.", ", in ": ", in ", "Permalink to this headline": "Permalink zu dieser \u00dcberschrift", "Searching": "Suchen...", "Permalink to this definition": "Permalink zu dieser Definition", "Hide Search Matches": "Suchergebnisse ausblenden", "Search Results": "Suchergebnisse"}}); Documentation.addTranslations({"locale": "de", "plural_expr": "(n != 1)", "messages": {"Search Results": "Suchergebnisse", "Preparing search...": "Suche wird vorbereitet...", "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 zutreffenden Dokumente gefunden. Haben Sie alle Suchbegriffe richtig geschrieben und gen\u00fcgend Kategorien ausgew\u00e4hlt?", "Search finished, found %s page(s) matching the search query.": "Suche beendet, %s zutreffende Seite(n) gefunden.", ", in ": ", in ", "Permalink to this headline": "Permalink zu dieser \u00dcberschrift", "Searching": "Suche...", "Permalink to this definition": "Permalink zu dieser Definition", "module, in ": "Modul, in ", "Hide Search Matches": "Suchergebnisse ausblenden"}});

BIN
sphinx/locale/de/LC_MESSAGES/sphinx.mo
View File

Binary file not shown.

29
sphinx/locale/de/LC_MESSAGES/sphinx.po
View File

@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2008-08-07 21:40+0200\n" "POT-Creation-Date: 2008-08-07 21:40+0200\n"
"PO-Revision-Date: 2009-05-22 18:51+0200\n" "PO-Revision-Date: 2009-06-16 19:25+0200\n"
"Last-Translator: Horst Gutmann <zerok@zerokspot.com>\n" "Last-Translator: Horst Gutmann <zerok@zerokspot.com>\n"
"Language-Team: de <LL@li.org>\n" "Language-Team: de <LL@li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@ -118,7 +118,7 @@ msgstr "Parameter"
#: sphinx/directives/desc.py:418 #: sphinx/directives/desc.py:418
#, python-format #, python-format
msgid "%s() (built-in function)" msgid "%s() (built-in function)"
msgstr "%s() (eingebaute Funktion)" msgstr "%s() (Standard-Funktion)"
#: sphinx/directives/desc.py:419 sphinx/directives/desc.py:476 #: sphinx/directives/desc.py:419 sphinx/directives/desc.py:476
#: sphinx/directives/desc.py:488 #: sphinx/directives/desc.py:488
@ -129,7 +129,7 @@ msgstr "%s() (in Modul %s)"
#: sphinx/directives/desc.py:422 #: sphinx/directives/desc.py:422
#, python-format #, python-format
msgid "%s (built-in variable)" msgid "%s (built-in variable)"
msgstr "%s (eingebaute Variable)" msgstr "%s (Standard-Variable)"
#: sphinx/directives/desc.py:423 sphinx/directives/desc.py:514 #: sphinx/directives/desc.py:423 sphinx/directives/desc.py:514
#, python-format #, python-format
@ -139,7 +139,7 @@ msgstr "%s (in Modul %s)"
#: sphinx/directives/desc.py:439 #: sphinx/directives/desc.py:439
#, python-format #, python-format
msgid "%s (built-in class)" msgid "%s (built-in class)"
msgstr "%s (eingebaute Klasse)" msgstr "%s (Standard-Klasse)"
#: sphinx/directives/desc.py:440 #: sphinx/directives/desc.py:440
#, python-format #, python-format
@ -248,7 +248,7 @@ msgstr "Zu tun"
#: sphinx/ext/todo.py:99 #: sphinx/ext/todo.py:99
#, python-format #, python-format
msgid "(The original entry is located in %s, line %d and can be found " msgid "(The original entry is located in %s, line %d and can be found "
msgstr "(Der Eintrag steht in %s, Zeile %s, siehe " msgstr "(Der ursprüngliche Eintrag steht in %s, Zeile %s, siehe "
#: sphinx/ext/todo.py:105 #: sphinx/ext/todo.py:105
msgid "here" msgid "here"
@ -331,11 +331,11 @@ msgstr "Exception"
#: sphinx/locale/__init__.py:39 #: sphinx/locale/__init__.py:39
msgid "statement" msgid "statement"
msgstr "Statement" msgstr "Anweisung"
#: sphinx/locale/__init__.py:40 #: sphinx/locale/__init__.py:40
msgid "built-in function" msgid "built-in function"
msgstr "eingebaute Funktion" msgstr "Standard-Funktion"
#: sphinx/themes/basic/defindex.html:2 #: sphinx/themes/basic/defindex.html:2
msgid "Overview" msgid "Overview"
@ -427,7 +427,7 @@ msgstr "Los"
#: sphinx/themes/basic/layout.html:81 #: sphinx/themes/basic/layout.html:81
msgid "Enter search terms or a module, class or function name." msgid "Enter search terms or a module, class or function name."
msgstr "Geben Sie einen Modul-, Klassen- oder Funktionsnamen einn." msgstr "Geben Sie Suchbegriffe oder einen Modul-, Klassen- oder Funktionsnamen ein."
#: sphinx/themes/basic/layout.html:119 #: sphinx/themes/basic/layout.html:119
#, python-format #, python-format
@ -530,7 +530,7 @@ msgstr "Automatisch generierte Liste der Änderungen in Version %(version)s"
#: sphinx/themes/basic/changes/versionchanges.html:18 #: sphinx/themes/basic/changes/versionchanges.html:18
msgid "Library changes" msgid "Library changes"
msgstr "Bibliotheksänderungen" msgstr "Bibliotheks-Änderungen"
#: sphinx/themes/basic/changes/versionchanges.html:23 #: sphinx/themes/basic/changes/versionchanges.html:23
msgid "C API changes" msgid "C API changes"
@ -555,7 +555,7 @@ msgstr "Suchergebnisse ausblenden"
#: sphinx/themes/basic/static/searchtools.js:274 #: sphinx/themes/basic/static/searchtools.js:274
msgid "Searching" msgid "Searching"
msgstr "Suchen..." msgstr "Suche..."
#: sphinx/themes/basic/static/searchtools.js:279 #: sphinx/themes/basic/static/searchtools.js:279
msgid "Preparing search..." msgid "Preparing search..."
@ -574,13 +574,13 @@ msgid ""
"Your search did not match any documents. Please make sure that all words " "Your search did not match any documents. Please make sure that all words "
"are spelled correctly and that you've selected enough categories." "are spelled correctly and that you've selected enough categories."
msgstr "" msgstr ""
"Es wurden keine Dokumente gefunden. Haben Sie alle Suchworte richtig " "Es wurden keine zutreffenden Dokumente gefunden. Haben Sie alle Suchbegriffe richtig "
"geschrieben und genügend Kategorien ausgewählt?" "geschrieben und genügend Kategorien ausgewählt?"
#: sphinx/themes/basic/static/searchtools.js:466 #: sphinx/themes/basic/static/searchtools.js:466
#, python-format #, python-format
msgid "Search finished, found %s page(s) matching the search query." msgid "Search finished, found %s page(s) matching the search query."
msgstr "Suche beendet, %s Seite(n) mit Ergebnissen wurden gefunden." msgstr "Suche beendet, %s zutreffende Seite(n) gefunden."
#: sphinx/writers/latex.py:187 #: sphinx/writers/latex.py:187
msgid "Release" msgid "Release"
@ -588,12 +588,11 @@ msgstr "Release"
#: sphinx/writers/latex.py:639 #: sphinx/writers/latex.py:639
msgid "continued from previous page" msgid "continued from previous page"
msgstr "" msgstr "Fortsetzung der vorherigen Seite"
#: sphinx/writers/latex.py:643 #: sphinx/writers/latex.py:643
#, fuzzy
msgid "Continued on next page" msgid "Continued on next page"
msgstr "Gesamtes Stichwortverzeichnis auf einer Seite" msgstr "Fortsetzung auf der nächsten Seite"
#: sphinx/writers/text.py:166 #: sphinx/writers/text.py:166
#, python-format #, python-format