Author: xlawrence
Date: Wed May 23 10:10:30 2007
New Revision: 17355
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17355&repname=
=3Djahia
Log:
resolve issue http://www.jahia.net/jira/browse/JAHIA-1931: Exception raised=
when a site is deselected as default site
Modified:
trunk/core/src/conf/java/JahiaAdministrationResources.properties
trunk/core/src/conf/java/JahiaAdministrationResources_en.properties
trunk/core/src/conf/java/JahiaAdministrationResources_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=3D17355&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 Ma=
y 23 10:10:30 2007
@@ -381,7 +381,7 @@
org.jahia.admin.search.ManageSearch.whenToIndex.label =3D When to index a=
site ?
org.jahia.admin.search.ManageSearch.whenToIndexOptimiz.label =3D When to p=
erform an index optimization ?
org.jahia.admin.select.label =3D Select
-org.jahia.admin.selectTask.label =3D Select the task you want to perform =
+org.jahia.admin.selectTask.label =3D Select the task you want to perform
org.jahia.admin.selectWebsite.label =3D Select your website
org.jahia.admin.server.label =3D server
org.jahia.admin.server.ManageServer.disabled.label =3D DISABLED
@@ -435,6 +435,7 @@
org.jahia.admin.site.ManageSites.enableVersioning.label =3D Enable Versio=
ning
org.jahia.admin.site.ManageSites.giveMeAMembership.label =3D Give me as a=
dministrator membership on this virtual site.
org.jahia.admin.site.ManageSites.initialSiteContent.label =3D Initial site=
content
+org.jahia.admin.site.ManageSites.isTheDefaultSite.label =3D This site is =
the default virtual site
org.jahia.admin.site.ManageSites.manageVirtualSites.label =3D Manage virt=
ual sites
org.jahia.admin.site.ManageSites.NoTemplatePreview.label =3D No template p=
review
org.jahia.admin.site.ManageSites.noTemplatesHasbeenFound.label =3D No tem=
plates set has been found.
@@ -464,6 +465,7 @@
org.jahia.admin.site.ManageSites.exportall.label =3D Export all sites
org.jahia.admin.site.ManageSites.exportsites.label =3D Export selected sit=
es
org.jahia.admin.site.ManageSites.deletesites.label =3D Delete selected sit=
es
+org.jahia.admin.site.ManageSites.noSiteSpecified.label =3D Virtual site se=
lection is empty
org.jahia.admin.site.ManageSites.multipleimport.label =3D Import one or mo=
re virtual sites
org.jahia.admin.site.ManageSites.multipleimport.fileselect =3D Please sele=
ct the file to import
org.jahia.admin.site.ManageSites.multipleimport.fileinput =3D Or give the =
path of an import file on the server
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=3D17355&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=
May 23 10:10:30 2007
@@ -27,8 +27,8 @@
=
org.jahia.admin.aboutJahia.label =3D About Jahia
org.jahia.admin.administrativeAuditLog.label =3D Administrative audit logs
-org.jahia.admin.add.label=3DAdd
-org.jahia.admin.apply.label=3DApply
+org.jahia.admin.add.label =3D Add
+org.jahia.admin.apply.label =3D Apply
org.jahia.admin.audit.ManageLogs.autoLimitLogsTo.label =3D Auto-limit log=
s to
org.jahia.admin.audit.ManageLogs.backToLogSettings.label =3D Back to log =
settings
org.jahia.admin.audit.ManageLogs.day.label =3D day(s)
@@ -198,9 +198,9 @@
org.jahia.admin.htmleditors.manageMarkupsFiltering.label =3D Manage markup=
s filtering
org.jahia.admin.htmleditors.manageSiteSetting.label =3D Manage site setting
org.jahia.admin.htmleditors.markupName.label =3D Markup Name
-org.jahia.admin.htmleditors.NomarkupRegistered.label=3DNo Markup Registere=
d yet
+org.jahia.admin.htmleditors.NomarkupRegistered.label =3D No Markup Registe=
red yet
org.jahia.admin.htmleditors.markupsToRemoveWhenParsingTextContent.label =
=3D Markups to remove when parsing text content
-org.jahia.admin.htmleditors.backHtmlEditorsOperationChoice.label=3DBack to=
Html Editors Operation Choices
+org.jahia.admin.htmleditors.backHtmlEditorsOperationChoice.label =3D Back =
to Html Editors Operation Choices
org.jahia.admin.htmleditors.reloadHtmlEditorsConfigFile.label =3D Reload H=
tml Editors Configuration File from disk
org.jahia.admin.htmleditors.virtualSiteName.label =3D Site Name
org.jahia.admin.htmleditors.virtualSiteHtmlCleanupEnabled.label =3D Html C=
leanup (with Tidy)
@@ -255,8 +255,8 @@
org.jahia.admin.homepages.ManageHomepages.useThisTemplate.label =3D Use t=
his template
org.jahia.admin.homeSite.label =3D Home site
org.jahia.admin.info.LicenceInfo.current.label =3D Current
-org.jahia.admin.info.LicenceInfo.licenseActivated.label=3Dactivated
-org.jahia.admin.info.LicenceInfo.licenseDeactivated.label=3Ddeactivated
+org.jahia.admin.info.LicenceInfo.licenseActivated.label =3D activated
+org.jahia.admin.info.LicenceInfo.licenseDeactivated.label =3D deactivated
org.jahia.admin.info.LicenceInfo.jahiaEdition.free.label =3D Community Edi=
tion
org.jahia.admin.info.LicenceInfo.jahiaEdition.standard.label =3D Standard =
Edition
org.jahia.admin.info.LicenceInfo.jahiaEdition.pro.label =3D Professional E=
dition
@@ -380,8 +380,8 @@
org.jahia.admin.search.ManageSearch.whatIsIndexing.label =3D What is inde=
xing a site ?
org.jahia.admin.search.ManageSearch.whenToIndex.label =3D When to index a=
site ?
org.jahia.admin.search.ManageSearch.whenToIndexOptimiz.label =3D When to p=
erform an index optimization ?
-org.jahia.admin.select.label=3DSelect
-org.jahia.admin.selectTask.label =3D Select the task you want to perform =
+org.jahia.admin.select.label =3D Select
+org.jahia.admin.selectTask.label =3D Select the task you want to perform
org.jahia.admin.selectWebsite.label =3D Select your website
org.jahia.admin.server.label =3D server
org.jahia.admin.server.ManageServer.disabled.label =3D DISABLED
@@ -435,6 +435,7 @@
org.jahia.admin.site.ManageSites.enableVersioning.label =3D Enable Versio=
ning
org.jahia.admin.site.ManageSites.giveMeAMembership.label =3D Give me as a=
dministrator membership on this virtual site.
org.jahia.admin.site.ManageSites.initialSiteContent.label =3D Initial site=
content
+org.jahia.admin.site.ManageSites.isTheDefaultSite.label =3D This site is =
the default virtual site
org.jahia.admin.site.ManageSites.manageVirtualSites.label =3D Manage virt=
ual sites
org.jahia.admin.site.ManageSites.NoTemplatePreview.label =3D No template p=
review
org.jahia.admin.site.ManageSites.noTemplatesHasbeenFound.label =3D No tem=
plates set has been found.
@@ -464,6 +465,7 @@
org.jahia.admin.site.ManageSites.exportall.label =3D Export all sites
org.jahia.admin.site.ManageSites.exportsites.label =3D Export selected sit=
es
org.jahia.admin.site.ManageSites.deletesites.label =3D Delete selected sit=
es
+org.jahia.admin.site.ManageSites.noSiteSpecified.label =3D Virtual site se=
lection is empty
org.jahia.admin.site.ManageSites.multipleimport.label =3D Import one or mo=
re virtual sites
org.jahia.admin.site.ManageSites.multipleimport.fileselect =3D Please sele=
ct the file to import
org.jahia.admin.site.ManageSites.multipleimport.fileinput =3D Or give the =
path of an import file on the server
@@ -1029,19 +1031,19 @@
org.jahia.admin.sitepermissions.permissionsTitle.label=3DPermissions
=
# openration modes
-operationMode.edit =3D Edit
+operationMode.edit=3DEdit
operationMode.compare=3DCompare
operationMode.preview=3DPreview
operationMode.live=3DLive
=
# admin buttons
-button.mySettings =3D My settings
-button.pageSettings =3D Page settings
-button.workflow =3D Workflow
+button.mySettings=3DMy settings
+button.pageSettings=3DPage settings
+button.workflow=3DWorkflow
button.administration=3DAdministration
button.login=3DLogin
button.logout=3DLogout
-button.username =3D username
+button.username=3Dusername
button.search=3DSearch
button.sitemap=3DSitemap
=
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=3D17355&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=
May 23 10:10:30 2007
@@ -124,16 +124,16 @@
org.jahia.admin.Message.selectRadioBoxes.label =3D Veuillez s=C3=A9lection=
ner une des cases ci-dessus
org.jahia.admin.Message.selectSitePage.label =3D Veuillez s=C3=A9lectionne=
r une page du site
org.jahia.admin.aboutJahia.label =3D =C3=80 propos de Jahia
-org.jahia.admin.add.label =3D Ajouter
-org.jahia.admin.administrativeAuditLog.label =3D Gestion des logs d'admin=
istration
-org.jahia.admin.apply.label =3D Appliquer
+org.jahia.admin.add.label=3DAjouter
+org.jahia.admin.administrativeAuditLog.label =3D Gestion des logs d'admini=
stration
+org.jahia.admin.apply.label=3DAppliquer
org.jahia.admin.audit.ManageLogs.autoLimitLogsTo.label =3D Limiter automa=
tiquement le log =C3=A0
org.jahia.admin.audit.ManageLogs.backToLogSettings.label =3D Retour aux p=
ropri=C3=A9t=C3=A9s des logs
org.jahia.admin.audit.ManageLogs.dateColumnTitle.label =3D Date
org.jahia.admin.audit.ManageLogs.day.label =3D jour(s)
org.jahia.admin.audit.ManageLogs.deleteAllLogEntries.label =3D Supprimer =
les entr=C3=A9es de log
org.jahia.admin.audit.ManageLogs.disableLogs.label =3D D=C3=A9sactiver le=
s logs
-org.jahia.admin.audit.ManageLogs.enableLogs.label =3D Activer les logs
+org.jahia.admin.audit.ManageLogs.enableLogs.label =3D Activer les logs
org.jahia.admin.audit.ManageLogs.flush.label =3D Purger
org.jahia.admin.audit.ManageLogs.flushLogs.label =3D Purger le log
org.jahia.admin.audit.ManageLogs.keepEntriesMoreRecentThan.label =3D Cons=
erver les entr=C3=A9es de moins de
@@ -584,11 +584,13 @@
org.jahia.admin.site.ManageSites.giveMeAMembership.label =3D Accordez-moi=
des droits d'administrateur sur ce site virtuel.
org.jahia.admin.site.ManageSites.import.wait =3D Vos donn=C3=A9es sont mai=
ntenant en cours d'importation. Cela peut prendre un certain temps, selon l=
a taille de votre fichier ...
org.jahia.admin.site.ManageSites.initialSiteContent.label =3D Contenu du s=
ite initial
+org.jahia.admin.site.ManageSites.isTheDefaultSite.label =3D Ce site est l=
e site virtuel par d=C3=A9faut
org.jahia.admin.site.ManageSites.manageVirtualSites.label =3D G=C3=A9rer =
les sites virtuels
org.jahia.admin.site.ManageSites.multipleimport.fileinput =3D Ou indiquez =
le chemin d'acc=C3=A8s d'un fichier sur le serveur
org.jahia.admin.site.ManageSites.multipleimport.fileselect =3D Veuillez s=
=C3=A9lectionner le fichier =C3=A0 importer
org.jahia.admin.site.ManageSites.multipleimport.label =3D Importation simu=
ltan=C3=A9e de plusieurs sites virtuels
org.jahia.admin.site.ManageSites.noImport.label =3D Site vide
+org.jahia.admin.site.ManageSites.noSiteSpecified.label =3D Aucun site virt=
uel sp=C3=A9cifi=C3=A9
org.jahia.admin.site.ManageSites.noTemplatesHasbeenFound.label =3D Aucun =
mod=C3=A8le n'a =C3=A9t=C3=A9 trouv=C3=A9.
org.jahia.admin.site.ManageSites.numberSiteForLicense.label =3D Le nombre=
de sites pour cette licence est limit=C3=A9 =C3=A0
org.jahia.admin.site.ManageSites.or.label =3D ou
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
