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	Latest translations from Transifex and merged English strings	2012-04-26 19:48:54 -04:00
preferences.dtd	Merge non-English locales from Transifex	2012-11-05 22:21:13 -05:00
searchbox.dtd	Latest translations from Transifex and merged English strings	2012-04-26 19:48:54 -04:00
standalone.dtd	Merge non-English locales from Transifex	2012-11-05 22:21:13 -05:00
timeline.properties	Latest translations from Transifex and merged English strings	2012-04-26 19:48:54 -04: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