Dan Stillman 4496c8d9e9 Merge remote-tracking branch 'aurimasv/multipleLookup' ... Conflicts: chrome/locale/en-US/zotero/zotero.dtd		2013-03-05 14:46:31 -05:00
..
about.dtd	Localizes most of the strings marked "todo: localize"	2013-03-04 03:44:37 +01:00
preferences.dtd	localization preferences pane	2013-02-27 17:13:48 +01:00
searchbox.dtd	Fixes #111: "Search subcollections" instead of "Search subfolders" in Advanced search.	2012-05-03 17:35:49 -04:00
standalone.dtd	Fix strange accesskeys in Standalone "(Print" & "Support and Documentation")	2013-02-16 22:33:22 +01:00
timeline.properties	Merged 1.0 branch back to trunk	2007-10-23 07:11:59 +00:00
zotero.dtd	Merge remote-tracking branch 'aurimasv/multipleLookup'	2013-03-05 14:46:31 -05:00
zotero.properties	Merge remote-tracking branch 'aurimasv/multipleLookup'	2013-03-05 14:46:31 -05:00