Pulling in changes from upstream

sphinx/builders/gettext.py

@@ -111,8 +111,8 @@ class MessageCatalogBuilder(I18nBuilder):
                 for message in catalog.messages:
                     positions = catalog.metadata[message]
 
-                    # generate "#: file1:line1 file2:line2 ..."
-                    pofile.write(u"#: %s\n" % ", ".join("%s:%s" %
+                    # generate "#: file1:line1\n#: file2:line2 ..."
+                    pofile.write(u"#: %s\n" % "\n#: ".join("%s:%s" %
                         (path.relpath(source, self.outdir), line)
                         for source, line, _ in positions))
                     # generate "# uuid1\n# uuid2\n ..."

sphinx/locale/ja/LC_MESSAGES/sphinx.po

@@ -2,14 +2,15 @@
 # Copyright (C) 2008 ORGANIZATION
 # This file is distributed under the same license as the Sphinx project.
 # Yasushi Masuda <whosaysni@gmail.com>, 2008.
-# Kouhei Sutou <kou@clear-code.com, 2011.
+# Kouhei Sutou <kou@clear-code.com>, 2011.
+# Akitoshi Ohta <fire.kuma8@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Sphinx 1.1pre\n"
 "POT-Creation-Date: 2008-09-11 23:58+0200\n"
-"PO-Revision-Date: 2011-05-15 21:25+0900\n"
-"Last-Translator: Kouhei Sutou <kou@clear-code.com>\n"
+"PO-Revision-Date: 2011-08-27 17:50+0900\n"
+"Last-Translator: Akitoshi Ohta <fire.kuma8@gmail.com>\n"
 "Language-Team: Japanese\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
@@ -753,7 +754,7 @@ msgstr "前のページからの続き"
 
 #: sphinx/writers/latex.py:677
 msgid "Continued on next page"
-msgstr "総索引"
+msgstr "次のページに続く"
 
 #: sphinx/writers/text.py:430
 msgid "[image]"

sphinx/themes/basic/static/searchtools.js_t

@@ -174,7 +174,7 @@ var Search = {
 
     // lookup as object
     for (var i = 0; i < objectterms.length; i++) {
-      var others = Array.concat(objectterms.slice(0,i),
+      var others = [].concat(objectterms.slice(0,i),
                                 objectterms.slice(i+1, objectterms.length))
       var results = this.performObjectSearch(objectterms[i], others);
       // Assume first word is most likely to be the object,