Simon Kornblith e682ab729c Merge branch '3.0' ... Conflicts: chrome/locale/da-DK/zotero/zotero.dtd chrome/locale/ko-KR/zotero/zotero.dtd translators		2012-07-01 11:41:31 -04:00
..
about.dtd	Merge latest strings from Transifex	2012-06-29 16:25:17 -04:00
preferences.dtd	Merge latest strings from Transifex	2012-06-29 16:25:17 -04:00
searchbox.dtd	Merged locales from BZ	2010-02-03 02:56:20 +00:00
standalone.dtd	Merge latest strings from Transifex	2012-06-29 16:25:17 -04:00
timeline.properties	Merging locales from BZ (existing locales only)	2010-01-15 23:03:45 +00:00
zotero.dtd	Merge branch '3.0'	2012-07-01 11:41:31 -04:00
zotero.properties	Merge latest strings from Transifex	2012-06-29 16:25:17 -04:00