mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13843 commits 9 branches 364 tags 290 MiB
Commit graph

333 commits

Author SHA1 Message Date
Dan Stillman
cf9dd6d73f Merge locales from Transifex 2013-03-20 22:53:59 -04:00
Dan Stillman
147f325e40 Merge locales from Transifex 2013-03-17 03:34:42 -04:00
Dan Stillman
e86cda2440 Merge new English strings 2013-03-12 14:21:23 -04:00
Dan Stillman
ee16d96f92 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/preferences/preferences.xul
	chrome/content/zotero/xpcom/storage/webdav.js
	chrome/locale/gl-ES/zotero/zotero.dtd
	chrome/locale/gl-ES/zotero/zotero.properties
	chrome/locale/zh-CN/zotero/zotero.dtd
	chrome/locale/zh-CN/zotero/zotero.properties
	install.rdf
	update.rdf
 2013-02-16 05:07:59 -05:00
Simon Kornblith
ce12c999ca Fix integration.error.notInstalled string on non-English locales 2013-02-07 17:21:23 -05:00
Dan Stillman
224adc0372 Merge locales from Transifex 2013-02-06 21:55:49 -05:00
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
gracile-fr
f0ad251097 Localization of hardcoded "Quick Format Citation" dialog title 2013-02-02 15:31:41 +01:00
Simon Kornblith
1c3890e837 Merge branch '3.0' 2013-01-26 00:29:08 -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
2e81f087b9 Fix WebDAV URL error message 2012-12-11 03:30:48 -05:00
Simon Kornblith
73f775950d Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/cite.js
 2012-11-08 09:40:18 -05:00
Dan Stillman
6220bc39f5 "Citations"/"Notes" instead of "Citation"/"Note" in right-click dialog 2012-11-06 01:16:03 -05:00
Simon Kornblith
b3237ae5e5 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/http.js
	chrome/content/zotero/xpcom/translation/translate_firefox.js
 2012-11-06 00:50:11 -05:00
Dan Stillman
00e30dea71 Merge non-English locales from Transifex 2012-11-05 22:21:13 -05:00
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
Dan Stillman
a8a8bc6af0 Merge latest strings from Transifex 2012-06-29 16:25:17 -04:00
Simon Kornblith
4e5d4281f1 Merge branch '3.0' 2012-05-26 18:24:52 -04:00
Dan Stillman
3132a09966 Merge new English strings 2012-05-03 23:10:47 -04:00
Dan Stillman
d456117ebe Merge branch '3.0' 2012-05-03 17:56:32 -04:00
Dan Stillman
8e5c82a718 Latest translations from Transifex and merged English strings 2012-04-26 19:48:54 -04:00
Simon Kornblith
09813b145d Merge branch '3.0' 2012-02-14 15:00:07 -05:00
Dan Stillman
b3fe7b822a Merge locales from Transifex 2012-02-13 21:50:44 -05:00
Dan Stillman
de7467a62c Merge branch '3.0' 2012-02-10 14:10:07 -05:00
Dan Stillman
1ce06aae79 Add line about editing citations to QuickFormat guidance panel 2012-02-10 04:47:41 -05:00
Dan Stillman
3a4401a995 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/integration.js
	chrome/content/zotero/xpcom/storage/webdav.js
	chrome/content/zotero/xpcom/storage/zfs.js
	install.rdf
	update.rdf
 2012-02-09 02:13:02 -05:00
