Commit graph

77 commits

Author SHA1 Message Date
Dan Stillman
224adc0372 Merge locales from Transifex 2013-02-06 21:55:49 -05:00
Dan Stillman
5b34dce40f Remove "Try to override conflicting shortcuts" pref
I probably should have removed this years ago in 292c357e when I made
the shortcut keys only work within the Zotero pane.
2013-01-22 18:38:00 -05:00
Dan Stillman
00e30dea71 Merge non-English locales from Transifex 2012-11-05 22:21:13 -05:00
Dan Stillman
a8a8bc6af0 Merge latest strings from Transifex 2012-06-29 16:25:17 -04:00
Dan Stillman
cf89e9d23f Update locales from Transifex (and add Khmer) 2012-02-16 21:04:49 -05:00
Dan Stillman
b3fe7b822a Merge locales from Transifex 2012-02-13 21:50:44 -05:00
Dan Stillman
a4afb67d91 Point directly to 3.0 plugins page from preferences
Not sure why this is localized, though
2012-01-25 16:44:48 -05:00
Dan Stillman
ed6666c4d7 Merge locales 2012-01-20 17:52:51 -05:00
Dan Stillman
9d16cb2fe6 "Use Firefox profile directory" -> "Use profile directory" 2012-01-05 14:58:11 -05:00
Dan Stillman
4bc5406d34 Merge new English strings 2011-12-20 02:27:34 -05:00
Dan Stillman
eea45d6d94 Merge locales 2011-08-28 22:54:17 +00:00
Dan Stillman
82a7dbee68 Merge locales 2011-08-10 19:54:59 +00:00
Dan Stillman
ce67b52ed4 Merge new English strings to non-English locales 2011-02-10 04:28:14 +00:00
Dan Stillman
47dc4d7864 - Merge English strings to locales
- Fix problem with nn-NO locale
2011-01-11 19:40:22 +00:00
Dan Stillman
ba48148405 Merge new English strings to other locales 2010-09-16 16:24:14 +00:00
Dan Stillman
8bff745d1b Merged non-English locales from BZ 2010-02-18 04:34:52 +00:00
Dan Stillman
8dcfbd43cd Merged updates locales from BZ 2010-01-26 03:24:56 +00:00
Dan Stillman
eb51439686 Merging locales from BZ (existing locales only) 2010-01-15 23:03:45 +00:00
Dan Stillman
eabd87864f Merge locales for 2.0b6 2009-07-06 12:40:24 +00:00
Dan Stillman
1db1de2257 Merged locales 2009-05-14 16:01:17 +00:00
Dan Stillman
cb38ee8b02 Merge locales 2008-09-23 02:34:57 +00:00
Dan Stillman
2dffa33364 Merge recent English strings to other locales on trunk 2008-09-01 06:45:03 +00:00
Dan Stillman
6408762b12 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
Dan Stillman
416f023384 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
Dan Stillman
200cca74a6 Merged revisions 1986,1988-1990,1996,1998,2000-2004,2006,2008-2010,2013,2020-2028,2032-2034,2037,2039,2044-2049,2052-2056,2059,2065-2066,2068-2072,2075,2077-2079,2081,2083-2084,2086,2088-2094,2096,2099,2101,2103-2104,2107-2110,2115,2118,2120-2122,2126-2128,2131,2140,2142-2145,2149-2153,2155-2159,2165,2167-2168,2170-2171,2173-2176,2179-2183,2185-2186 via svnmerge from
https://www.zotero.org/svn/extension/branches/1.0
2008-01-30 09:53:19 +00:00
Dan Stillman
e2cb3a699a Merge r1802-1983 from branch to trunk 2007-12-02 05:45:07 +00:00
Dan Stillman
35ff52f2e8 Merged 1.0 branch back to trunk 2007-10-23 07:11:59 +00:00