From 34cd1103a08d8c87dfc539d5770235e9e50b59cc Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 15 Apr 2009 09:15:58 +0000
Subject: [PATCH] - merge WorldCat translators and fix search (for ISBNs, at
 least) - make lookup button - podcast icon is now ipod_cast.png and
 radioBroadcast icon is now transmit.png, both from famfamfam

---
 chrome/content/zotero/lookup.xul              |   9 +-
 chrome/content/zotero/overlay.xul             |   2 +-
 chrome/content/zotero/recognizePDF.js         |   2 +-
 chrome/locale/en-US/zotero/zotero.dtd         |  14 +-
 chrome/locale/en-US/zotero/zotero.properties  |   7 +-
 chrome/skin/default/zotero/indicator.gif      | Bin 1542 -> 0 bytes
 chrome/skin/default/zotero/overlay.css        |  19 +++
 chrome/skin/default/zotero/toolbar-lookup.png | Bin 0 -> 746 bytes
 .../skin/default/zotero/treeitem-podcast.png  | Bin 749 -> 711 bytes
 .../zotero/treeitem-radioBroadcast.png        | Bin 498 -> 749 bytes
 chrome/skin/default/zotero/zotero.css         |   8 +-
 translators/Open WorldCat (Search).js         |  92 ------------
 translators/Open WorldCat (Web).js            |  79 -----------
 translators/Open WorldCat.js                  | 131 ++++++++++++++++++
 translators/Worldcat.org.js                   |  63 ---------
 15 files changed, 177 insertions(+), 249 deletions(-)
 delete mode 100644 chrome/skin/default/zotero/indicator.gif
 create mode 100755 chrome/skin/default/zotero/toolbar-lookup.png
 delete mode 100644 translators/Open WorldCat (Search).js
 delete mode 100644 translators/Open WorldCat (Web).js
 create mode 100644 translators/Open WorldCat.js
 delete mode 100644 translators/Worldcat.org.js

diff --git a/chrome/content/zotero/lookup.xul b/chrome/content/zotero/lookup.xul
index 1d0bd4ec10..c284eed8f3 100644
--- a/chrome/content/zotero/lookup.xul
+++ b/chrome/content/zotero/lookup.xul
@@ -8,18 +8,19 @@
 	id="zotero-search-dialog"
 	title="Search"
 	orient="vertical"
+	buttons="accept,cancel"
 	ondialogaccept="return Zotero_Lookup.accept();"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	
 	<script src="include.js"/>
 	<script src="lookup.js"/>
 	
-	<description>&zotero.lookup.description;</description>
-	<textbox id="lookup-textbox" flex="1"/>
+	<description style="font-size: small">&zotero.lookup.description;</description>
+	<textbox style="font-size: small" id="lookup-textbox" flex="1"/>
 	<hbox id="dialog-button-box">
 		<toolbarbutton class="zotero-small-progress-indicator" id="progress"/>
 		<spacer flex="1"/>
-		<button class="dialog-button" dlgtype="cancel"/>
-		<button class="dialog-button" dlgtype="accept"/>
+		<button class="dialog-button" style="font: menu" dlgtype="cancel"/>
+		<button class="dialog-button" style="font: menu" dlgtype="accept"/>
 	</hbox>
 </dialog>
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 0a6e055d91..ff634a7e80 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -181,7 +181,6 @@
 						<!-- New Item drop-down built in overlay.js::onLoad() -->
 						<menupopup>
 							<menuseparator/>
-							<menuitem label="&zotero.toolbar.lookup;" oncommand="window.openDialog('chrome://zotero/content/lookup.xul', 'lookup', 'chrome,modal')"/>
 							<menuitem label="&zotero.toolbar.attachment.linked;" oncommand="ZoteroPane.addAttachmentFromDialog(true);" tooltiptext=""/>
 							<menuitem label="&zotero.toolbar.attachment.add;" oncommand="ZoteroPane.addAttachmentFromDialog();"  tooltiptext=""/>
 							<menuseparator/>
@@ -191,6 +190,7 @@
 						</menupopup>
 					</toolbarbutton>
 					<toolbarbutton id="zotero-tb-item-from-page" tooltiptext="&zotero.toolbar.newItemFromPage.label;" oncommand="ZoteroPane.addItemFromPage()"/>
+					<toolbarbutton id="zotero-tb-lookup" tooltiptext="&zotero.toolbar.lookup.label;" oncommand="window.openDialog('chrome://zotero/content/lookup.xul', 'lookup', 'chrome,modal')"/>
 					<toolbarseparator/>
 					<toolbarbutton id="zotero-tb-link-page" tooltiptext="&zotero.toolbar.attachment.weblink;" oncommand="ZoteroPane.addAttachmentFromPage(true)"/>
 					<toolbarbutton id="zotero-tb-snapshot-page" tooltiptext="&zotero.toolbar.attachment.snapshot;" oncommand="ZoteroPane.addAttachmentFromPage()"/>
