Author: dsaulnier
Date: Fri May 25 17:53:30 2007
New Revision: 17390
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17390&repname=
=3Djahia
Log:
Updated key value in default, En & Fr in Versioning engine.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D17390&rep=
name=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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties Fri May 25 17:53:30 2007
@@ -1151,7 +1151,7 @@
org.jahia.engines.version.deletedBy =3D Deleted by
org.jahia.engines.version.deleteDate =3D Delete date
org.jahia.engines.version.exactRestore =3D Exact restore
-org.jahia.engines.version.exactRestoreDescription =3D Sub pages(<span styl=
e =3D " color: Blue">blue pages</span>) and content of selected pages will =
be removed (They were deleted or added after the selected date)
+org.jahia.engines.version.exactRestoreDescription =3D All modifications su=
bsequent to the revision date will be lost, including added or removed sub =
pages (<span style =3D " color: Blue">concerned pages are blue highlighted<=
/span>)
org.jahia.engines.version.fieldsTab =3D Fields
org.jahia.engines.version.from =3D From
org.jahia.engines.version.ignoreRevisionDateSelection =3D Ignore revision =
date selection
@@ -1173,7 +1173,7 @@
org.jahia.engines.version.pagesSelection =3D Pages selection
org.jahia.engines.version.pagesThatExistOnlyInStaging =3D Pages that exist=
only in staging (<span style =3D " color: Blue">blue pages</span>) cannot =
be undo
org.jahia.engines.version.partialRestore =3D Partial restore
-org.jahia.engines.version.partialRestoreDescription =3D Restore only conte=
nt not deleted at the selected date
+org.jahia.engines.version.partialRestoreDescription =3D Containers created=
after the restoration date will not be deleted, but will be kept in their =
current state. Deleted and still existing containers will be restored in th=
eir state at the restoration date.
org.jahia.engines.version.previouslyDeletedPages =3D Previously deleted pa=
ges (<span style =3D " color: red">red pages</span>) will be deleted again =
if applying undo
org.jahia.engines.version.proceedToStep =3D Proceed to step
org.jahia.engines.version.restore =3D restore
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D17390&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties Fri May 25 17:53:30 2007
@@ -1151,7 +1151,7 @@
org.jahia.engines.version.deletedBy =3D Deleted by
org.jahia.engines.version.deleteDate =3D Delete date
org.jahia.engines.version.exactRestore =3D Exact restore
-org.jahia.engines.version.exactRestoreDescription =3D Sub pages(<span styl=
e =3D " color: Blue">blue pages</span>) and content of selected pages will =
be removed (They were deleted or added after the selected date)
+org.jahia.engines.version.exactRestoreDescription =3D All modifications su=
bsequent to the revision date will be lost, including added or removed sub =
pages (<span style =3D " color: Blue">concerned pages are blue highlighted<=
/span>)
org.jahia.engines.version.fieldsTab =3D Fields
org.jahia.engines.version.from =3D From
org.jahia.engines.version.ignoreRevisionDateSelection =3D Ignore revision =
date selection
@@ -1173,7 +1173,7 @@
org.jahia.engines.version.pagesSelection =3D Pages selection
org.jahia.engines.version.pagesThatExistOnlyInStaging =3D Pages that exist=
only in staging (<span style =3D " color: Blue">blue pages</span>) cannot =
be undo
org.jahia.engines.version.partialRestore =3D Partial restore
-org.jahia.engines.version.partialRestoreDescription =3D Restore only conte=
nt not deleted at the selected date
+org.jahia.engines.version.partialRestoreDescription =3D Containers created=
after the restoration date will not be deleted, but will be kept in their =
current state. Deleted and still existing containers will be restored in th=
eir state at the restoration date.
org.jahia.engines.version.previouslyDeletedPages =3D Previously deleted pa=
ges (<span style =3D " color: red">red pages</span>) will be deleted again =
if applying undo
org.jahia.engines.version.proceedToStep =3D Proceed to step
org.jahia.engines.version.restore =3D restore
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D17390&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties Fri May 25 17:53:30 2007
@@ -899,7 +899,7 @@
org.jahia.engines.version.deleted =3D supprim=C3=A9
org.jahia.engines.version.deletedBy =3D Supprim=C3=A9 par
org.jahia.engines.version.exactRestore =3D Restauration exacte
-org.jahia.engines.version.exactRestoreDescription =3D Les sous-pages(<span=
style =3D " color: Blue">pages en bleu</span>) et les contenus des pages s=
=C3=A9lectionn=C3=A9es seront supprim=C3=A9s (ils ont =C3=A9t=C3=A9 supprim=
=C3=A9s ou ajout=C3=A9s apr=C3=A8s la date s=C3=A9lectionn=C3=A9e)
+org.jahia.engines.version.exactRestoreDescription =3D Toutes les modificat=
ions ult=C3=A9rieures =C3=A0 la date de r=C3=A9vision seront perdues, y com=
pris les sous-pages ayant =C3=A9t=C3=A9 ajout=C3=A9es ou supprim=C3=A9es (<=
span style =3D " color: Blue">les pages concern=C3=A9es sont affich=C3=A9es=
en bleu</span>)
org.jahia.engines.version.fieldsTab =3D Champs
org.jahia.engines.version.from =3D De
org.jahia.engines.version.ignoreRevisionDateSelection =3D Ignorer la s=C3=
=A9lection de la date de r=C3=A9vision
@@ -921,7 +921,7 @@
org.jahia.engines.version.pagesSelection =3D S=C3=A9lection des pages
org.jahia.engines.version.pagesThatExistOnlyInStaging =3D Les pages qui n'=
ont jamais =C3=A9t=C3=A9 valid=C3=A9es (<span style =3D " color: Blue">page=
s en bleu</span>) ne peuvent pas =C3=AAtre invalid=C3=A9es
org.jahia.engines.version.partialRestore =3D Restauration partielle
-org.jahia.engines.version.partialRestoreDescription =3D Restaurer seulemen=
t le contenu non supprim=C3=A9 =C3=A0 la date s=C3=A9lectionn=C3=A9e
+org.jahia.engines.version.partialRestoreDescription =3D Les containers cr=
=C3=A9=C3=A9s apr=C3=A8s la date de restauration ne seront pas supprim=C3=
=A9s, mais seront conserv=C3=A9s dans leur =C3=A9tat actuel. Les containers=
supprim=C3=A9s ou toujours existants seront restaur=C3=A9s dans leur =C3=
=A9tat =C3=A0 la date de restauration.
org.jahia.engines.version.previouslyDeletedPages =3D Les pages pr=C3=A9c=
=C3=A9demment supprim=C3=A9es (<span style =3D " color: red">pages en rouge=
</span>) seront =C3=A0 nouveau supprim=C3=A9es
org.jahia.engines.version.proceedToStep =3D Passer =C3=A0 l'=C3=A9tape
org.jahia.engines.version.restore =3D restaurer
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
