From f1a3cb35773c4fdcb203a0df6c716d582834cdb9 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 12 Jan 2015 21:51:50 -0700 Subject: [PATCH] Update versions, submodules, and repotime --- chrome/content/zotero/locale/csl | 2 +- install.rdf | 4 ++-- resource/config.js | 2 +- resource/schema/renamed-styles.json | 6 +++++- resource/schema/repotime.txt | 2 +- translators | 2 +- update.rdf | 4 ++-- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl index 892b3cf43f..23920d2cea 160000 --- a/chrome/content/zotero/locale/csl +++ b/chrome/content/zotero/locale/csl @@ -1 +1 @@ -Subproject commit 892b3cf43f0b3450da16f8a59929ea99bfb0722c +Subproject commit 23920d2cea52e12f2c3caac097266c13757e5acf diff --git a/install.rdf b/install.rdf index 1da9f31e22..fda61f58ab 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 4.0.24.1.SOURCE + 4.0.25.SOURCE Center for History and New Media
George Mason University Dan Cohen Sean Takats @@ -25,7 +25,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 31.0 - 34.* + 35.* diff --git a/resource/config.js b/resource/config.js index 5a26caf36e..ca27fa48fa 100644 --- a/resource/config.js +++ b/resource/config.js @@ -13,7 +13,7 @@ var ZOTERO_CONFIG = { BOOKMARKLET_ORIGIN: 'https://www.zotero.org', HTTP_BOOKMARKLET_ORIGIN: 'http://www.zotero.org', BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/', - VERSION: '4.0.24.1.SOURCE' + VERSION: '4.0.25.SOURCE' }; EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"]; diff --git a/resource/schema/renamed-styles.json b/resource/schema/renamed-styles.json index 45a6210d01..171acf5b1b 100644 --- a/resource/schema/renamed-styles.json +++ b/resource/schema/renamed-styles.json @@ -22,8 +22,8 @@ "annals-of-thoracic-surgery": "the-annals-of-thoracic-surgery", "annual-reviews-alphabetically": "annual-reviews-alphabetical", "annual-reviews-by-appearance": "annual-reviews", - "apa5th": "apa-5th-edition", "apa-fr": "apa-fr-provost", + "apa5th": "apa-5th-edition", "apsa": "american-political-science-association", "archives-of-dermatology": "jama-dermatology", "asa": "american-sociological-association", @@ -270,6 +270,7 @@ "harvard3": "harvard-swinburne-university-of-technology", "hbp": "hpb", "head-and-neck-oncology": "biomed-central", + "healthcare-the-journal-of-delivery-science-and-innovation": "healthcare", "heart-and-lung-the-journal-of-critical-care": "heart-and-lung-the-journal-of-acute-and-critical-care", "hwr-berlin": "hochschule-fur-wirtschaft-und-recht-berlin", "ices-jms": "ices-journal-of-marine-science", @@ -357,6 +358,7 @@ "national-library-of-medicine-grant": "national-library-of-medicine-grant-proposals", "natural-product-updates": "royal-society-of-chemistry", "nature-neuroscience-brief-communication": "nature-neuroscience-brief-communications", + "natureza-e-conservacao": "natureza-and-conservacao", "netherlands-journal-of-medicine": "the-netherlands-journal-of-medicine", "neumologica-y-cirugia-de-torax-neurofibromatosis": "neumologia-y-cirugia-de-torax", "neural-systems-and-circuits": "biomed-central", @@ -372,6 +374,7 @@ "optical-society-of-america": "the-optical-society", "oxford-brookes-university-faculty-of-health-and-life-sciences": "harvard-oxford-brookes-university-faculty-of-health-and-life-sciences", "oxford-university-new-south-wales": "oxford-the-university-of-new-south-wales", + "pedobiologia-international-journal-of-soil-biology": "pedobiologia-journal-of-soil-ecology", "physiological-biochemical-zoology": "physiological-and-biochemical-zoology", "plant-cell": "the-plant-cell", "polish-botanical-society": "acta-societatis-botanicorum-poloniae", @@ -395,6 +398,7 @@ "springer-plasmonics": "plasmonics", "springer-protocols": "springerprotocols", "sustainable-healthcare": "biomed-central", + "synergy-research": "synergy", "tah-gkw": "geistes-und-kulturwissenschaften-teilmann", "tah-soz": "sozialwissenschaften-teilmann", "taylor-and-francis-reference-style-f": "taylor-and-francis-chicago-f", diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt index a9a2a04e56..c262fcdfd6 100644 --- a/resource/schema/repotime.txt +++ b/resource/schema/repotime.txt @@ -1 +1 @@ -2014-11-30 00:00:00 +2015-01-10 13:55:00 diff --git a/translators b/translators index f14e271b73..84953b0cca 160000 --- a/translators +++ b/translators @@ -1 +1 @@ -Subproject commit f14e271b73ce2f2290d36d3e4f04f76c8dd60b51 +Subproject commit 84953b0cca9875d238ec6ffad41ed80004eaf9c0 diff --git a/update.rdf b/update.rdf index 0e5ee8a399..25b2607951 100644 --- a/update.rdf +++ b/update.rdf @@ -7,12 +7,12 @@ - 4.0.24.1.SOURCE + 4.0.25.SOURCE {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 31.0 - 34.* + 35.* http://download.zotero.org/extension/zotero.xpi sha1: