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	Merge new English strings	2011-12-20 02:27:34 -05:00
preferences.dtd	Merge locales from Transifex	2013-02-06 21:55:49 -05:00
searchbox.dtd	Merged revisions 2640-2647,2651,2653-2654,2656-2658,2660-2667,2670-2672,2674-2677,2680,2683-2684,2687-2704,2707 to trunk via svnmerge from 1.0 branch	2008-05-16 09:14:11 +00:00
standalone.dtd	Latest translations from Transifex and merged English strings	2012-04-26 19:48:54 -04:00
timeline.properties	Merged revisions 2640-2647,2651,2653-2654,2656-2658,2660-2667,2670-2672,2674-2677,2680,2683-2684,2687-2704,2707 to trunk via svnmerge from 1.0 branch	2008-05-16 09:14:11 +00: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