zotero/chrome/locale
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
..
af-ZA/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
ar/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
bg-BG/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
ca-AD/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
cs-CZ/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
da-DK/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
de/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
el-GR/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
en-US/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
es-ES/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
et-EE/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
eu-ES/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
fa/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
fi-FI/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
fr-FR/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
gl-ES/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
he-IL/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
hr-HR/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
hu-HU/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
is-IS/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
it-IT/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
ja-JP/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
km/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
ko-KR/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
mn-MN/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
nb-NO/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
nl-NL/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
nn-NO/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
pl-PL/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
pt-BR/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
pt-PT/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
ro-RO/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
ru-RU/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
sk-SK/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
sl-SI/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
sr-RS/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
sv-SE/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
th-TH/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
tr-TR/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
vi-VN/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
zh-CN/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00
zh-TW/zotero Merge branch '3.0' 2013-02-16 05:07:59 -05:00