Dan Stillman
c9476bbd5d Merge locales 2012-02-01 20:11:54 -05:00
Dan Stillman
7ce3bd7060 "Zotero Migration Notification" -> "Existing Zotero Library Found" 2012-02-01 19:28:58 -05:00
Dan Stillman
e725eb88b4 "Firefox" -> "Firefox"/"Zotero" as appropriate 2012-02-01 02:35:22 -05:00
Dan Stillman
f4804b66b5 Merge branch '3.0' 2012-01-27 00:24:50 -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
b1cd48a863 Avoid a third "this" in save icon first-run guidance 2012-01-19 21:06:28 -05:00
Dan Stillman
5e2cd44cc8 Remove trailing period 2012-01-18 03:41:29 -05:00
Dan Stillman
4767cad19e Merge branch '3.0' 2012-01-10 19:54:09 -05:00
Dan Stillman
9d16cb2fe6 "Use Firefox profile directory" -> "Use profile directory" 2012-01-05 14:58:11 -05:00
Dan Stillman
3ac5a6db09 Merge branch '3.0' 2011-12-22 12:21:32 -05:00
Dan Stillman
4bc5406d34 Merge new English strings 2011-12-20 02:27:34 -05:00
Dan Stillman
309579719a Remove numChildren localization 2011-11-26 03:45:56 -05:00
Dan Stillman
eea45d6d94 Merge locales 2011-08-28 22:54:17 +00:00
Dan Stillman
947190b29a Merge locales 2011-08-21 04:59:29 +00:00
Dan Stillman
82a7dbee68 Merge locales 2011-08-10 19:54:59 +00:00
Dan Stillman
30ff1bd2ae "Manage Locate Engines"->"Manage Lookup Engines" in other locales 2011-03-04 19:50:48 +00:00
Dan Stillman
fb1a49ece9 Merge new English strings to non-English locales 2011-02-14 18:36:53 +00:00
Dan Stillman
ce67b52ed4 Merge new English strings to non-English locales 2011-02-10 04:28:14 +00:00
Dan Stillman
2f802fe74d Don't start Standalone on databases from <2.1b3 2011-01-13 20:52:15 +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
84cf9d8cbe Closes #1037, Remove Firefox 2.0/3.0–specific code 2010-07-09 20:10:43 +00:00
Dan Stillman
ef4a1f9cb7 - Display proper message for "(NS_ERROR_FILE_ACCESS_DENIED) [nsIFile.lastModifiedTime]", and add additional detail to message text 2010-02-24 10:47:24 +00:00
Dan Stillman
8bff745d1b Merged non-English locales from BZ 2010-02-18 04:34:52 +00:00
Dan Stillman
e651d03804 Fix "Invalid field 'repository' in ItemFields.isBaseField()" error for people with Repository column selected in middle pane 2010-02-04 11:18:38 +00:00
Dan Stillman
20e5f4c53f Add missing strings in non-English locales 2010-02-04 07:55:48 +00:00
Dan Stillman
a2d9dbba83 Closes #853, repository field should contain only data on actual archives, not online databases 
- Renamed 'Repository' to 'Library Catalog' and added 'Archive'
- Moved 'Repository' data to 'Archive' for item types other than books, periodicals, and theses
- Mapped 'Archive' to CSL 'archive'
 2010-02-03 04:50:45 +00:00
