mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
zotero/chrome/locale/zh-CN/zotero
History
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 locales from Transifex 2013-02-06 21:55:49 -05:00
preferences.dtd Merge locales from Transifex 2013-02-06 21:55:49 -05:00
searchbox.dtd Merge locales from Transifex 2013-02-06 21:55:49 -05:00
standalone.dtd Merge locales from Transifex 2013-02-06 21:55:49 -05:00
timeline.properties Merge locales from Transifex 2013-02-06 21:55:49 -05:00
zotero.dtd Merge locales from Transifex 2013-02-06 21:55:49 -05:00
zotero.properties Merge branch '3.0' 2013-02-16 05:07:59 -05:00