Dan Stillman 0061ff3ca5 Merge branch '3.0' ... Conflicts: chrome/content/zotero/preferences/preferences.xul chrome/content/zotero/xpcom/data/item.js chrome/content/zotero/xpcom/utilities_translate.js		2013-02-04 07:02:38 -05:00
..
about.dtd	Merge locales from Transifex	2012-02-13 21:50:44 -05:00
preferences.dtd	Remove "Try to override conflicting shortcuts" pref	2013-01-22 18:38:00 -05:00
searchbox.dtd	Merge locales from Transifex	2012-02-13 21:50:44 -05:00
standalone.dtd	Latest translations from Transifex and merged English strings	2012-04-26 19:48:54 -04:00
timeline.properties	Merge locales from Transifex	2012-02-13 21:50:44 -05:00
zotero.dtd	Merge branch '3.0'	2013-02-04 07:02:38 -05:00
zotero.properties	Fix WebDAV URL error message	2012-12-11 03:30:48 -05:00