Dan Stillman
2db41e47cf Merged locales from BZ 2010-02-03 02:56:20 +00:00
Dan Stillman
3bb9f38c8c Make "Display all tags in this library" localizable 2010-02-03 00:38:16 +00:00
Dan Stillman
8dcfbd43cd Merged updates locales from BZ 2010-01-26 03:24:56 +00:00
Dan Stillman
5c37be057b Schema updates: 
- For "Book Section", added "Book Author" (needs to be mapped to CSL container-author) (closes #872)
- For A/V item types, "Recording Type" mapped to "Type" is now "Format" mapped to "Medium" (closes #1060)
- For "Radio Broadcast" and "TV Broadcast", replaced "Series Title" with "Program Title" mapped to "Publication Title" (CSL field container-title rather than collection-title) (closes #860)
- For "Patent", added "Country" field, removed (nonfunctional) base-map from "Place" to "Country", added "Issuing Authority", replaced "Date" with "Filing Date" (not currently mapped to CSL), and moved "Date" data to "Filing Date". Kept "Issue Date" base-mapped to "Date".  (closes #1375)
- For "Film", mapped "Distributor" to "Publisher" (closes #861) and added "Genre" mapped to "Type"
- For "Podcast", mapped "Audio File Type" to "Medium" rather than "Type"
- For "Bill", added "Cosponsor" creator type (closes #655)
- For "Case", added "Author" as primary creator type instead of "Counsel" (#655)
- For "Computer Program", added "Date" (closes #1502)
- For "Thesis" and "Newspaper Article", added "Place" (closes #1274)
- For "Thesis", replaced 'pages' with 'numPages' (closes #1618)


This can't yet sync, so upping sync API version and delaying dev XPI build.
 2010-01-25 23:16:15 +00:00
Dan Stillman
f73e45a5dc Restore Quick Start Guide item for new installations 2010-01-22 06:48:31 +00:00
Dan Stillman
eb51439686 Merging locales from BZ (existing locales only) 2010-01-15 23:03:45 +00:00
Dan Stillman
7150d38cf1 Addresses #1475, Localize add-on strings 
Localizes most (though not quite all) of the new unlocalized strings, hopefully without breaking anything
 2009-12-30 07:22:53 +00:00
Dan Stillman
9c5c02ef50 - In saved searches, use librayID_key hashes rather than ids for collections and saved searches (fixes inconsistent references across machines going forward, though it can't fix references that are already incorrect) 
- Make "Saved Search" a separate search condition from 'Collection' in drop-down menu
- Better handle invalid search conditions
- (Dev) Saved search conditions are now 'collection' and 'savedSearch' rather than 'collectionID' and 'savedSearchID', though the latter can be used as shortcuts when adding

This could use some testing.
 2009-12-05 10:26:47 +00:00
Dan Stillman
455a1e65f1 - Fix item deletion behavior to be consistent between Windows (where it was prompting to erase child items) and OS X (where it wasn't for some reason) -- child items are now always removed, since unlinking them didn't make sense in the context of moving items to the trash and could cause problematic data states that would break syncing and trash emptying 
- Show appropriate message when moving items to trash
- Unbind delete action from Backspace on Windows, where it's non-standard
- Fixed some inconsistencies in Cmd/Ctrl-Delete behavior -- Cmd-Delete will move item to trash without prompt in Library and move items to trash with a prompt in collection or search

API changes:

- Zotero.Items.erase(), Zotero.Item.erase(), and Zotero.ItemTreeView.deleteSelection() no longer takes eraseChildren parameter
 2009-10-28 18:45:49 +00:00
Dan Stillman
f4100739ce Merge new English strings 2009-09-23 08:12:10 +00:00
Dan Stillman
dd89fb6d47 Merge English strings 2009-09-14 06:11:13 +00:00
Dan Stillman
e981f03514 Merge English locale changes 2009-08-11 04:43:50 +00:00
Dan Stillman
19c6e59bab Add "since starting Firefox" to "The following errors have occurred" in error report window 2009-08-10 00:41:04 +00:00
Dan Stillman
67ecb6cda9 - Fix Doc Prefs window in OpenOffice to reflect correct app 
- Remove reference to Word from incompatible version message, which is also used with OpenOffice
- Add lines to Doc Prefs window to clarify the necessary file format (though enforcing this at save time would be best)
 2009-08-08 11:32:16 +00:00
Dan Stillman
20a14919ce Remove "Collections" header, since it's no longer accurate and takes up space 2009-07-24 06:30:27 +00:00
Dan Stillman
eabd87864f Merge locales for 2.0b6 2009-07-06 12:40:24 +00:00
Dan Stillman
2bfb5af205 Change "Documentation" to "Support and Documentation" and update URL 2009-07-03 07:04:13 +00:00
Dan Stillman
1db1de2257 Merged locales 2009-05-14 16:01:17 +00:00
Dan Stillman
505d3e6ac7 Add a couple localized strings 2009-03-17 08:11:22 +00:00
Dan Stillman
bafd02759b Add non-English strings for deleted items folder 2009-02-12 16:18:28 +00:00
Dan Stillman
04ea113823 Change invalid style warning to allow for non-CSL styles 2008-10-28 17:53:30 +00:00
Dan Stillman
e65473d618 Missing locale line 2008-09-23 03:57:19 +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