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 |
|
Dan Stillman
|
6220bc39f5
|
"Citations"/"Notes" instead of "Citation"/"Note" in right-click dialog
|
2012-11-06 01:16:03 -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
|
3132a09966
|
Merge new English strings
|
2012-05-03 23:10:47 -04:00 |
|
Dan Stillman
|
8e5c82a718
|
Latest translations from Transifex and merged English strings
|
2012-04-26 19:48:54 -04:00 |
|
Dan Stillman
|
cf89e9d23f
|
Update locales from Transifex (and add Khmer)
|
2012-02-16 21:04:49 -05:00 |
|