Commit graph

328 commits

Author SHA1 Message Date
Dan Stillman
782e798973 Merge new English strings 2017-08-09 02:04:03 +02:00
Dan Stillman
6232c83b4b Merge new English strings 2017-08-05 19:47:59 +02:00
Dan Stillman
03f8c5fa99 Merge new English strings 2017-07-31 05:47:03 -04:00
Dan Stillman
34b99fb71c Merge new English strings 2017-07-28 19:17:11 -04:00
Dan Stillman
e475b22f1d Add intl.accept_languages from Mozilla language packs 2017-07-25 16:27:31 -04:00
Dan Stillman
521f291b84 Fix PluralForm support
The library was using the plural rule defined in the built-in
intl.properties, but that was always en-US in the standalone app.
2017-07-25 15:20:23 -04:00
Dan Stillman
3bb8b5d24d Merge new English strings 2017-07-25 03:08:43 -04:00
Dan Stillman
efe8b65f84 Update non-English locales 2017-07-21 07:54:45 -04:00
Dan Stillman
2addf6b27b Get Zotero.locale from loaded locale, not from pref
It was previously set from general.useragent.locale, but that's not used
by default, meaning that date interpretation and some other things might
have been incorrect for everyone who didn't set a locale explicitly and
toggle matchOS...
2017-07-21 07:51:57 -04:00
Dan Stillman
97d46b79f1 Update locales from Transifex 2017-07-19 04:08:26 -04:00
Dan Stillman
cf5a943ec6 Update locales from Transifex 2017-07-17 18:25:21 -04:00
Dan Stillman
2ca10b3d54 Update non-English strings 2017-07-08 19:14:34 -04:00
Dan Stillman
043c0ac6b7 Update locales from Transifex 2017-07-07 18:29:38 -04:00
Dan Stillman
cb913ffccb Update non-English strings 2017-07-07 05:31:36 -04:00
Dan Stillman
7729dcafc0 Update non-English strings 2017-07-07 03:41:50 -04:00
Dan Stillman
72feaab6f4 Update locales from Transifex 2017-07-01 07:07:31 -04:00
Dan Stillman
16b2e82f74 Update non-English strings 2017-06-29 04:11:22 -04:00
Dan Stillman
2119b5ab75 Update non-English strings 2017-06-27 16:26:48 -04:00
Dan Stillman
a56af4a101 Merge new English string 2017-06-27 01:10:27 -04:00
Dan Stillman
b2eea914e4 Update locales from Transifex 2017-06-26 19:00:08 -04:00
Dan Stillman
38652f9362 Merge new English strings 2017-06-20 23:12:15 -04:00
Dan Stillman
88089e290d Update locales from Transifex 2017-06-13 18:03:59 -04:00
Dan Stillman
74fe4b31f9 Merge locales from Transifex 2017-05-17 21:41:40 -04:00
Dan Stillman
4ef39107f3 Update locales from Transifex 2017-05-05 05:14:15 -04:00
Dan Stillman
e4bc715dc1 Update locales from Transifex 2017-04-14 23:14:22 -04:00
Dan Stillman
3d0c7d3c43 Update locales from Transifex 2017-03-02 03:49:28 -05:00
Dan Stillman
41538ebca6 Update locales from Transifex 2017-02-15 13:13:45 -05:00
Dan Stillman
13442198db Update locales from Transifex 2017-01-24 03:48:43 -05:00
Dan Stillman
dcd1da70af Merge new English strings 2017-01-19 17:21:58 -05:00
Dan Stillman
3d83f5ff70 Update locales from Transifex 2017-01-15 15:45:47 -05:00
Dan Stillman
cbcfb6b92e Fix missing Options menu on Windows/Linux 2017-01-10 21:44:03 -05:00
Dan Stillman
fb7592bb53 Update locales from Transifex 2017-01-09 04:53:15 -05:00
Dan Stillman
9fbdc77cac Update Edit menu strings in non-English locales
Remove localizations in standalone.dtd and replace with editMenuOverlay.dtd
files from the Mozilla language packs

