zotero/chrome/locale/ja-JP/zotero
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 Latest translations from Transifex and merged English strings 2012-04-26 19:48:54 -04:00
preferences.dtd Merge latest strings from Transifex 2012-06-29 16:25:17 -04:00
searchbox.dtd Latest translations from Transifex and merged English strings 2012-04-26 19:48:54 -04:00
standalone.dtd Latest translations from Transifex and merged English strings 2012-04-26 19:48:54 -04: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-07-01 11:41:31 -04:00
zotero.properties Merge new English strings 2012-05-03 23:10:47 -04:00