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

100 commits

Author SHA1 Message Date
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
6201577829 Update locales from Transifex 2014-04-26 01:34:38 -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
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
d6ab465a4c Update a few locales 2013-02-08 02:01:51 -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
7629f8b10d Fix a couple backwards '%S' 2012-02-13 22:02:04 -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