From 5ba3a3a0cd098af1ce869cbb72fb9f9c1cc1f8e9 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Sat, 21 May 2011 10:41:57 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20V3.4-BUG-FIX=20to=20HEAD=20=20=20=2025?= =?UTF-8?q?384:=20ALF-5352=20-=20user=20usages=20=20=20=20-=20re-apply=20r?= =?UTF-8?q?19862=20(ALF-713=20fix)=20that=20was=20lost=20(probably=20due?= =?UTF-8?q?=20to=20merge=20conflict)=20=20=20=2025440:=20Merged=20DEV/TEMP?= =?UTF-8?q?ORARY=20to=20V3.4-BUG-FIX=20=20=20=20=20=20=2025232:=20ALF-4300?= =?UTF-8?q?:=20DB2:=20Review=20schema=20(eg.=20VARCHAR=20columns)=20with?= =?UTF-8?q?=20respect=20to=20multi-byte=20support=20(when=20using=20DB2=20?= =?UTF-8?q?/=20UTF-8)=20=20=20=20=20=20=2025371:=20ALF-4300:=20DB2:=20Revi?= =?UTF-8?q?ew=20schema=20(eg.=20VARCHAR=20columns)=20with=20respect=20to?= =?UTF-8?q?=20multi-byte=20support=20(when=20using=20DB2=20/=20UTF-8)=20?= =?UTF-8?q?=20=20=20=20=20=20-=20All=20VARCHAR=20fields=20quadrupled=20for?= =?UTF-8?q?=20DB2=20relative=20to=20MySQL=20to=20support=20UTF-8=20charact?= =?UTF-8?q?er=20sets=20=20=20=20=20=20=20-=20=E2=80=98varchar-field-sizes-?= =?UTF-8?q?quadruple-increasing.sql=E2=80=99=20introduced=20by=20patch=20?= =?UTF-8?q?=20=20=20=20=20=20-=20Minor=20conflict=20anticipated=20on=20Alf?= =?UTF-8?q?rescoSchemaUpdate-2.1-A--to--2.2-ACL.sql;=20ensure=20larger=20c?= =?UTF-8?q?olumn=20size=20is=20kept.=20=20=20=20=20=20=20-=20Schema=20numb?= =?UTF-8?q?er=20now=20at=204201.=20=20=20=2025444:=20Fix=20ALF-6689:=20WQS?= =?UTF-8?q?:=20Incorrect=20work=20of=20email=20field=20on=20contact=20page?= =?UTF-8?q?=20=20=20=20Fix=20ALF-7058:=20WQS:=20Blog=20article=20page=20of?= =?UTF-8?q?=20custom=20type=20gives=20an=20error=20=20=20=2025447:=20Fix?= =?UTF-8?q?=20ALF-5198:=20WQS:=20Error=20while=20Name=20field=20filled=20w?= =?UTF-8?q?ith=20more=20than=2070=20characters=20or=20special=20characters?= =?UTF-8?q?=20=20=20=2025506:=20ALF-6281:=20Actions=20for=20folder=20do=20?= =?UTF-8?q?not=20work=20(Quickr=20connector=20plug-in)=20=20=20=2025534:?= =?UTF-8?q?=20ALF-646:=20Alfresco=20Logo=20isn't=20displayed=20in=20SPP=20?= =?UTF-8?q?Open=20window=20=20=20=2025590:=20Merged=20DEV/TEMPORARY=20to?= =?UTF-8?q?=20V3.4-BUG-FIX=20=20=20=20=20=20=2025582:=20ALF-6282:=20Incorr?= =?UTF-8?q?ect=20behavior=20of=20Propertiesa=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?-=20Add=20"Created",=20"Modified"=20and=20"Label"=20tags=20to?= =?UTF-8?q?=20document/folder=20entries=20in=20AlfrescoAtomBasedFeedServic?= =?UTF-8?q?eImpl.createEntry()=20=20=20=2025595:=20Merged=20DEV/TEMPORARY?= =?UTF-8?q?=20to=20V3.4-BUG-FIX=20=20=20=20=20=20=2025592:ALF-7194:=20Savi?= =?UTF-8?q?ng=20a=20Excel=20file=20with=20CIFS=20reset=20permissions.=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20-=20Copy=20value=20of=20"Inherit=20P?= =?UTF-8?q?arent=20Space=20Permissions"=20flag=20to=20the=20new=20node=20i?= =?UTF-8?q?n=20ContentDiskDriver.cloneNode()=20method.=20=20=20=2025635:?= =?UTF-8?q?=20Merged=20DEV/TEMPORARY=20to=20V3.4-BUG-FIX=20=20=20=20=20=20?= =?UTF-8?q?=2025574:=20ALF-6288:=20Action=20'Send=20Link'=20is=20not=20wor?= =?UTF-8?q?ked=20=20=20=20=20=20=2025616:=20ALF-6288:=20Action=20'Send=20L?= =?UTF-8?q?ink'=20is=20not=20worked=20=20=20=20=20=20=20=20=20=20-=20Alfre?= =?UTF-8?q?scoQuickrPathHelper.getNodePath()=20method=20was=20modified=20t?= =?UTF-8?q?o=20return=20full=20node=20path,=20e.g.=20"/Company=20Home/Site?= =?UTF-8?q?s/TestSite/documentLibrary/test.odt".=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20-=20AlfrescoQuickrPathHelper.removeSlashesAndRoot(String?= =?UTF-8?q?=20value)=20method=20was=20renamed=20to=20AlfrescoQuickrPathHel?= =?UTF-8?q?per.resolveNodePath(String=20path,=20boolean=20isRelative).=20?= =?UTF-8?q?=20=20=2025638:=20Merged=20DEV/TEMPORARY=20to=20V3.4-BUG-FIX=20?= =?UTF-8?q?(with=20feedback=20from=20Gary)=20=20=20=20=20=20=2025376:=20AL?= =?UTF-8?q?F-684:=20Ftp=20requests=20to=20the=20IPv6=20resolved=20hostname?= =?UTF-8?q?=20are=20failing=20=20=20=20=20=20=20=20=20=20The=20ftp.ipv6.en?= =?UTF-8?q?abled=20property=20was=20removed,=20and=20a=20ServerSocket=20is?= =?UTF-8?q?=20opened=20without=20InetAddress=20parameter.=20It=20allows=20?= =?UTF-8?q?Java=20to=20determine=20if=20a=20IPv6=20is=20used=20and=20bind?= =?UTF-8?q?=20"::"=20any=20local=20address=20to=20the=20server=20socket.?= =?UTF-8?q?=20It=20allows=20to=20connect=20to=20the=20Alfresco=20FTP=20usi?= =?UTF-8?q?ng=20both=20IPv4=20and=20IPv6=20addresses=20regardless=20to=20s?= =?UTF-8?q?erver=20OS.=20=20=20=2025639:=20ALF-5115:=20Removed=20circular?= =?UTF-8?q?=20dependency=20from=20non-continuous=20builds=20=20=20=20-=20N?= =?UTF-8?q?o=20need=20to=20use=20-f=20continuous.xml=20anymore=20when=20bu?= =?UTF-8?q?ilding=20enterprise=20or=20community=20=20=20=20-=20Added=20ass?= =?UTF-8?q?emble-command-extras=20stub=20to=20community=20build.xml,=20ove?= =?UTF-8?q?rridden=20by=20enterprise=20build.xml=20and=20called=20by=20con?= =?UTF-8?q?tinuous.xml=20=20=20=2025699:=20MERGE=20DEV=20to=20V3.4-BUG-FIX?= =?UTF-8?q?=20=20=20=20=20=20ALF-5745=20:=20AVMTemplateNode=20d:date=20pro?= =?UTF-8?q?perties=20are=20wrong.=20=20=20=2025770:=20Investigation=20test?= =?UTF-8?q?s=20for=20ALF-6904:=20Wrong=20behaviour=20when=20overriding=20a?= =?UTF-8?q?=20constraint=20in=20content=20model=20=20=20=2025774:=20Fixed?= =?UTF-8?q?=20ALF-7193:=20XAM=20Connector:=20xam.archive.nodePropertiesToW?= =?UTF-8?q?rite=20must=20not=20make=20properties=20mandatory=20=20=20=20?= =?UTF-8?q?=20-=20The=20property=20had=20to=20be=20set=20to=20null=20-=20a?= =?UTF-8?q?chievable=20because=20it=20is=20MLText=20=20=20=20=20-=20Added?= =?UTF-8?q?=20full=20d:mltext=20expansion=20=20=20=20=20-=20Added=20double?= =?UTF-8?q?=20checks=20for=20nulls=20creeping=20in=20=20=20=2025851:=20Fix?= =?UTF-8?q?ed=20ALF-7381:=20OOM=20when=20Debug=20logging=20on=20ReferenceC?= =?UTF-8?q?ountingReadOnlyIndexReaderFactory=20=20=20=20=20-=20Use=20a=20W?= =?UTF-8?q?eakHashMap=20=20=20=2025853:=20Merged=20DEV/TEMPORARY=20to=20V3?= =?UTF-8?q?.4-BUG-FIX=20=20=20=20=20=20=2025852:=20ALF-6373:=20Preview=20i?= =?UTF-8?q?sn't=20generated=20for=20content=20added=20by=20quickr=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20Added=20AlfrescoQuickrDocumentHelper.getMi?= =?UTF-8?q?meType(NodeRef=20fileRef)=20method=20that=20resolves=20the=20mi?= =?UTF-8?q?me=20type=20using=20the=20node=20name.=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20Set=20the=20mime=20type=20of=20nodes=20created=20in=20Alf?= =?UTF-8?q?rescoDocumentServiceImpl=20and=20AlfrescoAtomBasedFeedServiceIm?= =?UTF-8?q?pl.=20=20=20=2025860:=20Resolve=20ALF-7286:=20CMIS=20UP=20link?= =?UTF-8?q?=20for=20document=20doesn't=20contain=20all=20parents=20=20=20?= =?UTF-8?q?=2025866:=20Fix=20for=20ALF-6312=20=20=20=20=20=20-=20moved=20c?= =?UTF-8?q?onfiguration=20to=20the=20correct=20file=20to=20be=20picked=20u?= =?UTF-8?q?p=20by=20Spring=20Surf=20=20=20=2025870:=20Merged=20DEV/TEMPORA?= =?UTF-8?q?RY=20to=20V3.4-BUG-FIX=20=20=20=20=20=20=2025840:=20ALF-6279:?= =?UTF-8?q?=20Failed=20to=20save=20properties=20in=20Symphony=20documents.?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20AlfrescoDocumentServiceImpl.setDo?= =?UTF-8?q?cType()=20method=20was=20modified=20to=20check=20for=20existenc?= =?UTF-8?q?e=20of=20document=20type=20in=20provided=20ClbDraft=20object.?= =?UTF-8?q?=20=20=20=2025908:=20Set=203.4.2=20revision=20=20=20=2025931:?= =?UTF-8?q?=20Fix=20for=20ALF-6565:=20Explorer=20UI=20allows=20duplication?= =?UTF-8?q?=20of=20Replication=20targets=20which=20in=20effects=20breaks?= =?UTF-8?q?=20Alfresco=20=20=20=2025987:=20DOC-238:=20Sharepoint=20(VTI)?= =?UTF-8?q?=20Protocol=20Configuration=20Documentation=20is=20outdated=20-?= =?UTF-8?q?=20have=20added=20comments=20in=20the=20properties=20file=20to?= =?UTF-8?q?=20indicate=20what=20they=20do=20=20=20=2025994:=20WQS:=20Added?= =?UTF-8?q?=20a=20little=20more=20information=20to=20the=20log=20message?= =?UTF-8?q?=20when=20a=20404=20is=20returned=20=20=20=2026003:=20ALF-7663:?= =?UTF-8?q?=20NPEs=20when=20using=20PermissionService=20with=20AVM=20store?= =?UTF-8?q?s=20=20=20=20-=20added=20unit=20tests=20for=20regression=20test?= =?UTF-8?q?ing=20=20=20=20-=20no=20longer=20an=20issue=20=20=20=2026004:?= =?UTF-8?q?=20ALF-7662:=20AVM=20permissions=20-=20access=20denied=20except?= =?UTF-8?q?ion=20when=20trying=20to=20create=20file=20in=20a=20layered=20d?= =?UTF-8?q?irectory,=20when=20no=20explicit=20permissions=20set=20(on=20ro?= =?UTF-8?q?ot=20dir=20node)=20=20=20=20-=20test=20passes=20on=203.4.2=20-?= =?UTF-8?q?=20updated=20test=20to=20reflect=202.1=20state=20=20=20=2026011?= =?UTF-8?q?:=20ALF-6372=20Now=20when=20the=20package=20manager=20adds=20it?= =?UTF-8?q?ems=20to=20a=20package=20it=20does=20not=20mark=20the=20items?= =?UTF-8?q?=20as=20modified.=20=20=20=2026026:=20ALF-6350:=20Add=20support?= =?UTF-8?q?=20for=20Ideographic=20Space=20to=20the=20Full=20Text=20Search?= =?UTF-8?q?=20-=20=20=20=20-=20added=20full=20set=20of=20Unicode=20charact?= =?UTF-8?q?ers=20for=20letters=20and=20digits=20(0x0000=20-=200xFFFF)=20?= =?UTF-8?q?=20=20=20-=20added=20fill=20set=20of=20Unicode=20whitespace=20?= =?UTF-8?q?=20=20=20-=20class=20to=20generate=20Unicode=20types=20->=20ran?= =?UTF-8?q?ges=20=20=20=20-=20upgraded=20antlr=20to=203.3.=20(required=20t?= =?UTF-8?q?o=20resolve=203.2=20bug)=20=20=20=20-=20fixed=20Lexer=20and=20p?= =?UTF-8?q?arser=20test=20=20=20=20-=20much=20still=20depends=20on=20the?= =?UTF-8?q?=20tokeniser=20....=20=20=20=2026048:=20Fix=20for=20ALF-7507=20?= =?UTF-8?q?-=20Manage=20Deleted=20Items=20-=20Recover=20All=20Icon=20Missi?= =?UTF-8?q?ng=20=20=20=2026050:=20Fixed=20failing=20tests=20WorkflowFormPr?= =?UTF-8?q?ocessorTest=20and=20TaskFormProcessorTest.=20=20=20=2026068:=20?= =?UTF-8?q?Resolve=20ALF-7342=20-=20dynamic=20Models=20-=20unable=20to=20a?= =?UTF-8?q?dd=20new=20properties=20to=20an=20aspect=20if=20the=20aspect=20?= =?UTF-8?q?is=20a=20mandatory=20aspect=20of=20another=20aspect=20=20=20=20?= =?UTF-8?q?26082:=20WQS:=20Improved=20debug-level=20logging=20to=20track?= =?UTF-8?q?=20WQS-to-repo=20interaction=20better.=20=20=20=2026094:=20Some?= =?UTF-8?q?=20formatting=20=20=20=2026095:=20Fixed=20ALF-7531:=20alfresco.?= =?UTF-8?q?jgroups.bind=5Finterface=20is=20not=20taken=20into=20account=20?= =?UTF-8?q?=20=20=20=20-=20Added=20'bind=5Finterface'=20property=20to=20TC?= =?UTF-8?q?P=20config=20=20=20=20=20-=20Value=20injected=20into=20system?= =?UTF-8?q?=20properties:=20alfresco.jgroups.bind=5Finterface=20=20=20=202?= =?UTF-8?q?6130:=20Fix=20for=20CIFS=20multitenancy=20not=20working.=20ALF-?= =?UTF-8?q?6816.=20=20=20=20Need=20to=20search=20the=20global=20share=20li?= =?UTF-8?q?st=20for=20admin=20named=20pipe=20shares.=20=20=20=2026131:=20F?= =?UTF-8?q?ix=20for=20CIFS=20cut/paste=20write-protected=20error.=20ALF-18?= =?UTF-8?q?22=20=20=20=2026132:=20Solairs/NFS=20ReadDir=20issue,=20cannot?= =?UTF-8?q?=20list=20folder=20more=20than=20once.=20ALF-5386=20=20=20=20Se?= =?UTF-8?q?arch=20resume=20id/cookie=20value=20of=20zero=20has=20special?= =?UTF-8?q?=20meaning=20for=20NFS.=20=20=20=2026133:=20Changed=20FTP=20ret?= =?UTF-8?q?urn=20status=20for=20MKD=20command=20to=20257,=20for=20RFC=20co?= =?UTF-8?q?mpliance.=20ALF-7501.=20=20=20=2026136:=20Fix=20for=20FTP=20CWD?= =?UTF-8?q?-MKD-CWD=20sequence=20failing.=20ALF-7530=20=20=20=20Trim=20fil?= =?UTF-8?q?esystem=20path=20to=20make=20sure=20there=20is=20no=20trailing?= =?UTF-8?q?=20backslash.=20=20=20=2026144:=20Merged=20V3.4=20to=20V3.4-BUG?= =?UTF-8?q?-FIX=20=20=20=20=20=20=2025890:=20Fix=20for=20ALF-5796=20-=20It?= =?UTF-8?q?'s=20impossible=20to=20add=20tag=20in=20Japanese=20language=20(?= =?UTF-8?q?IE=20specific)=20=20=20=20=20=20=2025891:=20Fixes:=20ALF-7363?= =?UTF-8?q?=20(updated=20JA=20translation)=20=20=20=20=20=20=2025894:=20Fi?= =?UTF-8?q?xed=20Legal=20and=20License=20url=20in=20About=20dialog=20=20?= =?UTF-8?q?=20=20=20=20=2025896:=20ALF-6476=20-translation=20on=20Transfer?= =?UTF-8?q?=20Target=20configuration=20=20=20=20=20=20=2025899:=20First=20?= =?UTF-8?q?cut=20of=20French=20transfer=20properties.=20=20Mostly=20Englis?= =?UTF-8?q?h!=20but=20has=203=20lines=20of=20French.=20=20=20=20=20=20=202?= =?UTF-8?q?5900:=20Fix=20for=20ALF-6916:=20More=20Deployment=20Reports=20a?= =?UTF-8?q?ction=20causes=20an=20error=20=20=20=20=20=20=2025901:=20Fixes:?= =?UTF-8?q?=20ALF-6847=20(Italian=20Translation)=20=20=20=20=20=20=2025902?= =?UTF-8?q?:=20Fixes:=20ALF-6861=20(incorrectly=20encoded=20German=20chara?= =?UTF-8?q?cter)=20=20=20=20=20=20=2025904:=20Fixes:=20ALF-6755=20(transla?= =?UTF-8?q?tion=20quoting=20error)=20=20=20=20=20=20=2025911:=20Fixes:=20A?= =?UTF-8?q?LF-6478=20-=20French=20translation=20correction=20=20=20=20=20?= =?UTF-8?q?=20=2025913:=20Fixes:=20ALF-6334=20and=20ALF-6477=20(Profile=20?= =?UTF-8?q?Edit=20style=20issues=20-=20makes=20mark=20up=20consistent,=20c?= =?UTF-8?q?lears=20floats=20to=20allow=20for=20foreign=20languages=20being?= =?UTF-8?q?=20a=20tad=20more=20verbose=20than=20English=20and=20adjusts=20?= =?UTF-8?q?padding=20to=20help=20input=20boxes=20line=20up.=20=20=20=20=20?= =?UTF-8?q?=20=2025914:=20Help=20URL=20for=203.4=20enterprise=20docs=20=20?= =?UTF-8?q?=20=20=20=20=2025915:=20Updates=20TinyMCE=20translation=20as=20?= =?UTF-8?q?requested=20in=20ALF-6486.=20=20=20=20=20=20=2025916:=20Updated?= =?UTF-8?q?=20support=20URL=20in=20readme=20=20=20=20=20=20=2025917:=20Fix?= =?UTF-8?q?es:=20ALF-6482,=20wrong=20word=20order=20in=20FR=20has=20been?= =?UTF-8?q?=20corrected.=20=20=20=20=20=20=2025919:=20Fixes:=20ALF-6655=20?= =?UTF-8?q?updated=20to=20allow=20enough=20space=20for=20verbose=20languag?= =?UTF-8?q?es=20(e.g.=20FR,=20ES)=20=20=20=20=20=20=2025925:=20Fix=20for?= =?UTF-8?q?=20ALF-6885:=20alfresco-enterprise-3.4.0.zip=20package=20has=20?= =?UTF-8?q?2=20issues=20with=20apply=5Famps.sh=20=20=20=20=20=20=2025936:?= =?UTF-8?q?=20ALF-6469=20-=20transfer=20folders=20internationalized=20=20?= =?UTF-8?q?=20=20=20=20=2025941:=20Merged=20BRANCHES/DEV/dwebster/=20to=20?= =?UTF-8?q?BRANCHES/V3.4:=20=20=20=20=20=20=20=20=20=2025939:=20Latest=20J?= =?UTF-8?q?A=20update=20from=20Translators,=20received:=202011-02-28=20=20?= =?UTF-8?q?=20=20=20=20=2025943:=20Merged=20BRANCHES/DEV/dwebster/=20to=20?= =?UTF-8?q?BRANCHES/V3.4:=20=20=20=20=20=20=20=20=20=2025942:=20Language?= =?UTF-8?q?=20updates=20for=20property=20string=20changes=20and=20addition?= =?UTF-8?q?s=20between=203.4.0=20and=203.4.1=20=20=20=20=20=20=2025946:=20?= =?UTF-8?q?ALF-7191:=20Generate=20duplicate=20=5Fen=20resource=20bundles,?= =?UTF-8?q?=20using=20location=20of=20=5Ffr=20bundles=20as=20a=20guide=20f?= =?UTF-8?q?or=20ALL=20bundles=20under=20alfresco=20and=20share=20WEB-INF/c?= =?UTF-8?q?lasses=20=20=20=20=20=20=2025947:=20ALF-7191:=20Reverse=20accid?= =?UTF-8?q?entally=20committed=20changes=20to=20WebDAV=20in=2025946!=20=20?= =?UTF-8?q?=20=20=20=20=2025949:=20Fixes:=20ALF-6521=20and=20ALF-6493=20(S?= =?UTF-8?q?ite=20discussion's=20handling=20of=20tags=20with=20special=20ch?= =?UTF-8?q?aracters=20in=20them)=20=20=20=20=20=20=2025950:=20Fixes:=20ALF?= =?UTF-8?q?-6489=20-=20encodes=20the=20content's=20name=20to=20make=20it?= =?UTF-8?q?=20safe=20for=20a=20URL.=20=20=20=20=20=20=2025951:=20Fixes:=20?= =?UTF-8?q?ALF-6487=20Adjusts=20styling=20for=20rename=20panel=20=20=20=20?= =?UTF-8?q?=20=20=2025954:=20ALF-7191=20-=20Generate=20=5Fen=20bundles=20f?= =?UTF-8?q?or=20all=20message=20bundles=20for=20Explorer=20and=20Share=20-?= =?UTF-8?q?=20using=20known=20location=20of=20message=20bundles=20=20=20?= =?UTF-8?q?=20=20=20=2025956:=20Allow=20a=20bit=20of=20leeway=20with=20aud?= =?UTF-8?q?it=20timing=20during=20delete=20tests=20=20=20=20=20=20=2025957?= =?UTF-8?q?:=20Fixed=20ALF-7341:=20Upload=20performance=20degradation=20wh?= =?UTF-8?q?en=20uploading=20contents=20to=20folders=20with=20content=20rul?= =?UTF-8?q?es=20applied.=20=20=20=20=20=20=20=20=20=20-=20Action=20executi?= =?UTF-8?q?ons=20were=20being=20recorded=20by=20the=20ActionTrackingServic?= =?UTF-8?q?e=20for=20all=20actions=20=20=20=20=20=20=20=20=20=20-=20Post-c?= =?UTF-8?q?ommit=20updates=20of=20the=20action=20node=20was=20reducing=20p?= =?UTF-8?q?erformance=20=20=20=20=20=20=20=20=20=20-=20Added=20'trackStatu?= =?UTF-8?q?s'=20to=20ActionExecuter,=20ActionDefinition=20and=20Action=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20-=20Default=20'trackStatus'=20is=20f?= =?UTF-8?q?alse;=20exceptions:=20'replicationActionExecutor'=20and=20'comm?= =?UTF-8?q?it-transfer'=20=20=20=20=20=20=20=20=20=20-=20Adjusted=20tests?= =?UTF-8?q?=20accordingly=20=20=20=20=20=20=20=20=20=20-=20General=20clean?= =?UTF-8?q?up=20around=20modifications=20=20=20=20=20=20=2025964:=20ALF-56?= =?UTF-8?q?25=20-=20When=20viewing=20properties=20in=20version=20history?= =?UTF-8?q?=20hitting=20close=20results=20in=20loop=20=20=20=20=20=20=2025?= =?UTF-8?q?970:=20Merged=20BRANCHES/DEV/V3.4-BUG-FIX=20to=20BRANCHES/V3.4:?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2025967:=20Fix=20ALF-7440:=20WQS:?= =?UTF-8?q?=20commons-pool=20library=20has=20been=20upgraded,=20but=20WQS?= =?UTF-8?q?=20build=20properties=20have=20not=20been=20changed=20according?= =?UTF-8?q?ly=20=20=20=20=20=20=2025971:=20ALF-7441:=20Help=20URLs=20point?= =?UTF-8?q?ing=20to=20new=20doc=20system=20(1=20of=202)=20=20=20=20=20=20?= =?UTF-8?q?=2025972:=20ALF-7441:=20Help=20URLs=20pointing=20to=20new=20doc?= =?UTF-8?q?=20system=20(2=20of=202)=20=20=20=20=20=20=2025974:=20Reverted?= =?UTF-8?q?=20rev=2025964=20-=20as=20fix=20is=20scheduled=20for=203.4.2=20?= =?UTF-8?q?=20=20=20=20=20=2025979:=20Disabling=20intermittent=20failing?= =?UTF-8?q?=20unit=20test.=20ALF-7443=20logged.=20=20=20=20=20=20=2025980:?= =?UTF-8?q?=20Merged=20V3.4-BUG-FIX=20to=20V3.4=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=2025978:=20ALF-7394=20-=20Alfresco=20Network=20dashlet,=20now?= =?UTF-8?q?=20Alfresco=20Support=20information=20=20=20=20=20=20=2026014:?= =?UTF-8?q?=20ALF-7087=20-=20Cannot=20override=20webscript=20files=20in=20?= =?UTF-8?q?case=20of=20using=20jboss=205.1GA=20=20=20=20=20=20=2026024:=20?= =?UTF-8?q?ALF-7466=20-=20Links=20do=20not=20appear=20correctly=20in=20the?= =?UTF-8?q?=20management=20Console=20(RM)=20=20=20=20=20=20=2026036:=20ALF?= =?UTF-8?q?-6403:=20Merged=20V3.4=20to=20V3.4=20(lost=20revision)=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=2025627:=20Fixes=20ALF-7222:=20Updated=20lin?= =?UTF-8?q?ux=20installer=20window=20height=20(with=20taller=20image=20to?= =?UTF-8?q?=20hide=20additonal=20background)=20=20=20=20=20=20=2026039:=20?= =?UTF-8?q?Fix=20intermittent=20failures=20in=20InviteServiceTest.tearDown?= =?UTF-8?q?()=20=20=20=20=20=20=2026040:=20Fix=20intermittent=20failures?= =?UTF-8?q?=20in=20InviteServiceTest.setUp()=20=20=20=20=20=20=2026043:=20?= =?UTF-8?q?Sync=20up=20run-junit-test=20with=20junit=20macros=20so=20that?= =?UTF-8?q?=20it=20can=20be=20used=20to=20run=20unit=20tests=20in=20an=20e?= =?UTF-8?q?nterprise=20environment=20(e.g.=20DB2=20/=20Oracle)=20=20=20=20?= =?UTF-8?q?=20=20=2026044:=20Possibly=20fix=20intermittent=20TransferServi?= =?UTF-8?q?ceImplTest=20failures=20by=20using=20org.alfresco.repo.transact?= =?UTF-8?q?ion.RetryingTransactionInterceptor=20=20=20=20=20=20=2026052:?= =?UTF-8?q?=20Do=20not=20wait=20indefinitely=20for=20a=20heartbeat=20in=20?= =?UTF-8?q?HeartBeatTest.=20A=20broken=20heartbeat=20would=20cause=20the?= =?UTF-8?q?=20build=20to=20hang=20forever!=20=20=20=20=20=20=2026056:=20Me?= =?UTF-8?q?rged=20V3.4-TEAM=20to=20V3.4=20=20=20=20=20=20=20=20=20=2026053?= =?UTF-8?q?:=20Added=20in=20loop=20to=20wait=20for=20asynchronous=20post-f?= =?UTF-8?q?ailure=20auditing=20(ALF-3055)=20=20=20=20=20=20=2026077:=20Upp?= =?UTF-8?q?ed=20LOGFILSIZ=20to=20avoid=20failures=20in=20unit=20tests=20wi?= =?UTF-8?q?th=20large=20transactions=20on=20DB2=20=20=20=20=20=20=2026084:?= =?UTF-8?q?=20Avoid=20intermittent=20test=20failures=20in=20AbstractTestFo?= =?UTF-8?q?rmRestApi=20by=20using=20retrying=20transactions=20=20=20=20=20?= =?UTF-8?q?=20=2026096:=20Correction=20to=20DB2=20drop=20/=20create=20comm?= =?UTF-8?q?ands=20=20=20=20=20=20=2026097:=20Fixes:=20ALF-7102,=20typo=20i?= =?UTF-8?q?n=20property=20string.=20=20=20=20=20=20=2026100:=20Merged=20V3?= =?UTF-8?q?.4-TEAM=20to=20V3.4=20=20=20=20=20=20=20=20=20=2025985:=20Anoth?= =?UTF-8?q?er=20cycle=20of=20fixing=20installer=20from=20Win=20builds.=20?= =?UTF-8?q?=20Still=20waiting=20for=20official=20fix=20from=20Bitrock.=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=2026067:=20Fixes=20for=20installer=20b?= =?UTF-8?q?uilds=20on=20Windows=20=20=20=20=20=20=2026102:=20Attempt=20to?= =?UTF-8?q?=20avoid=20intermittent=20failures=20in=20TaggingServiceImplTes?= =?UTF-8?q?t=20by=20upping=20wait=20time=20=20=20=20=20=20=2026109:=20Anot?= =?UTF-8?q?her=20go=20at=20executing=20the=20db2=20creation=20statements?= =?UTF-8?q?=20synchronously=20through=20db2cmd=20=20=20=20=20=20=2026111:?= =?UTF-8?q?=20ALF-6764=20-=20Copyright=20year=20on=20Share=20login=20page?= =?UTF-8?q?=20out=20of=20date=20=20=20=20=20=20=2026127:=20Merged=20V3.4-T?= =?UTF-8?q?EAM=20to=20V3.4=20=20=20=20=20=20=20=20=20=2026120:=20Fix=20pos?= =?UTF-8?q?tgres.bki=20on=20Win=20builds=20=20=20=20=20=20=2026142:=20Merg?= =?UTF-8?q?ed=20PATCHES/V3.4.0=20to=20V3.4=20=20=20=20=20=20=20=20=20=2025?= =?UTF-8?q?999:=20ALF-7377:=20Validate=20and=20reject=20partial=20WebDAV?= =?UTF-8?q?=20requests=20sometimes=20produced=20by=20NetDrive=20=20=20=202?= =?UTF-8?q?6145:=20Merged=20V3.4=20to=20V3.4-BUG-FIX=20(RECORD=20ONLY)=20?= =?UTF-8?q?=20=20=20=20=20=2026143:=20Merged=20PATCHES/V3.4.0=20to=20V3.4?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2026005:=20Merged=20V3.4-BUG-FIX=20?= =?UTF-8?q?to=20PATCHES/V3.4.0=20=20=20=20=20=20=20=20=20=20=20=20=2026002?= =?UTF-8?q?:=20ALF-7282=20Updated=20NodeListConverter=20so=20that=20it=20n?= =?UTF-8?q?ow=20implements=20the=20method=20revert(Object,=20ProcessDefini?= =?UTF-8?q?tion)=20=20=20=2026153:=20Fix=20for=20CIFS=20concurrent=20folde?= =?UTF-8?q?r=20listing=20returns=20wrong=20list=20of=20files.=20ALF-6385.?= =?UTF-8?q?=20=20=20=20Synchronize=20the=20VirtualCircuit.allocateSearchSl?= =?UTF-8?q?ot()=20method=20and=20put=20a=20marker=20object=20in=20the=20al?= =?UTF-8?q?located=20slot=20so=20it=20does=20not=20get=20reused=20before?= =?UTF-8?q?=20the=20real=20search=20is=20put=20into=20the=20slot.=20=20=20?= =?UTF-8?q?=2026156:=20Merged=20/BRANCHES/DEV/BELARUS/V3.3-2010=5F12=5F20?= =?UTF-8?q?=20to=20BRANCHES/DEV/V3.4-BUG-FIX:=20=20=20=20=20=20=2024902:?= =?UTF-8?q?=20ALF-5985:=20Users=20with=20an=20apostrophe=20in=20their=20us?= =?UTF-8?q?ername=20cannot=20cancel=20their=20own=20workflow=20no=20action?= =?UTF-8?q?=20button=20shown=20=20=20=2026177:=20ALF-6686=20-=20DOCLIB=20-?= =?UTF-8?q?=20add=20'add-default-resource'=20as=20enhancement.=20=20=20=20?= =?UTF-8?q?26181:=20Fix=20for=20ALF-7179=20-=20NPE=20on=20Check=20in=20act?= =?UTF-8?q?ion=20when=20define=20lockable=20aspect=20as=20mandatory.=20=20?= =?UTF-8?q?=20=2026182:=20ALF-3145=20-=20Caller=20of=20CopyBehaviorCallbac?= =?UTF-8?q?k.getCopyProperties=20should=20ensure=20modifiability=20of=20pr?= =?UTF-8?q?operties=20map=20=20=20=20=20=20-=20Copy=20Service=20was=20alre?= =?UTF-8?q?ady=20done.=20=20=20Merged=20similar=20changes=20to=20CopyBehav?= =?UTF-8?q?iourCallback.=20=20=20=2026185:=20ALF-7238=20-=20Value=20for=20?= =?UTF-8?q?$fieldHtmlId=20changes=20after=20metadata=20refresh=20=20=20=20?= =?UTF-8?q?26196:=20Fixed=20ALF-3383:=20range=20slider=20does=20not=20hono?= =?UTF-8?q?r=20xs:fractionDigits=20=20=20=2026202:=20ALF-6947:=20RM=20LOV?= =?UTF-8?q?=20Constraint=20values=20are=20not=20returned=20in=20alphabetic?= =?UTF-8?q?=20order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * RM list of values are now shown in the UI as ordered * this can be overridden in the constrant definition but isn't exposed in the admin UI 26206: Fixed ALF-6538 "My Tasks Dashlet needs to use Page URL" (code contribution from Jeff Potts) 26211: Fixed ALF-1289 "Search for groups on "Add Group" form works incorrectly" 26213: Fixes ALF-6697: Updates to flash and html uploaders to prevent files named with (Windows) illegal characters from being uploaded 26220: Fixed CopyServicePolicies javadoc 26221: Fixed ALF-4926: Incorrect behavior of update and move rule for the same folder - Pulled rule-specific code out of FileFolderService - Added detection for new nodes and renamed nodes in current transaction - New nodes will only fire inbound properties, renamed nodes won't fire outbound, etc - Added in coverage tests: - testCheckThatModifyNameDoesNotTriggerInboundRule - testCheckThatModifyNameDoesNotTriggerOutboundRule - testUpdateAndMoveRuleOnSameFolder - Requires regression tests of ALF-4846 and rule-based test cases - Inbound, update and outbound have to be respected for all clients 26222: Confirmed 3.4 fix presence for ALF-5001: cm:name uniqueness check can fail if the property is not set - Unit test the condition - Checked that code now uses the node UUID as a cm:name substitute 26228: Test fix after rev 25770 for ALF-6904 26232: Fixes ALF-6697: Improved error handling for HTML uploader 26236: Fixes ALF-6697: Re-use forms validation logic 26237: Build fix for lexer tests (character encoding issues on build box + using unfixed antlr test environment for one test) 26244: Merged BRANCHES/DEV/BELARUS/V3.3-2011_01_18 to BRANCHES/DEV/V3.4-BUG-FIX: (with modifications) 25071: ALF-1846: Workflow validation is not perfomed when tasks progression are requested 26259: Fix for ALF-7520: Upgrading from "old permission model" to "new permission model" (DmPermissionsPatch) - include generic patch to fix up permission inheritance issues Probable work around for ALF-7453: ACL Propagation issue for large number of users/ACLs 26276: Unit test fix for ALF-4926: Incorrect behavior of update and move rule for the same folder - Content update trigger now ignores nodes that are created in the same transaction 26277: Fix for ALF-7636, the onLoggedOut function was being called directly rather than an event being triggered, which made it impossible for plugins to use the event. 26278: Fix ALF-7568: Thumbnails should not go into the trash can - For 3.4: Just the content model setting for cm:thumbnail - Relates to TEAM rev 25038 26283: If we're not doing action tracking during execution and completion, then don't do the pending step either (ALF-7341) 26284: ALF-5998 - German language pack error in Explorer - Incorrect layout of Manage Task button in My tasks component in alfresco explorer 26285: Hopefully avoid intermittent failures caused by either slow machines (by ensuring locks are held during slow execution), and fixing up the action tracking parts of the test (broken by ALF-7341 changes) 26286: ALF-5889 - Italian translation errors in Explorer and Share - Aspects 26299: Fixed ALF-6289 "Contributor is absent in Permissions section at the details page" 26305: ALF-7264 - Improve error messages when there are no valid email addresses to send an email too (avoids a null pointer, instead gives a helpful one), and also a provisional fix for @localhost email validation (pending a proper fix via VALIDATOR-292) 26308: ALF-6073 - *.docx document is displayed on all views (Document List portlet) 26309: ALF-7532 - Content Rule on RM site (other than Folder) creates 'GUID' folder in Share Note: Fixed on Team, but along with many other unrelated fixes; hence not merged directly. 26311: Fixed ALF-7162: Bulk import NPE 26317: ALF-5560 - Incorrect behaviour on import. RM FilePlan now tolerates (but does not render) non-RM content which was causing the original issue. 26318: Fixes ALF-7321: Ensure that WCM and Share groups don't appear as options in Repository web-client start workflow wizard for group and pooled review workflows 26327: Merged V3.4 to V3.4-BUG-FIX 26158: Merged DEV/TEMPORARY to V3.4 26154: ALF-7571: Create Web Project wizard - Step 3 Superfluous “cellpadding” elements were removed. Missing space was added. 26164: ALF-6885: Changed svn:eol-style from native to LF for all .sh scripts 26165: Merged V3.4-TEAM to V3.4 26161: Fix full installer. 26178: Merged DEV/TEMPORARY to V3.4 26172: ALF-7601: 3.4.1 SDK WebServiceSamples multiple problems Configuration properties for WebServiceSamples was moved to correct place. Dependency to SDK AlfrescoEmbedded was added to classpath. It is required for FileCopyUtils from Spring which is used in WebServiceSamples. 26190: Reversed 26165 / 26161 - breaks installer building 26192: Convert TaggingServiceImplTest to use retrying transactions! 26194: ALF-7045: AVM upgrade - re-implement AVM "rename duplicates" patch as a DB upgrade script 26195: Update installer overlay files 26197: Final installer updates - built and tested on OSX 26199: Allow relocatable data for postgres - part2 26204: Attempt to avoid intermittent unit test failures in RecordsManagementAuditServiceImplTest by adding some Thread.sleep() calls to allow for asynchronous audit behaviour 26207: Set site notification to false on install (ALF-6181) 26212: Merged DEV to V3.4 26203: ALF-7605 PostgreSQL: Upgrade from 2.1.7 to 3.4.1 is failing - constraint "alf_access_control_entry_acl_id_key" does not exist 1. The statements which are drop constraints, marked as optional 2. The alter statements with new constraint names were added 26245: Added OOo port number configuration 26256: Fixes ALF-7679: Remove webscript-framework-config-custom.xml file 26270: License updates from Ashutosh 26274: Fix intermittent unit test failure with retrying transaction 26275: Possible fix to intermittent test failure. 26295: Reduce scope of retrying transaction, in a hope of fixing TaggingServiceImplTest.testOnStartupJob() 26303: And the prize for the largest number of retrying transactions in a single unit test goes to... 26307: Fixes: ALF-7704: Japanese language option not appearing in dropdown box on log in page. 26314: Another defensive sleep() in RecordsManagementAuditServiceImplTest 26325: Moved defensive sleep() in RecordsManagementAuditServiceImplTest 26329: Resolved merge issue in TaggingServiceImplTest 26332: ALF-7499: DOD5015 PublishUpdatesJob is not resilient to missing nodes 26337: Build fix - Added checks for new "sorted" parameter on ListOfValuesConstraint 26338: ALF-6004 - Verisonable aspect applied to content in Web Quick Start does not result in version information being exposed 26341: ALF-5394 Fixed issue where pooled actors (users not groups) were not working properly. 26352: Removed svn:mergeinfo 26357: ALF-5369: Disposition errors when importing FilePlan which includes custom event * missing events are now created with the information available * prevents exception when browsing imported file plan * TODO make sure sufficient information is stored in the export file so that events missing can be correctly recreated 26358: Found and fixed javascript error/bug when date-picker was used in form w read-only="true" 26360: Fixed ALF-5980 "Language pack errors in Share - Incorrect layout on Manage permissions page" 26362: Fixed ALF-5894 "Italian language pack in Share - Incorrect layout of My Profile dashlet" 26367: MERGE SWIFT to V3.4 BUG-FIX for ALF-5125 word offfice 2007 creates permanent temporary files on 3.2.2.1, and possible wrong ownership 26001 26081 26208 26216 26261 26315 26339 26370: MERGE DEV To V3.4-BUG FIX 26342 : ALF-5125 - word office 2007 creates permanent temporary files on 3.2.2.1, and possible wrong ownership 26382: Using predefined statics and neatening 26387: ALF-4101: Blog Archive filter has duplicate dates 26396: Fix for ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs - final part of fix for locking ACL changes (avoid simultaneous changes to the ACEs associated with an ACL) 26397: ALF-7823 - CIFS shuffle looses "mime type" of attachment. ALF-7670 - MS Word 2003 'Save As' to CIFS in a folder with a rule 'extract common metadata' does NOT extract the metadata 26398: Fixed ALF-6384 "Share - 'Insert Image Library' function in WIKI not working properly in IE8" 26407: Merged V3.4-2010_11_29 to V3.4-BUG-FIX 24159: ALF-413: Incorrect notification is displayed on Manage deleted items page when deleting an item that is already recovered 26412: Fix for ALF-4400: Share Search - Not Finding Document When Search Uses More Than One Tag in the Search Criteria - added TAG field - UI no longer has to do ugly query build and TAG is part of the default macro - Fixed unreported AND OR precedence issue and added grouping 26424: Fix for ALF-7795: Greater than (>) operator does not work with untokenised String properties in CMIS Query - fixed with issues will be resolved in SOLR/SWIFT - any term starting with { (used to encode locale) will be excluded from the range. - range queries not supported for urls .... 26449: Fixed ALF-5385 "Unable to edit groups on ts.alfresco.com" 26454: Fix for ALF-7852: Query consuming all heap and receiving an OOM exception - missing close on TermDocs and TermPositions 26460: ALF-634, ALF-7103 Externalized the JBPM Config location, so it can now be set as a property in repository.properties. 26470: Fixed ALF-7744: Ensure that new options.limit gets set when updating RSS feed results 26479: ALF-6533 - GROUP_EVERYONE is a special group, so when looking up the members to send an email, we need to call a different authority service method to get everyone 26484: ALF-7715 - Switch from the old Ant ZipFile to the new Commons Compress one, which supports the new file encoding zip extension 26488: ALF-7192 - Invitation code should support subtypes of Site in addition 26489: ALF-7192 - Update the Browse Bean and Site Aspect policy to support subtypes of Site 26493: ALF-7192 - When handling permissions and roles on sites, allow for sites which are a subtype of the default site type, rather than only supporting SiteModel.TYPE_SITE. (Unit test to follow) 26499: Fixes ALF-6415: Ensure that labels on installer radio buttons doesn't flow outside the window 26511: Merged DEV to V3.4-BUG-FIX 26406: ALF-7680: Check out of document allows users to create Working-Copy into Spaces where they do not have write access - Unit tests for ALF-7680 and ETHREEOH-535 were added. 26442: ALF-7680: Check out of document allows users to create Working-Copy into Spaces where they do not have write access - If destination folder for working copy is the same as the parent folder of the source node then working copy should be created even if the user has no permissions to create children in the parent of the source node. The following logic was added for Check Out operation to apply it: - if the target folder node is the same as the parent folder of the source document then working copy is created using 'System' user - if the target folder is a different parent, then working copy is created using current user. 26515: Partially fixes ALF-5774: Set correct Japanese date formatting on Repo Web Client summary panels 26529: Fix for ALF-6722 MT: Cancel workflow button isn't available for tenant users 26533: Fixed ALF-6563: Can't properly expose categories or associations on AWE forms 26534: Added correct source files for jbpm-jpdl-3.3.1 26535: Updated disabled testAsynchronousTaskExecutes as part of investigation into ALF-6405 26537: Fixed ALF-7927: Script error on Step 3 of Create Web Project Wizard - IE6/IE7 26540: ALF-7192 - Add unit test for custom site type 26559: Merged DEV to V3.4-BUG-FIX 26547: ALF-7528 : JSF - Edit online with Office 2010 causes the document mimetype to be lost - PutMethod was modified to use only guessed mime type for documents and completely ignore the Content-Type header from client. 26560: Fixes ALF-7931: Ensure checkboxes render correctly in IE6 for forms and replication job 26565: ALF-7232 - remove temporary (unit test) debug from log4j.properties 26566: Add a couple more site service checks for roles 26568: Fixes: ALF-7950 - escaped apostrophe 26576: Fix for: ALF-7996: Error when applying patch.fixAclInheritance - removed having clause for nasty where clause - hopefully optimised out .... 26580: Fixed ALF-7915 "Cannot delete rules created with check-in perform action." 26591: ALF-7995 - Repo tier web script get dataLists returns rule folder. Also fixed incorrect folder path rendering on non-Site rules page and removed reference to non-existent file. 26598: Add notes on if Transformers can be converted to Tika or not, and if not why 26601: Fixed ALF-7804: XAM: Long paths cause 'org.snia.xam.InvalidArgumentException' when XAM aspect is applied - Path-generation truncates the first characters to leave only 512 in the path - Added catch and WARN on failure to write properties to XSet (rather than fail) - Added log4j config for XAM 26603: Fixes: ALF-868 - IE Bug. 26604: Fixes: ALF-6486 - L10N bug in width of TinyMCE's dropdown lists not accommodating longer phrases in other languages. Width is now fluid 26606: Fixes: ALF-7397 - Removed repeated chars in JA dates that include long names for days of the week. 26611: Upgrade POI and Tika for ALF-7959 26612: Add test file from ALF-7959, tweaked to include the "Quick" text, and with the original user details munged 26613: Fix up unit tests after Tika upgrade for ALF-7959 26618: ALF-7959 - Convert the Outlook MSG text converter to using Tika, which fixes encoding problems 26628: Merged PATCHES/V3.1.2 to V3.4-BUG-FIX 26626: Merged DEV/TEMPORARY to PATCHES/V3.1.2 26400: ALF-607: Rules not firing on subspaces Execute RuleServiceImpl. getRules(), RuleServiceImpl. getOwningNodeRef(Rule) and RuleServiceImpl. getOwningNodeRef(Action) methods from System User. 26630: Merged HEAD to V3.4-BUG-FIX 26620: Modified to allow for multiple mime-types for Alfresco 3.3+. Related to ALF-4027. 26629: ALF-4027: Kofax Binaries corresponding to 26620 26650: Merged SWIFT to V3.4-BUG-FIX 26093: Workaround to the fact that the Solr classpath has got too large to include on a Windows command line! (32K) 26683: ALF-8045: VersionableAspect now properly resolves the namespaces of the QNames registered with excludedOnUpdateProps 26684: Resolve ALF-7515: CMIS operation getObjectRelationships() is not spec compliant 26689: Change the status code for the CIFS Trans2QueryPath response when the file does not exist. Possible fix for ALF-6727. 26691: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26681: ALF-1871: FileLink and FolderLink items do not appear in WebDav Modify PropFindMethod to show file/folder links and return href of original node. Modify GetMethod to allow browser deal with file/folder links. 26692: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26558: ALF-7910: It's impossible to delete folder with accentuated letter via IMAP from Outlook 2010 Call "AlfrescoImapFolder sourceNode = getFolder(user, oldMailboxName);" before decoding oldMailboxName in ImapServiceImpl.renameMailbox() method. Update JavaDoc in AlfrescoImapService. Add testRenameAccentedMailbox() test. 26693: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26544: ALF-7911: Cannot contribute via IMAP if another user with only Consumer permissions has logged in first Dynamically check readOnly in AlfrescoImapFolder.isReadOnly() method. 26694: Merged DEV/TEMPORARY to V3.4-BUG-FIX (with corrections) 26343: ALF-6945 Failed Kerberos SSO auth returns HTML web page with wrong text/plain MIME type Setting content-type to text/html added for page used for failed Kerberos and NTLM authentications. 26695: Resolve ALF-7538: CMIS AtomPub: Not possible to retrieve associations defined via an Aspect. 26696: ALF-6132: Correction to handling of optional elements by Pavel 26701: Fixes ALF-8064: Ensure Windows installer respects manual service startup selection 26706: Resolve ALF-7759: MTOM is not enabled for all CMIS Web Services 26713: Resolve ALF-7994: Custom behavior is not triggered when creating content via CMIS 26717: Resolve ALF-6848: CMIS Rest: Properties Filter Parameter incorrectly functioning. 26720: Fix ALF-7977: Webform validation on change is always passing 26726: ALF-7086: Root folder has wrong Allowable Actions 26727: Resolve ALF-6266: Incorrect exception thrown when deleting a non-existing document (web-services binding) 26728: WQS: Performance enhancements. Local max throughput increased from 11 PIs/sec to 24 PIs/sec with 15 concurrent users (CPU utilization dropped from 100% to 70%) 26729: ALF-8045: Fix VersionServiceImplTest 26735: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26725: ALF-3919 : WCM - JSF does not return an appropriate warning when creating content with ' ; ' character 1. The AVMNodeConverter class was modified to allow ';' character usage in web content names. 26736: Merged V3.4 to V3.4-BUG-FIX 26411: Fixes: ALF-7292 and ALF-7289, removes "· " from after Web and before Alfresco. 26413: Fixes: ALF-7765 - ensures naming consistency 26414: Fixes: ALF-7697 - Rewording the URL help text on the create site dialogue 26417: Fixes: ALF-7414, confused and hardcoded date-formatting & date formatting translations fixed. 26610: Fix for: ALF-8007: Lucene index not coherent or not up to date or we can not rely on it to check that a working copy exist. 26739: ALF-8085 - DMDeploymentTarget uses System.out 26748: ALF-7929: Script error on Web Form Details window - IE6/ IE7 - Fix up to CHK-10095 reviewed by Kev 26749: ALF-7557: Display full paths of categories in Explorer (reviewed by Kev) 26751: ALF-8079: NPE in ContentDiskDriver 26754: Fixes: ALF-2984. parseInt octal bug, so forcing dec. 26761: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 26760: Merged V3.4-BUG-FIX to V3.4 26759: Merged V3.4-BUG-FIX to V3.4 (3.4.2) 26762: ALF-8028 ResultSet not closed in TransferServiceImpl2 try...finally pattern was added to search operation. 26764: Further fixes to teh patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs 26765: ALF-634, ALF-7103: Possible fix to JBPM regressions introduced by r26460 26788: Further fixes to the patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs - fix type that would have missed a minor error (for unused shared ACLs) 26815: ALF-5500: Support site subtypes in SPP 26863: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26853: ALF-3792: Copy Access Should Be More Restrictive Checking permissions for “Copy” was added action. Security settings for FileFolderService.copy operations were made more strict for Alfresco and RM. 26890: Merged HEAD to V3.4-BUG-FIX 26856: Fixed ClientInfo is null in sessionLoggedOn event. JLAN-121. 26867: Fix for wildcard search handling returning dot and dot-dot file entries. ALF-4960. 26868: Fix for wildcard search handling returning dot and dot-dot file entries, repo filesystem. ALF-4960. 26888: CIFS path broken when ß (German sz) char is in folder name. ALF-7186. 26909: AVMRepository: add missing error info - report store name (if not found) 26934: Fixed ALF-6532: Upload new version fails in Share (checkout) when using ContentStoreSelector - Includes investigative tests from DEV rev 26902 - Fixed safeCopyContent to cater for first-time setting of property where content is already in new store (copy operations) - Tested XAM use-case as well 26996: Fix for ALF-8229. patch.webSiteAddModerated upgrade error. Trivial fix sanctioned for check-in on 3.4.2 by SteveR. 26997: Undoing accidental check-in of eclipse project files changes. 27045: Change to CIFS session setup exception processing as per ALF-229. 27069: ALF-3871: Global properties now visible through JMX 27108: Merged PATCHES/V3.3.3 to V3.4-BUG-FIX 27107: ALF-8388: Merged PATCHES/V3.3.4 to PATCHES/V3.3.3 26894: ALF-7237: Further diagnostics for maxChecks and maxCheckTime 27110: Merge DEV to V3.4-BUG-FIX 26859 : ALF-6546 - JCR export fails when node has a null property value 27116: ALF-8190 - Minor version labels non-intuitive now the minor version will start at 0.1 rather than 1.0 27121: Fixed ALF-8307: Audit query template in 3.4.0 should quote key values for application and username 27332: Follow on test corrections from the fix to ALF-8190. 27508: Merge Dev to V3.4-BUG-FIX 27153 : ALF-5496 Commenting on a Space creates an Empty Folder via CIFS 27575: Merged DEV/TEMPORARY to V3.4-BUG-FIX 27070: ALF-4954: when cookies are disabled, Share enters into a loop, Explorer outputs a java.lang.NullPointerException exception, Firefox 1. SSOAuthenticationFilter and login page for Share application was modified to handle lack of cookies in a manner web-client do that. 27586: Ignore default build directory for virtual server 27587: Fix for ALF-8188: Share - Search returns no result when using special characters - not really a bug .... added implementation to support \u0000 style encoding in the parser but not the impl 27590: Merged DEV to V3.4-BUG-FIX 27147: ALF-7979 : Metadata extracters should log a warning/error when type conversion of field values fails 1. Adding additional logging for type conversion failure during metadata extraction. - Additionally removed some false TODOs and fixed generics in class 27593: Fix for: ALF-7827: CMIS Contains does not support TEXT, ALL, d:content etc as would be expected - added to match Alfresco FTS 27595: Fix for: ALF-8073: Property value not stored in Lucene index if stored=true and tokenized=false - if stored is selected the value will be stored in the plain property entry 27599: Merged V3.3 to V3.4-BUG-FIX 27130: Merged DEV/TEMPORARY to V3.3 27129: ALF-8141: Using the copy/move action causes the Path QName to change to 'copy' or 'move' MoveActionExecuter: Remove PARAM_ASSOC_TYPE_QNAME and PARAM_ASSOC_QNAME(Also remove it from classes that use them). Use FileFolderService for move operation. CopyActionExecuter: Remove PARAM_ASSOC_TYPE_QNAME and PARAM_ASSOC_QNAME(Also remove it from classes that use them). Use CopyService with original assocTypeQName and assocQName(Don't use FileFolderService here because it doesn't respect deep copy flag). 27155: ALF-8141: Fix up unit tests plus RESTful calls to RuleService 27601: Fix up unit tests following merge of ALF-8141 27604: Fix for ALF-7738: Hyphen not handled correctly in cmis-alfresco search for Aspects/types : " no viable alternative at character 'a' " - query names are now escaped where required 27613: Upgrade Tika and POI for ALF-7978 27618: ALF-1813 Fixed security issue where tasks could be edited by a user who did not have acess tot he task. 27637: Merged DEV/TEMPORARY to V3.4-BUG-FIX 26965: ALF-8258: sharedLockTokens property duplicated many times Changed LockInfo.sharedLockTokens from LinkedList to HashSet because in RFC "Lock token URIs MUST be unique across all resources for all time.", and therefore sharedLockTokens should contain non-repeatable values. 27662: ALF-8549: activities.getFeedControls() does not return a scriptable object in Javascript - also fix REST call (/api/activities/feed/controls) to return JSON 27663: Perf improvement: cache User Feed Controls (for generator job run) - note: activity feed controls are not currently exposed via Share UI 27668: ALF-8413: Share Feed Generator on Oracle generates NPE (when commenting in repo view) - fix NPE (note: in general Share does not post activities outside of site context + feed generator is currently based on site members) 27669: ALF-8549: activities.getFeedControls() does not return a scriptable object in Javascript - quick test fix for PostgreSQL (follow-on from r27662) 27697: ALF-8581: User activities are displayed twice in My Activities dashlet (in cluster env) - add cluster job lock service (SLNG-770) 27776: ALF-8581: Reverted changes to FeedGeneratorJob 27806: Merged DEV to V3.4-BUG-FIX 27793: ALF-8351 : JBPM Tables in Oracle missing index on Foreign Keys leading to table Locks 1. Sql script that creates indexes for foreign keys in jbpm tables was implemented. This script synchronizes jbpm indexes with mysql version. Merge changes: Changed 4.0 references to 3.4; Incremented schema number. 27808: Fixed ALF-7510: Share - Workflow 'due date' field date validation doesn't work properly 27811: Fixed ALF-6179: WebDAV has problems if username contains spaces 27812: Partial fix for ALF-7032: Alfresco doesn't escape special XML characters in AtomPub 27815: Switched to use ?xml instead of ?html in partial fix for ALF-7032: Alfresco doesn't escape special XML characters in AtomPub 27825: ALF-8489 Fixed issue by removing inappropriate 'requiredApprovePercent' field. 27852: Fix for ALF-7845 index.recovery.mode=AUTO doesn't rebuild avm index - applied provided patch 27857: Fix for ALF-868: Large Table Data causes TinyMCE to drop below Alfresco Footer in Web Form - IE7 only 27860: Fixes: ALF-2199 Errors in CSS files. 27866: Fixes: ALF-1327 - truncation issues in the calendar. 27881: Fixes bug in Chrome introduced with r27866 27898: CIFS on Windows fails to start under certain conditions. ALF-8723 27901: Merged DEV to V3.4-BUG-FIX 27891: ALF-7421: An opensolaris NFS client cannot see folders renamed using the web UI after two minutes. NFS server cache updating policy handler was implemented: - NfsServerNodeMonitor.java’ – new policy handler for NFS server; - NFSServerBean.java’ was modified to configure implemented node monitor with NFS server instance during server start up; - file-servers.properties’ was expanded with new properties for new node monitor which allows controlling node monitor 'enabled' state; - file-servers-context.xml’ was expanded with bean configuration for new node monitor and with configuration for NFS server bean to accept newly configured node monitor bean; - ShareDetailsHash.java’ was modified to externalize hashtable of the cache; - NFSServer.java’ was modified to externalize its cache for public access 27902: ALF-8744 - Untransalted strings in Recent shapshot 27903: Fixes: ALF-5717 Issues with non i18n/L10N Data List form fields. 27922: Fixes: ALF-8726 by back porting some Team usability fixes. *Do Not Merge* 27923: Fixes: ALF-8429 - Replaces hard coded English tooltip with a pre-existing i18n string. 27929: Fixed ALF-8768: Wrong path in comment for wcm-bootstrap-context.xml 27938: Partial Fix for: ALF-8720: Adds missing spaces. 27940: Merged V3.3 to V3.4-BUG-FIX 27851: Fix for ALF-8476:CLONE -Query consuming all heap and receiving an OOM exception - actually fixes stack overflow with skipTo when there are lots of deleted docs in an index in a row (<10000 on the default settings) ---- Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX/root/projects/repository/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX/root/projects/repository/source/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java 27942: Merged V3.4 to V3.4-BUG-FIX 26772: Fix for ALF-7843 - Created via SPP all-day event displays incorrectly 26775: Fix for ALF-3374 - Reverting a file in workflow causes a Successful error message 26778: Fix message Failed to find I18N message key: reset_categories for locale: en_US 26781: Fix for ALF-6488 - LangPack FR - [Site's Wiki] Renaming a wiki's page - special chars handling 26783: Fixed ALF-7421: An opensolaris NFS client cannot see folders renamed using the web UI after two minutes. - De-Hibernate DAO refactor missed implementing 'system.enableTimestampPropagation' - Set 'system.enableTimestampPropagation=true' in alfresco-global.properties - Timestamps will be written to immediate parent folder and will therefore not drop out of the filestate cache after 2 min 26785: Services-layer fix for ALF-8036. Incorrect permissions copied when copying folder with permissions from one site to another. UI will have to make changes in the UI layer in order to use new Services methods, thus completing the fix. This check-in adds support in the SiteService for moving and copying site-contained nodes. New move/copy methods are available in the Java Foundation API and in the JavaScript API which mimic the signatures of those in the NodeService and CopyService respectively. These methods simply delegate to the back-end services and so behaviours should be the same as before if they are used in place of the node and copy service methods. With one exception: The SiteService wrapper methods detect when the relocated node has been copied/moved between two different Share sites and clears permissions from the relocated node (and its primary descendants) that refer to the previous site. This has not been implemented using policies/behaviours as we can't bind the behaviour to any particular content class. Nodes of any type could be copied/moved between sites. 26787: Removed erroneous import from StreamContent - incorrect dependency on de.schlichtherle.io.FileOutputStream 26803: Fixes: ALF-8138, adds a i18n property for a ToDo list's attachment title. 26806: Fixed ALF-8154: Shorten the node path as prefix-only path - Use Path.toPrefixString instead of Path.toString - Provides improved fix for ALF-7804 26824: Fixed ALF-7012: WCM - Schema error "xs:enumeration full" select button group shows "Please select..." 26832: UI-layer fix component for ALF-8036 and a refactoring of the Services-layer fix component. Rather than add various facade methods to the SiteService for all the copy & move variants in NodeService, CopyService, FileFolderService etc, I have added a single new method to the SiteService cleanSitePermissions(). This removes all out-of-date site permissions after a node has been moved or copied to a new site. Also changed the slingshot action webscripts for move-to and copy-to to call this cleanUp method. 26838: Rewording a misleading code comment. Related to ALF-8036 changes. 26847: ALF-6727: File server protocols don't report the read only attribute for folders unless new configuration setting filesystem.setReadOnlyFlagOnFolders is true - Default is false - On windows, the read only attribute doesn't mean the folder is read only - it means "this folder has been customized - please fetch a desktop.ini". - This results in poor performance for non-admin users due to lots of secondary fetches for configuration information. - See the bug for more details. 26855: ALF-6727: Missing files from last check in 26858: Merged V3.4-TEAM to V3.4 26841: Fix for ALF-1044. (Searching for groups whose names contain regex reserved chars.) The fix was to add [] as reserved chars to the RegEx SimpleLanguageDef. Thanks AndyH. 26860: ALF-7101 and ALF-7866 - don't show the rules options to collaborators, as they shouldn't be able to create/manage rules 26861: Merged DEV/TEMPORARY to V3.4 (with corrections) 26157: ALF-1544: Server won't start on JBoss: Unable to resolve drag and drop application as a file, class path resource [alfresco/desktop/Alfresco.exe] DesktopAction uses Resource’s InputStream for drug-n-drop files representation. 26870: ALF-6727: Fix up ContentDiskDriverTest 26898: Fix ALF-8219: Deploying WQS in the same container as Alfresco causes startup to stall 26899: Possible installer build fix - uncomment project.readmeFile - set failifexecutionfails="true" on installer build targets so we know if installer building failed! 26900: ALF-8180: The installer shouldn't randomly delete a directory called tomcat that it didn't create - Fix provided by Bitrock 26919: Backing out 3 changes related to ALF-8036 due to uncertainty over fix approach. I'm reverse-merging revisions 26785, 26832 and 26838 out of this 3.4.2 branch. The fix version for ALF-8036 has been changed to 3.4.3 and so we don't want an unfinished fix on 3.4.2. In fact, this fix may be finished, but there is some uncertainty now over the approach to adopt (strip permissions vs. prevert copying of permissions). This fix will go to Team and 3.4.3 instead. 26932: Fixed a couple of non-unicode French characters that were messing up my scripts and: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4: 26911: Latest updates from translators (based on rev26710) 26944: ALF-3569 - Alfresco repository CIFS driver not setting timestamps. 26952: Finishes the completeness tests & fixes several L10N bugs. 26972: Fixes ALF-8272: Alfresco cannot be started after fresh install 26980: ALF-8287 - All buttons are disabled on Data Lists page. 27039: Merged BRANCHES/DEV/dwebsterV34 to BRANCHES/V3.4: - Update from Translators (based on r26837). 27059: Merged PATCHES/V3.4.1 to V3.4 26959: ALF-8261: 3.4 JSF performance regression introduced by WebProjectServiceImpl.hasWebProjectsRoot() (ALF-3085) 27020: ALF-8281: CLONE -'Move To' operation for categories, folders and records doesn't work ESCALATION 27061: Merged PATCHES/V3.3.4 to V3.4 27032: ALF-8289: Merged DEV to PATCHES/V3.3.4 27028: ALF-8289: Occasionally, web form complains of missing required fields when the fields are indeed populated 27068: Merged DEV to V3.4 27067: ALF-3774 : Unable to disable listening on port 7500 (JGroups) 1. DummyProtocol was changed to rewrite default configuration. This changes turn off diagnostic probing for DummyChannel. 27071: Fixed ALF-8363: BadSqlGrammarException during patch.fixAclInheritance on Oracle - Using '... = true' does not work for Oracle. - Replaced with parameterClass="boolean" and #trueOrFalse# - Tested against limited dataset so some condition paths might be missed. 27083: ALF-8124: Corrected ${} placeholders in Japanese installer strings 27088: Fixed ALF-8377: Generic KeywordSearch is not resilient to stale Lucene indexes - Cleaned up PersonSearchTest - Added exists check to KeywordSearch - Rationalized related bean declarations 27113: Fixed ALF-1322 "Creating user with username containing spaces works incorrectly" 27127: ALF-8346 - 'Complete event' button for folders is disabled in IE 27136: Installer string updates from Gloria 27173: Fix for: ALF-7834: CLONE - ACL Propagation issue for large number of users/ACLs - manually fix up the cache when changing inheritance 27503: Fix for ALF-8345 - Extra icons on the form of adding translation without content(IE specific) 27504: Fix for ALF-6917 - A system error happens when user attempted press toggle 'Version History' 27505: ALF-6215 - French Language pack - It's incorrect layout in Document List component 27509: ALF-8451: Port AVM-rename-dupes.sql to DB2 and SQL Server 27511: ALF-7165: User with contributor role cannot view content 27512: Installer string updates from Gloria - Corrections to msgid Installer.ReadmeFile.View 27557: case sensitivity issues with terminfo database building from Windows 27563: Merged DEV to V3.4 27558: ALF-8408: Impossible to upload a new file by contributor to subspace when rule is applied to subspaces Retrieving of rule was surrounded in RunAs(System username) block. It allows to retrieve rule node and its actions if user has no read permissions to rule node and to rule's actions. JUnit test "PermissionsForPropagatedRules_ALF_8408" was added. 27602: Fix for ALF-5625 - When viewing properties in version history hitting close results in loop (V3.4.2) 27622: ALF-5607: Remove bundled postgres data directory on installation abort on Linux 27639: Fix for ALF-6488 - Decode HTML content before creating page url argument for wiki 27647: Fix for ALF-8552 27672: ALF-8553: PatchService didn't recurse on dependents of already applied patches - Hence patch ordering was wrong on V3.4 upgrade 27684: ALF-8553, ALF-8602: set batchMaxQueryRange on patch.fixNameCrcValues-2 to avoid OOM 27687: Merge DEV to V3.4 27674 : ALF-8453 CIFS Failed to save versionable MS Word content as collaborator 27690: Merged DEV/TEMPORARY to V3.4 27688: ALF-7822 : AVM projects unavailable after upgrade to 3.4.1 script was modified to prevent data corruption 27775: Fixes ALF-8654: Add removed quotes back into .po files 27805: ALF-2935: Properly control RMI port in Bitrock installer - order repository-properties before shared-properties so that you can specify the port in alfresco-global.properties if you want to - include a tokenized alfresco-shared.properties in the WCM installation files 27807: Merged V3.4-TEAM to V3.4 27756: ALF-8207 - ALL LANG - Themes are not translated 27840: ALF-8687: No items display for series when opening it from library list 27853: Fixes: ALF-7465 - Removes some of the differences between the Add Event and Remove Event dialogues & reuses existing TagLibrary component to avoid conflicts. 27856: ALF-8687: No items display for series when opening it from library list. Slight refactor to better match non-RM doclib code. 27871: Fixes ALF-8124: Ensure Spanish locale for installer shows product name correctly 27932: Fixes ALF-5519: alfresco-enterprise-wcmqs-3.3.3.zip does not contain awe.war - Added awe.war to WQS zip file 27944: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 26766: Merged V3.4-BUG-FIX to V3.4 26761: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 26760: Merged V3.4-BUG-FIX to V3.4 26759: Merged V3.4-BUG-FIX to V3.4 (3.4.2) 26762: ALF-8028 ResultSet not closed in TransferServiceImpl2 try...finally pattern was added to search operation. 26764: Further fixes to the patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs 26765: ALF-634, ALF-7103: Possible fix to JBPM regressions introduced by r26460 26831: Merged V3.4-BUG-FIX to V3.4 26788: Further fixes to the patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs - fix type that would have missed a minor error (for unused shared ACLs) 27016: Merged V3.4-BUG-FIX to V3.4 26996: Fix for ALF-8229. patch.webSiteAddModerated upgrade error Trivial fix sanctioned for check-in on 3.4.2 by SteveR 26997: Undoing accidental check-in of eclipse project files changes 27859: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4: 27857: Fix for ALF-868: Large Table Data causes TinyMCE to drop below Alfresco Footer in Web Form - IE7 only git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/messages/office-addin.properties | 2 +- .../messages/office-addin_de.properties | 25 +- .../messages/office-addin_es.properties | 48 ++-- .../messages/office-addin_fr.properties | 24 +- .../messages/office-addin_it.properties | 6 +- .../messages/office-addin_ja.properties | 240 +++++++++--------- config/alfresco/messages/webclient.properties | 1 + .../alfresco/messages/webclient_de.properties | 85 ++++--- .../alfresco/messages/webclient_es.properties | 3 +- .../alfresco/messages/webclient_fr.properties | 17 +- .../alfresco/messages/webclient_it.properties | 4 +- .../alfresco/messages/webclient_ja.properties | 83 +++--- .../client/portlet_node_summary_panel.ftl | 4 +- .../templates/client/task_summary_panel.ftl | 2 +- config/alfresco/web-client-config-actions.xml | 1 - config/alfresco/web-client-config-dialogs.xml | 4 +- config/alfresco/web-client-config.xml | 2 +- .../evaluator/CancelWorkflowEvaluator.java | 3 +- .../evaluator/DiscussionCopyEvaluator.java | 6 + .../servlet/command/TaskCommandProcessor.java | 13 +- .../command/UIActionCommandProcessor.java | 15 +- .../org/alfresco/web/bean/BrowseBean.java | 3 +- .../org/alfresco/web/bean/NavigationBean.java | 2 +- .../bean/actions/handlers/CopyHandler.java | 9 - .../bean/actions/handlers/MoveHandler.java | 10 - .../web/bean/coci/CCCheckinFileDialog.java | 5 + .../bean/content/DocumentDetailsDialog.java | 2 +- .../web/bean/repository/Repository.java | 21 ++ .../trashcan/TrashcanDeleteItemDialog.java | 10 +- .../trashcan/TrashcanRecoverItemDialog.java | 9 +- .../web/bean/workflow/WorkflowUtil.java | 20 +- .../web/forms/xforms/Schema2XForms.java | 33 ++- .../property/BaseAssociationEditor.java | 2 +- .../component/property/UIPropertySheet.java | 18 +- .../repo/renderer/BaseMultiValueRenderer.java | 16 +- source/web/cmisfs/browser/browser.css | 2 +- source/web/css/main.css | 4 +- source/web/css/xforms.css | 1 + source/web/images/icons/recover_all.gif | Bin 0 -> 1046 bytes source/web/jsp/dialog/container.jsp | 2 +- .../ml/add-translation-without-content.jsp | 4 +- source/web/jsp/trashcan/item-details.jsp | 55 ++-- .../create-website-wizard/form-details.jsp | 2 +- source/web/jsp/wcm/file-details.jsp | 2 +- source/web/scripts/ajax/deployment.js | 2 - source/web/scripts/ajax/doclist.js | 2 +- source/web/scripts/ajax/myspaces.js | 2 +- source/web/scripts/ajax/xforms.js | 50 ++-- 48 files changed, 490 insertions(+), 386 deletions(-) create mode 100644 source/web/images/icons/recover_all.gif diff --git a/config/alfresco/messages/office-addin.properties b/config/alfresco/messages/office-addin.properties index 7e04b5d32b..faf249c97a 100644 --- a/config/alfresco/messages/office-addin.properties +++ b/config/alfresco/messages/office-addin.properties @@ -11,7 +11,7 @@ office.title.document_tags=Document Tags # Help office.help.title=Online Help -office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.team.doc/concepts/MSAddin-using.html +office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html # Headers and Subheaders office.header.my_checked_out_documents=My Checked Out Documents diff --git a/config/alfresco/messages/office-addin_de.properties b/config/alfresco/messages/office-addin_de.properties index 3fbb1ffa21..0fe7b09a17 100644 --- a/config/alfresco/messages/office-addin_de.properties +++ b/config/alfresco/messages/office-addin_de.properties @@ -5,18 +5,18 @@ office.title.my_alfresco=Mein Alfresco office.title.navigation=R\u00e4ume und Dokumente durchsuchen office.title.search=Alfresco durchsuchen -office.title.document_details=Dokumentendetails +office.title.document_details=Dokumentendetails office.title.my_tasks=Meine Aufgaben office.title.document_tags=Dokumenten-Tags # Help office.help.title=Online Hilfe -office.help.url=http://www.alfresco.com/help/{0}{1}/{2}/msaddin/ +office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html # Headers and Subheaders office.header.my_checked_out_documents=Meine ausgecheckten Dokumente office.header.my_tasks=Meine Aufgaben -office.header.current_space=Aktueller Raum +office.header.current_space=Aktueller Arbeitsbereich office.header.spaces_in=R\u00e4ume in {0} office.header.documents_in=Dokumente in {0} office.header.document_actions=Dokumentenaktionen @@ -35,7 +35,7 @@ office.header.tagged=Getaggde Dokumente office.status.locked=Gesperrt # Actions -office.action.add_tag=Tag hinzuf\u00fcgen +office.action.add_tag=Einen Tag hinzuf\u00fcgen office.action.remove_tag=Tag "{0}" entfernen office.action.download={0} downloaden office.action.open={0} \u00f6ffnen @@ -45,7 +45,7 @@ office.action.checkin=Einchecken office.action.checkin.description=Aktuelles Dokument einchecken. office.action.checkout=Auschecken office.action.checkout.description=Aktuelles Dokument als Arbeitskopie auschecken. -office.action.start_workflow=Workflow beginnen +office.action.start_workflow=Workflow starten office.action.start_workflow.description=Erweiterten Workflow f\u00fcr aktuelles Dokument starten. office.action.transform_pdf=In PDF umwandeln. office.action.transform_pdf.description=In Adobe PDF-Format umwandeln. @@ -68,7 +68,7 @@ office.action.return_search.description=Zur\u00fcck zum Such-Tab office.action.manage_task=Verwalten # Buttons -office.button.submit=Erstellen +office.button.submit=Vorlegen office.button.cancel=Abbrechen office.button.ok=OK office.button.search=Suche @@ -76,7 +76,7 @@ office.button.search=Suche # Messages office.message.unmanaged=Das aktuelle Dokument wird nicht von Alfresco verwaltet. office.message.unversioned=Das aktuelle Dokument ist nicht versioniert. -office.message.none=Keine +office.message.none=Keine office.message.no_documents=Keine Dokumente office.message.no_due_date=Kein F\u00e4lligkeitsdatum office.message.no_tasks=Keine Aufgaben @@ -87,13 +87,13 @@ office.message.results_max.after=Elemente office.message.no_results=Keine Ergebnisse gefunden office.message.confirm_delete=Wollen Sie dieses Dokument wirklich l\u00f6schen? office.message.enter_workflow_details=Neue Details f\u00fcr den Workflow untenstehend eingeben -office.message.workflow_action_complete=Aktion ''{0}'' des Workflows abgeschlossen. +office.message.workflow_action_complete=Aktion '{0}' des Workflows abgeschlossen. # Properties office.property.title=Titel office.property.description=Beschreibung office.property.creator=Ersteller -office.property.created=Erstellt +office.property.created=Angelegt office.property.modifier=Bearbeiter office.property.modified=Ge\u00e4ndert office.property.size=Gr\u00f6\u00dfe @@ -105,7 +105,7 @@ office.property.name=Name office.property.template=Mustervorlage office.property.filename=Dateiname des Dokuments office.property.workflow=Workflow -office.property.assign_to=Zuweisen +office.property.assign_to=Zuweisen office.property.due_on=F\u00e4llig am office.property.status=Status office.property.priority=Priorit\u00e4t @@ -113,7 +113,7 @@ office.property.start_date=Anfangsdatum office.property.type=Typ office.property.complete=Abschlie\u00dfen -#\u00c3\u0082\u00c2\u00a0Workflow +#\u00c2\u00a0Workflow office.workflow.review=\u00dcberpr\u00fcfen und zustimmen office.workflow.adhoc=Adhoc Aufgabe @@ -140,7 +140,6 @@ office.result.user_not_found=Benutzer nicht gefunden # Miscellaneous office.unit.kb=KB office.version.notes=Notizen -office.task.overdue=\u00dcberf\u00e4llig +office.task.overdue=\u00fcberf\u00e4llig office.task.due_today=heute f\u00e4llig office.tip.task_item=Aufgabenelement - diff --git a/config/alfresco/messages/office-addin_es.properties b/config/alfresco/messages/office-addin_es.properties index 527a004b51..6eb465001d 100755 --- a/config/alfresco/messages/office-addin_es.properties +++ b/config/alfresco/messages/office-addin_es.properties @@ -10,8 +10,8 @@ office.title.my_tasks=Mis Tareas office.title.document_tags=Etiquetas de documento # Help -office.help.title=Ayuda en l\u00c3\u00adnea -office.help.url=http://www.alfresco.com/help/{0}{1}/{2}/msaddin/ +office.help.title=Ayuda en l\u00ednea +office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html # Headers and Subheaders office.header.my_checked_out_documents=Mis Documentos bloqueados @@ -24,8 +24,8 @@ office.header.actions=Acciones office.header.details=Detalles del documento actual office.header.document_tags=Etiquetas de documento office.header.document_tags.for=Etiquetas de documento para {0} -office.header.version_history=Hist\u00c3\u00b3rico de versiones -office.header.version_history.for=Hist\u00c3\u00b3rico de versiones para ''{0}'' +office.header.version_history=Hist\u00f3rico de versiones +office.header.version_history.for=Hist\u00f3rico de versiones para {0} office.header.search=Buscar office.header.task_details=Detalles de la tarea office.header.tag_cloud=Nube de etiquetas @@ -35,7 +35,7 @@ office.header.tagged=Documentos etiquetados office.status.locked=Bloqueado # Actions -office.action.add_tag=A\u00c3\u00b1adir una etiqueta +office.action.add_tag=A\u00f1adir una etiqueta office.action.remove_tag=Quitar etiqueta ''{0}'' office.action.download=Descargar {0} office.action.open=Abrir {0} @@ -52,7 +52,7 @@ office.action.transform_pdf.description=Transformar en formato Adobe PDF. office.action.open_details=Abrir detalles completos office.action.open_details.description=Abrir los detalles del documento en Alfresco Explorer. office.action.save_to_alfresco=Guardar en Alfresco -office.action.save_to_alfresco.description=Le permite colocar el documento actual bajo administraci\u00c3\u00b3n de Alfresco. +office.action.save_to_alfresco.description=Le permite colocar el documento actual bajo administraci\u00f3n de Alfresco. office.action.insert=Insertar fichero en el documento actual office.action.create_collaboration_space=Crear espacio colaborativo office.action.create_collaboration_space.description=Crear un nuevo espacio colaborativo en el repositorio de Alfresco. @@ -63,8 +63,8 @@ office.action.parent_space=Hasta espacio padre office.action.create_space=Crear nuevo espacio office.action.create_collaboration_space=Crear nuevo espacio colaborativo office.action.delete=Eliminar -office.action.return_search=Volver a resultados de b\u00c3\u00basqueda -office.action.return_search.description=Volver a la pesta\u00c3\u00b1a de b\u00c3\u00basqueda +office.action.return_search=Volver a resultados de b\u00fasqueda +office.action.return_search.description=Volver a la pesta\u00f1a de b\u00fasqueda office.action.manage_task=Gestionar # Buttons @@ -74,30 +74,30 @@ office.button.ok=Aceptar office.button.search=Buscar # Messages -office.message.unmanaged=El documento actual no est\u00c3\u00a1 administrado por Alfresco. -office.message.unversioned=El documento actual no est\u00c3\u00a1 versionado. +office.message.unmanaged=El documento actual no est\u00e1 administrado por Alfresco. +office.message.unversioned=El documento actual no est\u00e1 versionado. office.message.none=Ninguno office.message.no_documents=No hay documentos office.message.no_due_date=No hay fecha de vencimiento office.message.no_tasks=No hay tareas office.message.no_subspaces=No hay subespacios -office.message.search_for=B\u00c3\u00basqueda de -office.message.results_max.before=Devolver un m\u00c3\u00a1ximo de +office.message.search_for=B\u00fasqueda de +office.message.results_max.before=Devolver un m\u00e1ximo de office.message.results_max.after=elementos -office.message.no_results=Ning\u00c3\u00ban resultado encontrado -office.message.confirm_delete=\u00c2\u00bfEst\u00c3\u00a1 seguro de que quiere eliminar este documento? -office.message.enter_workflow_details=Introduzca los datos del nuevo flujo de trabajo a continuaci\u00c3\u00b3n -office.message.workflow_action_complete=Acci\u00c3\u00b3n '{0}' de flujo de trabajo completada. +office.message.no_results=Ning\u00fan resultado encontrado +office.message.confirm_delete=\u00bfEst\u00e1 seguro de que quiere eliminar este documento? +office.message.enter_workflow_details=Introduzca los datos del nuevo flujo de trabajo a continuaci\u00f3n +office.message.workflow_action_complete=Acci\u00f3n '{0}' de flujo de trabajo completada. # Properties -office.property.title=T\u00c3\u00adtulo -office.property.description=Descripci\u00c3\u00b3n +office.property.title=T\u00edtulo +office.property.description=Descripci\u00f3n office.property.creator=Creador office.property.created=Creado office.property.modifier=Modificador office.property.modified=Modificado -office.property.size=Tama\u00c3\u00b1o -office.property.categories=Categor\u00c3\u00adas +office.property.size=Tama\u00f1o +office.property.categories=Categor\u00edas office.property.author=Autor office.property.date=Fecha office.property.due_date=Fecha de vencimiento @@ -113,12 +113,12 @@ office.property.start_date=Fecha de inicio office.property.type=Tipo office.property.complete=Completar -#\u00c3\u0082\u00c2\u00a0Workflow +#\u00c2\u00a0Workflow office.workflow.review=Revisar y aprobar office.workflow.adhoc=Tarea ad hoc # Result messages -office.result.failed=Acci\u00c3\u00b3n fallida +office.result.failed=Acci\u00f3n fallida office.result.convert.failed=No se pudo convertir el documento office.result.converted=Documento convertido office.result.delete.failed=No se pudo eliminar el documento @@ -130,8 +130,8 @@ office.result.checked_in=Documento desbloqueado office.result.version.failed=No se pudo versionar el documento office.result.versioned=Documento versionado office.result.workflow_started=Nuevo flujo de trabajo iniciado -office.result.unknown=Acci\u00c3\u00b3n desconocida -office.result.exception=Acci\u00c3\u00b3n fallida debido a una excepci\u00c3\u00b3n +office.result.unknown=Acci\u00f3n desconocida +office.result.exception=Acci\u00f3n fallida debido a una excepci\u00f3n office.result.create_space.failed=No se pudo crear el espacio office.result.create_space.missing_name=El espacio debe tener un nombre office.result.space_created=Nuevo espacio creado diff --git a/config/alfresco/messages/office-addin_fr.properties b/config/alfresco/messages/office-addin_fr.properties index b40df1ade8..1e04dd871f 100755 --- a/config/alfresco/messages/office-addin_fr.properties +++ b/config/alfresco/messages/office-addin_fr.properties @@ -11,7 +11,7 @@ office.title.document_tags=Tags du document # Help office.help.title=Aide en Ligne -office.help.url=office.help.url=http://www.alfresco.com/help/{0}{1}/{2}/msaddin/ +office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html # Headers and Subheaders office.header.my_checked_out_documents=Mes copies de travail @@ -28,7 +28,7 @@ office.header.version_history=Historique des versions office.header.version_history.for=Historique des versions pour {0} office.header.search=Rechercher office.header.task_details=D\u00e9tails de la t\u00e2che -office.header.tag_cloud=Nuage de tags +office.header.tag_cloud=Nuage d'\u00e9tiquettes office.header.tagged=Documents tagg\u00e9s # Document Status @@ -36,7 +36,7 @@ office.status.locked=Verrouill\u00e9 # Actions office.action.add_tag=Ajouter un tag -office.action.remove_tag=Supprimer le tag "{0}" +office.action.remove_tag=Supprimer l''\u00e9tiquette "{0}" office.action.download=T\u00e9l\u00e9charger {0} office.action.open=Ouvrir {0} office.action.make_versionable=Rendre versionnable @@ -55,7 +55,7 @@ office.action.save_to_alfresco=Enregistrer dans Alfresco office.action.save_to_alfresco.description=Vous permet de placer le document actuel sous la gestion Alfresco. office.action.insert=Ins\u00e9rer le fichier dans le document actuel office.action.create_collaboration_space=Cr\u00e9er un espace de collaboration -office.action.create_collaboration_space.description=Cr\u00e9er un espace de collaboration dans le entrep\u00f4t Alfresco. +office.action.create_collaboration_space.description=Cr\u00e9er un espace de collaboration dans l'entrep\u00f4t Alfresco. office.action.launch_alfresco=Lancer Alfresco office.action.launch_alfresco.description=D\u00e9marrer le client Web Alfresco Explorer. office.action.userhome=Vers l'espace personnel de l'utilisateur @@ -63,7 +63,7 @@ office.action.parent_space=Vers l'espace parent office.action.create_space=Cr\u00e9er un espace office.action.create_collaboration_space=Cr\u00e9er un espace de collaboration office.action.delete=Supprimer -office.action.return_search=Retourner aux r\u00e9sultats de la recherche +office.action.return_search=Revenir aux r\u00e9sultats de la recherche office.action.return_search.description=Retourner \u00e0\u00a0 l'onglet de recherche office.action.manage_task=G\u00e9rer @@ -87,13 +87,13 @@ office.message.results_max.after=d'articles office.message.no_results=Pas de r\u00e9sultat trouv\u00e9 office.message.confirm_delete=Etes-vous s\u00fbr de vouloir supprimer ce document\u00a0? office.message.enter_workflow_details=Saisir les d\u00e9tails du nouveau workflow ci-dessous -office.message.workflow_action_complete=Action de workflow '{0}' termin\u00e9e. +office.message.workflow_action_complete=Action de workflow ''{0}'' termin\u00e9e. # Properties office.property.title=Titre office.property.description=Description office.property.creator=Cr\u00e9ateur -office.property.created=Cr\u00e9e +office.property.created=Cr\u00e9\u00e9 office.property.modifier=Modificateur office.property.modified=Modifi\u00e9 office.property.size=Taille @@ -105,15 +105,15 @@ office.property.name=Nom office.property.template=Mod\u00e8le office.property.filename=Nom de fichier du document office.property.workflow=Workflow -office.property.assign_to=Assigner \u00e0\u00a0 +office.property.assign_to=Assigner \u00e0 office.property.due_on=A \u00e9ch\u00e9ance le -office.property.status=Etat +office.property.status=Statut office.property.priority=Priorit\u00e9 office.property.start_date=Date de D\u00e9but office.property.type=Type office.property.complete=Achev\u00e9 -# Workflow +#\u00c2\u00a0Workflow office.workflow.review=R\u00e9viser et approuver office.workflow.adhoc=T\u00e2che Adhoc @@ -141,5 +141,5 @@ office.result.user_not_found=Utilisateur introuvable office.unit.kb=Ko office.version.notes=Notes office.task.overdue=En retard -office.task.due_today=\u00e9ch\u00e9ance \u00e0\u00a0ce jour -office.tip.task_item=\u00c9l\u00e9ment de t\u00e2che +office.task.due_today=\u00e9ch\u00e9ance \u00e0 ce jour +office.tip.task_item=El\u00e9ment de t\u00e2che diff --git a/config/alfresco/messages/office-addin_it.properties b/config/alfresco/messages/office-addin_it.properties index 6846267111..4becde2731 100755 --- a/config/alfresco/messages/office-addin_it.properties +++ b/config/alfresco/messages/office-addin_it.properties @@ -11,7 +11,7 @@ office.title.document_tags=Tag documento # Help office.help.title=Aiuto online -office.help.url=http://www.alfresco.com/help/{0}{1}/{2}/msaddin/ +office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html # Headers and Subheaders office.header.my_checked_out_documents=I miei documenti sottoposti a Check Out @@ -108,12 +108,12 @@ office.property.workflow=Workflow office.property.assign_to=Assegna a office.property.due_on=Scade il office.property.status=Stato -office.property.priority=Priorit\u00e0\u00a0 +office.property.priority=Priorit\u00e0 office.property.start_date=Data di inizio office.property.type=Tipo office.property.complete=Completato -# Workflow +#\u00c2\u00a0Workflow office.workflow.review=Esamina e approva office.workflow.adhoc=Compito ad-hoc diff --git a/config/alfresco/messages/office-addin_ja.properties b/config/alfresco/messages/office-addin_ja.properties index 49aa358fed..c5695a9249 100755 --- a/config/alfresco/messages/office-addin_ja.properties +++ b/config/alfresco/messages/office-addin_ja.properties @@ -2,144 +2,144 @@ ## Microsoft Office Add-In Messages ## # Page Titles -office.title.my_alfresco=\u3042\u306a\u305f\u306eAlfresco -office.title.navigation=\u30b9\u30da\u30fc\u30b9\u3068\u6587\u66f8\u306e\u95b2\u89a7 -office.title.search=Alfresco\u306e\u691c\u7d22 -office.title.document_details=\u6587\u66f8\u306e\u8a73\u7d30 -office.title.my_tasks=\u3042\u306a\u305f\u306e\u30bf\u30b9\u30af -office.title.document_tags=\u6587\u66f8\u30bf\u30b0 +office.title.my_alfresco=\u3042\u306A\u305F\u306EAlfresco +office.title.navigation=\u30B9\u30DA\u30FC\u30B9\u3068\u6587\u66F8\u306E\u95B2\u89A7 +office.title.search=Alfresco\u3092\u691C\u7D22 +office.title.document_details=\u6587\u66F8\u306E\u8A73\u7D30 +office.title.my_tasks=\u30BF\u30B9\u30AF +office.title.document_tags=\u6587\u66F8\u30BF\u30B0 # Help -office.help.title=\u30aa\u30f3\u30e9\u30a4\u30f3\u30fb\u30d8\u30eb\u30d7 -office.help.url=http://www.alfresco.com/help/34/{0}{1}/{2}/msaddin/ +office.help.title=\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30D8\u30EB\u30D7 +office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html # Headers and Subheaders -office.header.my_checked_out_documents=\u3042\u306a\u305f\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u6e08\u6587\u66f8 -office.header.my_tasks=\u3042\u306a\u305f\u306e\u30bf\u30b9\u30af -office.header.current_space=\u73fe\u5728\u306e\u30b9\u30da\u30fc\u30b9 -office.header.spaces_in={0}\u306e\u30b9\u30da\u30fc\u30b9 -office.header.documents_in={0}\u306e\u6587\u66f8 -office.header.document_actions=\u6587\u66f8\u30a2\u30af\u30b7\u30e7\u30f3 -office.header.actions=\u30a2\u30af\u30b7\u30e7\u30f3 -office.header.details=\u73fe\u5728\u306e\u6587\u66f8\u306e\u8a73\u7d30 -office.header.document_tags=\u6587\u66f8\u30bf\u30b0 -office.header.document_tags.for={0}\u306e\u6587\u66f8\u30bf\u30b0 -office.header.version_history=\u30d0\u30fc\u30b8\u30e7\u30f3\u5c65\u6b74 -office.header.version_history.for={0}\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u5c65\u6b74 -office.header.search=\u691c\u7d22 -office.header.task_details=\u30bf\u30b9\u30af\u306e\u8a73\u7d30 -office.header.tag_cloud=\u30bf\u30b0\u30fb\u30af\u30e9\u30a6\u30c9 -office.header.tagged=\u30bf\u30b0\u4ed8\u6587\u66f8 +office.header.my_checked_out_documents=\u3042\u306A\u305F\u306E\u30C1\u30A7\u30C3\u30AF\u30A2\u30A6\u30C8\u6E08\u6587\u66F8 +office.header.my_tasks=\u30BF\u30B9\u30AF +office.header.current_space=\u73FE\u5728\u306E\u30B9\u30DA\u30FC\u30B9 +office.header.spaces_in={0}\u306E\u30B9\u30DA\u30FC\u30B9 +office.header.documents_in={0}\u306E\u6587\u66F8 +office.header.document_actions=\u6587\u66F8\u5411\u3051\u30A2\u30AF\u30B7\u30E7\u30F3 +office.header.actions=\u30A2\u30AF\u30B7\u30E7\u30F3 +office.header.details=\u73FE\u5728\u306E\u6587\u66F8\u306E\u8A73\u7D30 +office.header.document_tags=\u6587\u66F8\u30BF\u30B0 +office.header.document_tags.for={0}\u306E\u6587\u66F8\u30BF\u30B0 +office.header.version_history=\u30D0\u30FC\u30B8\u30E7\u30F3\u5C65\u6B74 +office.header.version_history.for={0}\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u5C65\u6B74 +office.header.search=\u691C\u7D22 +office.header.task_details=\u30BF\u30B9\u30AF\u306E\u8A73\u7D30 +office.header.tag_cloud=\u30BF\u30B0\u30FB\u30AF\u30E9\u30A6\u30C9 +office.header.tagged=\u30BF\u30B0\u4ED8\u304D\u6587\u66F8 # Document Status -office.status.locked=\u30ed\u30c3\u30af\u6e08 +office.status.locked=\u30ED\u30C3\u30AF\u6E08 # Actions -office.action.add_tag=\u30bf\u30b0\u3092\u8ffd\u52a0 -office.action.remove_tag="{0}"\u30bf\u30b0\u3092\u53d6\u9664\u304f -office.action.download={0}\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9 -office.action.open={0}\u3092\u958b\u304f -office.action.make_versionable=\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u7ba1\u7406\u53ef\u80fd\u306b\u3059\u308b -office.action.compare_current=\u73fe\u5728\u306e\u6587\u66f8\u3068\u6bd4\u8f03 -office.action.checkin=\u30c1\u30a7\u30c3\u30af\u30a4\u30f3 -office.action.checkin.description=\u73fe\u5728\u306e\u6587\u66f8\u3092\u30c1\u30a7\u30c3\u30af\u30a4\u30f3\u3057\u307e\u3059\u3002 -office.action.checkout=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8 -office.action.checkout.description=\u73fe\u5728\u306e\u6587\u66f8\u3092\u4f5c\u696d\u4e2d\u306e\u30b3\u30d4\u30fc\u306b\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u307e\u3059\u3002 -office.action.start_workflow=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306e\u958b\u59cb -office.action.start_workflow.description=\u73fe\u5728\u306e\u6587\u66f8\u306e\u30a2\u30c9\u30d0\u30f3\u30b9\u30c9\u30fb\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3092\u958b\u59cb\u3057\u307e\u3059\u3002 -office.action.transform_pdf=PDF\u306b\u5909\u63db -office.action.transform_pdf.description=Adobe PDF\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306b\u5909\u63db\u3057\u307e\u3059\u3002 -office.action.open_details=\u3059\u3079\u3066\u306e\u8a73\u7d30\u3092\u958b\u304f -office.action.open_details.description=Alfresco Explorer\u306e\u6587\u66f8\u8a73\u7d30\u3092\u958b\u304d\u307e\u3059\u3002 -office.action.save_to_alfresco=Alfresco\u306b\u4fdd\u5b58 -office.action.save_to_alfresco.description=\u73fe\u5728\u306e\u6587\u66f8\u3092Alfresco\u306e\u7ba1\u7406\u4e0b\u306b\u7f6e\u304d\u307e\u3059\u3002 -office.action.insert=\u73fe\u5728\u306e\u6587\u66f8\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u633f\u5165\u3057\u307e\u3059\u3002 -office.action.create_collaboration_space=\u30b3\u30e9\u30dc\u30ec\u30fc\u30b7\u30e7\u30f3\u30fb\u30b9\u30da\u30fc\u30b9\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002 -office.action.create_collaboration_space.description=Alfresco\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306b\u65b0\u3057\u3044\u30b3\u30e9\u30dc\u30ec\u30fc\u30b7\u30e7\u30f3\u30b9\u30da\u30fc\u30b9\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002 -office.action.launch_alfresco=Alfresco\u306e\u8d77\u52d5 -office.action.launch_alfresco.description=Alfresco Explorer\u306eWeb\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u8d77\u52d5\u3057\u307e\u3059\u3002 -office.action.userhome=\u30e6\u30fc\u30b6\u306e\u30db\u30fc\u30e0\u30b9\u30da\u30fc\u30b9\u3078 -office.action.parent_space=\u89aa\u30b9\u30da\u30fc\u30b9\u307e\u3067 -office.action.create_space=\u65b0\u898f\u30b9\u30da\u30fc\u30b9\u306e\u4f5c\u6210 -office.action.create_collaboration_space=\u65b0\u898f\u30b3\u30e9\u30dc\u30ec\u30fc\u30b7\u30e7\u30f3\u30fb\u30b9\u30da\u30fc\u30b9\u306e\u4f5c\u6210 -office.action.delete=\u524a\u9664 -office.action.return_search=\u691c\u7d22\u7d50\u679c\u306b\u623b\u308b -office.action.return_search.description=\u691c\u7d22\u30bf\u30d6\u306b\u623b\u308b -office.action.manage_task=\u7ba1\u7406 +office.action.add_tag=\u30BF\u30B0\u306E\u8FFD\u52A0 +office.action.remove_tag=\u30BF\u30B0"{0}"\u306E\u524A\u9664 +office.action.download={0}\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9 +office.action.open={0}\u3092\u958B\u304F +office.action.make_versionable=\u30D0\u30FC\u30B8\u30E7\u30F3\u7BA1\u7406\u5BFE\u8C61\u306B\u3059\u308B +office.action.compare_current=\u73FE\u5728\u3068\u6BD4\u8F03 +office.action.checkin=\u30C1\u30A7\u30C3\u30AF\u30A4\u30F3 +office.action.checkin.description=\u73FE\u5728\u306E\u6587\u66F8\u3092\u30C1\u30A7\u30C3\u30AF\u30A4\u30F3\u3057\u307E\u3059\u3002 +office.action.checkout=\u30C1\u30A7\u30C3\u30AF\u30A2\u30A6\u30C8 +office.action.checkout.description=\u73FE\u5728\u306E\u6587\u66F8\u3092\u4F5C\u696D\u7528\u30B3\u30D4\u30FC\u306B\u30C1\u30A7\u30C3\u30AF\u30A2\u30A6\u30C8\u3057\u307E\u3059\u3002 +office.action.start_workflow=\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u306E\u958B\u59CB +office.action.start_workflow.description=\u73FE\u5728\u306E\u6587\u66F8\u306E\u30A2\u30C9\u30D0\u30F3\u30B9\u30C9\u30FB\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u3092\u958B\u59CB\u3057\u307E\u3059\u3002 +office.action.transform_pdf=PDF\u3078\u306E\u5909\u63DB +office.action.transform_pdf.description=Adobe PDF\u5F62\u5F0F\u306B\u5909\u63DB\u3057\u307E\u3059\u3002. +office.action.open_details=\u8A73\u7D30\u3092\u958B\u304F +office.action.open_details.description=Alfresco Explorer\u3067\u6587\u66F8\u306E\u8A73\u7D30\u3092\u958B\u304D\u307E\u3059\u3002 +office.action.save_to_alfresco=Alfresco\u306B\u4FDD\u5B58 +office.action.save_to_alfresco.description=\u73FE\u5728\u306E\u6587\u66F8\u3092Alfresco\u306E\u7BA1\u7406\u30B7\u30B9\u30C6\u30E0\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002 +office.action.insert=\u73FE\u5728\u306E\u6587\u66F8\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u633F\u5165 +office.action.create_collaboration_space=\u30B3\u30E9\u30DC\u30EC\u30FC\u30B7\u30E7\u30F3\u30FB\u30B9\u30DA\u30FC\u30B9\u306E\u4F5C\u6210 +office.action.create_collaboration_space.description=Alfresco\u30EA\u30DD\u30B8\u30C8\u30EA\u306B\u65B0\u3057\u3044\u30B3\u30E9\u30DC\u30EC\u30FC\u30B7\u30E7\u30F3\u30FB\u30B9\u30DA\u30FC\u30B9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002 +office.action.launch_alfresco=Alfresco\u306E\u8D77\u52D5 +office.action.launch_alfresco.description=Alfresco Explorer\u306EWeb\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u3092\u958B\u59CB\u3057\u307E\u3059\u3002 +office.action.userhome=\u30E6\u30FC\u30B6\u306E\u30DB\u30FC\u30E0\u30FB\u30B9\u30DA\u30FC\u30B9\u306B +office.action.parent_space=\u89AA\u30B9\u30DA\u30FC\u30B9\u307E\u3067 +office.action.create_space=\u65B0\u898F\u30B9\u30DA\u30FC\u30B9\u306E\u4F5C\u6210 +office.action.create_collaboration_space=\u65B0\u898F\u30B3\u30E9\u30DC\u30EC\u30FC\u30B7\u30E7\u30F3\u30FB\u30B9\u30DA\u30FC\u30B9\u306E\u4F5C\u6210 +office.action.delete=\u524A\u9664 +office.action.return_search=\u691C\u7D22\u7D50\u679C\u306B\u623B\u308B +office.action.return_search.description=\u691C\u7D22\u30BF\u30D6\u306B\u623B\u308B +office.action.manage_task=\u7BA1\u7406 # Buttons -office.button.submit=\u9001\u4fe1 -office.button.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb +office.button.submit=\u9001\u4FE1 +office.button.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB office.button.ok=OK -office.button.search=\u691c\u7d22 +office.button.search=\u691C\u7D22 # Messages -office.message.unmanaged=\u73fe\u5728\u306e\u6587\u66f8\u306fAlfresco\u306b\u3088\u3063\u3066\u7ba1\u7406\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 -office.message.unversioned=\u73fe\u5728\u306e\u6587\u66f8\u306f\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 -office.message.none=\u306a\u3057 -office.message.no_documents=\u6587\u66f8\u304c\u3042\u308a\u307e\u305b\u3093\u3002 -office.message.no_due_date=\u7de0\u5207\u65e5\u304c\u3042\u308a\u307e\u305b\u3093\u3002 -office.message.no_tasks=\u30bf\u30b9\u30af\u306f\u3042\u308a\u307e\u305b\u3093\u3002 -office.message.no_subspaces=\u30b5\u30d6\u30b9\u30da\u30fc\u30b9\u304c\u3042\u308a\u307e\u305b\u3093\u3002 -office.message.search_for=\u691c\u7d22\u5bfe\u8c61 -office.message.results_max.before=\u6700\u5927\u5024\u306b\u623b\u308b -office.message.results_max.after=\u30a2\u30a4\u30c6\u30e0 -office.message.no_results=\u7d50\u679c\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 -office.message.confirm_delete=\u3053\u306e\u6587\u66f8\u3092\u524a\u9664\u3057\u307e\u3059\u304b? -office.message.enter_workflow_details=\u65b0\u3057\u3044\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306e\u8a73\u7d30\u3092\u4ee5\u4e0b\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -office.message.workflow_action_complete=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30fb\u30a2\u30af\u30b7\u30e7\u30f3'{0}'\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002 +office.message.unmanaged=\u73FE\u5728\u306E\u6587\u66F8\u306FAlfresco\u306B\u3088\u3063\u3066\u7BA1\u7406\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 +office.message.unversioned=\u73FE\u5728\u306E\u6587\u66F8\u306F\u30D0\u30FC\u30B8\u30E7\u30F3\u7BA1\u7406\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 +office.message.none=\u306A\u3057 +office.message.no_documents=\u6587\u66F8\u304C\u3042\u308A\u307E\u305B\u3093 +office.message.no_due_date=\u7DE0\u5207\u65E5\u306A\u3057 +office.message.no_tasks=\u30BF\u30B9\u30AF\u306F\u3042\u308A\u307E\u305B\u3093\u3002 +office.message.no_subspaces=\u30B5\u30D6\u30B9\u30DA\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093 +office.message.search_for=\u691C\u7D22\u5BFE\u8C61 +office.message.results_max.before=\u6700\u5927\u691C\u7D22\u6570 +office.message.results_max.after=\u30A2\u30A4\u30C6\u30E0 +office.message.no_results=\u691C\u7D22\u7D50\u679C\u304C\u3042\u308A\u307E\u305B\u3093\u3002 +office.message.confirm_delete=\u3053\u306E\u6587\u66F8\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F +office.message.enter_workflow_details=\u65B0\u3057\u3044\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u8A73\u7D30\u3092\u4E0B\u306B\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044 +office.message.workflow_action_complete=\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u30FB\u30A2\u30AF\u30B7\u30E7\u30F3'{0}'\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002 # Properties -office.property.title=\u30bf\u30a4\u30c8\u30eb -office.property.description=\u8aac\u660e -office.property.creator=\u4f5c\u6210\u8005 -office.property.created=\u4f5c\u6210\u6e08\u307f -office.property.modifier=\u4fee\u6b63\u8005 -office.property.modified=\u4fee\u6b63\u6e08 -office.property.size=\u30b5\u30a4\u30ba -office.property.categories=\u30ab\u30c6\u30b4\u30ea -office.property.author=\u4f5c\u6210\u8005 -office.property.date=\u65e5\u4ed8 -office.property.due_date=\u7de0\u5207\u65e5 -office.property.name=\u540d\u524d -office.property.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8 -office.property.filename=\u6587\u66f8\u30d5\u30a1\u30a4\u30eb\u540d -office.property.workflow=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc -office.property.assign_to=\u5272\u5f53\u3066\u5148 -office.property.due_on=\u671f\u9650 -office.property.status=\u30b9\u30c6\u30fc\u30bf\u30b9 -office.property.priority=\u512a\u5148 -office.property.start_date=\u958b\u59cb\u65e5 -office.property.type=\u30bf\u30a4\u30d7 -office.property.complete=\u5b8c\u4e86 +office.property.title=\u30BF\u30A4\u30C8\u30EB +office.property.description=\u8AAC\u660E +office.property.creator=\u4F5C\u6210\u8005 +office.property.created=\u4F5C\u6210\u6E08 +office.property.modifier=\u4FEE\u6B63\u8005 +office.property.modified=\u5909\u66F4\u6E08 +office.property.size=\u30B5\u30A4\u30BA +office.property.categories=\u30AB\u30C6\u30B4\u30EA +office.property.author=\u4F5C\u6210\u8005 +office.property.date=\u65E5\u4ED8 +office.property.due_date=\u7DE0\u5207\u65E5 +office.property.name=\u540D\u524D +office.property.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +office.property.filename=\u6587\u66F8\u306E\u30D5\u30A1\u30A4\u30EB\u540D +office.property.workflow=\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC +office.property.assign_to=\u5272\u5F53\u3066\u5148 +office.property.due_on=\u7DE0\u5207\u65E5 +office.property.status=\u30B9\u30C6\u30FC\u30BF\u30B9 +office.property.priority=\u512A\u5148 +office.property.start_date=\u958B\u59CB\u65E5 +office.property.type=\u30BF\u30A4\u30D7 +office.property.complete=\u5B8C\u4E86 -# Workflow -office.workflow.review=\u30ec\u30d3\u30e5\u30fc\u3068\u627f\u8a8d -office.workflow.adhoc=\u30a2\u30c9\u30db\u30c3\u30af\u30fb\u30bf\u30b9\u30af +#\u00A0Workflow +office.workflow.review=\u30EC\u30D3\u30E5\u30FC\u3068\u627F\u8A8D +office.workflow.adhoc=\u30A2\u30C9\u30DB\u30C3\u30AF\u30FB\u30BF\u30B9\u30AF # Result messages -office.result.failed=\u5931\u6557\u3057\u305f\u30a2\u30af\u30b7\u30e7\u30f3 -office.result.convert.failed=\u6587\u66f8\u3092\u5909\u63db\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 -office.result.converted=\u6587\u66f8\u304c\u5909\u63db\u3055\u308c\u307e\u3057\u305f\u3002 -office.result.delete.failed=\u6587\u66f8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 -office.result.deleted=\u6587\u66f8\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002 -office.result.checkout.failed=\u6587\u66f8\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 -office.result.checked_out=\u6587\u66f8\u304c\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3055\u308c\u307e\u3057\u305f\u3002 -office.result.checkin.failed=\u6587\u66f8\u3092\u30c1\u30a7\u30c3\u30af\u30a4\u30f3\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 -office.result.checked_in=\u6587\u66f8\u304c\u30c1\u30a7\u30c3\u30af\u30a4\u30f3\u3055\u308c\u307e\u3057\u305f -office.result.version.failed=\u6587\u66f8\u3092\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 -office.result.versioned=\u6587\u66f8\u3092\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3057\u307e\u3057\u305f\u3002 -office.result.workflow_started=\u65b0\u898f\u306e\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3092\u958b\u59cb\u3057\u307e\u3057\u305f\u3002 -office.result.unknown=\u4e0d\u660e\u306a\u30a2\u30af\u30b7\u30e7\u30f3 -office.result.exception=\u4f8b\u5916\u306e\u305f\u3081\u30a2\u30af\u30b7\u30e7\u30f3\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002 -office.result.create_space.failed=\u30b9\u30da\u30fc\u30b9\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 -office.result.create_space.missing_name=\u30b9\u30da\u30fc\u30b9\u306b\u306f\u540d\u524d\u3092\u3064\u3051\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 -office.result.space_created=\u65b0\u898f\u30b9\u30da\u30fc\u30b9\u304c\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u3002 -office.result.user_not_found=\u30e6\u30fc\u30b6\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +office.result.failed=\u30A2\u30AF\u30B7\u30E7\u30F3\u304C\u5931\u6557\u3057\u307E\u3057\u305F +office.result.convert.failed=\u6587\u66F8\u3092\u5909\u63DB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F +office.result.converted=\u6587\u66F8\u304C\u5909\u63DB\u3055\u308C\u307E\u3057\u305F +office.result.delete.failed=\u6587\u66F8\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F +office.result.deleted=\u6587\u66F8\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F +office.result.checkout.failed=\u6587\u66F8\u3092\u30C1\u30A7\u30C3\u30AF\u30A2\u30A6\u30C8\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F +office.result.checked_out=\u6587\u66F8\u304C\u30C1\u30A7\u30C3\u30AF\u30A2\u30A6\u30C8\u3055\u308C\u307E\u3057\u305F +office.result.checkin.failed=\u6587\u66F8\u3092\u30C1\u30A7\u30C3\u30AF\u30A4\u30F3\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F +office.result.checked_in=\u6587\u66F8\u304C\u30C1\u30A7\u30C3\u30AF\u30A4\u30F3\u3055\u308C\u307E\u3057\u305F +office.result.version.failed=\u6587\u66F8\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u7BA1\u7406\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F +office.result.versioned=\u6587\u66F8\u304C\u30D0\u30FC\u30B8\u30E7\u30F3\u7BA1\u7406\u3055\u308C\u307E\u3057\u305F +office.result.workflow_started=\u65B0\u3057\u3044\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u304C\u958B\u59CB\u3055\u308C\u307E\u3057\u305F +office.result.unknown=\u4E0D\u660E\u306A\u30A2\u30AF\u30B7\u30E7\u30F3 +office.result.exception=\u4F8B\u5916\u304C\u767A\u751F\u3057\u305F\u305F\u3081\u30A2\u30AF\u30B7\u30E7\u30F3\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F +office.result.create_space.failed=\u30B9\u30DA\u30FC\u30B9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F +office.result.create_space.missing_name=\u30B9\u30DA\u30FC\u30B9\u306B\u306F\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059 +office.result.space_created=\u65B0\u898F\u30B9\u30DA\u30FC\u30B9\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F +office.result.user_not_found=\u30E6\u30FC\u30B6\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 # Miscellaneous office.unit.kb=KB -office.version.notes=\u30e1\u30e2 -office.task.overdue=\u671f\u9650\u5207\u308c -office.task.due_today=\u672c\u65e5\u671f\u9650 -office.tip.task_item=\u30bf\u30b9\u30af\u30fb\u30a2\u30a4\u30c6\u30e0 +office.version.notes=\u30E1\u30E2 +office.task.overdue=\u671F\u9650\u5207\u308C +office.task.due_today=\u672C\u65E5\u671F\u9650 +office.tip.task_item=\u30BF\u30B9\u30AF\u30FB\u30A2\u30A4\u30C6\u30E0 diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 6fabf35bbb..9e282ab9ad 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -525,6 +525,7 @@ navigator_desc=Allows tree based navigation around the repository shelf=Shelf shelf_desc=Area that includes the clipboard, recent space and shortcuts reset_navigator=Refresh +reset_categories=Refresh navigator_node_deleted=The space just selected is no longer in the repository, please Refresh the Navigator before continuing. # Common Wizard messages diff --git a/config/alfresco/messages/webclient_de.properties b/config/alfresco/messages/webclient_de.properties index 7c4ff4a398..1c91c20d78 100644 --- a/config/alfresco/messages/webclient_de.properties +++ b/config/alfresco/messages/webclient_de.properties @@ -180,8 +180,8 @@ advanced_search=Erweiterte Suche value_not_set=nicht eingestellt description_not_set=Keine Beschreibung eingestellt. clear=Ergebnisse l\u00f6schen -results_contains=Ergebnisse f\u00fcr "{0}"... -results_contains_filter=Ergebnisse f\u00fcr "{0}" aus "{1}". +results_contains=Ergebnisse f\u00fcr ''{0}''. +results_contains_filter=Ergebnisse f\u00fcr ''{0}'' aus ''{1}''. details_view=Ansicht Details view_icon=Ansicht Icon view_browse=Ansicht Durchsuchen @@ -465,7 +465,7 @@ title_save_search=Suchanfrage speichern save_search_description=Suchanfrage f\u00fcr sp\u00e4teren Gebrauch speichern search_props=Gespeicherte Sucheigenschaften select_saved_search=Eine gespeicherte Suche ausw\u00e4hlen... -saved_search_warning=Mit diesem Vorgang wird versucht, die bestehende, gespeicherte Suche "{0}" zu \u00fcberschreiben +saved_search_warning=Mit diesem Vorgang wird versucht, die bestehende, gespeicherte Suche ''{0}'' zu \u00fcberschreiben user_searches=Ihre Suchen global_searches=\u00d6ffentliche Suchen save_search_global=Als \u00f6ffentliche, allen Benutzern zug\u00e4ngliche Suche speichern. @@ -525,6 +525,7 @@ navigator_desc=Erm\u00f6glicht auf Baumstruktur basierende Navigation durch das shelf=Regal shelf_desc=Bereich, der die Zwischenablage, k\u00fcrzlich besuchten Arbeitsbereiche und Verkn\u00fcpfungen beinhaltet reset_navigator=Aktualisieren +reset_categories=Aktualisieren navigator_node_deleted=Der gerade ausgew\u00e4hlte Arbeitsbereich ist nicht mehr im Repository vorhanden, bitte erst Navigator aktualisieren und dann fortfahren. # Common Wizard messages @@ -609,8 +610,8 @@ selected_usersgroups_perms=Ausgew\u00e4hlte Benutzer/Gruppen und dazugeh\u00f6ri remove_permissions_title=Benutzer "{0}" entfernen remove_permissions_subtitle=Ja anklicken, um alle Berechtigungen des Benutzers zu entfernen. remove_permissions=M\u00f6chten Sie wirklich alle Berechtigungen dieses Benutzers entfernen? -edit_permissions_title=Berechtigungen f\u00fcr "{0}" \u00e4ndern -view_permissions_title=Berechtigungen f\u00fcr "{0}" anzeigen +edit_permissions_title=Berechtigungen f\u00fcr ''{0}'' \u00e4ndern +view_permissions_title=Berechtigungen f\u00fcr ''{0}'' anzeigen edit_permissions_subtitle=Berechtigungen auf Zugriff auf Ihren Ordner oder Ihre Datei \u00e4ndern, die Sie einem Benutzer einger\u00e4umt haben. view_permissions_subtitle=Berechtigungen auf Zugriff auf Ihren Ordner oder Ihre Datei, die Sie einem Benutzer einger\u00e4umt haben. select_perm=Berechtigung ausw\u00e4hlen @@ -802,7 +803,7 @@ import_error_info=Wenn diese Option gew\u00e4hlt wird, erfolgt der Import im Hin # Edit Content messages edit_file_title=Datei bearbeiten -edit_file_prompt=Zur Bearbeitung der Datei "{0}" untenstehenden Link anklicken und auf Aufforderung Speichern w\u00e4hlen. +edit_file_prompt=Zur Bearbeitung der Datei ''{0}'' untenstehenden Link anklicken und auf Aufforderung Speichern w\u00e4hlen. edit_download_complete=Nach Abschluss des Downloads, Schlie\u00dfen anklicken. edit_using_web_form=Hier klicken, um diese Datei mit einem Web-Formular zu bearbeiten. checkout_file_title=Datei auschecken @@ -1018,15 +1019,15 @@ condition_compare_property_value=Namenseigenschaft passt zu "{0}". condition_compare_property_value_not=Namenseigenschaft passt nicht zu "{0}". action_add_features=Aspekt "{0}" hinzuf\u00fcgen. action_remove_features=Aspekt {0} entfernen -action_specialise_type=Element ist vom Typ "{0}" -action_simple_workflow={0} Element nach "{1}" wenn Aktion "{2}" durchgef\u00fchrt wird. -action_link_category=Mit Kategorie "{0}" verlinken -action_transform=Kopiert Inhalt nach "{0}" und wandelt in "{1}" um -action_transform_image=Kopiert Bild nach "{0}" und wandelt mit Option "{2}" in "{1}" um -action_copy=Nach "{0}" kopieren -action_copy_to_web_project_folder=Nach "{0}" in "{1}" kopieren -action_move=Nach "{0}" verschieben -action_mail=E-Mail an "{0} senden +action_specialise_type=Element ist vom Typ ''{0}'' +action_simple_workflow={0} Element nach ''{1}'' wenn Aktion ''{2}'' durchgef\u00fchrt wird. +action_link_category=Mit Kategorie ''{0}'' verlinken +action_transform=Kopiert Inhalt nach ''{0}'' und wandelt in ''{1}'' um +action_transform_image=Kopiert Bild nach ''{0}'' und wandelt mit Option ''{2}'' in ''{1}'' um +action_copy=Nach ''{0}'' kopieren +action_copy_to_web_project_folder=Nach ''{0}'' in ''{1}'' kopieren +action_move=Nach ''{0}'' verschieben +action_mail=E-Mail an ''{0} senden action_mail_template=Mustervorlage verwenden action_check_in=Inhalt als "{0}" mit Kommentar "{1}" einchecken action_check_out=Inhalt nach "{0}" auschecken @@ -1291,7 +1292,7 @@ shared_folder=Geschichteter Ordner shared_file=Geschichtete Datei stale_shared_folder=Gegenstandsloser geschichteter Ordner stale_shared_file=Gegenstandslose geschichtete Datei -target_is_deleted=Zielordner f\u00fcr "{0}" wurde gel\u00f6scht. +target_is_deleted=Zielordner f\u00fcr ''{0}" wurde gel\u00f6scht. shared_from=Von {0} geschichtet add_avm_content_dialog_desc=Anhand dieses Dialogs k\u00f6nnen Sie Inhalt zu einem Ordner hinzuf\u00fcgen. update_avm_file_desc=Datei der Site mit Inhalt Ihres Computers aktualisieren. @@ -1350,7 +1351,7 @@ deploy_successful=Deployment erfolgreich deploy_failed=Deployment fehlgeschlagen deploy_server_not_selected=Dieser Server wurde nicht ausgew\u00e4hlt, da die Momentaufnahme bereits erfolgreich angewandt wurde. deploy_test_server_not_available=Keine nicht zugewiesenen Testserver verf\u00fcgbar. -deploy_test_server_allocated=Der Testserver "{0}" ist dieser Sandbox zugewiesen. F\u00fcr die Vorschau des aktuellen Deployment untenstehenden Vorschau-Link anklicken (wenn URL bekannt) oder OK anklicken, um die letzten \u00c4nderungen anzuwenden. +deploy_test_server_allocated=Der Testserver ''{0}'' ist dieser Sandbox zugewiesen. F\u00fcr die Vorschau des aktuellen Deployment untenstehenden Vorschau-Link anklicken (wenn URL bekannt) oder OK anklicken, um die letzten \u00c4nderungen anzuwenden. deploy_started=gestartet deploy_finished=Abgeschlossen deployed_by=Von @@ -1511,12 +1512,12 @@ delete_listed_items_confirm=M\u00f6chten Sie wirklich folgenden gel\u00f6schte D recover_listed_items=Gelistete Elemente wiederherstellen recover_listed_items_info=Gelistete Dateien und Arbeitsbereiche aus dem Speicher gel\u00f6schter Dateien wiederherstellen recover_listed_items_confirm=Wollen Sie wirklich folgende gel\u00f6schten Dateien und Arbeitsbereiche aus dem Speicher gel\u00f6schter Dateien wiederherstellen? -recovered_item_success=Element \"{0}\" ist erfolgreich wiederhergestellt worden. -recovered_item_parent=Element \"{0}\" konnte nicht wiederhergestellt werden, da Elternordner fehlt. +recovered_item_success=Element \''{0}\'' ist erfolgreich wiederhergestellt worden. +recovered_item_parent=Element \''{0}\'' konnte nicht wiederhergestellt werden, da Elternordner fehlt. recovered_item_parent_short=Elternordner fehlt -recovered_item_permission=Element \"{0}\" konnte nicht wiederhergestellt werden, da Sie nicht \u00fcber die erforderlichen Berechtigungen verf\u00fcgen, das Element im Elternordner wiederherzustellen. +recovered_item_permission=Element \''{0}\'' konnte nicht wiederhergestellt werden, da Sie nicht \u00fcber die erforderlichen Berechtigungen verf\u00fcgen, das Element im Elternordner wiederherzustellen. recovered_item_permission_short=Keine Schreib-Berechtigung -recovered_item_integrity=Element \"{0}\" konnte nicht wiederhergestellt werden, da im Elternordner jetzt ein gleichnamiges Element vorhanden ist. +recovered_item_integrity=Element \''{0}\'' konnte nicht wiederhergestellt werden, da im Elternordner jetzt ein gleichnamiges Element vorhanden ist. recovered_item_integrity_short=Es gibt ein gleichnamiges Element recovered_item_failure=Element \"{0}\" konnte aufgrund von Fehler: {1} nicht wiederhergestellt werden recovered_item_failure_short=Fehlgeschlagen @@ -1713,7 +1714,7 @@ outcome=Ergebnis reassign=Neu zuweisen cancel_workflow=Workflow abbrechen cancel_workflow_info=\u00dcber OK diesen Workflow abbrechen. -cancel_workflow_confirm=M\u00f6chten Sie den Workflow \"{0}\" wirklich abbrechen? +cancel_workflow_confirm=M\u00f6chten Sie den Workflow \''{0}\'' wirklich abbrechen? error_cancel_workflow=Workflow kann aufgrund eines Systemfehlers nicht abgebrochen werden: reassign_task_title=Aufgabe neu zuweisen reassign_task_desc=Mit diesem Dialog k\u00f6nnen Sie eine Aufgabe neu zuweisen. @@ -1960,10 +1961,10 @@ error_update_category=Kategorie konnte aufgrund des Systemfehlers: {0} nicht akt error_update_simpleworkflow=Einfacher Arbeitsablauf konnte aufgrund des Systemfehlers: {0} nicht aktualisiert werden error_workflow_approve=Dokument konnte aufgrund des Systemfehlers: {0} nicht zugestimmt werden: error_workflow_reject=Dokument konnte aufgrund des Systemfehlers: {0} nicht abgelehnt werden: -error_aspect_classify=Aspekt "klassifizierbar" konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden. -error_aspect_classify_space=Aspekt "klassifizierbar" konnte aufgrund des Systemfehlers: {0} nicht auf den Raum angewandt werden. -error_aspect_versioning=Aspekt "versionierbar" konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden. -error_aspect_inlineeditable=Aspekt "inline-editierbar" konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden. +error_aspect_classify=Aspekt ''klassifizierbar'' konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden. +error_aspect_classify_space=Aspekt ''klassifizierbar'' konnte aufgrund des Systemfehlers: {0} nicht auf den Raum angewandt werden. +error_aspect_versioning=Aspekt ''versionierbar'' konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden. +error_aspect_inlineeditable=Aspekt ''inline-editierbar'' konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden. error_content_missing=Der Inhalt des Nodes fehlt: \n Knoten: {0} \n Leser: {1} \nBitte wenden Sie sich an Ihren Systemadministrator. error_export=Export: {0} konnte nicht ausgef\u00fchrt werden. error_import=Import: {0} konnte nicht ausgef\u00fchrt werden. @@ -1978,9 +1979,9 @@ error_association=Zuordnungsdefinition f\u00fcr Zuordnung \"{0}\" konnte nicht g error_charset_null=Zeichensatzwert Null error_negative_quota=Kontingent kann nicht negativ sein: {0} error_search_not_exist=Suche mit Namen: {0} existiert nicht -error_search_not_exist=Suche mit Namen: \"{0}\" existiert nicht -error_retrieving_search_results=Fehler bei der Ermittlung der Ergebnisse der Suche \"{0}\"- \"{1}\" -error_domain_mismatch=Domain Diskrepanz: erwarteter Wert = {0}, tats\u00e4chlicher = {1} +error_search_not_exist=Suche mit Namen: \''{0}\'' existiert nicht +error_retrieving_search_results=Fehler bei der Ermittlung der Ergebnisse der Suche \''{0}\''- \''{1}\'' +error_domain_mismatch=Domain Diskrepanz: erwarteter Wert={0}, tats\u00e4chlicher={1} error_not_stored=Derzeit kein Fehler gespeichert error_no_stack_trace=Keine Stapelverfolgung verf\u00fcgbar error_permissions=Sie verf\u00fcgen nicht \u00fcber ausreichend Berechtigungen, um das angefragte Element anzuzeigen. @@ -1992,8 +1993,8 @@ return_to_application=Zur\u00fcck zur Anwendung return_home=Mein Inhalt delete_space_info=OK anklicken, um diesen Raum mit seinem gesamten Inhalt zu entfernen. delete_space_assoc_info=Dieser Raum erscheint an vielen Speicherorten. Zum Entfernen des Raums aus dem aktuellen Speicherort OK anklicken. -delete_space_confirm=M\u00f6chten Sie \"{0}\" mit seinem gesamten Inhalt wirklich l\u00f6schen? -delete_space_assoc_confirm=M\u00f6chten Sie \"{0}\" wirklich aus dem aktuellen Speicherort l\u00f6schen? +delete_space_confirm=M\u00f6chten Sie \''{0}\'' mit seinem gesamten Inhalt wirklich l\u00f6schen? +delete_space_assoc_confirm=M\u00f6chtenSie \''{0}\'' wirklich aus dem aktuellen Speicherort l\u00f6schen? delete_space_multiple_parents_warn=Dieser Raum erscheint an vielen Speicherorten. Daher wird der untenstehend ausgew\u00e4hlte Vorgang alle Speicherorte betreffen. delete_forums_info=OK anklicken, um diesen Forenraum mit seinem gesamten Inhalt zu entfernen. delete_forum_info=OK anklicken, um dieses Forum mit seinen Themen zu entfernen. @@ -2001,21 +2002,21 @@ delete_forum_confirm=M\u00f6chten Sie \"{0}\" mit seinen gesamten Themen wirklic delete_topic_info=OK anklicken, um dieses Thema mit seinen Posts zu entfernen. delete_topic_confirm=M\u00f6chten Sie \"{0}\" mit seinen gesamten Posts wirklich l\u00f6schen? delete_post_info=OK anklicken, um diesen Post aus dem Thema zu entfernen. -delete_post_confirm=M\u00f6chten Sie den Post wirklich aus \"{0}\" l\u00f6schen? +delete_post_confirm=M\u00f6chten Sie den Post wirklich aus \''{0}\'' l\u00f6schen? delete_file_info=OK anklicken, um diese Datei samt der Vorg\u00e4ngerversionen zu entfernen. delete_file_assoc_info=Diese Datei erscheint an vielen Speicherorten. Zum Entfernen der Datei aus dem aktuellen Speicherort OK anklicken. -delete_file_confirm=M\u00f6chten Sie \"{0}\" und alle Vorg\u00e4ngerversionen wirklich l\u00f6schen? -delete_file_assoc_confirm=M\u00f6chtenSie \"{0}\" wirklich aus dem aktuellen Speicherort l\u00f6schen? -delete_file_multiple_parents_confirm=\"{0}\" erscheint an mehreren Speicherorten. M\u00f6chten Sie es wirklich aus allen Speicherorten entfernen und alle Vorg\u00e4ngerversionen l\u00f6schen? -delete_translation_confirm=M\u00f6chten Sie \"{0}\" und alle Vorg\u00e4ngerversionen wirklich l\u00f6schen? Die mehrsprachigen Eigenschaften lassen sich nicht wiederherstellen. -delete_empty_translation_confirm=M\u00f6chten Sie \"{0}\" wirklich endg\u00fcltig l\u00f6schen? Dieses Dokument wird nicht wiederhergestellt. -delete_ml_container_confirm=M\u00f6chten Sie \"{0}\" und alle Vorg\u00e4ngerausgaben wirklich l\u00f6schen? Dabei wird auch jede \u00dcbersetzung gel\u00f6scht. +delete_file_confirm=M\u00f6chten Sie \''{0}\'' und alle Vorg\u00e4ngerversionen wirklich l\u00f6schen? +delete_file_assoc_confirm=M\u00f6chtenSie \''{0}\'' wirklich aus dem aktuellen Speicherort l\u00f6schen? +delete_file_multiple_parents_confirm=\''{0}\'' erscheint an mehreren Speicherorten. M\u00f6chten Sie es wirklich aus allen Speicherorten entfernen und alle Vorg\u00e4ngerversionen l\u00f6schen? +delete_translation_confirm=M\u00f6chten Sie \''{0}\'' und alle Vorg\u00e4ngerversionen wirklich l\u00f6schen? Die mehrsprachigen Eigenschaften lassen sich nicht wiederherstellen. +delete_empty_translation_confirm=M\u00f6chten Sie \''{0}\'' wirklich endg\u00fcltig l\u00f6schen? Dieses Dokument wird nicht wiederhergestellt. +delete_ml_container_confirm=M\u00f6chten Sie \''{0}\'' und alle Vorg\u00e4ngerausgaben wirklich l\u00f6schen? Dabei wird auch jede \u00dcbersetzung gel\u00f6scht. delete_rule_info=Ja anklicken, um diese Regel aus dem Raum zu entfernen. delete_user_info=Ja anklicken, um diesen Benutzer aus dem Raum zu entfernen. -delete_rule_confirm=M\u00f6chten Sie \"{0}\" wirklich l\u00f6schen? -delete_user_confirm=Der Benutzer wird nicht mehr auf das System zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \"{0}\" wirklich l\u00f6schen? -remove_invited_user_confirm=Der Benutzer wird nicht mehr auf die Dokumente und Ordner in diesem Raum zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \"{0}\" wirklich entfernen? -remove_content_user_confirm=Der Benutzer wird nicht mehr auf diesen Inhalt zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \"{0}\" wirklich entfernen? +delete_rule_confirm=M\u00f6chten Sie \''{0}\'' wirklich l\u00f6schen? +delete_user_confirm=Der Benutzer wird nicht mehr auf das System zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \''{0}\'' wirklich l\u00f6schen? +remove_invited_user_confirm=Der Benutzer wird nicht mehr auf die Dokumente und Ordner in diesem Raum zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \''{0}\'' wirklich entfernen? +remove_content_user_confirm=Der Benutzer wird nicht mehr auf diesen Inhalt zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \''{0}\'' wirklich entfernen? delete_companyroot_confirm=WARNUNG: Dies ist ein Sonderordner, auf den alle Benutzer zugreifen! Bitte pr\u00fcfen Sie, dass Sie diesen Ordner wirklich l\u00f6schen wollen. Ein Entfernen des Ordners kann Systemfehler herbeif\u00fchren. delete_node_not_found=Das Element, das Sie zu l\u00f6schen versuchen, ist nicht auffindbar. Es kann sein, dass es bereits gel\u00f6scht wurde. Bitte schlie\u00dfen Sie diesen Dialog und versuchen Sie den L\u00f6schvorgang noch einmal. diff --git a/config/alfresco/messages/webclient_es.properties b/config/alfresco/messages/webclient_es.properties index b5b28a7428..51b81ceeca 100755 --- a/config/alfresco/messages/webclient_es.properties +++ b/config/alfresco/messages/webclient_es.properties @@ -525,6 +525,7 @@ navigator_desc=Permite navegar mediante \u00e1rboles por todo el repositorio shelf=Tableta shelf_desc=\u00c1rea que incluye el portapapeles, recientes espacios y accesos directos reset_navigator=Actualizar +reset_categories=Actualizar navigator_node_deleted=El espacio que acaba de seleccionar ya no est\u00e1 en el repositorio, por favor, Actualizar el navegador antes de continuar. # Common Wizard messages @@ -1980,7 +1981,7 @@ error_negative_quota=La cuota no puede ser negativa: {0} error_search_not_exist=No existe b\u00fasqueda con el nombre: {0} error_search_not_exist=No existe b\u00fasqueda con el nombre: \"{0}\" error_retrieving_search_results=Error al obtener resultados para la b\u00fasqueda \"{0}\" - \"{1}\" -error_domain_mismatch=Error de coincidencia de dominio: previsto = {0}, real = {1} +error_domain_mismatch=Error de coincidencia de dominio: expected = {0}, actual = {1} error_not_stored=Actualmente no hay errores almacenados error_no_stack_trace=La traza de la pila no est\u00e1 disponible error_permissions=No tiene los permisos suficientes para ver el elemento solicitado. diff --git a/config/alfresco/messages/webclient_fr.properties b/config/alfresco/messages/webclient_fr.properties index 05af64476d..641b7e9ef7 100755 --- a/config/alfresco/messages/webclient_fr.properties +++ b/config/alfresco/messages/webclient_fr.properties @@ -525,6 +525,7 @@ navigator_desc=Permet une navigation en arbre sur l'entrep\u00f4t shelf=Panneau lat\u00e9ral shelf_desc=Emplacement qui inclut le presse-papiers, les Espace r\u00e9cents et les raccourcis reset_navigator=Rafra\u00eechir +reset_categories=Rafra\u00eechir navigator_node_deleted=L'espace s\u00e9lectionn\u00e9 n'est pr\u00e9sent dans l'entrep\u00f4t, merci de rafra\u00eechir la vue avant de continuer. # Common Wizard messages @@ -1773,7 +1774,7 @@ workflow_context=Contexte workflow_command=Commande (tapez help pour l'aide) workflow_command_submit=Soumettre workflow_last_command=Derni\u00e8re commande\u00a0: -workflow_duration=Dur\u00e9e : +workflow_duration=Dur\u00e9e: workflow_duration_ms=ms # JMX Dumper messages @@ -1786,7 +1787,7 @@ configadmin_context=Contexte configadmin_command=Commande (tapez help pour l'aide) configadmin_command_submit=Soumettre configadmin_last_command=Derni\u00e8re commande\u00a0: -configadmin_duration=Dur\u00e9e : +configadmin_duration=Dur\u00e9e: configadmin_duration_ms=ms @@ -1796,7 +1797,7 @@ repoadmin_context=Contexte repoadmin_command=Commande (tapez help pour l'aide) repoadmin_command_submit=Soumettre repoadmin_last_command=Derni\u00e8re commande\u00a0: -repoadmin_duration=Dur\u00e9e : +repoadmin_duration=Dur\u00e9e: repoadmin_duration_ms=ms # Tenant Admin Console messages @@ -1805,7 +1806,7 @@ tenantadmin_context=Contexte tenantadmin_command=Commande (tapez help pour l'aide) tenantadmin_command_submit=Soumettre tenantadmin_last_command=Derni\u00e8re commande\u00a0: -tenantadmin_duration=Dur\u00e9e : +tenantadmin_duration=Dur\u00e9e: tenantadmin_duration_ms=ms @@ -1980,7 +1981,7 @@ error_negative_quota=Le quota ne peut pas \u00eatre n\u00e9gatif\u00a0: {0} error_search_not_exist=Search does not exist with name: {0} error_search_not_exist=Aucune recherche n''existe avec le nom suivant\u00a0: \"{0}\" error_retrieving_search_results=Erreur d''obtention de r\u00e9sultats pour la recherche \"{0}\" - \"{1}\" -error_domain_mismatch=Discordance de domaine\u00a0: valeur attendue = {0}, valeur r\u00e9elle = {1} +error_domain_mismatch=Discordance de domaine : attendu = {0}, r\u00e9el = {1} error_not_stored=Aucune erreur actuellement enregistr\u00e9e error_no_stack_trace=Aucune trace de pile disponible error_permissions=Vous ne disposez pas des permissions suffisantes pour afficher l'\u00e9l\u00e9ment requis. @@ -1991,10 +1992,10 @@ error_external_protocol_support=Les liens externes doivent \u00eatre saisis manu return_to_application=Retourner \u00e0 l'application return_home=Mon contenu delete_space_info=Pour supprimer cet Espace et tout son contenu, cliquez sur OK. -delete_space_assoc_info=Cet espace s'affiche dans plusieurs emplacements.Pour supprimer l'espace de l'emplacement actuel, cliquer sur OK. +delete_space_assoc_info=Cet espace s'affiche dans plusieurs emplacements. Pour supprimer l'espace de l'emplacement actuel, cliquer sur OK. delete_space_confirm=\u00cates-vous s\u00fbr de vouloir supprimer \"{0}\" et l''ensemble de son contenu\u00a0? delete_space_assoc_confirm=\u00cates-vous certain de vouloir supprimer \"{0}\" de son emplacement actuel\u00a0? -delete_space_multiple_parents_warn=Cet espace s'affiche dans plusieurs emplacements.Par cons\u00e9quent, l'op\u00e9ration s\u00e9lectionn\u00e9e ci-dessous s'appliquera sur tous les emplacements. +delete_space_multiple_parents_warn=Cet espace s'affiche dans plusieurs emplacements. Par cons\u00e9quent, l'op\u00e9ration s\u00e9lectionn\u00e9e ci-dessous s'appliquera sur tous les emplacements. delete_forums_info=Pour supprimer cet Espace forum et son contenu, cliquez sur OK. delete_forum_info=Pour supprimer ce forum et ses discussions, cliquez sur OK. delete_forum_confirm=\u00cates-vous s\u00fbr de vouloir supprimer \"{0}\" et ses sujets\u00a0? @@ -2003,7 +2004,7 @@ delete_topic_confirm=Etes-vous s\u00fbr de vouloir supprimer \"{0}\" et tous ses delete_post_info=Pour supprimer ce message de la discussion, cliquez sur OK. delete_post_confirm=Etes-vous s\u00fbr que vous voulez supprimer le message de \"{0}\"\u00a0? delete_file_info=Pour supprimer ce fichier et toutes les versions pr\u00e9c\u00e9dentes, cliquez sur OK. -delete_file_assoc_info=Ce fichier s'affiche dans plusieurs emplacements.Pour supprimer le fichier de l'emplacement actuel, cliquer sur OK. +delete_file_assoc_info=Ce fichier s'affiche dans plusieurs emplacements. Pour supprimer le fichier de l'emplacement actuel, cliquer sur OK. delete_file_confirm=\u00cates-vous s\u00fbre de vouloir supprimer \"{0}\" et tous ses versions pr\u00e9c\u00e9dentes\u00a0? delete_file_assoc_confirm=\u00cates-vous certain de vouloir supprimer \"{0}\" de son emplacement actuel\u00a0? delete_file_multiple_parents_confirm=\"{0}\" apparait en de multiples endroits, \u00eates-vous s\u00fbr de vouloir le supprimer de tous les emplacements et de supprimer toutes les versions ant\u00e9rieures\u00a0? diff --git a/config/alfresco/messages/webclient_it.properties b/config/alfresco/messages/webclient_it.properties index 7f6e6b4502..9b1ecbeb22 100755 --- a/config/alfresco/messages/webclient_it.properties +++ b/config/alfresco/messages/webclient_it.properties @@ -525,6 +525,7 @@ navigator_desc=Consente di spostarsi tramite la struttura ad albero all'interno shelf=Scaffale shelf_desc=Area contenente gli appunti, gli spazi recenti e le scorciatoie reset_navigator=Aggiorna +reset_categories=Aggiorna navigator_node_deleted=Lo spazio selezionato non \u00e8 pi\u00f9 presente nel repository, aggiornare il Navigatore prima di continuare. # Common Wizard messages @@ -2125,6 +2126,3 @@ trx.transferStatus=Stato attuale trx.fromRepositoryId=Trasferito da trx.repositoryId=Origine trasferita trx.invadedBy=Contiene trasferimenti - -# Team properties -team_login_warning=La pagina Alfresco Explorer non \u00e8 supportata. Accedere a questa pagina solo seguendo le istruzioni del Supporto Alfresco. diff --git a/config/alfresco/messages/webclient_ja.properties b/config/alfresco/messages/webclient_ja.properties index 4a07dd91f6..6f03fd22ea 100755 --- a/config/alfresco/messages/webclient_ja.properties +++ b/config/alfresco/messages/webclient_ja.properties @@ -21,7 +21,7 @@ ml_common_content_properties=\u5171\u901a\u306e\u591a\u8a00\u8a9e\u30b3\u30f3\u3 ml_other_options=\u4ed6\u306e\u30aa\u30d7\u30b7\u30e7\u30f3 ml_add_trans_when_diag_close=\u3053\u306e\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u9589\u3058\u308b\u3068\u304d\u306b\u7ffb\u8a33\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 ml_with_content=\u30b3\u30f3\u30c6\u30f3\u30c4\u3042\u308a -ml_just_trans_info=\u30b3\u30f3\u30c6\u30f3\u30c4\u306a\u3057 (\u7ffb\u8a33\u60c5\u5831\u306e\u307f) +ml_just_trans_info=\u30b3\u30f3\u30c6\u30f3\u30c4\u306a\u3057\uff08\u7ffb\u8a33\u60c5\u5831\u306e\u307f\uff09 not_multilingual=\u3053\u306e\u6587\u66f8\u306b\u306f\u591a\u8a00\u8a9e\u306e\u30a2\u30b9\u30da\u30af\u30c8\u304c\u3064\u3044\u3066\u3044\u307e\u305b\u3093\u3002 allow_multilinguism=\u591a\u8a00\u8a9e\u30a2\u30b9\u30da\u30af\u30c8\u3092\u8a31\u53ef select_language=<\u8a00\u8a9e\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044> @@ -186,7 +186,7 @@ details_view=\u8a73\u7d30\u8868\u793a view_icon=\u30a2\u30a4\u30b3\u30f3\u8868\u793a view_browse=\u95b2\u89a7\u8868\u793a create_options=\u4f5c\u6210 -more_options=\u305d\u306e\u4ed6\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u2026 +more_options=\u305d\u306e\u4ed6\u306e\u30a2\u30af\u30b7\u30e7\u30f3... more_actions=\u305d\u306e\u4ed6\u306e\u30a2\u30af\u30b7\u30e7\u30f3 more_options_space=\u3053\u306e\u30b9\u30da\u30fc\u30b9\u306e\u8a73\u7d30\u306a\u30a2\u30af\u30b7\u30e7\u30f3 more_options_file=\u3053\u306e\u6587\u66f8\u306e\u8a73\u7d30\u306a\u30a2\u30af\u30b7\u30e7\u30f3 @@ -201,9 +201,9 @@ change=\u5909\u66f4 select=\u9078\u629e set=\u8a2d\u5b9a no_categories_applied=\u3053\u306e\u6587\u66f8\u306b\u306f\u30ab\u30c6\u30b4\u30ea\u304c\u307e\u3060\u9069\u7528\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 -has_following_categories=\u3053\u306e\u6587\u66f8\u306b\u306f\u6b21\u306e\u30ab\u30c6\u30b4\u30ea\u304c\u9069\u7528\u3055\u308c\u307e\u3059\u30fb\u30fb\u30fb +has_following_categories=\u3053\u306e\u6587\u66f8\u306b\u306f\u6b21\u306e\u30ab\u30c6\u30b4\u30ea\u304c\u9069\u7528\u3055\u308c\u307e\u3059... no_categories_applied_space=\u3053\u306e\u30b9\u30da\u30fc\u30b9\u306b\u306f\u307e\u3060\u30ab\u30c6\u30b4\u30ea\u304c\u9069\u7528\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 -has_following_categories_space=\u3053\u306e\u30b9\u30da\u30fc\u30b9\u306b\u306f\u6b21\u306e\u30ab\u30c6\u30b4\u30ea\u304c\u9069\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u30fb\u30fb\u30fb +has_following_categories_space=\u3053\u306e\u30b9\u30da\u30fc\u30b9\u306b\u306f\u6b21\u306e\u30ab\u30c6\u30b4\u30ea\u304c\u9069\u7528\u3055\u308c\u3066\u3044\u307e\u3059... moved=\u79fb\u52d5\u6e08 copied=\u30b3\u30d4\u30fc\u6e08 clipboard=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9 @@ -268,7 +268,7 @@ information=\u60c5\u5831 move=\u79fb\u52d5 type=\u30bf\u30a4\u30d7 tag=\u30bf\u30b0 -encoding=\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0 +encoding=\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0 aspect=\u30a2\u30b9\u30da\u30af\u30c8 workflow=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc workflows=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc @@ -278,7 +278,7 @@ login=\u30ed\u30b0\u30a4\u30f3 templates=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8 template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8 rss_template=RSS\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8 -select_button=\u9078\u629e\u30fb\u30fb\u30fb +select_button=\u9078\u629e... select_items=\u30a2\u30a4\u30c6\u30e0\u306e\u9078\u629e select_an_item=\u30a2\u30a4\u30c6\u30e0\u3092\u9078\u629e selected_items=\u9078\u629e\u6e08\u30a2\u30a4\u30c6\u30e0 @@ -464,7 +464,7 @@ saved_searches=\u4fdd\u5b58\u3057\u305f\u691c\u7d22\u30aa\u30d7\u30b7\u30e7\u30f title_save_search=\u691c\u7d22\u30af\u30a8\u30ea\u306e\u4fdd\u5b58 save_search_description=\u5f8c\u3067\u518d\u4f7f\u7528\u3067\u304d\u308b\u3088\u3046\u306b\u691c\u7d22\u30af\u30a8\u30ea\u3092\u4fdd\u5b58\u3057\u307e\u3059\u3002 search_props=\u4fdd\u5b58\u6e08\u306e\u691c\u7d22\u30d7\u30ed\u30d1\u30c6\u30a3 -select_saved_search=\u4fdd\u5b58\u3057\u305f\u691c\u7d22\u306e\u9078\u629e\u30fb\u30fb\u30fb +select_saved_search=\u4fdd\u5b58\u3057\u305f\u691c\u7d22\u306e\u9078\u629e... saved_search_warning=\u3053\u306e\u30aa\u30da\u30ec\u30fc\u30b7\u30e7\u30f3\u3092\u884c\u3046\u3068\u3001\u4fdd\u5b58\u3057\u305f\u65e2\u5b58\u306e\u691c\u7d22''{0}''\u304c\u4e0a\u66f8\u304d\u3055\u308c\u307e\u3059 user_searches=\u691c\u7d22 global_searches=\u691c\u7d22\uff08\u516c\u958b\u30ec\u30d9\u30eb\uff09 @@ -525,6 +525,7 @@ navigator_desc=\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u95a2\u3057\u3066\u30c4\u30e shelf=\u30b7\u30a7\u30eb\u30d5 shelf_desc=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u3001\u6700\u8fd1\u306e\u30b9\u30da\u30fc\u30b9\u3001\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\u306a\u3069\u3092\u542b\u3080\u30a8\u30ea\u30a2 reset_navigator=\u518d\u8aad\u307f\u8fbc\u307f +reset_categories=\u518d\u8aad\u307f\u8fbc\u307f navigator_node_deleted=\u9078\u629e\u3055\u308c\u305f\u30b9\u30da\u30fc\u30b9\u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306b\u5b58\u5728\u3057\u307e\u305b\u3093\u3002\u30ca\u30d3\u30b2\u30fc\u30bf\u3092\u518d\u8aad\u307f\u8fbc\u307f\u3057\u3066\u304b\u3089\u7d9a\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002 # Common Wizard messages @@ -540,7 +541,7 @@ clear_button=\u30af\u30ea\u30a2 you_may_want=\u6b21\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u63a8\u5968\u3057\u307e\u3059\u3002 summary_step_description=\u5165\u529b\u60c5\u5831\u306e\u6982\u8981\u3092\u8868\u793a\u3057\u307e\u3059\u3002 error_wizard_completed_already=\u3053\u306e\u30a6\u30a3\u30b6\u30fc\u30c9\u306f\u3059\u3067\u306b\u5b8c\u4e86\u3057\u3066\u3044\u307e\u3059\u3002 -you_may_want_checkout_document=\u7d9a\u3051\u308b\u306b\u306f\u518d\u8d77\u52d5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u3053\u306e\u6587\u66f8\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3059\u308b\u3053\u3068\u3067\u3001\u4ed6\u306e\u30e6\u30fc\u30b6\u306b\u3088\u308b\u5909\u66f4\u306e\u4e0a\u66f8\u3092\u9632\u3050\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 +you_may_want_checkout_document=\u7d9a\u3051\u308b\u306b\u306f\u518d\u8d77\u52d5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u3053\u306e\u6587\u66f8\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3059\u308b\u3053\u3068\u3067\u3001\u4ed6\u306e\u30e6\u30fc\u30b6\u306b\u3088\u308b\u5909\u66f4\u306e\u4e0a\u66f8\u3092\u9632\u3050\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 # Category Management messages title_categories_list=\u30ab\u30c6\u30b4\u30ea @@ -591,7 +592,7 @@ selected_users=\u9078\u629e\u3055\u308c\u305f\u30e6\u30fc\u30b6 groups_err_group_name_length=\u30b0\u30eb\u30fc\u30d7ID\u306f{0}\u304b\u3089{1}\u6587\u5b57\u306e\u9593\u306e\u9577\u3055\u306b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 groups_err_group_name=\u30b0\u30eb\u30fc\u30d7ID\u306b\u6587\u5b57''{0}''\u3092\u542b\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093 groups_err_exists=\u540c\u540d\u306e\u30b0\u30eb\u30fc\u30d7ID\u304c\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\u3002\u30b0\u30eb\u30fc\u30d7ID\u306f\u56fa\u6709\u306e\u3082\u306e\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 -Read=\u8aad\u8fbc +Read=\u8aad\u3080 Write=\u66f8\u8fbc\u307f Delete=\u524a\u9664 permission=\u6a29\u9650 @@ -621,10 +622,10 @@ change_user_perms=\u30e6\u30fc\u30b6\u30fc\u306e\u6a29\u9650\u306e\u5909\u66f4 invite_title=\u30e6\u30fc\u30b6\u306e\u62db\u5f85\u30a6\u30a3\u30b6\u30fc\u30c9 invite_desc=\u3053\u306e\u30a6\u30a3\u30b6\u30fc\u30c9\u3067\u306f\u3001\u4ed6\u306e\u30e6\u30fc\u30b6\u30fc\u306b\u3053\u306e\u30b9\u30da\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u3092\u4e0e\u3048\u307e\u3059\u3002 invite_step1_title=\u30b9\u30c6\u30c3\u30d7 1 - \u30e6\u30fc\u30b6\u306e\u62db\u5f85 -invite_step1_desc=\u3053\u306e\u30b9\u30fc\u30da\u30b9\u306b\u5272\u5f53\u3066\u308b\u3001\u30e6\u30fc\u30b6\u3068\u305d\u306e\u5f79\u5272\u3092\u9078\u629e\u3057\u307e\u3059\u3002 +invite_step1_desc=\u3053\u306e\u30b9\u30da\u30fc\u30b9\u306b\u3001\u30e6\u30fc\u30b6\u3068\u30e6\u30fc\u30b6\u304c\u679c\u305f\u3059\u5f79\u5272\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 invite_step2_title=\u30b9\u30c6\u30c3\u30d7 2 - \u30e6\u30fc\u30b6\u306b\u901a\u77e5\u3059\u308b invite_step2_desc=\u9078\u629e\u3057\u305f\u30e6\u30fc\u30b6\u306b\u901a\u77e5\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -i_want_to=\u4ee5\u4e0b\u3092\u5b9f\u884c\u30fb\u30fb\u30fb +i_want_to=\u4ee5\u4e0b\u3092\u5b9f\u884c... invite_step_1=\u30e6\u30fc\u30b6\u306e\u62db\u5f85 invite_step_2=\u30e6\u30fc\u30b6\u3078\u901a\u77e5 invite_all=\u5168\u3066\u306e\u30e6\u30fc\u30b6\u3092\u30b2\u30b9\u30c8\u3068\u3057\u3066\u62db\u5f85 @@ -661,7 +662,7 @@ content_owner=\u30e6\u30fc\u30b6 ''{0}'' \u306f\u3053\u306e\u30b3\u30f3\u30c6\u3 # AVM Compare snapshot_compare_to_current=\u73fe\u5728\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3068\u306e\u6bd4\u8f03 -snapshot_compare_to_current_description=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8''{0}''\u3068\u73fe\u5728\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306e\u9593\u306e\u5909\u66f4\u3092\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a +snapshot_compare_to_current_description=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8''{0}''\u3068\u73fe\u5728\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306e\u9593\u306e\u5909\u66f4\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a snapshot_compare_to_previous=\u524d\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3068\u306e\u6bd4\u8f03 snapshot_compare_to_previous_description=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8''{0}''\u3068 ''{1}''\u306e\u9593\u306e\u5909\u66f4\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a snapshot_compare_to_any=\u4efb\u610f\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3068\u306e\u6bd4\u8f03 @@ -831,8 +832,8 @@ show_details=\u8a73\u7d30\u3092\u8868\u793a user_search_info=\u30e6\u30fc\u30b6\u3092\u898b\u3064\u3051\u308b\u306b\u306f\u3001\u59d3\u3001\u540d\u3001\u3042\u308b\u3044\u306f\u30e6\u30fc\u30b6\u540d\u3067\u30e6\u30fc\u30b6\u3092\u691c\u7d22\u3057\u307e\u3059\u3002 \u307e\u305f\u3001\u5168\u3066\u306e\u30e6\u30fc\u30b6\u3092\u8868\u793a\u3059\u308b\u306b\u306f'\u5168\u3066\u8868\u793a'\u3092\u30af\u30ea\u30c3\u30af\u3057\u307e\u3059\u3002\u305f\u3060\u3057\u3001\u30b7\u30b9\u30c6\u30e0\u306b\u30e6\u30fc\u30b6\u6570\u304c\u591a\u3044\u5834\u5408\u3001\u6642\u9593\u304c\u304b\u304b\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002 group_search_info=\u30b0\u30eb\u30fc\u30d7\u540d\u3092\u4f7f\u3063\u3066\u30b0\u30eb\u30fc\u30d7\u691c\u7d22\u3092\u898b\u3064\u3051\u307e\u3059\u3002 \u307e\u305f\u3001'\u5168\u3066\u8868\u793a'\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3053\u3068\u3067\u5168\u3066\u306e\u30b0\u30eb\u30fc\u30d7\u3092\u5168\u3066\u8868\u793a\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002\u305f\u3060\u3057\u3001\u30b7\u30b9\u30c6\u30e0\u306b\u30b0\u30eb\u30fc\u30d7\u6570\u304c\u591a\u3044\u5834\u5408\u3001\u6642\u9593\u304c\u304b\u304b\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002 user_change_homespace_info=\u3042\u308b\u30e6\u30fc\u30b6\u306b\u65b0\u898f\u306e\u30db\u30fc\u30e0\u30b9\u30da\u30fc\u30b9\u3092\u9078\u629e\u3057\u305f\u5834\u5408\u3067\u3082\u3001\u5143\u306e\u30db\u30fc\u30e0\u30b9\u30da\u30fc\u30b9\u306e\u65e2\u5b58\u306e\u6a29\u9650\u306f\u7dad\u6301\u3055\u308c\u307e\u3059\u3002 \u5143\u306e\u30db\u30fc\u30e0\u30b9\u30da\u30fc\u30b9\u306b\u5fc5\u8981\u306a\u304f\u306a\u3063\u305f\u5834\u5408\u3001\u6a29\u9650\u3092\u5909\u66f4\u3059\u308b\u305f\u3081\u306b[\u30b9\u30da\u30fc\u30b9\u30e6\u30fc\u30b6\u306e\u7ba1\u7406]\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u4f7f\u7528\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002 -quota_totalusage=\u5408\u8a08\u4f7f\u7528\u91cf (\u3053\u306e\u691c\u7d22\u306e) -quota_totalquota=\u5408\u8a08\u30af\u30a9\u30fc\u30bf (\u3053\u306e\u691c\u7d22\u306e) +quota_totalusage=\u5408\u8a08\u4f7f\u7528\u91cf\uff08\u3053\u306e\u691c\u7d22\u306e\uff09 +quota_totalquota=\u5408\u8a08\u30af\u30a9\u30fc\u30bf\uff08\u3053\u306e\u691c\u7d22\u306e\uff09 caused_by=\u539f\u56e0: # Content Wizard messages @@ -983,7 +984,7 @@ reject_step_name=\u5374\u4e0b\u30b9\u30c6\u30c3\u30d7\u306e\u540d\u524d required_format=\u8981\u6c42\u3055\u308c\u305f\u30d5\u30a9\u30fc\u30de\u30c3\u30c8 details=\u8a73\u7d30 select_condition=\u6761\u4ef6\u306e\u9078\u629e -select_a_condition=\u6761\u4ef6\u306e\u9078\u629e\u30fb\u30fb\u30fb +select_a_condition=\u6761\u4ef6\u306e\u9078\u629e... condition=\u6761\u4ef6 conditions=\u6761\u4ef6 condition_settings=\u6761\u4ef6\u306e\u8a2d\u5b9a @@ -1037,7 +1038,7 @@ action_script_select=\u5b9f\u884c\u3059\u308b\u30b9\u30af\u30ea\u30d7\u30c8\u309 not_condition_result=\u4e0a\u8a18\u306e\u57fa\u6e96\u306b\u30de\u30c3\u30c1\u3057\u306a\u3044\u30a2\u30a4\u30c6\u30e0\u3092\u30c1\u30a7\u30c3\u30af space=\u30b9\u30da\u30fc\u30b9 import_to=\u30a4\u30f3\u30dd\u30fc\u30c8\u5148 -encoding=\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0 +encoding=\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0 encoding_utf8=UTF-8 rule_type=\u30eb\u30fc\u30eb\u30bf\u30a4\u30d7 rule_background_info=\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u9078\u629e\u3057\u305f\u5834\u5408\u3001\u30eb\u30fc\u30eb\u306f\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u3067\u5b9f\u884c\u3055\u308c\u308b\u305f\u3081\u3001\u7d50\u679c\u304c\u3059\u3050\u306b\u53cd\u6620\u3055\u308c\u306a\u3044\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002 @@ -1064,8 +1065,8 @@ a_template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8 creating_from=\u4f5c\u6210\u5143 save_as_template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3068\u3057\u3066\u4fdd\u5b58 template_name=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u540d -select_a_template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u9078\u629e\u3057\u307e\u3059\u30fb\u30fb\u30fb -select_a_script=\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u306e\u9078\u629e\u3057\u307e\u3059\u30fb\u30fb\u30fb +select_a_template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u9078\u629e\u3057\u307e\u3059... +select_a_script=\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u9078\u629e\u3057\u307e\u3059... starting_space=\u30b9\u30da\u30fc\u30b9\u3092\u958b\u59cb space_options=\u30b9\u30da\u30fc\u30b9\u30fb\u30aa\u30d7\u30b7\u30e7\u30f3 space_details=\u30b9\u30da\u30fc\u30b9\u306e\u8a73\u7d30 @@ -1334,7 +1335,7 @@ revert_selected_confirm=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u304b\u3089\u revert_all_title=\u5168\u3066\u306e\u30a2\u30a4\u30c6\u30e0\u3092\u5143\u306b\u623b\u3059 revert_snapshot_title=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306e\u30ea\u30d0\u30fc\u30c8 revert_snapshot_desc=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u3092\u7279\u5b9a\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u30d0\u30fc\u30b8\u30e7\u30f3ID\u306b\u30ea\u30d0\u30fc\u30c8\u3057\u307e\u3059\u3002 -revert_snapshot_confirm=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u3092\u30d0\u30fc\u30b8\u30e7\u30f3:\u00a0{0} \u306b\u30ea\u30d0\u30fc\u30c8\u3057\u307e\u3059\u3002 +revert_snapshot_confirm=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u3092\u30d0\u30fc\u30b8\u30e7\u30f3:?{0} \u306b\u30ea\u30d0\u30fc\u30c8\u3057\u307e\u3059\u3002 revert_all_conflicts=\u5168\u3066\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ea\u30d0\u30fc\u30c8\u3059\u308b revert_all_desc=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u306e\u5168\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u3092\u5143\u306b\u623b\u3059\u306b\u306f\u3001[OK]\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002 revert_all_confirm=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u306e\u5168\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u3092\u5143\u306b\u623b\u3057\u307e\u3059\u304b? @@ -1345,7 +1346,7 @@ deploy_sandbox_desc=\u30c7\u30d7\u30ed\u30a4\u5148\u306e\u30c6\u30b9\u30c8\u30b5 redeploy_sandbox_title=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u306e\u5909\u66f4\u306e\u30c7\u30d7\u30ed\u30a4 redeploy_sandbox_desc=[OK]\u3092\u30af\u30ea\u30c3\u30af\u3057\u3001\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u5185\u306e\u5909\u66f4\u3092\u5272\u5f53\u3066\u6e08\u30c6\u30b9\u30c8\u30b5\u30fc\u30d0\u306b\u30c7\u30d7\u30ed\u30a4\u3057\u3066\u304f\u3060\u3055\u3044\u3002 deploy_destination=\u30c7\u30d7\u30ed\u30a4\u5148\u306e\u30b5\u30fc\u30d0\u3092\u9078\u629e -deploying=\u30c7\u30d7\u30ed\u30a4\u4e2d\u30fb\u30fb\u30fb +deploying=\u30c7\u30d7\u30ed\u30a4\u4e2d... deploy_successful=\u30c7\u30d7\u30ed\u30a4\u306b\u6210\u529f\u3057\u307e\u3057\u305f\u3002 deploy_failed=\u30c7\u30d7\u30ed\u30a4\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 deploy_server_not_selected=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u304c\u3059\u3067\u306b\u30c7\u30d7\u30ed\u30a4\u6e08\u3067\u3042\u308b\u305f\u3081\u3001\u3053\u306e\u30b5\u30fc\u30d0\u306f\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3068\u3057\u3066\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 @@ -1392,7 +1393,7 @@ deploy_attempt_date=\u8a66\u884c\u65e5 select_deploy_attempt=\u30c7\u30d7\u30ed\u30a4\u8a66\u884c\u3092\u8868\u793a deployed_to_servers=\u30c7\u30d7\u30ed\u30a4\u5148 no_deploy_attempts=\u65e5\u4ed8\u7bc4\u56f2\u306b\u8868\u793a\u3059\u308b\u30c7\u30d7\u30ed\u30a4\u8a66\u884c\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 -no_deploy_reports=\u30c7\u30d7\u30ed\u30a4\u306e\u8a73\u7d30\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u30c7\u30d7\u30ed\u30a4\u304c\u9032\u884c\u4e2d\u3067\u3042\u308b\u3068\u601d\u308f\u308c\u307e\u3059\u3002\u8a73\u7d30\u304c\u8868\u793a\u3055\u308c\u308b\u307e\u3067\u3053\u306e\u30da\u30fc\u30b8\u3092\u518d\u8aad\u8fbc\u307f\u3057\u307e\u3059\u3002 +no_deploy_reports=\u30c7\u30d7\u30ed\u30a4\u306e\u8a73\u7d30\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u30c7\u30d7\u30ed\u30a4\u304c\u9032\u884c\u4e2d\u3067\u3042\u308b\u3068\u601d\u308f\u308c\u307e\u3059\u3002\u8a73\u7d30\u304c\u8868\u793a\u3055\u308c\u308b\u307e\u3067\u3053\u306e\u30da\u30fc\u30b8\u3092\u518d\u8aad\u307f\u8fbc\u307f\u3057\u307e\u3059\u3002 port_must_be_number=\u30dd\u30fc\u30c8\u756a\u53f7\u306b\u306f\u6570\u5b57\u3092\u542b\u3081\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 host_wrong_format=\u30db\u30b9\u30c8\u540d\u304c\u7121\u52b9\u306a\u5f62\u5f0f\u3067\u3059\u3002 edit_deploy_server=\u30c7\u30d7\u30ed\u30a4\u30fb\u30b5\u30fc\u30d0\u306e\u8a73\u7d30\u3092\u7de8\u96c6 @@ -1437,7 +1438,7 @@ static_tab={0}\u9759\u7684\u30d5\u30a1\u30a4\u30eb generated_tab={0}\u751f\u6210\u30d5\u30a1\u30a4\u30eb all_items_tab=\u5168\u3066\u306e\u30a2\u30a4\u30c6\u30e0 inc_tab_size=\u30b9\u30af\u30ed\u30fc\u30eb\u3067\u304d\u308b\u30a8\u30ea\u30a2\u306e\u30b5\u30a4\u30ba\u3092100px\u5358\u4f4d\u3067\u5897\u3084\u3057\u307e\u3059\u3002 -dec_tab_size=\u30b9\u30af\u30ed\u30fc\u30eb\u3067\u304d\u308b\u30a8\u30ea\u30a2\u306e\u30b5\u30a4\u30ba\u3092100px\u5358\u4f4d\u3067\u6e1b\u5c11\u3057\u307e\u3059\u3002 (\u6700\u5c0f100px) +dec_tab_size=\u30b9\u30af\u30ed\u30fc\u30eb\u3067\u304d\u308b\u30a8\u30ea\u30a2\u306e\u30b5\u30a4\u30ba\u3092100px\u5358\u4f4d\u3067\u6e1b\u5c11\u3057\u307e\u3059\u3002\uff08\u6700\u5c0f100px\uff09 prompt_for_web_form=Web\u30d5\u30a9\u30fc\u30e0\u306e\u9078\u629e prompt_for_web_form_info=\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\u3059\u308b\u305f\u3081\u306eWeb\u30d5\u30a9\u30fc\u30e0\u3092\u9078\u629e @@ -1543,7 +1544,7 @@ recovery_report_reason=\u5931\u6557\u7406\u7531 my_alfresco=\u3042\u306a\u305f\u306eAlfresco title_my_alfresco=\u3042\u306a\u305f\u306eAlfresco dashboard_info=\u3042\u306a\u305f\u306eAlfresco\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9 -dashboard_description=\u3053\u306e\u30d3\u30e5\u30fc\u3092\u8a2d\u5b9a\u3057\u3066\u3001\u30d1\u30fc\u30bd\u30ca\u30eb\u30fbAlfresco\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002 +dashboard_description=\u3053\u306e\u30d3\u30e5\u30fc\u3092\u8a2d\u5b9a\u3057\u3066\u3001\u30d1\u30fc\u30bd\u30ca\u30ebAlfresco\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002 configure=\u8a2d\u5b9a error_dashboard=\u30c0\u30c3\u30b7\u30e5\u30ec\u30c3\u30c8\u306e1\u3064\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 @@ -1581,7 +1582,7 @@ layout_three_column_desc=\u3053\u306e\u30ec\u30a4\u30a2\u30a6\u30c8\u3067\u306f\ # My Alfresco Dashlet components messages dashlet_gettingstarted_label=\u30b9\u30bf\u30fc\u30c8\u30ac\u30a4\u30c9 dashlet_gettingstarted_desc=Alfresco Web\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u521d\u3081\u3066\u4f7f\u3046\u65b9\u3092\u5bfe\u8c61\u3068\u3057\u305f\u3001\u5f79\u7acb\u3064\u60c5\u5831\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002 -dashlet_mydocuments=\u3042\u306a\u305f\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8 +dashlet_mydocuments=\u30de\u30a4\u30fb\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8 dashlet_mydocuments_desc=\u30db\u30fc\u30e0\u30b9\u30da\u30fc\u30b9\u306b\u6587\u66f8\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a\u3057\u307e\u3059\u3002 dashlet_checkedoutdocs=\u3042\u306a\u305f\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u6e08\u6587\u66f8 dashlet_checkedoutdocs_desc=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3055\u308c\u3066\u3044\u308b\u6587\u66f8\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a\u3057\u307e\u3059\u3002 @@ -1701,7 +1702,7 @@ doclist-webscript_title=\u6587\u66f8\u30ea\u30b9\u30c8 doclist-webscript_desc=\u6587\u66f8\u30ea\u30b9\u30c8Web\u30b9\u30af\u30ea\u30d7\u30c8 myspaces-webscript_title=\u3042\u306a\u305f\u306e\u30b9\u30da\u30fc\u30b9\u30fb\u30ea\u30b9\u30c8 myspaces-webscript_desc=\u3042\u306a\u305f\u306e\u30b9\u30da\u30fc\u30b9Web\u30b9\u30af\u30ea\u30d7\u30c8 -mytasks-webscript_title=\u3042\u306a\u305f\u306e\u30bf\u30b9\u30af +mytasks-webscript_title=\u30bf\u30b9\u30af mytasks-webscript_desc=\u3042\u306a\u305f\u306e\u30bf\u30b9\u30afWeb\u30b9\u30af\u30ea\u30d7\u30c8 mywebforms-webscript_title=\u3042\u306a\u305f\u306eWeb\u30d5\u30a9\u30fc\u30e0 mywebforms-webscript_desc=\u3042\u306a\u305f\u306eWeb\u30d5\u30a9\u30fc\u30e0Web\u30b9\u30af\u30ea\u30d7\u30c8 @@ -1763,14 +1764,14 @@ imap.attachments.folder=\u6dfb\u4ed8\u30d5\u30a9\u30eb\u30c0 title_admin_console=\u7ba1\u7406\u8005\u30b3\u30f3\u30bd\u30fc\u30eb admin_console=\u7ba1\u7406\u8005\u30b3\u30f3\u30bd\u30fc\u30eb admin_description=\u3053\u306e\u30d3\u30e5\u30fc\u3092\u4f7f\u7528\u3057\u3066\u3001\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u3092\u884c\u3044\u307e\u3059\u3002 -admin_limited_license=\u30e9\u30a4\u30bb\u30f3\u30b9\u6e08: {0} \u30e9\u30a4\u30bb\u30f3\u30b9\u304c {1} \u306b\u4e0e\u3048\u3089\u308c\u3066\u304a\u308a\u3001{3} \u65e5\u5f8c\u306b\u671f\u9650\u5207\u308c\u306b\u306a\u308a\u307e\u3059 {4,date,short} (\u6b8b\u308a {5} \u65e5 - \u767a\u884c\u65e5 {2,date,short})\u3002 -admin_unlimited_license=\u30e9\u30a4\u30bb\u30f3\u30b9\u6e08: {0} \u30e9\u30a4\u30bb\u30f3\u30b9\u304c {1} \u306b\u4e0e\u3048\u3089\u308c\u3066\u304a\u308a\u3001\u307e\u3060\u671f\u9650\u306f\u5207\u308c\u3066\u3044\u307e\u305b\u3093\u3002(\u767a\u884c\u65e5 {2,date,short})\u3002 +admin_limited_license=\u30e9\u30a4\u30bb\u30f3\u30b9\u6e08: {0} \u30e9\u30a4\u30bb\u30f3\u30b9\u304c {1} \u306b\u4e0e\u3048\u3089\u308c\u3066\u304a\u308a\u3001{3} \u65e5\u5f8c\u306b\u671f\u9650\u5207\u308c\u306b\u306a\u308a\u307e\u3059 {4,date,short} \uff08\u6b8b\u308a {5} \u65e5 - \u767a\u884c\u65e5 {2,date,short}\uff09\u3002 +admin_unlimited_license=\u30e9\u30a4\u30bb\u30f3\u30b9\u6e08: {0} \u30e9\u30a4\u30bb\u30f3\u30b9\u304c {1} \u306b\u4e0e\u3048\u3089\u308c\u3066\u304a\u308a\u3001\u307e\u3060\u671f\u9650\u306f\u5207\u308c\u3066\u3044\u307e\u305b\u3093\u3002\uff08\u767a\u884c\u65e5 {2,date,short}\uff09\u3002 admin_invalid_license=\u30e9\u30a4\u30bb\u30f3\u30b9\u6e08: \u7121\u52b9\u306a\u30e9\u30a4\u30bb\u30f3\u30b9 - Alfresco\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u8aad\u53d6\u5c02\u7528\u6a5f\u80fd\u306b\u5236\u9650\u3055\u308c\u307e\u3059\u3002 # Workflow Console messages title_workflow_console=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30fb\u30b3\u30f3\u30bd\u30fc\u30eb workflow_context=\u30b3\u30f3\u30c6\u30af\u30b9\u30c8 -workflow_command=\u30b3\u30de\u30f3\u30c9 (help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b) +workflow_command=\u30b3\u30de\u30f3\u30c9\uff08help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b\uff09 workflow_command_submit=\u9001\u4fe1 workflow_last_command=\u6700\u5f8c\u306e\u30b3\u30de\u30f3\u30c9: workflow_duration=\u671f\u9593: @@ -1783,7 +1784,7 @@ title_jmx_output=\u30a2\u30a6\u30c8\u30d7\u30c3\u30c8 # WebClient Config Admin Console messages title_configadmin_console=Web\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a2d\u5b9a\u7ba1\u7406\u8005\u30b3\u30f3\u30bd\u30fc\u30eb configadmin_context=\u30b3\u30f3\u30c6\u30af\u30b9\u30c8 -configadmin_command=\u30b3\u30de\u30f3\u30c9 (help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b) +configadmin_command=\u30b3\u30de\u30f3\u30c9\uff08help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b\uff09 configadmin_command_submit=\u9001\u4fe1 configadmin_last_command=\u6700\u5f8c\u306e\u30b3\u30de\u30f3\u30c9: configadmin_duration=\u671f\u9593: @@ -1793,7 +1794,7 @@ configadmin_duration_ms=ms # Repository Admin Console messages title_repoadmin_console=\u30ea\u30dd\u30b8\u30c8\u30ea\u7ba1\u7406\u8005\u30b3\u30f3\u30bd\u30fc\u30eb repoadmin_context=\u30b3\u30f3\u30c6\u30af\u30b9\u30c8 -repoadmin_command=\u30b3\u30de\u30f3\u30c9 (help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b) +repoadmin_command=\u30b3\u30de\u30f3\u30c9\uff08help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b\uff09 repoadmin_command_submit=\u9001\u4fe1 repoadmin_last_command=\u6700\u5f8c\u306e\u30b3\u30de\u30f3\u30c9: repoadmin_duration=\u671f\u9593: @@ -1802,7 +1803,7 @@ repoadmin_duration_ms=ms # Tenant Admin Console messages title_tenantadmin_console=\u30c6\u30ca\u30f3\u30c8\u7ba1\u7406\u8005\u30b3\u30f3\u30bd\u30fc\u30eb tenantadmin_context=\u30b3\u30f3\u30c6\u30af\u30b9\u30c8 -tenantadmin_command=\u30b3\u30de\u30f3\u30c9 (help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b) +tenantadmin_command=\u30b3\u30de\u30f3\u30c9\uff08help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b\uff09 tenantadmin_command_submit=\u9001\u4fe1 tenantadmin_last_command=\u6700\u5f8c\u306e\u30b3\u30de\u30f3\u30c9: tenantadmin_duration=\u671f\u9593: @@ -1934,7 +1935,7 @@ error_checkin=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u306b\u3088\u308a\u30b3 error_paste=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u306b\u3088\u308a\u30a2\u30a4\u30c6\u30e0\u3092\u8cbc\u308a\u4ed8\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093: error_login_user=\u30ed\u30b0\u30a4\u30f3\u3067\u304d\u307e\u305b\u3093 - \u4e0d\u660e\u306a\u30e6\u30fc\u30b6\u540d/\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059\u3002 error_login_missing=\u30e6\u30fc\u30b6\u540d\u3068\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 -error_login_disallowed=\u30e6\u30fc\u30b6\u540d\u304c\u5374\u4e0b\u3055\u308c\u307e\u3057\u305f \uff70 \u5f8c\u3067\u518d\u8a66\u884c\u3092\u3059\u308b\u304b\u3001\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +error_login_disallowed=\u30e6\u30fc\u30b6\u540d\u304c\u5374\u4e0b\u3055\u308c\u307e\u3057\u305f - \u5f8c\u3067\u518d\u8a66\u884c\u3092\u3059\u308b\u304b\u3001\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 error_login_maxusers=\u30e6\u30fc\u30b6\u306e\u6700\u5927\u6570\u3092\u8d85\u3048\u307e\u3057\u305f - \u5f8c\u3067\u518d\u8a66\u884c\u3092\u3059\u308b\u304b\u3001\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 error_delete_rule=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u306b\u3088\u308a\u30eb\u30fc\u30eb\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093: error_actions=\u30a8\u30e9\u30fc\u306b\u3088\u308a\u30a2\u30af\u30b7\u30e7\u30f3\u306e\u5b9f\u884c\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0} @@ -2006,7 +2007,7 @@ delete_file_info=\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u3068\u4ee5\u524d\u306e\u3 delete_file_assoc_info=\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u8907\u6570\u306e\u5834\u6240\u306b\u8868\u793a\u3055\u308c\u307e\u3059\u3002\u73fe\u5728\u306e\u5834\u6240\u304b\u3089\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u9664\u304f\u306b\u306f\u3001[OK]\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002 delete_file_confirm=\"{0}\" \u3068\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5168\u3066\u524a\u9664\u3057\u307e\u3059\u304b? delete_file_assoc_confirm=\"{0}\" \u3092\u73fe\u5728\u306e\u5834\u6240\u304b\u3089\u53d6\u9664\u304d\u307e\u3059\u304b? -delete_file_multiple_parents_confirm=\u5168\u3066\u306e\u5834\u6240\u304b\u3089\u53d6\u9664\u304d\u3001\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5168\u3066\u524a\u9664\u3057\u307e\u3059\u304b? +delete_file_multiple_parents_confirm=\"{0}\"\u5168\u3066\u306e\u5834\u6240\u304b\u3089\u53d6\u9664\u304d\u3001\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5168\u3066\u524a\u9664\u3057\u307e\u3059\u304b? delete_translation_confirm=\"{0}\" \u3068\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5168\u3066\u524a\u9664\u3057\u307e\u3059\u304b? \u305d\u306e\u591a\u8a00\u8a9e\u30d7\u30ed\u30d1\u30c6\u30a3\u306f\u5fa9\u65e7\u3055\u308c\u307e\u305b\u3093\u3002 delete_empty_translation_confirm=\"{0}\"\u3092\u6052\u4e45\u7684\u306b\u524a\u9664\u3057\u307e\u3059\u304b? \u5f8c\u3067\u3053\u306e\u6587\u66f8\u3092\u5fa9\u65e7\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 delete_ml_container_confirm=\"{0}\" \u3068\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5168\u3066\u524a\u9664\u3057\u307e\u3059\u304b? \u305d\u308c\u305e\u308c\u306e\u7ffb\u8a33\u3082\u524a\u9664\u3055\u308c\u307e\u3059\u3002 @@ -2039,7 +2040,7 @@ idle=\u30a2\u30a4\u30c9\u30eb loading=\u30ed\u30fc\u30c7\u30a3\u30f3\u30b0 eg=\u4f8b click_to_edit=\u30af\u30ea\u30c3\u30af\u3057\u3066\u7de8\u96c6 -please_select=\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u30fb\u30fb\u30fb +please_select=\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044... # File Picker go_up=\u4e0a\u3078 @@ -2059,7 +2060,7 @@ category_browser_browse_description=\u3053\u306e\u30d3\u30e5\u30fc\u3067\u306f\u title_category_browse=Alfresco Web\u30af\u30e9\u30a4\u30a2\u30f3\u30c8 - \u30ab\u30c6\u30b4\u30ea\u95b2\u89a7 # 3.0 Sites messages -ReadPermissions=\u8aad\u8fbc +ReadPermissions=\u8aad\u3080 SiteManager=\u30b5\u30a4\u30c8\u30fb\u30de\u30cd\u30fc\u30b8\u30e3 SiteConsumer=\u30b5\u30a4\u30c8\u30fb\u30b2\u30b9\u30c8 SiteCollaborator=\u30b5\u30a4\u30c8\u5171\u540c\u4f5c\u696d\u8005 @@ -2077,9 +2078,9 @@ composite_condition_page_description=\u4ed6\u306e\u6761\u4ef6\u3092\u3044\u304f\ composite_condition_page_title=\u5408\u6210\u6761\u4ef6\u3092\u4f5c\u6210 composite_condition_page_selected=\u7d50\u5408\u3055\u308c\u308b\u9078\u629e\u6e08\u6761\u4ef6 composite_condition_page_or=\u307e\u305f\u306f -text_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d (\u4f8b\u3048\u3070\u3001description\u307e\u305f\u306fcm:description) -integer_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d (\u4f8b\u3048\u3070\u3001count\u307e\u305f\u306fmy:count) -date_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d (\u4f8b\u3048\u3070\u3001created\u307e\u305f\u306fcm:created) +text_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\uff08\u4f8b\u3048\u3070\u3001description\u307e\u305f\u306fcm:description\uff09 +integer_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\uff08\u4f8b\u3048\u3070\u3001count\u307e\u305f\u306fmy:count\uff09 +date_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\uff08\u4f8b\u3048\u3070\u3001created\u307e\u305f\u306fcm:created\uff09 property_condition_operation=\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u5024 property_condition_value=\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u5024 property_condition_operation=\u30aa\u30da\u30ec\u30fc\u30b7\u30e7\u30f3 @@ -2105,9 +2106,9 @@ condition_compare_date_property_value=\u65e5\u4ed8\u578b\u30d7\u30ed\u30d1\u30c6 condition_compare_date_property_value_not=\u65e5\u4ed8\u578b\u30d7\u30ed\u30d1\u30c6\u30a3 ''{0}'' \u306e\u5024\u304c ''{2}'' {1}\u3001\u304c\u6210\u308a\u7acb\u305f\u306a\u3044\u6642 condition_compare_boolean_property_value=\u30d6\u30fc\u30ea\u30a2\u30f3\u578b\u30d7\u30ed\u30d1\u30c6\u30a3 ''{0}'' \u306e\u5024\u304c ''{2}'' {1}\u3001\u304c\u6210\u308a\u7acb\u3064\u6642 condition_compare_boolean_property_value_not=\u30d6\u30fc\u30ea\u30a2\u30f3\u578b\u30d7\u30ed\u30d1\u30c6\u30a3 ''{0}'' \u306e\u5024\u304c ''{2}'' {1}\u3001\u304c\u6210\u308a\u7acb\u305f\u306a\u3044\u6642 -condition_composite_summary=\u5408\u6210\u6761\u4ef6 ({0} \u6761\u4ef6 {1}) -condition_composite_summary_not=\u5408\u6210\u6761\u4ef6 ({0} \u6761\u4ef6 {1} \u3068\u53cd\u8ee2) -condition_composite_error=\u5408\u6210\u6761\u4ef6 (\u30a8\u30e9\u30fc) +condition_composite_summary=\u5408\u6210\u6761\u4ef6\uff08{0} \u6761\u4ef6 {1}\uff09 +condition_composite_summary_not=\u5408\u6210\u6761\u4ef6\uff08{0} \u6761\u4ef6 {1} \u3068\u53cd\u8ee2\uff09 +condition_composite_error=\u5408\u6210\u6761\u4ef6\uff08\u30a8\u30e9\u30fc\uff09 component_property=\u30d7\u30ed\u30d1\u30c6\u30a3 component_value=\u5024 diff --git a/config/alfresco/templates/client/portlet_node_summary_panel.ftl b/config/alfresco/templates/client/portlet_node_summary_panel.ftl index 2e6c73b015..cf6869130c 100644 --- a/config/alfresco/templates/client/portlet_node_summary_panel.ftl +++ b/config/alfresco/templates/client/portlet_node_summary_panel.ftl @@ -54,9 +54,9 @@ <#if node.properties.description?exists>  ${msg("description")}:${node.properties.description?html} -  ${msg("created")}:${node.properties.created?datetime} +  ${msg("created")}:${node.properties.created?string(msg("date_time_pattern"))}  ${msg("creator")}:${node.properties.creator} -  ${msg("modified")}:${node.properties.modified?datetime} +  ${msg("modified")}:${node.properties.modified?string(msg("date_time_pattern"))}  ${msg("modifier")}:${node.properties.modifier} <#if node.properties.owner?exists>  ${msg("owner")}:${node.properties.owner} diff --git a/config/alfresco/templates/client/task_summary_panel.ftl b/config/alfresco/templates/client/task_summary_panel.ftl index 3d5bb615b4..822d81af20 100644 --- a/config/alfresco/templates/client/task_summary_panel.ftl +++ b/config/alfresco/templates/client/task_summary_panel.ftl @@ -16,7 +16,7 @@ - +
${msg("task_summary_panel.type")}:${task.type?html}
${msg("task_summary_panel.name")}:${task.name?html}
${msg("task_summary_panel.start_date")}:${task.startDate?date}
${msg("task_summary_panel.start_date")}:${task.startDate?string(msg("date_pattern"))}
${msg("task_summary_panel.due_date")}: <#if task.properties["bpm:dueDate"]?exists> ${task.properties["bpm:dueDate"]?date} diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml index bef4d279ab..a59a2bc672 100644 --- a/config/alfresco/web-client-config-actions.xml +++ b/config/alfresco/web-client-config-actions.xml @@ -1188,7 +1188,6 @@ - inlineAction diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml index 949b427b94..62657ed997 100644 --- a/config/alfresco/web-client-config-dialogs.xml +++ b/config/alfresco/web-client-config-dialogs.xml @@ -527,7 +527,7 @@ + show-ok-button="false" error-message-id="empty_message" /> + description-id="manage_task_desc" error-message-id="empty_message" /> diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml index ba7493e030..587ce84c58 100644 --- a/config/alfresco/web-client-config.xml +++ b/config/alfresco/web-client-config.xml @@ -75,7 +75,7 @@ false - http://docs.alfresco.com/{version.major}.{version.minor}/topic/com.alfresco.team.doc/topics/guh-wcm-welcome-explorer.html + http://docs.alfresco.com/{version.major}.{version.minor}/topic/com.alfresco.{version.edition}_{version.major}_{version.minor}_0.doc/topics/guh-wcm-welcome-explorer.html diff --git a/source/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java b/source/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java index 52067ec6ef..771dc71509 100644 --- a/source/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java +++ b/source/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java @@ -24,7 +24,6 @@ import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.workflow.WorkflowTask; -import org.alfresco.util.ISO9075; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Repository; @@ -58,7 +57,7 @@ public class CancelWorkflowEvaluator extends BaseActionEvaluator { // find the current username User user = Application.getCurrentUser(context); - String currentUserName = ISO9075.encode(user.getUserName()); + String currentUserName = user.getUserName(); // get the username of the initiator NodeService nodeSvc = Repository.getServiceRegistry( diff --git a/source/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java b/source/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java index 5617d5b02e..da9faa26d7 100644 --- a/source/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java +++ b/source/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java @@ -24,6 +24,7 @@ import org.alfresco.model.ContentModel; import org.alfresco.model.ForumModel; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeService; +import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Repository; @@ -66,6 +67,11 @@ public class DiscussionCopyEvaluator extends BaseActionEvaluator result = false; } + if (!node.hasPermission(PermissionService.READ)) + { + result = false; + } + return result; } } diff --git a/source/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java b/source/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java index 916d8acfd1..01785096ac 100644 --- a/source/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java +++ b/source/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java @@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRequest; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.ServiceRegistry; +import org.alfresco.web.bean.workflow.WorkflowUtil; import org.alfresco.web.ui.common.Utils; /** @@ -52,7 +53,7 @@ public final class TaskCommandProcessor implements CommandProcessor /* (non-Javadoc) * @see org.alfresco.web.app.servlet.command.CommandProcessor#validateArguments(javax.servlet.ServletContext, java.lang.String, java.util.Map, java.lang.String[]) */ - public boolean validateArguments(ServletContext sc, String command, Map args, String[] urlElements) + public boolean validateArguments(ServletContext sc, String cmd, Map args, String[] urlElements) { if (urlElements.length == 0) { @@ -63,13 +64,13 @@ public final class TaskCommandProcessor implements CommandProcessor { transition = urlElements[1]; } - return true; + return WorkflowUtil.isTaskEditable(cmd, sc); } /** * @see org.alfresco.web.app.servlet.command.CommandProcessor#process(org.alfresco.service.ServiceRegistry, javax.servlet.http.HttpServletRequest, java.lang.String) */ - public void process(ServiceRegistry serviceRegistry, HttpServletRequest request, String command) + public void process(ServiceRegistry serviceRegistry, HttpServletRequest request, String commandName) { Map properties = new HashMap(1, 1.0f); // all workflow commands use a "target" Node property as an argument @@ -78,13 +79,13 @@ public final class TaskCommandProcessor implements CommandProcessor { properties.put(EndTaskCommand.PROP_TRANSITION, transition); } - Command cmd = CommandFactory.getInstance().createCommand(command); + Command cmd = CommandFactory.getInstance().createCommand(commandName); if (cmd == null) { - throw new AlfrescoRuntimeException("Unregistered workflow command specified: " + command); + throw new AlfrescoRuntimeException("Unregistered workflow command specified: " + commandName); } cmd.execute(serviceRegistry, properties); - this.command = command; + this.command = commandName; } /** diff --git a/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java b/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java index 7cc346a8dc..b21d4ea52d 100644 --- a/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java +++ b/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java @@ -31,6 +31,7 @@ import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.ServiceRegistry; import org.alfresco.web.app.AlfrescoNavigationHandler; import org.alfresco.web.app.servlet.FacesHelper; +import org.alfresco.web.bean.workflow.WorkflowUtil; import org.alfresco.web.ui.common.Utils; /** @@ -48,7 +49,12 @@ import org.alfresco.web.ui.common.Utils; */ public class UIActionCommandProcessor implements ExtCommandProcessor { - public static final String PARAM_CONTAINER = "container"; + /** + * + */ + private static final String MANAGE_TASK = "managetask"; + +public static final String PARAM_CONTAINER = "container"; private ServletContext sc = null; private String command = null; @@ -59,7 +65,7 @@ public class UIActionCommandProcessor implements ExtCommandProcessor // add our commands to the command registry CommandFactory.getInstance().registerCommand("createwebcontent", CreateWebContentCommand.class); CommandFactory.getInstance().registerCommand("editwebcontent", EditWebContentCommand.class); - CommandFactory.getInstance().registerCommand("managetask", ManageTaskDialogCommand.class); + CommandFactory.getInstance().registerCommand(MANAGE_TASK, ManageTaskDialogCommand.class); CommandFactory.getInstance().registerCommand("editcontentprops", EditContentPropertiesCommand.class); CommandFactory.getInstance().registerCommand("userprofile", UserProfileDialogCommand.class); CommandFactory.getInstance().registerCommand("editspace", EditSpaceCommand.class); @@ -76,6 +82,11 @@ public class UIActionCommandProcessor implements ExtCommandProcessor { this.args = new HashMap(args); } + if(MANAGE_TASK.equals(command)) + { + String taskId = args.get(ManageTaskDialogCommand.PROP_TASKID); + return WorkflowUtil.isTaskEditable(taskId, sc); + } return true; } diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java index b05304fba7..320640a0a3 100644 --- a/source/java/org/alfresco/web/bean/BrowseBean.java +++ b/source/java/org/alfresco/web/bean/BrowseBean.java @@ -664,7 +664,8 @@ public class BrowseBean implements IContextListener, Serializable QName currentNodeType = currentNode.getType(); if (SiteModel.TYPE_SITES.isMatch(currentNodeType) || - SiteModel.TYPE_SITE.isMatch(currentNodeType)) + SiteModel.TYPE_SITE.isMatch(currentNodeType) || + getDictionaryService().isSubClass(currentNodeType, SiteModel.TYPE_SITE)) { siteSpace = true; } diff --git a/source/java/org/alfresco/web/bean/NavigationBean.java b/source/java/org/alfresco/web/bean/NavigationBean.java index 560648435f..1c7297beda 100644 --- a/source/java/org/alfresco/web/bean/NavigationBean.java +++ b/source/java/org/alfresco/web/bean/NavigationBean.java @@ -539,7 +539,7 @@ public class NavigationBean implements Serializable do { value = serverDescriptor.getDescriptor(m.group(1)); - m.appendReplacement(sb, value != null ? value.toLowerCase() : m.group(1)); + m.appendReplacement(sb, value != null ? value : m.group(1)); result = m.find(); } while (result); m.appendTail(sb); diff --git a/source/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java b/source/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java index 04b92216ee..205e90cd1e 100644 --- a/source/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java +++ b/source/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java @@ -24,11 +24,8 @@ import java.util.Map; import javax.faces.context.FacesContext; -import org.alfresco.model.ContentModel; import org.alfresco.repo.action.executer.CopyActionExecuter; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.service.namespace.QName; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.bean.wizard.IWizardBean; @@ -54,12 +51,6 @@ public class CopyHandler extends BaseActionHandler NodeRef destNodeRef = (NodeRef)actionProps.get(PROP_DESTINATION); repoProps.put(CopyActionExecuter.PARAM_DESTINATION_FOLDER, destNodeRef); - // add the type and name of the association to create when the copy - // is performed - repoProps.put(CopyActionExecuter.PARAM_ASSOC_TYPE_QNAME, - ContentModel.ASSOC_CONTAINS); - repoProps.put(CopyActionExecuter.PARAM_ASSOC_QNAME, - QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "copy")); } public void prepareForEdit(Map actionProps, diff --git a/source/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java b/source/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java index e3d93b5716..056d493dc1 100644 --- a/source/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java +++ b/source/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java @@ -24,11 +24,8 @@ import java.util.Map; import javax.faces.context.FacesContext; -import org.alfresco.model.ContentModel; import org.alfresco.repo.action.executer.MoveActionExecuter; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.service.namespace.QName; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.bean.wizard.IWizardBean; @@ -53,13 +50,6 @@ public class MoveHandler extends BaseActionHandler // add the destination space id to the action properties NodeRef destNodeRef = (NodeRef)actionProps.get(PROP_DESTINATION); repoProps.put(MoveActionExecuter.PARAM_DESTINATION_FOLDER, destNodeRef); - - // add the type and name of the association to create when the move - // is performed - repoProps.put(MoveActionExecuter.PARAM_ASSOC_TYPE_QNAME, - ContentModel.ASSOC_CONTAINS); - repoProps.put(MoveActionExecuter.PARAM_ASSOC_QNAME, - QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "move")); } public void prepareForEdit(Map actionProps, diff --git a/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java b/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java index a96d7288a8..acf4ac2908 100644 --- a/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java +++ b/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java @@ -57,4 +57,9 @@ public class CCCheckinFileDialog extends CheckinCheckoutDialog return false; } + @Override + protected String getErrorOutcome(Throwable exception) + { + return "dialog:close"; + } } diff --git a/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java b/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java index c2e7901ffc..7965fdab17 100644 --- a/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java @@ -529,7 +529,7 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio if (this.getNodeService().exists(ref)) { builder.append("
  • "); - builder.append(Utils.encode(Repository.getNameForNode(this.getNodeService(), ref))); + builder.append(Utils.encode(Repository.getNameForCategoryNode(this.getNodeService(), ref))); builder.append("
    • "); } } diff --git a/source/java/org/alfresco/web/bean/repository/Repository.java b/source/java/org/alfresco/web/bean/repository/Repository.java index 5ce36f38ff..ac35af1f86 100644 --- a/source/java/org/alfresco/web/bean/repository/Repository.java +++ b/source/java/org/alfresco/web/bean/repository/Repository.java @@ -229,6 +229,27 @@ public final class Repository return name; } + /** + * Helper to get the display name path for a category node. + * + * @param nodeService + * @param ref the category node ref + * @return display name string for the specified category node. + */ + public static String getNameForCategoryNode(NodeService nodeService, NodeRef ref) + { + String name = null; + + // Check that node reference still exists + if (nodeService.exists(ref) == true) + { + Path path = nodeService.getPath(ref); + name = Repository.getNamePath(nodeService, path, null, "/", null); + } + + return name; + } + /** * Escape a QName value so it can be used in lucene search strings * diff --git a/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java b/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java index 04d9041f9f..8b8b000020 100644 --- a/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java +++ b/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java @@ -64,12 +64,16 @@ public class TrashcanDeleteItemDialog extends TrashcanDialog return newOutcome; } + @Override + protected String getDefaultFinishOutcome() + { + return "dialog:close[2]"; + } + @Override protected String finishImpl(FacesContext context, String outcome) throws Exception { - deleteItem(context, outcome); - return "dialog:close"; - + return deleteItem(context, outcome); } @Override diff --git a/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java b/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java index 4e320a9379..a901d87d07 100644 --- a/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java +++ b/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java @@ -118,14 +118,19 @@ public class TrashcanRecoverItemDialog extends TrashcanDialog } } - return "dialog:close"; + return outcome; + } + + @Override + protected String getDefaultFinishOutcome() + { + return "dialog:close[2]"; } @Override protected String finishImpl(FacesContext context, String outcome) throws Exception { return recoverItem(context, outcome); - } @Override diff --git a/source/java/org/alfresco/web/bean/workflow/WorkflowUtil.java b/source/java/org/alfresco/web/bean/workflow/WorkflowUtil.java index f6437e1e77..5d4e30f69a 100644 --- a/source/java/org/alfresco/web/bean/workflow/WorkflowUtil.java +++ b/source/java/org/alfresco/web/bean/workflow/WorkflowUtil.java @@ -24,14 +24,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.servlet.ServletContext; + import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.CopyService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; +import org.alfresco.service.cmr.workflow.WorkflowService; +import org.alfresco.service.cmr.workflow.WorkflowTask; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.web.bean.repository.Node; @@ -265,7 +270,7 @@ public class WorkflowUtil // TODO: Deal with child associations if and when we need to support // them for workflow tasks, for now warn that they are being used - Map childAssocs = node.getAddedChildAssociations(); + Map childAssocs = node.getAddedChildAssociations(); if (childAssocs.size() > 0) { if (logger.isWarnEnabled()) @@ -274,4 +279,17 @@ public class WorkflowUtil return params; } + + public static boolean isTaskEditable(String taskId, ServletContext sc) + { + if(taskId ==null|| taskId.isEmpty()) + { + return false; + } + ServiceRegistry serviceRegistry = Repository.getServiceRegistry(sc); + String username = serviceRegistry.getAuthenticationService().getCurrentUserName(); + WorkflowService workflowService = serviceRegistry.getWorkflowService(); + WorkflowTask task = workflowService.getTaskById(taskId); + return workflowService.isTaskEditable(task, username); + } } diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java index 4d62a7cb88..422a59f441 100644 --- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java +++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java @@ -486,11 +486,11 @@ public class Schema2XForms implements Serializable } } - // Check the nil attribute - if (oldEl.getAttributeNS(NamespaceConstants.XMLSCHEMA_INSTANCE_NS, "nil").equals("true")) + // Populate the nil attribute. It may be true or false + if (proto.hasAttributeNS(NamespaceConstants.XMLSCHEMA_INSTANCE_NS, "nil")) { clone.setAttributeNS(NamespaceConstants.XMLSCHEMA_INSTANCE_NS, - NamespaceConstants.XMLSCHEMA_INSTANCE_PREFIX + ":nil", "true"); + NamespaceConstants.XMLSCHEMA_INSTANCE_PREFIX + ":nil", String.valueOf(isEmpty)); } // Copy over attributes present in the prototype @@ -2679,8 +2679,23 @@ public class Schema2XForms implements Serializable final Map enumValues = new LinkedHashMap(enumFacets.getLength()); - final String nullValue = Application.getMessage(FacesContext.getCurrentInstance(), "please_select"); - enumValues.put(nullValue, null); + String appearance = extractPropertyFromAnnotation(NamespaceService.ALFRESCO_URI, + "appearance", + this.getAnnotation(owner), + resourceBundle); + if (appearance == null || appearance.length() == 0) + { + appearance = enumFacets.getLength() < Schema2XForms.LONG_LIST_SIZE ? "full" : "compact"; + } + + // if appearance is "full" a radio button control is used, in this case we don't want the + // please select option available + if (!"full".equals(appearance)) + { + final String nullValue = Application.getMessage(FacesContext.getCurrentInstance(), "please_select"); + enumValues.put(nullValue, null); + } + for (int i = 0; i < enumFacets.getLength(); i++) { enumValues.put(enumFacets.item(i), @@ -2689,14 +2704,6 @@ public class Schema2XForms implements Serializable : null)); } - String appearance = extractPropertyFromAnnotation(NamespaceService.ALFRESCO_URI, - "appearance", - this.getAnnotation(owner), - resourceBundle); - if (appearance == null || appearance.length() == 0) - { - appearance = enumFacets.getLength() < Schema2XForms.LONG_LIST_SIZE ? "full" : "compact"; - } control.setAttributeNS(NamespaceConstants.XFORMS_NS, NamespaceConstants.XFORMS_PREFIX + ":appearance", appearance); diff --git a/source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java b/source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java index f6f4b425da..d3c574aadb 100644 --- a/source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java +++ b/source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java @@ -953,7 +953,7 @@ public abstract class BaseAssociationEditor extends UIInput // get all available groups AuthorityService authorityService = Repository.getServiceRegistry(context).getAuthorityService(); - Set groups = authorityService.getAllAuthorities(AuthorityType.GROUP); + Set groups = authorityService.getAllAuthoritiesInZone(AuthorityService.ZONE_APP_DEFAULT, AuthorityType.GROUP); this.availableOptions = new ArrayList(groups.size()); // get the NodeRef for each matching group diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java index ed124812c9..b5e61b321b 100644 --- a/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java +++ b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java @@ -526,10 +526,11 @@ public class UIPropertySheet extends UIPanel implements NamingContainer // output variable to hold flag for which submit button was pressed out.write("var finishButtonPressed = false;\n"); out.write("var nextButtonPressed = false;\n"); + out.write("var transitionButtonPressed = false;\n"); // output the validate() function out.write("function validate()\n{\n var result = true;\n "); - out.write("if ((finishButtonPressed || nextButtonPressed) && ("); + out.write("if ((transitionButtonPressed || finishButtonPressed || nextButtonPressed) && ("); int numberValidations = this.validations.size(); List realTimeValidations = @@ -549,7 +550,7 @@ public class UIPropertySheet extends UIPanel implements NamingContainer // return false if validation failed to stop the form submitting out.write(")\n { result = false; }\n\n"); - out.write(" finishButtonPressed = false;\n nextButtonPressed = false;\n"); + out.write(" finishButtonPressed = false;\n nextButtonPressed = false;\n transitionButtonPressed = false;\n"); out.write(" return result;\n}\n\n"); // output the processButtonState() function (if necessary) @@ -616,7 +617,18 @@ public class UIPropertySheet extends UIPanel implements NamingContainer out.write(getFinishButtonId()); out.write("').onclick = function() { finishButtonPressed = true; }\n"); - // set the flag when the finish button is clicked + // transition buttons on the workflow page also need to handle validation + // so look for submit buttons with ":transition_" in the id + out.write(" var inputItems = document.getElementsByTagName('input');\n"); + out.write(" for (i in inputItems)\n"); + out.write(" {\n"); + out.write(" if (inputItems[i].type == 'submit' && inputItems[i].id !== undefined && inputItems[i].id.indexOf(':transition_') != -1)\n"); + out.write(" {\n"); + out.write(" inputItems[i].onclick = function() { transitionButtonPressed = true; }\n"); + out.write(" }\n"); + out.write(" }\n"); + + // set the flag when the next button is clicked if (this.nextButtonId != null && this.nextButtonId.length() > 0) { out.write(" document.getElementById('"); diff --git a/source/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java b/source/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java index a6632c0fa8..27230927b8 100644 --- a/source/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java +++ b/source/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java @@ -28,6 +28,7 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import javax.faces.convert.Converter; +import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.web.app.Application; @@ -254,9 +255,18 @@ public abstract class BaseMultiValueRenderer extends BaseRenderer } out.write("'>"); - if (value instanceof NodeRef) - { - out.write(Utils.encode(Repository.getNameForNode(nodeService, (NodeRef)value))); + if (value instanceof NodeRef) + { + String name; + if (ContentModel.TYPE_CATEGORY.equals(nodeService.getType((NodeRef)value))) + { + name = Repository.getNameForCategoryNode(nodeService, (NodeRef)value); + } + else + { + name = Repository.getNameForNode(nodeService, (NodeRef)value); + } + out.write(Utils.encode(name)); } else if (value instanceof Date) { diff --git a/source/web/cmisfs/browser/browser.css b/source/web/cmisfs/browser/browser.css index 07a1916919..cec87f7da6 100644 --- a/source/web/cmisfs/browser/browser.css +++ b/source/web/cmisfs/browser/browser.css @@ -33,7 +33,7 @@ a:hover { } a:active { - color: a40000; + color: #a40000; text-decoration: underline; } diff --git a/source/web/css/main.css b/source/web/css/main.css index e5091b60e3..99196a3a64 100644 --- a/source/web/css/main.css +++ b/source/web/css/main.css @@ -209,7 +209,7 @@ a.headbarLink margin-top: 5px; margin-bottom: 5px; background: #dfe6ed; - vertical-align: center; + vertical-align: middle; padding-left: 6px; } @@ -332,7 +332,7 @@ input,textarea,select a.topToolbarLink, a.topToolbarLink:link, a.topToolbarLink:visited { - color: 004488; + color: #004488; font-weight: normal; font-size: 12px; } diff --git a/source/web/css/xforms.css b/source/web/css/xforms.css index bd47794c9b..a3da91aeac 100644 --- a/source/web/css/xforms.css +++ b/source/web/css/xforms.css @@ -98,6 +98,7 @@ .xformsTextArea { height: 200px; + width: 100%; } .xformsRichTextEditorHoverLayer diff --git a/source/web/images/icons/recover_all.gif b/source/web/images/icons/recover_all.gif new file mode 100644 index 0000000000000000000000000000000000000000..29c35e8a24dc7dd588e8f7990e399d73e2643696 GIT binary patch literal 1046 zcmZ?wbhEHb6krfw_&$N*#*G_y@7^scDmwD`OhQ6}{gSA)YuB1g^zG>An0ji%y?gf_ zJ$h7MU%zkPzLhIiPMkP#!-frW=FHi8XaB~H8&97;-FbYbaKFj6ZQHz8W_Yj2S+Qcp zrklq;e*72{6H{AT8@H)y>#Y-}^MeZt3fz`uELpPT;m2n>l@9&K*CZwv}bv`E=yi~ao36~`}$6-IQ;OE>#~IW{QT?Juba(_NpH*dU6i6S)yaKD z(xy$DWG2}kK74rdsh#WBukY#U$=TT;H`#gW)T!y4`!;XhTv%8bA0O|yB(|lcrMtVk ztES!cJz#l?~7hv)6~?YI?Y#Qf`jXlg5$@J z_xJZtpFaIR7%+?i>V<&fPZmZ7h6xNhAR|F}f`Q{RgCeiSg!VRWj|n^`Q5g&i4+s>c zHT+9a4eM0Xk)2zne5EK#oJTkdByoe z1EYn&gn|i2FE%T1Oi|cmaA2Xb9>0iAf`W$+i(4O;Maz~$0t?sztzrZl*;ls;@$pZn zOk(E{VqlU={2JuIbci|M=SPDB!@3xE>xc`Umr}fE*lPaxb<~QLOTt`w!;yxMNq+Zt zL}({ygs2_l)J?whV&@<6NnKWwe7zmYuI}>2W_?rKG!`~3a@D     		- + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> diff --git a/source/web/jsp/ml/add-translation-without-content.jsp b/source/web/jsp/ml/add-translation-without-content.jsp index 95302949ee..131d064b87 100644 --- a/source/web/jsp/ml/add-translation-without-content.jsp +++ b/source/web/jsp/ml/add-translation-without-content.jsp @@ -27,11 +27,11 @@ - + - + diff --git a/source/web/jsp/trashcan/item-details.jsp b/source/web/jsp/trashcan/item-details.jsp index f2add47edd..ee06c9e7b6 100644 --- a/source/web/jsp/trashcan/item-details.jsp +++ b/source/web/jsp/trashcan/item-details.jsp @@ -22,20 +22,31 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> +
    -
     +
     + + + + + + +
    + - + +
    + + + + + + + + @@ -45,35 +56,37 @@ border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted"
    + -
    - - - -
    -
    + <%-- icon image for the object --%> - +
    - + - +
    - +
    		<%-- properties for the item --%> - + @@ -81,9 +94,19 @@ columns="1" mode="view" labelStyleClass="propertiesLabel" externalConfig="true"
    -     - - + +     		+ + <%-- Document Actions --%> + + + + +
    +     diff --git a/source/web/jsp/wcm/create-website-wizard/form-details.jsp b/source/web/jsp/wcm/create-website-wizard/form-details.jsp index 6a4dfa6ca7..ae1e2b4e0e 100644 --- a/source/web/jsp/wcm/create-website-wizard/form-details.jsp +++ b/source/web/jsp/wcm/create-website-wizard/form-details.jsp @@ -43,7 +43,7 @@ var additionalConditionInput = document.getElementById('dialog:dialog-body:title'); var description = document.getElementById("dialog:dialog-body:description"); validateOutputPathPattern(disabledElement, outputPathInput, additionalConditionInput); - disabledElement.disabled = (disabledElement.disabled || description.value.length > 1024 || !validateName(name, "", false)); + disabledElement.disabled = (disabledElement.disabled || description.value.length > 1024 || !validateName(additionalConditionInput, "", false)); } diff --git a/source/web/jsp/wcm/file-details.jsp b/source/web/jsp/wcm/file-details.jsp index 083fd239ca..9140610505 100644 --- a/source/web/jsp/wcm/file-details.jsp +++ b/source/web/jsp/wcm/file-details.jsp @@ -115,7 +115,7 @@ - + diff --git a/source/web/scripts/ajax/deployment.js b/source/web/scripts/ajax/deployment.js index d8091ffe4a..ce65b3c3fe 100644 --- a/source/web/scripts/ajax/deployment.js +++ b/source/web/scripts/ajax/deployment.js @@ -120,8 +120,6 @@ Alfresco.checkDeployConfigButtonState = function() var port = document.getElementById('wizard:wizard-body:deployServerPort'); var button = document.getElementById('wizard:wizard-body:deployActionButton'); - console.log(button); - if (button != null) { var buttonState = false; diff --git a/source/web/scripts/ajax/doclist.js b/source/web/scripts/ajax/doclist.js index ec5e09774a..0291bbbba5 100644 --- a/source/web/scripts/ajax/doclist.js +++ b/source/web/scripts/ajax/doclist.js @@ -4,7 +4,7 @@ var MyDocs = { ANIM_LENGTH: 300, DETAIL_MARGIN: 8, TITLE_FONT_SIZE: 18, - RESOURCE_PANEL_HEIGHT: 150, + RESOURCE_PANEL_HEIGHT: 180, OVERLAY_OPACITY: 0.8, ServiceContext: null, Filter: null, diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js index b2291742f2..6fd1bf467c 100644 --- a/source/web/scripts/ajax/myspaces.js +++ b/source/web/scripts/ajax/myspaces.js @@ -4,7 +4,7 @@ var MySpaces = { ANIM_LENGTH: 300, DETAIL_MARGIN: 56, TITLE_FONT_SIZE: 18, - RESOURCE_PANEL_HEIGHT: 150, + RESOURCE_PANEL_HEIGHT: 180, OVERLAY_OPACITY: 0.8, fileInput: null, Path: null, diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js index 1912f86be0..567479d70c 100644 --- a/source/web/scripts/ajax/xforms.js +++ b/source/web/scripts/ajax/xforms.js @@ -121,15 +121,16 @@ alfresco.xforms.Widget = new Class({ /** Sets the widget's modified state, as indicated by an XFormsEvent. */ setModified: function(b) { - if (this._modified != b) - { this._modified = b; this._updateDisplay(false); if (this.isValidForSubmit()) { this.hideAlert(); } - } + else + { + this.showAlert(); + } }, /** Sets the widget's valid state, as indicated by an XFormsEvent */ @@ -281,13 +282,21 @@ alfresco.xforms.Widget = new Class({ /** Commits the changed value to the server */ _commitValueChange: function(value) { - if (this._compositeParent) + if (this.isRequired() && this.domNode.type == "select-one" && this.domNode.selectedIndex == 0) + { + this.xform.setXFormsValue(this.id, null); + this.setValue(null); + } + else { - this._compositeParent._commitValueChange(value); - } - else - { - this.xform.setXFormsValue(this.id, value || this.getValue()); + if (this._compositeParent) + { + this._compositeParent._commitValueChange(value); + } + else + { + this.xform.setXFormsValue(this.id, value || this.getValue()); + } } }, @@ -813,7 +822,7 @@ alfresco.xforms.NumericalRange = alfresco.xforms.Widget.extend({ this.currentValueDiv.firstChild); if (!this.widget._isDragInProgress) { - this._commitValueChange(); + this._commitValueChange(value); } } }); @@ -977,6 +986,8 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({ this.widget.style.border = "2px inset #f0f0f0"; this.widget.style.marginRight = "2px"; this.widget.style.overflow = "auto"; + this.widget.style.position = "absolute"; + this._oldValue = this.getInitialValue() || ""; this.widget.innerHTML = this._oldValue; this.widget.id = this.id+'-editorWidget'; @@ -1196,8 +1207,8 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({ { alfresco.xforms.RichTextEditor.clickMask.style.display='none' document.body.appendChild(alfresco.xforms.RichTextEditor.clickMask); - if (alfresco.xforms.RichTextEditor.currentInstance && - alfresco.xforms.RichTextEditor.currentInstance != this) + if (alfresco.xforms.RichTextEditor.currentInstance && document.getElementById(alfresco.xforms.RichTextEditor.currentInstance.domNode.id) + && alfresco.xforms.RichTextEditor.currentInstance != this) { alfresco.xforms.RichTextEditor.currentInstance._removeTinyMCE(); } @@ -3524,9 +3535,6 @@ alfresco.xforms.Repeat = alfresco.xforms.VGroup.extend({ var toChild = this.getChildAt(toIndex); this.xform.swapRepeatItems(fromChild, toChild); - // set tinymce current instance to null - alfresco.xforms.RichTextEditor.currentInstance = null; - var anim = dojo.lfx.html.fadeOut(fromChild.domContainer, 500); anim.onEnd = function() { @@ -3775,9 +3783,6 @@ alfresco.xforms.Repeat = alfresco.xforms.VGroup.extend({ event.stopPropagation(); if (this.isInsertRepeatItemEnabled()) { - // set tinymce current instance to null - alfresco.xforms.RichTextEditor.currentInstance = null; - this.setFocusedChild(null); var trigger = this._getRepeatItemTrigger("insert", { position: "before" }); trigger.fire(); @@ -3795,9 +3800,6 @@ alfresco.xforms.Repeat = alfresco.xforms.VGroup.extend({ event.stopPropagation(); if (this.isRemoveRepeatItemEnabled()) { - // set tinymce current instance to null - alfresco.xforms.RichTextEditor.currentInstance = null; - var index = this._repeatControls.indexOf(event.target.parentNode); var repeatItem = this.getChildAt(index); this.setFocusedChild(repeatItem); @@ -4487,12 +4489,11 @@ alfresco.xforms.XForm = new Class({ case "chiba-state-changed": { alfresco.log("handleStateChanged(" + xfe.targetId + ")"); - var isModified = false; if ("valid" in xfe.properties) { xfe.getTarget().setValid(xfe.properties["valid"] == "true"); - isModified= true; + xfe.getTarget().setModified(true); } if ("required" in xfe.properties) { @@ -4510,9 +4511,8 @@ alfresco.xforms.XForm = new Class({ { alfresco.log("setting " + xfe.getTarget().id + " = " + xfe.properties["value"]); xfe.getTarget().setValue(xfe.properties["value"]); - isModified= true; + xfe.getTarget().setModified(true); } - xfe.getTarget().setModified(isModified); break; } case "chiba-prototype-cloned":