Dan Stillman ee16d96f92 Merge branch '3.0' ... Conflicts: chrome/content/zotero/preferences/preferences.xul chrome/content/zotero/xpcom/storage/webdav.js chrome/locale/gl-ES/zotero/zotero.dtd chrome/locale/gl-ES/zotero/zotero.properties chrome/locale/zh-CN/zotero/zotero.dtd chrome/locale/zh-CN/zotero/zotero.properties install.rdf update.rdf		2013-02-16 05:07:59 -05:00
..
about.dtd	Latest translations from Transifex and merged English strings	2012-04-26 19:48:54 -04:00
preferences.dtd	Merge locales from Transifex	2013-02-06 21:55:49 -05:00
searchbox.dtd	Merged updates locales from BZ	2010-01-26 03:24:56 +00:00
standalone.dtd	Latest translations from Transifex and merged English strings	2012-04-26 19:48:54 -04:00
timeline.properties	Merge non-English locales from Transifex	2012-11-05 22:21:13 -05:00
zotero.dtd	Merge branch '3.0'	2013-02-16 05:07:59 -05:00
zotero.properties	Merge branch '3.0'	2013-02-16 05:07:59 -05:00