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 new English strings	2011-12-20 02:27:34 -05:00
preferences.dtd	Remove "Try to override conflicting shortcuts" pref	2013-01-22 18:38:00 -05:00
searchbox.dtd	Merged revisions 2190-2192,2194,2196-2199,2202-2205,2209,2212,2214-2215,2227-2228,2230,2232-2243,2245,2247-2256,2263-2272,2276,2278-2279,2281,2284-2286,2292,2296-2297,2299-2302,2304-2305,2309-2310,2314,2317-2323,2325-2329,2331-2337,2339,2341-2342,2344,2347-2366,2370-2371,2373-2377,2379-2391,2393-2402,2405-2410,2413,2415-2416,2418,2420-2421,2423,2427-2429,2431-2433,2437,2440-2441,2443-2450,2453,2455-2459,2461-2467,2471,2475-2480,2482-2490,2493,2495-2499,2501-2506,2511,2513-2519,2521,2525-2536,2540,2543-2553,2555-2559,2561-2576,2578,2580-2603,2606-2609,2611-2616,2618-2620,2624-2630,2632-2633 to trunk via svnmerge from 1.0 branch	2008-05-05 07:19:34 +00:00
standalone.dtd	Latest translations from Transifex and merged English strings	2012-04-26 19:48:54 -04:00
timeline.properties	Merged 1.0 branch back to trunk	2007-10-23 07:11:59 +00: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