Simon Kornblith e682ab729c Merge branch '3.0' ... Conflicts: chrome/locale/da-DK/zotero/zotero.dtd chrome/locale/ko-KR/zotero/zotero.dtd translators		2012-07-01 11:41:31 -04:00
..
about.dtd	Merge new English strings	2011-12-20 02:27:34 -05:00
preferences.dtd	Merge latest strings from Transifex	2012-06-29 16:25:17 -04:00
searchbox.dtd	Merged revisions 2710-2712,2714-2716,2718-2728,2730-2731,2734,2736-2738,2740-2750,2752-2753,2755,2758-2768,2770-2779,2782,2789-2790,2794,2797-2802,2804,2808-2810,2812,2814-2824,2826-2832,2834-2835 via svnmerge from 1.0 branch	2008-06-11 08:55:59 +00:00
standalone.dtd	Latest translations from Transifex and merged English strings	2012-04-26 19:48:54 -04:00
timeline.properties	Merged revisions 2640-2647,2651,2653-2654,2656-2658,2660-2667,2670-2672,2674-2677,2680,2683-2684,2687-2704,2707 to trunk via svnmerge from 1.0 branch	2008-05-16 09:14:11 +00:00
zotero.dtd	Merge branch '3.0'	2012-07-01 11:41:31 -04:00
zotero.properties	Merge latest strings from Transifex	2012-06-29 16:25:17 -04:00