Commits

Georg Brandl committed 860292d Merge

merge with 0.6

  • Participants
  • Parent commits 8cbe30d, b151c9b

Comments (0)

Files changed (5)

sphinx/cmdline.py

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

sphinx/ext/autodoc.py

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

sphinx/locale/de/LC_MESSAGES/sphinx.js

-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"}});

sphinx/locale/de/LC_MESSAGES/sphinx.mo

Binary file modified.

sphinx/locale/de/LC_MESSAGES/sphinx.po

 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2008-08-07 21:40+0200\n"
-"PO-Revision-Date: 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"
 "Language-Team: de <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 #: sphinx/directives/desc.py:418
 #, python-format
 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:488
 #: sphinx/directives/desc.py:422
 #, python-format
 msgid "%s (built-in variable)"
-msgstr "%s (eingebaute Variable)"
+msgstr "%s (Standard-Variable)"
 
 #: sphinx/directives/desc.py:423 sphinx/directives/desc.py:514
 #, python-format
 #: sphinx/directives/desc.py:439
 #, python-format
 msgid "%s (built-in class)"
-msgstr "%s (eingebaute Klasse)"
+msgstr "%s (Standard-Klasse)"
 
 #: sphinx/directives/desc.py:440
 #, python-format
 #: sphinx/ext/todo.py:99
 #, python-format
 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
 msgid "here"
 
 #: sphinx/locale/__init__.py:39
 msgid "statement"
-msgstr "Statement"
+msgstr "Anweisung"
 
 #: sphinx/locale/__init__.py:40
 msgid "built-in function"
-msgstr "eingebaute Funktion"
+msgstr "Standard-Funktion"
 
 #: sphinx/themes/basic/defindex.html:2
 msgid "Overview"
 
 #: sphinx/themes/basic/layout.html:81
 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
 #, python-format
 
 #: sphinx/themes/basic/changes/versionchanges.html:18
 msgid "Library changes"
-msgstr "Bibliotheksänderungen"
+msgstr "Bibliotheks-Änderungen"
 
 #: sphinx/themes/basic/changes/versionchanges.html:23
 msgid "C API changes"
 
 #: sphinx/themes/basic/static/searchtools.js:274
 msgid "Searching"
-msgstr "Suchen..."
+msgstr "Suche..."
 
 #: sphinx/themes/basic/static/searchtools.js:279
 msgid "Preparing search..."
 "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 "
+"Es wurden keine zutreffenden Dokumente gefunden. Haben Sie alle Suchbegriffe richtig "
 "geschrieben und genügend Kategorien ausgewählt?"
 
 #: sphinx/themes/basic/static/searchtools.js:466
 #, python-format
 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
 msgid "Release"
 
 #: sphinx/writers/latex.py:639
 msgid "continued from previous page"
-msgstr ""
+msgstr "Fortsetzung der vorherigen Seite"
 
 #: sphinx/writers/latex.py:643
-#, fuzzy
 msgid "Continued on next page"
-msgstr "Gesamtes Stichwortverzeichnis auf einer Seite"
+msgstr "Fortsetzung auf der nächsten Seite"
 
 #: sphinx/writers/text.py:166
 #, python-format