Also remove some other unused strings
2017-01-09 03:08:38 -05:00
Dan Stillman
d19d90a33c Update locales from Transifex 2016-12-17 09:00:19 -05:00
Dan Stillman
426c767a43 Update locales from Transifex 2016-12-14 02:23:29 -05:00
Dan Stillman
32ae3ee74d Remove extra space in string 2016-12-13 20:29:17 -05:00
Dan Stillman
b940890535 Update locales from Transifex 2016-12-13 09:12:22 -05:00
Dan Stillman
3f32523709 Updates locales from Transifex 2016-12-12 04:14:22 -05:00
Dan Stillman
d781f9c3d4 Update locales from Transifex 2016-12-11 02:30:35 -05:00
Dan Stillman
abff9e39ad Remove "do not interrupt" from migration message
It would be good for people not to kill the process indiscriminately, but the
migration will theoretically pick up where it left off, so it shouldn't be too
big a deal.
2016-12-06 05:02:59 -05:00
Dan Stillman
c2033ef5a1 Clearer status message during data dir migration 2016-11-22 03:20:54 -05:00
Dan Stillman
aaa20f4317 Update non-English strings 2016-11-22 02:33:05 -05:00
Dan Stillman
fb1e87a2da Update non-English locales 2016-11-21 05:19:18 -05:00
Dan Stillman
efde92f1ee Merge new English strings 2016-11-19 17:09:13 -05:00
Dan Stillman
0f5d2fea82 "Migrate Data Directory…" -> "Migrate To New Default Location…" 2016-11-16 23:04:22 -05:00
Dan Stillman
71524d9087 Update locales from Transifex 2016-11-16 01:13:06 -05:00
Dan Stillman
d52d5aeb6c Update locales from Transifex 2016-11-13 15:18:21 -05:00
Dan Stillman
f0aafe4c21 Update locales from Transifex 2016-10-09 01:07:49 -04:00
Dan Stillman
302e31ebff Update locales from Transifex 2016-10-03 13:49:58 -04:00
Dan Stillman
536c24a93f Update locales from Transifex 2016-10-03 13:44:54 -04:00
Dan Stillman
3741a75b1d Update locales from Transifex 2016-09-06 19:32:07 -04:00
Dan Stillman
7dce069490 Merge English strings to locales 2016-07-06 02:14:55 -04:00
Dan Stillman
de19d2fee5 Update locales from Transifex 2016-06-09 02:43:37 -04:00
Dan Stillman
80f31abc30 Merge new English strings for 5.0 2016-06-06 16:43:02 -04:00
Dan Stillman
6f1905bcfc Merge new English strings 2016-02-06 05:09:11 -05:00
Dan Stillman
6b93704006 Update locales from Transifex 2016-02-01 04:41:11 -05:00
Dan Stillman
325635e8ec Update locales from Transifex 2015-08-26 01:24:05 +02:00
Dan Stillman
dce9ff304f Update cslpreview.dtd and csledit.dtd from Transifex
Fixed config file that was preventing these from being pulled

