Simon Kornblith b3237ae5e5 Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/http.js chrome/content/zotero/xpcom/translation/translate_firefox.js		2012-11-06 00:50:11 -05:00
..
about.dtd	Merge new English strings	2011-12-20 02:27:34 -05:00
preferences.dtd	Merge non-English locales from Transifex	2012-11-05 22:21:13 -05:00
searchbox.dtd	Merge latest strings from Transifex	2012-06-29 16:25:17 -04: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'	2012-11-06 00:50:11 -05:00
zotero.properties	Merge non-English locales from Transifex	2012-11-05 22:21:13 -05:00