diff --git a/chrome/content/zotero/recognizePDF.js b/chrome/content/zotero/recognizePDF.js
index ec5e9879f7..e5ddfc2229 100644
--- a/chrome/content/zotero/recognizePDF.js
+++ b/chrome/content/zotero/recognizePDF.js
@@ -25,7 +25,7 @@
  */
 const Zotero_RecognizePDF_SUCCESS_IMAGE = "chrome://zotero/skin/tick.png";
 const Zotero_RecognizePDF_FAILURE_IMAGE = "chrome://zotero/skin/cross.png";
-const Zotero_RecognizePDF_LOADING_IMAGE = "chrome://zotero/skin/indicator.gif";
+const Zotero_RecognizePDF_LOADING_IMAGE = "chrome://global/skin/icons/loading_16.png";
 const DOIre = /\bdoi\: *([^\s]+)/i;
  
 /**
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 7576203d59..b39c35c253 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -57,6 +57,7 @@
 <!ENTITY zotero.toolbar.newItem.label					"New Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label			"More">
 <!ENTITY zotero.toolbar.newItemFromPage.label			"Create New Item from Current Page">
+<!ENTITY zotero.toolbar.lookup.label				"Add Item by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label				"Remove Item...">
 <!ENTITY zotero.toolbar.newCollection.label			"New Collection...">
 <!ENTITY zotero.toolbar.newSubcollection.label			"New Subcollection...">
@@ -66,6 +67,7 @@
 <!ENTITY zotero.toolbar.actions.label					"Actions">
 <!ENTITY zotero.toolbar.import.label					"Import...">
 <!ENTITY zotero.toolbar.export.label					"Export Library...">
+<!ENTITY zotero.toolbar.rtfScan.label					"RTF Scan...">
 <!ENTITY zotero.toolbar.timeline.label				"Create Timeline">
 <!ENTITY zotero.toolbar.duplicate.label				"Show Duplicates">
 <!ENTITY zotero.toolbar.preferences.label				"Preferences...">
@@ -100,7 +102,7 @@
 <!ENTITY zotero.tagSelector.renameTag				"Rename Tag...">
 <!ENTITY zotero.tagSelector.deleteTag				"Delete Tag...">
 
-<!ENTITY zotero.lookup.description				"Enter the DOI or PMID to look up in the box below.">
+<!ENTITY zotero.lookup.description				"Enter the ISBN, DOI, or PMID to look up in the box below.">
 
 <!ENTITY zotero.selectitems.title						"Select Items">
 <!ENTITY zotero.selectitems.intro.label				"Select which items you'd like to add to your library">
@@ -174,4 +176,12 @@
 <!ENTITY zotero.recognizePDF.cancel.label					"Cancel">
 <!ENTITY zotero.recognizePDF.pdfName.label				"PDF Name">
 <!ENTITY zotero.recognizePDF.itemName.label				"Item Name">
-<!ENTITY zotero.recognizePDF.captcha.label				"Type the text below to continue retrieving metadata.">
\ No newline at end of file
+<!ENTITY zotero.recognizePDF.captcha.label				"Type the text below to continue retrieving metadata.">
+
+<!ENTITY zotero.rtfScan.title		                    "RTF Scan">
+<!ENTITY zotero.rtfScan.cancel.label					"Cancel">
+<!ENTITY zotero.rtfScan.citation.label					"Citation">
+<!ENTITY zotero.rtfScan.itemName.label					"Item Name">
+<!ENTITY zotero.rtfScan.unmappedCitations.label				"Unmapped Citations">
+<!ENTITY zotero.rtfScan.ambiguousCitations.label			"Ambiguous Citations">
+<!ENTITY zotero.rtfScan.mappedCitations.label				"Mapped Citations">
\ No newline at end of file
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 987b194dad..9ad2eb4b10 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -532,5 +532,10 @@ recognizePDF.limit					= Query limit reached. Try again later.
 recognizePDF.complete.label			= Metadata Retrieval Complete.
 recognizePDF.close.label			= Close
 
+rtfScan.boxTitle					= Select a file to scan
+rtfScan.scanning.label				= Scanning RTF Document...
+rtfScan.saving.label				= Formatting RTF Document...
+rtfScan.rtf							= Rich Text Format (.rtf)
+
 lookup.failure.title				= Lookup Failed
-lookup.failure.description			= Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
\ No newline at end of file
+lookup.failure.description			= Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
diff --git a/chrome/skin/default/zotero/indicator.gif b/chrome/skin/default/zotero/indicator.gif
deleted file mode 100644
index 529e72f45a2395e2eddb0487edbe79b306c92c3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1542
zcma)+ZA?>F7{_}rw{MqAdn^?TGVN^(w7}TqO{+3&F9nJ+R*E<<0&OXdX^es|GZF{4
zEl^%<QI^gTU#c?11_70kEiAOW42e@2I5)Eqg*kCEI&?AkMOHL^K(l1$!})a1`9077
z|9?(uT8ey)9?$@7kVc!IpMU)L@#N&>(9lp{U!Tk6YH4YyudgpHEiEi8)M~XPNk&IU
z<2VigpuIfr-T(i>=Y2DhH)SO$HOVnigb(Dsi9bi^OfNlh;gy9lX!QL;2?>26z1K#P
zV&uBmc3ztB!JQGe3%xin-RaY+qK3d98fkvdQN;t{oK0gq+21S5uC5%{i0Rkv4w<&D
zJMjZD7~PJ7Ws}GES&9V@nF^RLDT|DSF@(;5sRA*CvH-&fm&e1b*w01Co_GW)!WWmq
zeOZb@C}{*uR%lI>L5yacs>LSc&yub>OO|tgQr{&M!Pxk;eM1c&ROwWXCzb>?PAMLC
z1GC6JXDUc(-m@u3aTC6;$74tGFI<-5LO#4LoR#vKh>|j7m0)u&+#r4f3us)g0tH^I
zt;E*mux|86(!<xH6O4U9M>S&sVn}Jx(E{rR@KAZe3V3OQgh*I9umtZKPs|XRegw&V
z*XWil!;da!)+BwsQ-QH9Pg^G5XT1P$nS_y40Tsy<R8iSm%mvl;UZzudT*On1ioy{z
zn)O%cO!!*W@@a^gv4JSSFh}T0XF!~lLl%z+<C{7KIe{oW*Q2Zo@$+O&xwqL2Vbs=>
z{=w<DmOy^?`)5TEl9%-nLgtkpqAJU4q;F9<UTUhBdZWZ9y&Y$WJp-0stoL2{XiFSc
zOI)b(Tnb;B8l&yZ)P!n1cG@bf>wwR=Ec@H0)=_Eu4eUa{DduV&e41fhwT}-kHt$uA
zb}g8vv`P8=DavZKF<526AnGep^efD4R7poT41ZImDN+S_C?KFCwamgWUZ<L>Jk`!~
zT#=Z`F1h2n%sgVJokp-VKc_!QT=Ag>&W4N}ZVs1IETePLkb?bUKW<p;r`&@w$J<UW
zsQS`Lp{-4At#Y?M%<Ub9>r#oNjnpyd9k)?!4M?%;92?~PwtjZ=-!&#>4sNe7_}r$O
zson-Y-4)nvlJpZQC&U&6uKs?SCVNj09n8wAFu|P76)3h_vPe_N8`*{Q<ay`Eqy~oQ
z4shG4@^lc#dMQU8$zIB8nj%ov{s=@oLN;<beyOi$Yd>?^VX)r(?M%vvE=b?K;_!f8
z85)&S&2)|t3TrI%&F?Itlg^Dg1pG215&^1RM0`E5g<hpKz}9wvGzobT;Vtj(7&PAL
zao=@D9I4TOcQDyWoJx0M>%-D^w{1v;Ej@GFf#$mhQ?td50gdL-SzT{X6={H?<9MQh
zTO&IDmziQe=nz0T8Ju01Xm47?mb69O*PU)%;OZFgx!P8>>(A#M=fWq3vBN`3q^FtF
zv|HfcX=>^}AYVq9-PJrn@MXK6`Md#U4{x3jGJ<^XDaW#fs!Er#ODIP}1U_W7@EKVI
zd^M_Eg2^QQ6DZ*yoe{9k_B%akiPtknp;_KPPaEMp_N?@h(ODHk$K`ainr|-+$frDT
zQKU?@eheS0B!m-{o=?<Pz_1hf3JLOYYvGP+K@U;EE`T<rix?%Z=7aslUug7pXiVcZ
z>N*C;UFV<hJLgExQwJ$TSNrVb&opBk^2+M9L_nSSoK%Ac<vi$aH_froBTamTLVMPu
q$JiVFt=rud{x4KgkGo|iCK<xmpbXGi<r1@H8`v9Pl@x;0*8K}1J>Sv*

diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 84edf71f1e..708beceed8 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -151,6 +151,11 @@ window[active="true"] #zotero-pane[fullscreenmode="true"][platform="mac"]
 	list-style-image: url('chrome://zotero/skin/toolbar-item-add.png');
 }
 
+#zotero-tb-lookup
+{
+	list-style-image: url('chrome://zotero/skin/toolbar-lookup.png');
+}
+
 #zotero-tb-item-from-page
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-item-from-page.png');
@@ -221,6 +226,20 @@ window[active="true"] #zotero-pane[fullscreenmode="true"][platform="mac"]
 	list-style-image: url(chrome://zotero/skin/drive_network.png);
 }
 
+#zotero-tb-sync {
+	list-style-image: url(chrome://zotero/skin/arrow_rotate_static.png);
+	margin-left: -2px;
+	margin-right: -2px;
+}
+
+#zotero-tb-sync[status=animate] {
+	list-style-image: url(chrome://zotero/skin/arrow_rotate_animated.png);
+}
+
+#zotero-tb-sync[status=error] {
+	list-style-image: url(chrome://zotero/skin/arrow_rotate_error.png);
+}
+
 #zotero-tb-sync #zotero-last-sync-time
 {
 	color: gray;
diff --git a/chrome/skin/default/zotero/toolbar-lookup.png b/chrome/skin/default/zotero/toolbar-lookup.png
new file mode 100755
index 0000000000000000000000000000000000000000..dac3c9050cd1ec973e93370f917bca2f06fe420c
GIT binary patch
literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!d`Uz>R5;6}
zQr}BcVHoxg@IIoOz{<k5AyKBav`n%gc~M%?MJ85I5fTPbl7=IfPVJYJ5?xqmr5KYX
zH77_!{+e^R>C_FkX>Oj)x$T^-or(4Io<oA+cGU+jAK%CKJn!>9&zA%s>3`~<!?H1_
z&1cAlck~FD;lp4C4`JzB7Cc`M!aZ;Ri~alYqi-J;KBv3l5)k;;s=pO6UkhSOFTgK8
zM|A!PemWWvvDL#jSS*0KxC#hd6PhW*s;?E{>3neJ;|LkE5gf`w#IA;av{V4EB^<#!
zB9FzGXNbCPfwSa+H6BHf#)#PK5HOXKbU9p~WGQh8yu<P{0m}u%ye$Y%od9b(hTy0i
z+~iGg)+%@g6mV%}ii9STS>cGQ8oav^+(a%yW7!A{W{T3i-_H?PT9GgX0%t6b6(YvG
zq>c)N#`6#y$-xRaAD($6fPXtRdwEB98b8;yhqu2^<!$Xd`Pnxqj7UH+G3@MZ>Q3`7
zkmJq<aqft%4q>YbtXWB<RR|g?5g5LU1#LbE9GQN-UGyV~G7eJ4JY~#N#ymOA&-coB
z&iW9(UKy74q{>*0u8ty9G#BGaV<FBfbJ&x2q?Mcg!FoA+Bm*mka<CIM1ip{<wo`b}
zc?nueGfZwBn)<HcY?A~T*SD(U5;#7liPAm&MVR{_#YI)_n#TMXnyIG{mRf%qP5P?>
zK{OtC+@mjqTUP*k$1cC^?T#%4_tMd8d4-LuXQEjk*aS{?bW1STnFeyYZv8&<#<pm^
zt`xPp5)oYcr6j%rifNK!VhEhP@tz(kPpfyML02Yr7Ixvh$pibl)Qm(Qh90Y^SV8vR
cT_xQA0pQKt?l9U6+W-In07*qoM6N<$f~g-&1ONa4

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/treeitem-podcast.png b/chrome/skin/default/zotero/treeitem-podcast.png
index f54bf736cdc0d58a07c0a0171cc5a25b5e007e0e..6f6d3406cb1062c517d384639dd27c4cc22eb48d 100644
GIT binary patch
delta 633
zcmV-<0*3wV1;+)DS$|ncL_t(I%Y~9lNK|nY#(($TabA`)X&Lka$!HNtP%SJfOO&C6
zXw$;lS<yNuf?TwS9xht7h*m=2zQsg~j0&+u3nK(EENqnVF*?3x=HCCk|3?d*a5U-L
zoCD`OKfVLUGR9D$!QR8bEtEQkk;jk{jQoc7KOy{AbUYYcZ-2Kc0E4}EQ0ft}WQ<4@
zEC-ANw*dYU%w=3m(9M-+&np3gy<v=bL$o?YRRorD;4Xuuz!#u>a3T<|fkGY@Cf*^$
zWp2FoZ2*+&Ay%CNAUCe?7FzM$IBj<=E_GXoVw{DkRwjoPN<nyg3Q>Hrn&9Khqo9X~
z?{rw6P?WrbSbuUJ>EFi$7uFJdKzL74ejS1MNqwV3W=NrfrVz^SBARq4&VpBJM+=FO
z--#s~DCEJhAym^$G2e+0XHb4Svt#|#?RS_S>9SGY>fMDo2;46OrQ3vSisXLvu{6^{
zKHI|dk3QnNipbJ+lsm}cv?RI>+)^rpa2votPy%0wk$*jHIZNyD#oF^7TI)`w6k2P-
zUVcW@w$--`Jr)Fh0h}b--y1@@AO*NZP+q7|wd3ls<0ntES-boD-#6iTHjc5dG+4$7
zQC!I|HQI<*aFL!N@J;~qyq&DrzISmSwzqN$OIjGS%<r!WAQR%+i$m*;VqhRr?#~{n
z2Vi{O2Xer*B5@uLOW;7+6WW+lDfPD>oAoMYQp!ztZ32`{H=C=0Rap7m*Tc)Qw@P5!
zHrZ^JY&MH++gk$um0%G_CK3q}iNr?u;(q~3sdPG>Zc|Ftmw#Zb7PQu%H~Rkolu}Ck
T%=-UQ00000NkvXXu0mjfXlgBd

delta 672
zcmV;R0$=^d1?>fpS$}^?L_t(I%Y~9%NRwe0h6j=`5Q0uU2*WTWqsWsY91Ma|6c3b=
zqJu!qGW;P?bg88=QI<nfw`Cq|Dl(Tpj1p@sg(Zqob`S)G5ZFO=5*Q2X%d2~tg+JB7
z!v`<#bwAhhyq^g$ZK`QcipoK_XMyQ1gOJl;vTcEhTMkC*Q-8MJ-wIa>j50R_FUD0t
zSR8|=KA7r)KvfifdFA$iX-_;;?g?i5;aNbJd*ERU>I!4mVWb+y>mhs_Mr+~jxe0pm
z<NpMNdz{P(js;A%83L`+HUI83aK((b&`RG0gMh+(CE(0-tOta<(s<HgFgvJ@c7w6T
zy^Pi+NVi$KGk^4#%;3G)jH@64civt)vkm;3qSa#1ay-?<V~3MSpY)tDT`Qy2i40dR
z@t_HY%3<)bz7^ogU83W3B5hWyLZJ6NG#_!8r2C4Q{`J`c*UZu#CU^ts`th8#a3|Ly
zT|d4eb<G&2^_ZEPN0AxSro1#sca<4!*<T(zjFWB@-+v{fYnh*)&xu4LsnWI3nFUSh
zQ5p}$QFj0at}0;PCzEtniQLm-3S-+f<2n=5{lHM!3Blh&q0m>l^G-?kEe&Z<z28i2
z^7?4Dq!p94`<nYzNH;3oc<E-uwkz1j;v~Fzgx~M?{(KEv@<DaoC2*OR^jLsKa21qE
zw@8cGy?^m+g7>KNN-!8)6TIg2df&O-?u1Q0oh`|t$~SHMl~sbf1si;P4)5m?Y_zwx
z+jqLV6MR_k_g|eOf+K?0>~{O-hK7dZ{{{#S3H~CucjHX3Pw+}jP0h$Z0|aLYUKVWI
zdQos=MMcF_X=&-nzXk~Q2+rAQ)>sM7E-o(4R2ju>oc#dxCdt{mM_twc0000<MNUMn
GLSTaOyGv&P

diff --git a/chrome/skin/default/zotero/treeitem-radioBroadcast.png b/chrome/skin/default/zotero/treeitem-radioBroadcast.png
index 3e8712ae2ace2bc92f9e30f6c6526f5ad59bf5c2..f54bf736cdc0d58a07c0a0171cc5a25b5e007e0e 100644
GIT binary patch
delta 683
zcmV;c0#yC-1MLNnD+aH~HwB96kufKK0)I(FK~y-)g_2!JlVKQ!2a+%lf=)dM!!RVH
z$de)*41!V=50sLkgFwwP{2@_vsiiSdmP1pwWgcuQGM7J$5^F4lC5lpZ5Cnw~*g<s?
z7z^vmt9zM+Kh?p*2QTk+KiBiTp9wH+s%cM(%0akif$1)TkkeqYZGnkf4o2#KQ?}mU
z3Ren@GB*S-##KRB9D}DmnCgN+RTO`D<@SJSPdroZ31<7@SwNS2;9(2u3S-w{q#DNS
zA$%J~YvJy>33~G5{{)14oXiQ11x&UX0<F?D|L!z!#f-PmO5X*8fWmww;LLQa2ZX!Q
zc+z1oJE)F!gR#cFjMgPcw^_P>GxV3t;Jw(4s~`b)-d;Mh4g8v-)nd?cJk`Wwhm%O3
z^qetWE2Gtk3|B7kpb3V`VeqoP72wKUqT_TTZC0y7p!Ym9A90wZ`-++V_1OZ~%+ehu
zcmwJB@tn1AC)XlfKfWS$%^0Tjn3<bLkr~vcyfjI7l^Jc>UmiP*lWr7$-zB7LnV+A}
zi9{l)(zVc;1x@Ku8V|)$cK`;iDq!CylXO>!+|yzTW7{?3Iuq0Vz);x<!QVom&{w+i
zPD%GI4QWul-%M@t`e?SK6_d96n)_8qH!9tD>1M>XE7-^4B)oZq-|zSSd<|RjL3Q0F
zaG93$Sb#=w6_iQ0NQ>Ejz42^<_o(wqFc@4Dyyo?K-?`oHgiSx4Ey<$FH*NcsRf4+(
z8+?2Y@8=P0w70k0ce=Y1d|2@JU!5a@BZAlLcKhdshKA(-1_%xb{vx<{<4mwm@JdZh
z&B#9k1ZN3e7Hr#kQE+2LMa5KUY3a$o1_<^D&e>_!SP9N9E-ua*RK;za{Q&hQ$=SO{
RUDf~q002ovPDHLkV1mOTPkI0V

delta 430
zcmV;f0a5<#1@Z%sD+bos)K6G4kufKK0fb3JK~#9!V*LOAKLaHIAb^+{C<FijM6?0j
z-JOwbZ7omH#Q_3{g^<Rco^Iy<|Nk}o{rk80-@kvH=<)yogkeB`f1ect10-Dj{rk@V
z)VxqwSXf0!NQmLWh4UB|00a<*0YD8$Sy|aYGy@aRgTlgM3~X#144*%LVfguf<0pmz
z00D$yz`uWg84L{#8Gio!1!VtYc=F^4!-EI682I@37=Hc2GyougFbw$f=P$$K$B!8v
zK70f=;Kz?23}3%~1-gcj;rE~47zO|Y5EcXe05yDJxOeX!(8ga3U%q@{`1b7^gMxw_
z11xNi0YCs@MB|Si-x)w@OITQch(SPrAM7QN0U!)wqXU2d!f?UQpFbIH-n<5O3CIi5
z(vlFHfFTOvqXU2d!Z6_PpWoKMe*Izi`wwCOFg6y+$Ve)4ad9%defti>0Du5uB$OA@
z(vq0}|NGwrWEL_oGH}kGJ)aR-9w2}iKn4(lQ&SV8f%qA^I6wd~Qkokb0Ro8P+z1e0
Y0G0&N=f<=nz5oCK07*qoM6N<$f&$>XnE(I)

diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css
index 0b48c8f0f1..0b5156c4b8 100644
--- a/chrome/skin/default/zotero/zotero.css
+++ b/chrome/skin/default/zotero/zotero.css
@@ -225,15 +225,11 @@ zoteromergepane {
 
 
 .zotero-small-progress-indicator {
-	list-style-image: url(chrome://zotero/skin/arrow_rotate_static.png);
+	list-style-image: url(chrome://global/skin/icons/notloading_16.png);
 	margin-left: -2px;
 	margin-right: -2px;
 }
 
 .zotero-small-progress-indicator[status=animate] {
-	list-style-image: url(chrome://zotero/skin/arrow_rotate_animated.png);
-}
-
-.zotero-small-progress-indicator[status=error] {
-	list-style-image: url(chrome://zotero/skin/arrow_rotate_error.png);
+	list-style-image: url(chrome://global/skin/icons/loading_16.png);
 }
\ No newline at end of file
diff --git a/translators/Open WorldCat (Search).js b/translators/Open WorldCat (Search).js
deleted file mode 100644
index 20ee4f9b3b..0000000000
--- a/translators/Open WorldCat (Search).js	
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-	"translatorID":"e07e9b8c-0e98-4915-bb5a-32a08cb2f365",
-	"translatorType":12,
-	"label":"Open WorldCat (Search)",
-	"creator":"Simon Kornblith",
-	"target":"http://partneraccess.oclc.org/",
-	"minVersion":"1.0.0b3.r1",
-	"maxVersion":"",
-	"priority":100,
-	"inRepository":true,
-	"lastUpdated":"2007-03-22 18:15:00"
-}
-
-function detectSearch(item) {
-	if(item.itemType == "book" || item.itemType == "bookSection") {
-		return true;
-	}
-	return false;
-}
-
-// creates an item from an Open WorldCat document
-function processOWC(doc) {
-	var spanTags = doc.getElementsByTagName("span");
-	for(var i=0; i<spanTags.length; i++) {
-		var spanClass = spanTags[i].getAttribute("class");
-		if(spanClass) {
-			var spanClasses = spanClass.split(" ");
-			if(Zotero.Utilities.inArray("Z3988", spanClasses)) {
-				var spanTitle = spanTags[i].getAttribute("title");
-				var item = new Zotero.Item();
-				if(Zotero.Utilities.parseContextObject(spanTitle, item)) {
-					if(item.title) {
-						item.title = Zotero.Utilities.capitalizeTitle(item.title);
-					} else {
-						item.title = "[Untitled]";
-					}
-					
-					item.complete();
-					return true;
-				} else {
-					return false;
-				}
-			}
-		}
-	}
-	
-	return false;
-}
-
-function doSearch(item) {
-	if(item.contextObject) {
-		var co = item.contextObject;
-	} else {
-		var co = Zotero.Utilities.createContextObject(item);
-	}
-	
-	Zotero.Utilities.loadDocument("http://partneraccess.oclc.org/wcpa/servlet/OpenUrl?"+co, function(doc) {
-		// find new COinS in the Open WorldCat page
-		if(processOWC(doc)) {	// we got a single item page
-			Zotero.done();
-		} else {				// assume we have a search results page
-			var items = new Array();
-			
-			var namespace = doc.documentElement.namespaceURI;
-			var nsResolver = namespace ? function(prefix) {
-				if (prefix == 'x') return namespace; else return null;
-			} : null;
-			
-			// first try to get only books
-			var elmts = doc.evaluate('//table[@class="tableLayout"]/tbody/tr/td[@class="content"]/table[@class="tableResults"]/tbody/tr[td/img[@alt="Book"]]/td/div[@class="title"]/a', doc, nsResolver, Components.interfaces.nsIDOMXPathResult.ANY_TYPE,null);
-			var elmt = elmts.iterateNext();
-			if(!elmt) {	// if that fails, look for other options
-				var elmts = doc.evaluate('//table[@class="tableLayout"]/tbody/tr/td[@class="content"]/table[@class="tableResults"]/tbody/tr[td/img[@alt="Book"]]/td/div[@class="title"]/a', doc, nsResolver, Components.interfaces.nsIDOMXPathResult.ANY_TYPE,null);
-				elmt = elmts.iterateNext()
-			}
-			
-			var urlsToProcess = new Array();
-			do {
-				urlsToProcess.push(elmt.href);
-			} while(elmt = elmts.iterateNext());
-			
-			Zotero.Utilities.processDocuments(urlsToProcess, function(doc) {
-				// per URL
-				processOWC(doc);
-			}, function() {	// done
-				Zotero.done();
-			});
-		}
-	}, null);
-	
-	Zotero.wait();
-}
\ No newline at end of file
diff --git a/translators/Open WorldCat (Web).js b/translators/Open WorldCat (Web).js
deleted file mode 100644
index a4627e6138..0000000000
--- a/translators/Open WorldCat (Web).js	
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-	"translatorID":"c73a4a8c-3ef1-4ec8-8229-7531ee384cc4",
-	"translatorType":4,
-	"label":"Open WorldCat (Web)",
-	"creator":"Sean Takats",
-	"target":"^http://(?:www\\.)?worldcat\\.org/(?:search\\?|profiles/[^/]+/lists/)",
-	"minVersion":"1.0.0b3.r1",
-	"maxVersion":"",
-	"priority":100,
-	"inRepository":true,
-	"lastUpdated":"2007-11-05 18:00:00"
-}
-
-function detectWeb(doc, url){
-	var nsResolver = doc.createNSResolver(doc.documentElement);
-
-	var xpath = '//table[@class="tableResults" or @class="table-results"]/tbody/tr/td[3][@class="result"]/div[@class="name"]/a/strong';
-	var results = doc.evaluate(xpath, doc,
-			       nsResolver, XPathResult.ANY_TYPE, null);
-	if(results.iterateNext()) {
-		return "multiple";
-	}
-}
-
-function processOWC(doc) {
-	var spanTags = doc.getElementsByTagName("span");
-	for(var i=0; i<spanTags.length; i++) {
-		var spanClass = spanTags[i].getAttribute("class");
-		if(spanClass) {
-			var spanClasses = spanClass.split(" ");
-			if(Zotero.Utilities.inArray("Z3988", spanClasses)) {
-				var spanTitle = spanTags[i].getAttribute("title");
-				var item = new Zotero.Item();
-				if(Zotero.Utilities.parseContextObject(spanTitle, item)) {
-					if(item.title) {
-						item.title = Zotero.Utilities.capitalizeTitle(item.title);
-					} else {
-						item.title = "[Untitled]";
-					}
-					
-					item.complete();
-					return true;
-				} else {
-					return false;
-				}
-			}
-		}
-	}
-	
-	return false;
-}
-
-function doWeb(doc, url){
-	var nsResolver = doc.createNSResolver(doc.documentElement);
-
-	var urls = new Array();
-	var items = new Array();
-	var xpath = '//table[@class="tableResults" or @class="table-results"]/tbody/tr/td[3][@class="result"]/div[@class="name"]/a';
-	var titles = doc.evaluate(xpath, doc, nsResolver, XPathResult.ANY_TYPE, null);
-	var title;
-	// Go through titles
-	while(title = titles.iterateNext()) {
-		items[title.href] = title.textContent;
-	}
-
-	items = Zotero.selectItems(items);
-
-	if(!items) {
-		return true;
-	}
-
-	for(var i in items) {
-		urls.push(i);
-	}
-
-	Zotero.Utilities.processDocuments(urls, function(doc) {
-		processOWC(doc);}, function() {Zotero.done();});
-	Zotero.wait();
-}
\ No newline at end of file
diff --git a/translators/Open WorldCat.js b/translators/Open WorldCat.js
new file mode 100644
index 0000000000..31bd8fb25b
--- /dev/null
+++ b/translators/Open WorldCat.js	
@@ -0,0 +1,131 @@
+{
+	"translatorID":"c73a4a8c-3ef1-4ec8-8229-7531ee384cc4",
+	"translatorType":12,
+	"label":"Open WorldCat",
+	"creator":"Simon Kornblith",
+	"target":"^http://www\.worldcat\.org/",
+	"minVersion":"1.0.0b3.r1",
+	"maxVersion":"",
+	"priority":100,
+	"inRepository":true,
+	"lastUpdated":"2009-04-15 07:12:45"
+}
+
+/**
+ * Gets Zotero item from a WorldCat icon src
+ */
+function getZoteroType(iconSrc) {
+	// only specify types not specified in COinS
+	if(iconSrc.indexOf("icon-rec") != -1) {
+		return "audioRecording";
+	} if(iconSrc.indexOf("icon-com") != -1) {
+		return "computerProgram";
+	} if(iconSrc.indexOf("icon-map") != -1) {
+		return "map";
+	}
+	return false;
+}
+
+/**
+ * Generates a Zotero item from a single item WorldCat page, or the first item on a multiple item
+ * page
+ */
+function generateItem(doc, node) {
+	var item = new Zotero.Item();
+	Zotero.Utilities.parseContextObject(node.nodeValue, item);
+	
+	// if only one, first check for special types (audio & video recording)
+	var type = false;
+	try {
+		type = doc.evaluate('//img[@class="icn"][contains(@src, "icon-")]/@src', doc, null, XPathResult.ANY_TYPE, null).iterateNext().nodeValue;
+	} catch(e) {}
+	
+	if(type) {
+		type = getZoteroType(type);
+		if(type) item.itemType = type;
+	}
+	
+	return item;
+}
+
+function detectWeb(doc) {
+	var xpath = doc.evaluate('//span[@class="Z3988"]/@title', doc, null, XPathResult.ANY_TYPE, null);
+	var node = xpath.iterateNext();
+	if(!node) return false;
+	
+	// see if there is more than one
+	if(xpath.iterateNext()) {
+		multiple = true;
+		return "multiple";
+	}
+	
+	// generate item and return type
+	return generateItem(doc, node).itemType;
+}
+
+function detectSearch(item) {
+	return !!item.ISBN;
+}
+
+function doWeb(doc) {
+	// otherwise, we need to get context objects and display select items dialog
+	var elems = [];
+	
+	// accumulate OpenURL contextObject nodes
+	var xpath = doc.evaluate('//span[@class="Z3988"]/@title', doc, null, XPathResult.ANY_TYPE, null);
+	while(elem = xpath.iterateNext()) {
+		elems.push(elem);
+	}
+	
+	if(elems.length > 1) {		// multiple items
+		var items = [];
+		var titles = [];
+		for(var i in elems) {
+			var item = new Zotero.Item();
+			Zotero.Utilities.parseContextObject(elems[i].nodeValue, item);
+			items.push(item);
+			titles.push(item.title);
+		}
+		
+		titles = Zotero.selectItems(titles);
+		if(!titles) return true;
+		
+		// accumulate appropriate types
+		var i = 0;
+		try {
+			var xpath = doc.evaluate('//div/img[@class="icn"][contains(@src, "icon-")][1]/@src', doc, null, XPathResult.ANY_TYPE, null);
+			while(elem = xpath.iterateNext()) {
+				var type = getZoteroType(elem.nodeValue);
+				if(type) items[i].itemType = type;
+				i++;
+			}
+		} catch(e) {}
+		
+		// complete items
+		for(var i in titles) {
+			items[i].complete();
+		}
+	} else {					// single item
+		generateItem(doc, elems[0]).complete();
+	}
+}
+
+function doSearch(item) {
+	if(item.contextObject) {
+		var co = item.contextObject;
+	} else {
+		var co = Zotero.Utilities.createContextObject(item);
+	}
+	
+	Zotero.Utilities.loadDocument("http://www.worldcat.org/search?q=isbn%3A"+item.ISBN+"&=Search&qt=results_page", function(doc) {
+		var node = doc.evaluate('//span[@class="Z3988"]/@title', doc, null, XPathResult.ANY_TYPE, null).iterateNext();
+		if(!node) Zotero.done(false);
+		
+		var item = generateItem(doc, node);
+		item.complete();
+		
+		Zotero.done();
+	}, null);
+	
+	Zotero.wait();
+}
\ No newline at end of file
diff --git a/translators/Worldcat.org.js b/translators/Worldcat.org.js
deleted file mode 100644
index 8b763a8d7b..0000000000
--- a/translators/Worldcat.org.js
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"translatorID":"490909d7-7d79-4c7a-a136-77df618d4db2",
-	"translatorType":4,
-	"label":"Worldcat.org",
-	"creator":"Michael Berkowitz",
-	"target":"http://(www.)?worldcat.org/",
-	"minVersion":"1.0.0b4.r5",
-	"maxVersion":"",
-	"priority":100,
-	"inRepository":true,
-	"lastUpdated":"2009-03-06 20:38:37"
-}
-
-function detectWeb(doc, url) {
-	if (url.match(/search?/) && doc.evaluate('//input[@id="itemid"]', doc, null, XPathResult.ANY_TYPE, null).iterateNext()) {
-		return "multiple";
-	} else {
-		var type = doc.evaluate('//tbody/tr/td[2][img]', doc, null, XPathResult.ANY_TYPE, null).iterateNext().textContent.toLowerCase().match(/(\w+);/)[1];
-		switch (type) {
-			case "book": return "book";
-			case "article": return "journalArticle";
-			case "recording":
-			case "disc": return "audioRecording";
-			case "tape": return "videoRecording";
-		}
-	}
-}
-
-function ENify(str) {
-	return str.match(/^[^&]+/)[0] + '?page=endnote&client=worldcat.org-detailed_record';
-}
-function doWeb(doc, url) {
-	var n = doc.documentElement.namespaceURI;
-	var ns = n ? function(prefix) {
-		if (prefix == 'x') return n; else return null;
-	} : null;
-	
-	var books = new Array();
-	if (detectWeb(doc, url) == "multiple") {
-		var items = new Object();
-		var titles = doc.evaluate('//div[@class="name"]/a', doc, ns, XPathResult.ANY_TYPE, null);
-		var title;
-		while (title = titles.iterateNext()) {
-			items[title.href] = Zotero.Utilities.trimInternal(title.textContent);
-		}
-		items = Zotero.selectItems(items);
-		for (var i in items) {
-			books.push(ENify(i));
-		}
-	} else {
-		var link = doc.evaluate('//a[contains(text(), "EndNote")]', doc, null, XPathResult.ANY_TYPE, null).iterateNext().href;
-		books = [link];
-	}
-	
-	Zotero.Utilities.HTTP.doGet(books, function(text) {
-		text = text.replace("MUSIC", "PAMP");
-		var translator = Zotero.loadTranslator("import");
-		translator.setTranslator("32d59d2d-b65a-4da4-b0a3-bdd3cfb979e7");
-		translator.setString(text);
-		translator.translate();
-	}, function () { Zotero.done(); });
-	Zotero.wait();
-}
\ No newline at end of file