Addresses #796
2015-07-31 14:11:44 -04:00
Dan Stillman
535d3340e3 Update locales from Transifex 2015-07-30 16:02:07 -04:00
Dan Stillman
3cf1c3ccda Merge locales from Transifex 2015-06-30 23:41:48 -04:00
Dan Stillman
dd146557b7 Merge non-English strings 2015-06-26 02:13:24 -04:00
Dan Stillman
a909951106 Merge locales from Transifex 2015-06-24 14:41:43 -04:00
Dan Stillman
42673cb0a2 Merge non-English strings 2015-06-24 06:24:25 -04:00
Dan Stillman
ab3b0367ef Merge locales from Transifex 2015-05-25 22:26:50 -04:00
Dan Stillman
3ac22b6242 Merge locales from Transifex 2015-05-19 17:28:40 -04:00
Dan Stillman
c1a581168a Merge locales from Transifex 2015-04-09 00:26:12 -04:00
Dan Stillman
52e735b035 Merge locales from Transifex 2015-03-26 20:34:23 -04:00
Dan Stillman
68b0fb0368 Merge locales from Transifex 2015-03-17 18:35:21 -04:00
Dan Stillman
072ced347c Merge locales from Transifex 2015-03-16 12:11:33 -04:00
Dan Stillman
cd358977f3 Update locales from Transifex
(Unfortunately this wipes out "Shortcuts" in all locales, but pushing
non-English locales to Transifex scares me too much. Sorry, localizers!
I think Transifex makes it easy to use previously used translations, at
least.)
2015-03-09 18:58:01 -04:00
Dan Stillman
b80d4cd369 Update locales from Transifex 2015-02-23 03:43:35 -05:00
Dan Stillman
20d4ab2d0a Merge locales from Transifex 2015-02-19 18:08:13 -05:00
Dan Stillman
9232dd5247 Merge locales from Transifex, though it's all Greek to me 2015-01-30 04:45:41 -05:00
Dan Stillman
d82f8e91dc Update locales from Transifex 2014-12-19 14:23:46 -05:00
Dan Stillman
e76cc07371 Merge locales from Transifex 2014-06-19 02:05:29 -04:00
Dan Stillman
3d27c2c6a7 Merge locales from Transifex 2014-06-07 17:16:40 -04:00
Dan Stillman
ba89dbf0ae Link translator errors to troubleshooting page instead of known issues 2014-06-02 17:00:57 -04:00
Dan Stillman
227fe74a1e Merge new English strings 2014-05-26 20:15:54 -04:00
Dan Stillman
eaff0fa419 Merge locales from Transifex 2014-05-16 14:50:19 -04:00
Dan Stillman
fef20d39a8 Merge English string 2014-05-15 21:41:22 -04:00
Dan Stillman
faad761491 Merge new English strings 2014-05-07 05:16:24 -04:00
Dan Stillman
1524fff30f Revert "Separate toolbar guidance strings for easier localization"
This reverts commit 5da9b4bbb6 and uses
slightly different wording between the two messages ("Click here…" vs.
"Click the icon…").
2014-04-29 03:03:42 -04:00
Dan Stillman
cefe301c74 s/firstRunGuidance.toolbarButton.new/firstRunGuidance.toolbarButton.upgrade/ 2014-04-28 22:56:41 -04:00
Dan Stillman
d4087c5b58 Merge new English strings 2014-04-28 22:51:51 -04:00
Dan Stillman
7091431c21 Update locales from Transifex
Includes new Lithuanian locale
2014-03-19 15:06:19 -04:00
Dan Stillman
b6b005f66f Update locales from Transifex 2014-03-16 00:19:52 -04:00
Dan Stillman
79904325ee Update locales from Transifex 2014-01-31 18:10:43 -05:00
Dan Stillman
af63818bed Update locales from Transifex 2013-12-13 18:33:27 -05:00
Dan Stillman
3aea8bf040 Update locales from Transifex 2013-11-19 17:39:22 -05:00
Dan Stillman
2ca0d159b5 Update locales 2013-11-13 00:40:22 -05:00
Dan Stillman
de62d3865e Update locales from Transifex 2013-11-12 00:39:09 -05:00
Dan Stillman
6e9b491e82 Update locales from Transifex 2013-11-05 16:52:31 -05:00
Dan Stillman
f2d9580ba6 Update locales from Transifex 2013-08-06 15:19:45 -04:00
Dan Stillman
e6756ea113 Update locales from Transifex 2013-07-11 23:16:48 -04:00
Dan Stillman
5268907798 Add new string to other locales 2013-05-02 01:28:04 -04:00
Dan Stillman
110f5bc963 Update locales from Transifex 2013-04-27 04:45:46 -04:00
Dan Stillman
7be0680537 Update localized string manually, since Transifex is currently broken 2013-04-11 05:07:02 -04:00
Dan Stillman
a966c30b38 Update locales from Transifex 2013-04-07 19:44:57 -04:00
Dan Stillman
d2fccbe4e9 Merge locales from Transifex 2013-04-01 02:14:41 -04:00
Dan Stillman
51476823d7 Merge locales from Transifex 2013-03-28 00:34:28 -04:00
Dan Stillman
760c327a1b Update locales from Transifex 2013-03-26 13:35:27 -04:00
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
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
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
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
97f214c9dc 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
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