mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5383 commits 9 branches 362 tags 278 MiB
Commit graph

81 commits

Author SHA1 Message Date
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
Dan Stillman
0ce556d48c Remove extra backslashes 2012-02-16 21:09:52 -05:00
Dan Stillman
cf89e9d23f Update locales from Transifex (and add Khmer) 2012-02-16 21:04:49 -05: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