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

457 commits

Author SHA1 Message Date
Dan Stillman
a47bd95903 Localize full-text sync strings 2013-11-05 16:16:31 -05:00
Simon Kornblith
0b92ad0037 Modify behavior on Zotero Standalone launch to account for failure 
- Close Zotero pane before database is closed prior to reload, instead
  of waiting until reload is complete
- Show an error message if Zotero Standalone is not accessible when it
  should be
 2013-11-05 15:52:40 -05:00
gracile-fr
f3137099bc Localize et al. in the middle pane 
(Heromyth's PR #358, #360, #361)
 2013-08-15 23:15:02 +02:00
gracile-fr
723e8a4e30 Localize Ctrl/Cmd-Shift in Prefs 2013-08-15 22:53:56 +02:00
gracile-fr
355b1fbc57 Localize Ctrl/Cmd-Shift in Prefs 2013-08-15 22:45:04 +02:00
Dan Stillman
b6f493207f Closes #311, Update RIS/Refer pref to mention BibTeX too 2013-08-06 16:32:02 -04:00
Dan Stillman
f2d9580ba6 Update locales from Transifex 2013-08-06 15:19:45 -04:00
Dan Stillman
86c6611560 Update auto-update pref text to include styles 2013-08-05 10:57:09 -04:00
Dan Stillman
dc8998c5bc Add Firefox-wide shortcut (Ctrl/Cmd-Shift-S) for "Save to Zotero" 
Also: Don't show Firefox-specific shortcut keys in Standalone prefs
 2013-07-31 23:19:19 -04:00
Simon Kornblith
670f272b32 Alter message on auto-update 
Avoid ambiguously implying that Linux users should be running Zotero as
root, and tell them to fix the permissions on the Zotero executable instead.

See https://forums.zotero.org/discussion/31020/
 2013-07-27 01:46:13 -04:00
Simon Kornblith
1055187c8b If Zotero is run as root, clobber the cache directory and show a warning 2013-07-25 00:47:38 -04:00
Dan Stillman
78b5bc6727 Update locales from Transifex 2013-07-22 02:31:30 -04:00
Dan Stillman
e6756ea113 Update locales from Transifex 2013-07-11 23:16:48 -04:00
Simon Kornblith
23fc663378 Call Preferences "Preferences" in menu on all platforms 
Fixes #340
 2013-06-19 12:52:04 -04:00
Dan Stillman
8a935c8443 Add Indonesian locale 2013-05-17 14:43:26 -04:00
Dan Stillman
5268907798 Add new string to other locales 2013-05-02 01:28:04 -04:00
Dan Stillman
5a2a485a79 Add a WebDAV verification step to ensure 404 on missing files 2013-05-02 01:19:26 -04:00
Dan Stillman
06007e85a8 Update locales from Transifex 2013-05-01 01:16:10 -04:00
Dan Stillman
110f5bc963 Update locales from Transifex 2013-04-27 04:45:46 -04:00
Simon Kornblith
91b2de3ec6 Add missing string from d81e801685 2013-04-17 02:01:30 -04:00
Dan Stillman
82c4c90f5c Fix spacing in sync auto-merge dialogs 2013-04-13 03:44:09 -04:00
Dan Stillman
7be0680537 Update localized string manually, since Transifex is currently broken 2013-04-11 05:07:02 -04:00
Dan Stillman
2236bab130 Better handle some file sync file access errors 
- Catch additional errors on Windows (too-long paths, maybe aliases)
- Fix "Show File" button (which didn't show in some cases, at least on
  Windows)
- Clarify error message
 2013-04-11 04:28:38 -04:00
Dan Stillman
a966c30b38 Update locales from Transifex 2013-04-07 19:44:57 -04:00
Dan Stillman
5878dac132 Clarify error message for login manager access failure in Firefox 
Fixes #288, Inappropriate error message when master password times out
 2013-04-07 16:28:40 -04:00
Dan Stillman
193b10a1f5 Fix newline symbols 2013-04-04 01:17:32 -04:00
Dan Stillman
f1a3a4e65b Update locales from Transifex 2013-04-04 01:16:26 -04:00
Dan Stillman
2bdc6fd9f4 fr-FR: Redo "Champs & Marqueurs" change 2013-04-03 05:35:36 -04:00
Dan Stillman
f9663dc64d Fix ⏎ characters in es-ES, fr-FR, and ja-JP 2013-04-03 04:38:14 -04:00
Dan Stillman
b541f00e99 Update locales from Transifex 2013-04-03 04:34:59 -04:00
Dan Stillman
48aca90c80 fr-FR: "Tous champs & Marqueurs" -> "Champs & Marqueurs" 2013-04-01 15:36:19 -04:00
Dan Stillman
925e352143 Fix ⏎ characters in localized strings 2013-04-01 02:16:10 -04:00
Dan Stillman
d2fccbe4e9 Merge locales from Transifex 2013-04-01 02:14:41 -04:00
Dan Stillman
2b12c68858 fr-FR: "Raccourcis clavier"->""Raccourcis" in prefs 2013-04-01 01:34:55 -04:00
Dan Stillman
ded84f7666 Fix bizarre newline symbols in fr-FR and ja-JP 2013-03-29 03:35:01 -04:00
Dan Stillman
6ea5afe8e3 Update locales from Transifex 2013-03-29 03:33:05 -04:00
Dan Stillman
51476823d7 Merge locales from Transifex 2013-03-28 00:34:28 -04:00
Simon Kornblith
4c7d096545 Use typographic quotes 2013-03-28 00:24:38 -04:00
Simon Kornblith
6efe6c5bd6 Move "Automatically abbreviate journal titles" setting to document preferences 
The setting is disabled by default for existing documents, but enabled by
default for new documents.
 2013-03-27 23:53:38 -04:00
Simon Kornblith
6d518c0cec Clarify failed validation error message 
See http://forums.zotero.org/discussion/28540?page=1#Item_4
 2013-03-27 11:29:53 -04:00
Dan Stillman
760c327a1b Update locales from Transifex 2013-03-26 13:35:27 -04:00
Dan Stillman
b54b77a107 Clarify WebDAV error messages 2013-03-22 17:47:35 -04:00
Dan Stillman
c7c8cbbeae Mention Search pane in PDF tools message 2013-03-22 13:34:01 -04:00
Dan Stillman
cf9dd6d73f Merge locales from Transifex 2013-03-20 22:53:59 -04:00
Dan Stillman
1f1c6d16ff Quit rather than restart when changing data directory 2013-03-20 16:45:09 -04:00
Dan Stillman
147f325e40 Merge locales from Transifex 2013-03-17 03:34:42 -04:00
Dan Stillman
5a863d97c8 Context-menu string cleanup 
- Remove all "Selected" from "Selected Item", because that's how a context menu works
- Change "Remove Selected Item" to "Remove Item from Collection" (fixes #122)
- Change "Delete Selected Item from Library" to "Move Item to Trash")
- Change "Remove" on Duplicate/Unfiled Items to "Hide" (fixes #122)
- Change "Create Parent Item from Selected Item" to "Create Parent Item"
 2013-03-17 01:22:47 -04:00
Dan Stillman
022ee4481b Add "Delete Collection and Items..." context-menu option 
Also update collection/search deletion dialogs with better button text and no more "[JavaScript Application]"
 2013-03-16 22:55:50 -04:00
Dan Stillman
e86cda2440 Merge new English strings 2013-03-12 14:21:23 -04:00
Dan Stillman
490a176dcd Remove whitespace from localized strings 
Follow-up to #264
 2013-03-05 18:08:26 -05:00
Dan Stillman
c6afb86ba6 Put "Swap first/last names" in creator context menu root 
And remove "Transform Name Form" menu for now

Discussed in #132
 2013-03-05 15:03:01 -05:00
Dan Stillman
c68196e7b5 Merge 'gracile/fbennett-patch-authors' 2013-03-05 14:58:31 -05:00
Dan Stillman
4496c8d9e9 Merge remote-tracking branch 'aurimasv/multipleLookup' 
Conflicts:
	chrome/locale/en-US/zotero/zotero.dtd
 2013-03-05 14:46:31 -05:00
Dan Stillman
8333c68f77 Fix trailing whitespace from #264 2013-03-05 03:43:50 -05:00
Dan Stillman
0c60911fd1 Tweaks to @gracile-fr's localization changes 
Addresses #264
 2013-03-05 03:43:46 -05:00
Dan Stillman
30f5679ec8 Merge remote-tracking branch 'gracile/3.1-l10n' into 3.1-l10n 2013-03-05 03:06:43 -05:00
gracile-fr
eb7b301073 Localizes most of the strings marked "todo: localize" 2013-03-04 03:44:37 +01:00
Dan Stillman
d2f028d797 Tag colors, synced settings, and (stopgap) silent DB upgrades 
- New tag colors support, with the ability to assign colors to up to 6
  tags per library. Tags with colors assigned will show up at the top of
  the tag selector and can be added to (and removed from) selected items
  by pressing the 1-6 keys on the keyboard. The tags will show up as
  color swatches before an item's title in the items list.
- Synced settings, with Notifier triggers when they change and
  accessible via the API (currently restricted on the server to
  'tagColors', but available for other things upon request)
- Silent DB upgrades for backwards-compatible changes. We'll do
  something fancier with async DB queries in 4.0, but this will work for
  changes that can be made without breaking compatibility with older
  clients, like the creation of new tables. The 'userdata' value is
  capped at 76, while further increments go to 'userdata2'.

TODO:

- Try to avoid jitter when redrawing swatches
- Optimize tag color images for retina displays
- Redo attachment dots in flat style?
- Clear all colors from an item with 0 (as in Thunderbird), but I don't
  think we can do this without undo
 2013-03-03 06:23:25 -05:00
gracile-fr
d69ffd2ad8 localize sync.js 2013-03-01 18:37:25 +01:00
gracile-fr
217929a3ea more localization 2013-02-28 23:31:07 +01:00
gracile-fr
cc2f7836f8 localization preferences pane 2013-02-27 17:13:48 +01:00
Simon Kornblith
41e32647c7 Merge pull request #258 from gracile-fr/3.0-access-key 
Fix strange accesskeys in Standalone ("Print" & "Support and Documentation")
 2013-02-26 17:37:42 -08:00
Simon Kornblith
4d2cee7824 Support journal abbreviations 
Currently disabled by default
 2013-02-24 05:57:28 -05:00
Dan Stillman
27a2a9c1f7 More relative path changes 
- If attachment exists at same relative path in new base directory,
  leave it alone so that it continues to work.
- If attachment doesn't exist in new base directory, revert it to an
  absolute path.
- If new base directory is an ancestor or descendant of the previous
  base directory, adjust relative paths below the new directory so that
  they keep working.
- More dialog changes
- Select current base directory in file picker when changing directory
- Always use .persistentDescriptor instead of initWithPath(), though it
  probably doesn't matter, and wrap in try/catch in case the old setting
  is broken in some way.
- New function Zotero.File.directoryContains(dir, file), since
  nsIFile.contains() isn't recursive
- Don't use a private Zotero.Item property from outside to force path changes.
 2013-02-21 06:24:46 -05:00
Dan Stillman
f1eb356c19 Relative path support changes 
- Changed placeholder to just "attachments:" for consistency with "storage:"
- Reworked dialog text
- Use a fancier (and undocumented) filefield XUL element for path
- A few small code tweaks
 2013-02-21 06:24:46 -05:00
Will S
b224c5cf66 Relative path support for linked files 2013-02-21 06:24:46 -05:00
gracile-fr
f110e3fba2 Fix strange accesskeys in Standalone "(Print" & "Support and Documentation") 2013-02-16 22:33:22 +01: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
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
gracile-fr
f2239d31bc Localize quotation marks (cf. previous commit) and colon 2013-02-07 00:11:32 +01: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
Dan Stillman
650c393507 Expose launchNonNativeFiles hidden pref in Firefox 
"Open PDFs and other files within Firefox when possible"
 2013-02-04 01:56:29 -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
Simon Kornblith
91c3374d6b Merge branch '3.0' and modify recognizePDF.js to use promises 
Conflicts:
	chrome/content/zotero/recognizePDF.js
	install.rdf
	update.rdf
 2013-01-21 01:04:05 -05:00
aurimasv
1b9c89fd59 Add support for multiple identifier lookup to the magic wand tool. Enable shift+enter for submitting input in multiline mode. Use shift+enter in single line mode to convert to multiline 2012-12-12 00:21:46 -06:00
Dan Stillman
bb93f019dc File sync overhaul 
- New promise-based architecture
- Library-specific file sync queues, allowing other libraries to
  continue if there's an error in one library
- Library-specific sync errors, with error icons next to each library
- Changed file uploading in on-demand download mode, which had been missing
- On-demand download progress indicator in middle pane
- More accurate progress indicator
- Various tweaks and bug fixes
- Various future tweaks and bug fixes
 2012-12-11 15:16:40 -05:00
Dan Stillman
2e81f087b9 Fix WebDAV URL error message 2012-12-11 03:30:48 -05:00
Dan Stillman
ac195d2a5e Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/integration/quickFormat.js
	chrome/content/zotero/xpcom/attachments.js
	chrome/content/zotero/xpcom/utilities.js
	install.rdf
	styles
	update.rdf
 2012-11-20 03:22:49 -05:00
Dan Stillman
b77a87e4ca Update "Edit" string in zh-CN locale 2012-11-15 23:13:13 -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
698e70fb79 Fix Edit menu label in fr-FR locale 2012-11-06 13:09:37 -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
Dan Stillman
dfd0a7ad83 Add option to skip tags when copying items between libraries 2012-11-02 05:45:26 -04:00
Dan Stillman
3a9483070e Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/tinymce/plugins/paste/editor_plugin.js
	chrome/content/zotero/xpcom/translation/translate_firefox.js
	chrome/content/zotero/zoteroPane.js
	install.rdf
	update.rdf
 2012-11-01 22:14:08 -04:00
Dan Stillman
079b767974 Closes #44, Allow generating citations via right-click 
Currently generates multi-source citations for multiple items for note
styles, but a list of note citations might be better.

Also, context menu option is unchanged, since it becomes very long if
you add "Citation/Bibliography".
 2012-11-01 21:47:10 -04:00
Simon Kornblith
9ea12d5561 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/translation/translate_item.js
 2012-10-10 17:25:21 -04:00
Dan Stillman
bd75d95da9 Fix "(null)" in Firefox login manager corruption message 
(It turns out this also displays if the user clicks Cancel on a master
password prompt, though.)
 2012-09-26 21:57:40 -04:00
Dan Stillman
c2e116a49a Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/locale/csl
	chrome/content/zotero/xpcom/server_connector.js
	chrome/content/zotero/xpcom/storage.js
 2012-09-10 17:18:08 -04:00
Sebastian Karcher
2f7fb532c8 Update chrome/locale/en-US/zotero/zotero.dtd 
Change label for "Create New Item" button - as per mutual agreement here: http://forums.zotero.org/discussion/17909/create-new-item-from-current-page-should-use-translator/#Item_17
 2012-09-09 12:34:37 -06:00
Simon Kornblith
d9ea6d3647 Add useJournalAbbreviation export option for BibTeX (see https://github.com/zotero/translators/pull/436) 2012-08-16 21:11:21 -04:00
Simon Kornblith
ab4c2f247d Merge branch '3.0' 2012-08-05 19:44:57 -04:00
Simon Kornblith
cd6e78899b Fix "Use profile directory" option to use correct app name 2012-08-01 10:52:00 -04:00
Simon Kornblith
349c19fe4d Merge branch '3.0' 2012-07-21 18:29:04 -04:00
Simon Kornblith
4fd978905c Clarify wording of missing item message as suggested by @adam3smith 2012-07-19 10:53:01 -04:00
Simon Kornblith
06825c4767 Validate CSL styles on installation, and restructure Zotero.Styles.install() to use Q. 
Closes https://www.zotero.org/trac/ticket/1681, automatic CSL validation
 2012-07-10 02:46:57 -04:00
Simon Kornblith
471af0c8ab Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/translation/translate_firefox.js
	chrome/content/zotero/xpcom/translation/translate_item.js
 2012-07-08 13:15:27 -04:00
Simon Kornblith
d2dcf2bbc7 LibreOffice does not support saving custom properties to docx, and corrupts properties read from docx, so change message 2012-07-08 11:00:11 -04: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
gracile-fr
7ee1b1e491 Frank's patch https://github.com/zotero/zotero/issues/132 
Menu item to swap creator first/last names (#132)
 2012-06-14 17:19:30 +02:00
Simon Kornblith
ac19b0490a Merge branch 'no-new-collection-on-import' 2012-06-10 22:39:41 -04:00
Simon Kornblith
d26bb24849 Merge branch 'attachment-progress' 2012-06-10 21:56:15 -04:00
Dan Stillman
f1f4044018 Merge branch '3.0' 2012-06-10 21:50:14 -04:00
Simon Kornblith
3a6669c66f Closes #23, "Saving item..." notification should show the name of the library where item is imported 2012-06-10 16:50:06 -04:00
Simon Kornblith
68365e2297 Allow user to control whether files are imported into a new collection. 
Adds three new preferences controlling whether a new collection is created upon import:
- extensions.zotero.import.createNewCollection.fromFile
	Controls whether a new collection is created by import from cog menu
- extensions.zotero.import.createNewCollection.fromClipboard
	Controls whether a new collection is created by import from clipboard
- extensions.zotero.import.createNewCollection.fromFileOpenHandler
	Controls whether a new collection is created when import is initiated by
	double-clicking a file or by dragging it over Zotero. This preference applies only to
	Zotero Standalone, and is configurable in the dialog that appears asking the user
	to confirm the import.

Closes #19, [papercuts] (26) Clipboard import into an open collection
 2012-06-10 11:05:39 -04:00
Simon Kornblith
4e5d4281f1 Merge branch '3.0' 2012-05-26 18:24:52 -04:00
Dan Stillman
1a76318538 Just focus libraries pane on shortcut key 
Closes #133
 2012-05-25 14:24:08 -04:00
gracile-fr
12a45882fe Localize editorWarning 
(cherry picked from commits f1be6125...f84e6b12)
 2012-05-04 15:33:43 -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
2bbd2be4e7 Use "%S more..." instead of hard-coding space, and make general string 
(cherry picked from commit 49b9c14b8d)
 2012-05-03 17:46:49 -04:00
gracile-fr
4ba9b6a4c0 Localization of strings previously hardcoded. All these strings are related to duplicate detection. 
(cherry picked from commit d6ae1c544d)
 2012-05-03 17:45:15 -04:00
gracile-fr
12fc2eadc0 Localization of strings previously hardcoded in itembox.xml (Move up/down) 
(cherry picked from commit acb7c22f75)
 2012-05-03 17:42:25 -04:00
gracile-fr
0ece4145cd Fixes #111: "Search subcollections" instead of "Search subfolders" in Advanced search. 2012-05-03 17:35:49 -04:00
Dan Stillman
49b9c14b8d Use "%S more..." instead of hard-coding space, and make general string 2012-05-03 17:33:19 -04:00
gracile-fr
7b5c176f8e Fixes #111: "Search subcollections" instead of "Search subfolders" in Advanced search. 2012-05-03 23:06:27 +02:00
gracile-fr
d6ae1c544d Localization of strings previously hardcoded. All these strings are related to duplicate detection. 2012-05-03 22:38:14 +02:00
gracile-fr
acb7c22f75 Localization of strings previously hardcoded in itembox.xml (Move up/down) 2012-05-03 22:16:24 +02:00
Dan Stillman
03072e363d Fix preferences in Thai locale 2012-05-01 03:03:39 -04:00
Dan Stillman
8e5c82a718 Latest translations from Transifex and merged English strings 2012-04-26 19:48:54 -04:00
Simon Kornblith
18d9c6be8c Add print and save options to reports, part 1 2012-04-19 00:12:43 -04:00
gracile-fr
18111dd15d Make additional fields available as columns with a submenu (fixes #84) 2012-03-24 19:39:14 +01:00
Simon Kornblith
947be813ec Merge branch '3.0' 2012-03-20 02:16:43 -04:00
gracile-fr
192162c567 Update chrome/locale/en-US/zotero/zotero.properties 2012-03-13 20:03:42 +01:00
Dan Stillman
daf1899c72 Remove unnecessary ellipsis 2012-03-12 01:43:56 -04:00
gracile-fr
ed0741959d Localize editorWarning 2012-03-08 14:06:01 +01:00
Simon Kornblith
b3f9f5102b Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/overlay.js
	chrome/content/zotero/xpcom/schema.js
 2012-02-28 17:22:34 -05:00
Dan Stillman
fbef301fe0 Add citation/footnote instructions to Quick Copy prefs 2012-02-28 15:28:14 -05:00
Dan Stillman
edd2f99ec9 Correct schema errors without pointing users to DB repair tool 
We can't do anything about actual database corruption, but we can fix
all the other things that the repair tool fixes.
 2012-02-24 12:05:06 -05:00
Simon Kornblith
394ad64091 Address Rintze's comments per http://forums.zotero.org/discussion/21934/ 2012-02-19 23:13:49 -05:00
Simon Kornblith
07028650f0 Closes #48, Additional field in QuickFormat dialog showing the name of the library and providing a link to the item with the following modifications 
- Open in current window if one is already open
- Use a button instead of a label
- Don't show button if citation item is not linked to a Zotero item

This doesn't currently work if the Zotero pane has never been opened in the given window, because ZoteroPane.selectItem() appears to fail in that circumstance. This needs to be fixed.
 2012-02-19 18:37:42 -05:00
Dan Stillman
17e9c466d0 Merge branch '3.0' 2012-02-17 04:26:58 -05: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
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
5c5967166f Fix broken en-US locale file 2012-02-10 04:53:18 -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
d3f4bc6d7e Tweak QuickFormat first-run text 2012-02-01 19:17:38 -05:00