Author: xlawrence
Date: Wed Jun 27 16:40:19 2007
New Revision: 17811
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17811&repname=
=3Djahia
Log:
backport improvement and fixes on error display in workflow report
backport last modifications of the bundles coming from SP branch
Modified:
trunk/core/src/conf/java/JahiaAdministrationResources.properties
trunk/core/src/conf/java/JahiaAdministrationResources_en.properties
trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties
trunk/core/src/conf/java/JahiaEnginesResources.properties
trunk/core/src/conf/java/JahiaEnginesResources_en.properties
trunk/core/src/conf/java/JahiaEnginesResources_fr.properties
Modified: trunk/core/src/conf/java/JahiaAdministrationResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources.properties&rev=3D17811&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaAdministrationResources.properties (origi=
nal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources.properties Wed Ju=
n 27 16:40:19 2007
@@ -461,6 +461,7 @@
org.jahia.admin.site.ManageSites.noImport.label =3D Empty site
org.jahia.admin.site.ManageSites.defaultImport.label =3D Default import
org.jahia.admin.site.ManageSites.fileImport.label =3D Import file =
+org.jahia.admin.site.ManageSites.import.label =3D Import
org.jahia.admin.site.ManageSites.or.label =3D or
org.jahia.admin.site.ManageSites.export.label =3D Export
org.jahia.admin.site.ManageSites.exportall.label =3D Export all sites
@@ -498,6 +499,8 @@
org.jahia.admin.sitepermissions.permission.engines.actions.add.label=3DAdd=
content
org.jahia.admin.sitepermissions.permission.engines.actions.paste.label=3DP=
aste content
org.jahia.admin.sitepermissions.permission.engines.actions.editMode.label=
=3DAccess to edit mode
+org.jahia.admin.sitepermissions.permission.engines.actions.byPassIntegrity=
Checks.label=3DBypass URL integrity checks
+org.jahia.admin.sitepermissions.permission.engines.actions.byPassWAIChecks=
.label=3DBypass WAI compliance checks
org.jahia.admin.sitepermissions.permission.engines.languages.en.label=3DEd=
it content in English
org.jahia.admin.sitepermissions.permission.engines.languages.fr.label=3DEd=
it content in French
org.jahia.admin.sitepermissions.permission.engines.languages.de.label=3DEd=
it content in German
@@ -569,6 +572,7 @@
org.jahia.admin.status.ManageStatus.availableConnections.label =3D availa=
ble connections
org.jahia.admin.status.ManageStatus.busyConnections.label =3D busy connec=
tions
org.jahia.admin.status.ManageStatus.cacheFlushingIntroduction.label=3DNote=
: cache flush operations only occur on this cluster node.
+
org.jahia.admin.status.ManageStatus.cache.AclNames.description.label=3DACL=
name cache
org.jahia.admin.status.ManageStatus.cache.AppplicationCache.description.la=
bel=3DApplications cache
org.jahia.admin.status.ManageStatus.cache.ApplicationContextCache.descript=
ion.label =3D Applications context cache
@@ -616,6 +620,7 @@
org.jahia.admin.status.ManageStatus.cache.JahiaFieldsDataManagerCache.desc=
ription.label =3D Jahia Fields manager cache
org.jahia.admin.status.ManageStatus.cache.JahiaGroupManagerCache.descripti=
on.label =3D Jahia Group manager cache
org.jahia.admin.status.ManageStatus.cache.JahiaLinkManagerCache.descriptio=
n.label =3D Jahia Link manager cache
+
org.jahia.admin.status.ManageStatus.cache.JahiaLinkManagerCachefindByLeftO=
bjectKey.description.label=3DJahia Link by left object key cache
org.jahia.admin.status.ManageStatus.cache.JahiaLinkManagerCachefindByRight=
ObjectKey.description.label=3DJahia Link by right object key cache
org.jahia.admin.status.ManageStatus.cache.JahiaLinkManagerCachefindByTypeA=
ndLeftObjectKey.description.label=3DJahia link by type and left object key =
cache
Modified: trunk/core/src/conf/java/JahiaAdministrationResources_en.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources_en.properties&rev=3D17811&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaAdministrationResources_en.properties (or=
iginal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources_en.properties Wed=
Jun 27 16:40:19 2007
@@ -461,6 +461,7 @@
org.jahia.admin.site.ManageSites.noImport.label =3D Empty site
org.jahia.admin.site.ManageSites.defaultImport.label =3D Default import
org.jahia.admin.site.ManageSites.fileImport.label =3D Import file =
+org.jahia.admin.site.ManageSites.import.label =3D Import
org.jahia.admin.site.ManageSites.or.label =3D or
org.jahia.admin.site.ManageSites.export.label =3D Export
org.jahia.admin.site.ManageSites.exportall.label =3D Export all sites
@@ -498,6 +499,8 @@
org.jahia.admin.sitepermissions.permission.engines.actions.add.label=3DAdd=
content
org.jahia.admin.sitepermissions.permission.engines.actions.paste.label=3DP=
aste content
org.jahia.admin.sitepermissions.permission.engines.actions.editMode.label=
=3DAccess to edit mode
+org.jahia.admin.sitepermissions.permission.engines.actions.byPassIntegrity=
Checks.label=3DBypass URL integrity checks
+org.jahia.admin.sitepermissions.permission.engines.actions.byPassWAIChecks=
.label=3DBypass WAI compliance checks
org.jahia.admin.sitepermissions.permission.engines.languages.en.label=3DEd=
it content in English
org.jahia.admin.sitepermissions.permission.engines.languages.fr.label=3DEd=
it content in French
org.jahia.admin.sitepermissions.permission.engines.languages.de.label=3DEd=
it content in German
@@ -569,6 +572,7 @@
org.jahia.admin.status.ManageStatus.availableConnections.label =3D availa=
ble connections
org.jahia.admin.status.ManageStatus.busyConnections.label =3D busy connec=
tions
org.jahia.admin.status.ManageStatus.cacheFlushingIntroduction.label=3DNote=
: cache flush operations only occur on this cluster node.
+
org.jahia.admin.status.ManageStatus.cache.AclNames.description.label=3DACL=
name cache
org.jahia.admin.status.ManageStatus.cache.AppplicationCache.description.la=
bel=3DApplications cache
org.jahia.admin.status.ManageStatus.cache.ApplicationContextCache.descript=
ion.label =3D Applications context cache
@@ -616,6 +620,7 @@
org.jahia.admin.status.ManageStatus.cache.JahiaFieldsDataManagerCache.desc=
ription.label =3D Jahia Fields manager cache
org.jahia.admin.status.ManageStatus.cache.JahiaGroupManagerCache.descripti=
on.label =3D Jahia Group manager cache
org.jahia.admin.status.ManageStatus.cache.JahiaLinkManagerCache.descriptio=
n.label =3D Jahia Link manager cache
+
org.jahia.admin.status.ManageStatus.cache.JahiaLinkManagerCachefindByLeftO=
bjectKey.description.label=3DJahia Link by left object key cache
org.jahia.admin.status.ManageStatus.cache.JahiaLinkManagerCachefindByRight=
ObjectKey.description.label=3DJahia Link by right object key cache
org.jahia.admin.status.ManageStatus.cache.JahiaLinkManagerCachefindByTypeA=
ndLeftObjectKey.description.label=3DJahia link by type and left object key =
cache
Modified: trunk/core/src/conf/java/JahiaAdministrationResources_fr.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources_fr.properties&rev=3D17811&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties (or=
iginal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties Wed=
Jun 27 16:40:19 2007
@@ -643,6 +643,8 @@
org.jahia.admin.sitepermissions.permission.engines.actions.paste.label=3DC=
oller contenu
org.jahia.admin.sitepermissions.permission.engines.actions.update.label=3D=
Mettre =C3=A0 jour contenu
org.jahia.admin.sitepermissions.permission.engines.actions.editMode.label=
=3DAcc=C3=A8s au mode d'=C3=A9dition
+org.jahia.admin.sitepermissions.permission.engines.actions.byPassIntegrity=
Checks.label=3DIgnorer les erreurs d'int=C3=A9grit=C3=A9 des liens
+org.jahia.admin.sitepermissions.permission.engines.actions.byPassWAIChecks=
.label=3DIgnorer les erreurs WAI
org.jahia.admin.sitepermissions.permission.engines.audit.ManageLogs_Engine=
.label=3DJournaux
org.jahia.admin.sitepermissions.permission.engines.containerlistproperties=
.FieldRightsEngine.label=3DDroits sur les champs (pop-up)
org.jahia.admin.sitepermissions.permission.engines.content.Edit.label=3D=
=C3=89dition de contenu
Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources.properties&rev=3D17811&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaEnginesResources.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources.properties Wed Jun 27 16=
:40:19 2007
@@ -150,11 +150,11 @@
org.jahia.okOff.button =3D /jsp/jahia/engines/images/buttons/ok_off.gif
org.jahia.cancelOn.button =3D /jsp/jahia/engines/images/buttons/cancel_on.=
gif
org.jahia.cancelOff.button =3D /jsp/jahia/engines/images/buttons/cancel_of=
f.gif
-org.jahia.nextContainer.button =3D To next content objet
-org.jahia.previousContainer.button =3D To previous content objet
-org.jahia.lastContainer.button =3D To last content objet
-org.jahia.firstContainer.button =3D To first content objet
-org.jahia.newContainer.button =3D Create new content objet
+org.jahia.nextContainer.button =3D To next content object
+org.jahia.previousContainer.button =3D To previous content object
+org.jahia.lastContainer.button =3D To last content object
+org.jahia.firstContainer.button =3D To first content object
+org.jahia.newContainer.button =3D Create new content object
org.jahia.navigation.toFirst.button =3D Go to first content object of the =
list
org.jahia.navigation.toPrevious.button =3D Go to previous content object o=
f the list
org.jahia.navigation.toNext.button =3D Go to next content object of the li=
st
@@ -523,7 +523,7 @@
org.jahia.engines.noTools.label =3D No tools available
=
org.jahia.applyToAllLanguages.label =3D Apply to all languages
-org.jahia.altApplyAndAddContainer.label =3D Apply the modifications and ad=
d new content objet (Ctrl+m)
+org.jahia.altApplyAndAddContainer.label =3D Apply the modifications and ad=
d new content object (Ctrl+m)
org.jahia.altApplyAndClose.label =3D Apply modifications and close window =
(Ctrl+enter)
org.jahia.altApplyWithoutClose.label =3D Apply the modifications whithout =
closing the window
org.jahia.altCloseWithoutSave.label =3D Close the window whithout saving m=
odifications (Ctrl+w)
@@ -536,10 +536,10 @@
org.jahia.page.options.label =3D Options
org.jahia.pageId.label =3D Page ID
org.jahia.refreshMainPage.label =3D Refresh Main Page
-org.jahia.warning.label =3D WARNING(S)
-org.jahia.error.label =3D ERROR(S)
-org.jahia.warningPart1.label =3D you are editing a content objet that has =
it's source on another page
-org.jahia.warningPart2.label =3D in order to validate this content objet y=
ou must navigate to the source page
+org.jahia.warning.label =3D Warning(s)
+org.jahia.error.label =3D Error(s)
+org.jahia.warningPart1.label =3D you are editing a content object that has=
it's source on another page
+org.jahia.warningPart2.label =3D in order to validate this content object =
you must navigate to the source page
=
org.jahia.bin.Jahia.jahiaWarning.label =3D Jahia Warning
org.jahia.bin.Jahia.serverLocked.label =3D Sorry, the server is locked in =
exclusive mode by a super admin.<br><br>No more access allowed. Try again l=
ater.
@@ -587,16 +587,16 @@
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
lphabeticalDescending.label =3D Descending
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
utomaticRanking.label =3D Automatic Ranking
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
hooseAnAutomaticSort.label =3D Choose an automatic sort
-org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ontainerListSettings.label =3D Content objet list settings
-org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ontainerListTitle.label =3D Content objet list title
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ontainerListSettings.label =3D Content object list settings
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ontainerListTitle.label =3D Content object list title
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
urrentFiled.label =3D Current Field
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ursorField.label =3D Cursor field
-org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.e=
mptyContainerListWarning.label =3D The content objet list is empty. You may=
edit the rights if you want.
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.e=
mptyContainerListWarning.label =3D The content object list is empty. You ma=
y edit the rights if you want.
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
d.label =3D ID
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
nsertionOrderAscending.label =3D Insertion order, ascending
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
nsertionOrderDescending.label =3D Insertion order, descending
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
anualRanking.label =3D Manual Ranking
-org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveAContainerUpOrDown.label =3D Move a content objet up or down
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveAContainerUpOrDown.label =3D Move a content object up or down
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveAtBottom.label =3D Move at bottom
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveDown.label =3D Move down
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveOnTop.label =3D Move on top
@@ -620,8 +620,8 @@
org.jahia.engines.copytree.CopyTree_Engine.tree.label =3D Tree
org.jahia.engines.copytree.CopyTree_Engine.treeManipulationPreview.label =
=3D Tree manipulation :: preview
org.jahia.engines.deletecontainer.DeleteContainer_Engine.close.label =3D C=
lose the window without deleting the Jahia object
-org.jahia.engines.deletecontainer.DeleteContainer_Engine.confirm.label =3D=
Are you sure you want to delete this content objet ?
-org.jahia.engines.deletecontainer.DeleteContainer_Engine.deleteContainer.l=
abel =3D Delete content objet
+org.jahia.engines.deletecontainer.DeleteContainer_Engine.confirm.label =3D=
Are you sure you want to delete this content object ?
+org.jahia.engines.deletecontainer.DeleteContainer_Engine.deleteContainer.l=
abel =3D Delete content object
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delLinks.label =
=3D The following links will be deleted
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delObj.label =3D =
Delete the Jahia object and close window
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPages.label =
=3D The following pages will be deleted
@@ -680,8 +680,10 @@
org.jahia.engines.filemanager.Filemanager_Engine.empty.label =3D Your sele=
ction is empty !
org.jahia.engines.filemanager.Filemanager_Engine.moreThanOne.label =3D You=
have selected more than 1 file/directory !
org.jahia.engines.filemanager.Filemanager_Engine.path.label =3D Path
+org.jahia.engines.filemanager.Filemanager_Engine.changePermOrSelectOther.l=
abel =3D Please select another file or ask an administrator to change the p=
ermissions of this file
org.jahia.engines.filemanager.Filemanager_Engine.createZip.label =3D Creat=
e Zip file of selected files/directories
org.jahia.engines.filemanager.Filemanager_Engine.deleteFile.label =3D Dele=
te File
+org.jahia.engines.filemanager.Filemanager_Engine.deleteFiles.label =3D Del=
ete Files
org.jahia.engines.filemanager.Filemanager_Engine.deleteDir.label =3D Delet=
e Directory
org.jahia.engines.filemanager.Filemanager_Engine.fileList.label =3D Files&=
nbsp;List
org.jahia.engines.filemanager.Filemanager_Engine.fileLocation.label =3D Fi=
le Location
@@ -690,8 +692,9 @@
org.jahia.engines.filemanager.Filemanager_Engine.deleteDenied.label =3D Yo=
u cannot delete this folder because it contains elements that cannot be del=
eted.
org.jahia.engines.filemanager.Filemanager_Engine.renameDenied.label =3D Yo=
u cannot rename this folder because it contains elements that cannot be ren=
amed.
org.jahia.engines.filemanager.Filemanager_Engine.permissionError.label =3D=
You cannot change permissions on this directory.
-org.jahia.engines.filemanager.Filemanager_Engine.readPermissionError.label=
=3D You are attempting to restrict read rights on a used file. . This will=
generate a 403 error on
-org.jahia.engines.filemanager.Filemanager_Engine.permIntegrityError.label =
=3D This file cannot be seen by the following users in live mode
+org.jahia.engines.filemanager.Filemanager_Engine.readPermissionError.label=
=3D You are attempting to restrict read rights on a used file. This will g=
enerate a 403 error on
+org.jahia.engines.filemanager.Filemanager_Engine.readPermissionConfirm.lab=
el =3D Please perform your changes again and select the above chack box to =
save them
+org.jahia.engines.filemanager.Filemanager_Engine.permIntegrityError.label =
=3D This file cannot be read by the following users in live mode
org.jahia.engines.filemanager.Filemanager_Engine.fileName.label =3D File&n=
bsp;Name
org.jahia.engines.filemanager.Filemanager_Engine.dirName.label =3D Directo=
ry Name
org.jahia.engines.filemanager.Filemanager_Engine.newName.label =3D New &nb=
sp;Name
@@ -702,6 +705,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D A=
file with that name already exists !
org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D Overw=
rite
org.jahia.engines.filemanager.Filemanager_Engine.filters.label =3D Filters
+org.jahia.engines.filemanager.Filemanager_Engine.filtersSearch.label =3D S=
earch
org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Auto=
matically rename
org.jahia.engines.filemanager.Filemanager_Engine.doNothing.label =3D Do no=
thing
org.jahia.engines.filemanager.Filemanager_Engine.createDir.label =3D Creat=
e New Directory
@@ -767,6 +771,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.homeDir.label =3D My fold=
er
org.jahia.engines.filemanager.Filemanager_Engine.sharedDir.label =3D Share=
d folder (site)
org.jahia.engines.filemanager.Filemanager_Engine.usersDir.label =3D User f=
olders
+org.jahia.engines.filemanager.Filemanager_Engine.group.label =3D Group
org.jahia.engines.filemanager.Filemanager_Engine.groupsDir.label =3D Group=
folders
org.jahia.engines.filemanager.Filemanager_Engine.operations.label =3D Oper=
ations
org.jahia.engines.filemanager.Filemanager_Engine.addproperty.label =3D Add=
property
@@ -952,8 +957,10 @@
org.jahia.engines.shared.BigText_Field.ignoreAllWarning.label =3D Ignore a=
ll warnings (note: warnings prevent the content object from being validated)
org.jahia.engines.shared.BigText_Field.ignoreWarning.label =3D Ignore warn=
ing(s)
org.jahia.engines.shared.BigText_Field.warning.label =3D Integrity Warning=
(s)
+org.jahia.engines.shared.BigText_Field.integrityError.label =3D Integrity =
Error(s)
org.jahia.engines.shared.BigText_Field.desactivateChecks.label =3D (can be=
disabled from the administration in "Html Checks and Validation")
org.jahia.engines.shared.BigText_Field.WAIwarning.label =3D WAI Warning(s)
+org.jahia.engines.shared.BigText_Field.WAIerror.label =3D WAI Error(s)
org.jahia.engines.shared.BigText_Field.error.label =3D Error(s)
org.jahia.engines.shared.Boolean_Field.booleanField.label =3D (boolean)
org.jahia.engines.shared.Boolean_Field.checkForTrue.label =3D Check for "t=
rue"
@@ -1022,7 +1029,7 @@
org.jahia.engines.shared.Page_Field.selectPageToLink.label =3D Select page=
to link
org.jahia.engines.shared.Page_Field.selectPageToMove.label =3D Select page=
to move
org.jahia.engines.shared.Page_Field.pageMoveOptions.label =3D Page move op=
tions
-org.jahia.engines.shared.Page_Field.pageMoveDeleteOldContainer.label =3D D=
elete the old content objet containing the page
+org.jahia.engines.shared.Page_Field.pageMoveDeleteOldContainer.label =3D D=
elete the old content object containing the page
org.jahia.engines.shared.Page_Field.shareTitleWithOtherLanguages.label =3D=
Copy this title in the other languages
org.jahia.engines.shared.Page_Field.differPageCreation.label =3D <b>Don't =
create</b> Jahia page
org.jahia.engines.shared.Page_Field.removePageLink.label =3D <b>Reset</b> =
link
@@ -1067,14 +1074,14 @@
org.jahia.engines.timebasedpublishing.rangerule.validTo.label =3D Expirati=
on date
org.jahia.engines.title.label =3D Title
org.jahia.engines.title.AddContainer =3D Add content object
-org.jahia.engines.title.ContainerListProperties =3D Property of content ob=
jet list
-org.jahia.engines.title.DeleteContainer =3D Delete content objet
+org.jahia.engines.title.ContainerListProperties =3D Property of content ob=
ject list
+org.jahia.engines.title.DeleteContainer =3D Delete content object
org.jahia.engines.title.PageProperties =3D Page property
org.jahia.engines.title.UpdateContainer =3D Update content object
org.jahia.engines.title.Lock =3D Loked page
org.jahia.engines.title.FileMangaer.fileUsage =3D File usage
org.jahia.engines.title.FileMangaer.fileEdit =3D File setting
-org.jahia.engines.updatecontainer.UpdateContainer_Engine.updateContainer.l=
abel =3D Update content objet
+org.jahia.engines.updatecontainer.UpdateContainer_Engine.updateContainer.l=
abel =3D Update content object
org.jahia.engines.updatefiled.UpdateField_Engine.fieldName.label =3D Field=
name
org.jahia.engines.updatefiled.UpdateField_Engine.fieldTitle.label =3D Fiel=
d title
org.jahia.engines.updatefiled.UpdateField_Engine.fieldType.label =3D Field=
type
@@ -1163,6 +1170,7 @@
org.jahia.engines.version.level =3D Level
org.jahia.engines.version.levels =3D Levels
org.jahia.engines.version.liveVersion =3D live
+org.jahia.engines.version.lockedPages =3D Pages appearing in red are curre=
ntly locked by another user and cannot be selected
org.jahia.engines.version.mergedDifference =3D Merged difference
org.jahia.engines.version.newVersion =3D New version
org.jahia.engines.version.nbOfRevisions =3D Nb of revisions
@@ -1214,6 +1222,11 @@
org.jahia.engines.version.valueStatus.3 =3D Staged value
org.jahia.engines.version.version =3D Version
org.jahia.engines.version.warning =3D Warning
+org.jahia.engines.workflow.definesRoles.label =3D This Worflow instance de=
fines the following roles
+org.jahia.engines.workflow.nextStepDefined.label =3D The following role is=
defined for the next step of the workflow
+org.jahia.engines.workflow.nextStep.label =3D Next step
+org.jahia.engines.workflow.name.label =3D Workflow name
+
org.jahia.engines.workflow.WorkflowEngine.acceptAndPublishPages.label =3D =
Accept pages and publish them
org.jahia.engines.workflow.WorkflowEngine.applyAndClose.label =3D Apply mo=
difications and close window
org.jahia.engines.workflow.WorkflowEngine.applyWithoutClose.label =3D Appl=
y the modifications whithout closing the window
@@ -1248,10 +1261,6 @@
org.jahia.engines.workflow.WorkflowEngine.checkboxes.label =3D The first b=
utton is to ACCEPT, the second to REJECT the action for the object
org.jahia.engines.workflow.WorkflowEngine.accept.label =3D Accept
org.jahia.engines.workflow.WorkflowEngine.reject.label =3D Reject
-org.jahia.engines.workflow.definesRoles.label =3D This Worflow instance de=
fines the following roles
-org.jahia.engines.workflow.nextStepDefined.label =3D The following role is=
defined for the next step of the workflow
-org.jahia.engines.workflow.nextStep.label =3D Next step
-org.jahia.engines.workflow.name.label =3D Workflow name
=
org.jahia.engines.workflow.mail.notification.start =3D Jahia Workflow Mail=
notification.\nModifications performed by user
org.jahia.engines.workflow.mail.notification.approved.published.label =3D =
Approved and published
@@ -1326,14 +1335,15 @@
org.jahia.engines.lock.parentPage.label =3D The parent page
org.jahia.engines.lock.page.label =3D Page
org.jahia.engines.lock.waitingForApproval.label =3D The content is in wait=
ing for approval state.
+org.jahia.engines.lock.markForDelete.label =3D The content object or its p=
arent page is marked for deletion.
org.jahia.engines.lock.waitingForApprovalCurrentState.label =3D The conten=
t is in waiting for approval state and is currently at this step of the val=
idation process.
-org.jahia.engines.lock.containerTocontentContainer.label =3D A content obj=
et is being added to the list by user
-org.jahia.engines.lock.theContainerList.label =3D The content objet list
-org.jahia.engines.lock.containerList.label =3D Content objet list
+org.jahia.engines.lock.containerTocontentContainer.label =3D A content obj=
ect is being added to the list by user
+org.jahia.engines.lock.theContainerList.label =3D The content object list
+org.jahia.engines.lock.containerList.label =3D Content object list
org.jahia.engines.lock.updateList.label =3D The list properties are being =
updated by user
org.jahia.engines.lock.objectParentPageProperties.label =3D The page prope=
rties are being updated by user
org.jahia.engines.lock.pageTemplateCanChange.label =3D is to be edited (th=
is page template can change).
-org.jahia.engines.lock.theContainer.label =3D The content objet
+org.jahia.engines.lock.theContainer.label =3D The content object
org.jahia.engines.lock.container.label =3D Data
org.jahia.engines.lock.isEditionMode.label =3D The content object is alrea=
dy being updated by user
org.jahia.engines.lock.willBeDeleted.label =3D The content object is alrea=
dy being deleted by user
@@ -1558,4 +1568,10 @@
org.jahia.engines.shared.Application_Field.unauthorized.label =3D You are =
not authorized to modify properties of the currently selected webapp
=
=
-org.jahia.closeOn.button=3D/jsp/jahia/engines/images/buttons/close_on.gif
\ No newline at end of file
+org.jahia.closeOn.button=3D/jsp/jahia/engines/images/buttons/close_on.gif
+
+## Restore container
+org.jahia.engines.restorelivecontainer.RestoreLiveContainer_Engine.restore=
.label =3D Restore live content
+org.jahia.engines.restorelivecontainer.RestoreLiveContainer_Engine.restore=
text.label =3D Are you sure you want to restore the last live version of th=
is content object ?
+org.jahia.engines.restorelivecontainer.RestoreLiveContainer_Engine.restore=
ReadOnly.label =3D The content object is already being restored by user
+
Modified: trunk/core/src/conf/java/JahiaEnginesResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_en.properties&rev=3D17811&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaEnginesResources_en.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_en.properties Wed Jun 27=
16:40:19 2007
@@ -1327,6 +1327,7 @@
org.jahia.engines.lock.waitingForApproval.label =3D The content is in wait=
ing for approval state.
org.jahia.engines.lock.waitingForApprovalCurrentState.label =3D The conten=
t is in waiting for approval state and is currently at this step of the val=
idation process.
org.jahia.engines.lock.containerTocontentContainer.label =3D A content obj=
et is being added to the list by user
+org.jahia.engines.lock.markForDelete.label =3D The content object or its p=
arent page is marked for deletion.
org.jahia.engines.lock.theContainerList.label =3D The content objet list
org.jahia.engines.lock.containerList.label =3D Content objet list
org.jahia.engines.lock.updateList.label =3D The list properties are being =
updated by user
@@ -1546,6 +1547,12 @@
org.jahia.chat.activate=3Donline
org.jahia.chat.status=3Dchange your status
=
+## Restore container
+org.jahia.engines.restorelivecontainer.RestoreLiveContainer_Engine.restore=
.label =3D Restore live content
+org.jahia.engines.restorelivecontainer.RestoreLiveContainer_Engine.restore=
text.label =3D Are you sure you want to restore the last live version of th=
is content object ?
+org.jahia.engines.restorelivecontainer.RestoreLiveContainer_Engine.restore=
ReadOnly.label =3D The content object is already being restored by user
+
+
##Application Engine
org.jahia.engines.application.applicationSettings.label =3D Application Se=
ttings
org.jahia.engines.application.applicationName.label =3D Application
Modified: trunk/core/src/conf/java/JahiaEnginesResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_fr.properties&rev=3D17811&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaEnginesResources_fr.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_fr.properties Wed Jun 27=
16:40:19 2007
@@ -483,6 +483,7 @@
org.jahia.engines.lock.lockResourceCanNuked.label =3D Les verrous ci-dessu=
s peuvent =C3=AAtre d=C3=A9truits si la case =C3=A0 cocher est s=C3=A9lecti=
onn=C3=A9e.
org.jahia.engines.lock.lockResourceCanStolen.label =3D Les verrous ci-dess=
us peuvent =C3=AAtre repris si la case =C3=A0 cocher est s=C3=A9l=C3=A9ctio=
nn=C3=A9e.
org.jahia.engines.lock.lockedByWorkflow.label =3D Le contenu est verrouill=
=C3=A9 par le moteur du workflow, pour l'utilisateur
+org.jahia.engines.lock.markForDelete.label =3D Le conteneur ou sa page par=
ente est en attente de suppression.
org.jahia.engines.lock.objectLockedByUser.label =3D Objet verrouill=C3=A9 =
par l'utilisateur :
org.jahia.engines.lock.objectParentPageProperties.label =3D Les propri=C3=
=A9t=C3=A9s de la page sont en cours d'=C3=A9dition par l'utilisateur
org.jahia.engines.lock.operationCannotCarriedOut.label =3D L'op=C3=A9ratio=
n requise ne peut =C3=AAtre ex=C3=A9cut=C3=A9e pour les raisons suivantes&n=
bsp;:
@@ -1136,4 +1137,9 @@
org.jahia.time.yesterday.prefix=3Dhier =C3=A0
org.jahia.warning.label =3D AVERTISSEMENT(S)
org.jahia.warningPart1.label =3D vous =C3=AAtes en train d'=C3=A9diter un =
objet de contenu dont la source situe sur une autre page
-org.jahia.warningPart2.label =3D Pour valider cet objet de contenu, vous d=
evez naviguer jusqu'=C3=A0 la page source
\ No newline at end of file
+org.jahia.warningPart2.label =3D Pour valider cet objet de contenu, vous d=
evez naviguer jusqu'=C3=A0 la page source
+
+## Restore container
+org.jahia.engines.restorelivecontainer.RestoreLiveContainer_Engine.restore=
.label =3D Restaurer version publi=C3=A9e
+org.jahia.engines.restorelivecontainer.RestoreLiveContainer_Engine.restore=
text.label =3D Etes-vous s=C3=BBr de vouloir restaurer la derni=C3=A8re ver=
sion en ligne de cet objet de contenu ?
+org.jahia.engines.restorelivecontainer.RestoreLiveContainer_Engine.restore=
ReadOnly.label =3D L'objet de contenu est d=C3=A9j=C3=A0 en cours de restau=
ration par l'utilisateur=3D=3D=3D=3D=3D=3D=3D
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
