Warning, warning... The merge is wrong.... I had made some changes, see below On Apr 28, 2009, at 5:46 PM, tmortagne (SVN) wrote:

Author: tmortagne Date: 2009-04-28 17:46:00 +0200 (Tue, 28 Apr 2009) New Revision: 19162

Modified: platform/core/trunk/xwiki-core/src/main/resources/ ApplicationResources_fr.properties Log: XWIKI-3718: Update french translations

Modified: platform/core/trunk/xwiki-core/src/main/resources/ ApplicationResources_fr.properties =================================================================== --- platform/core/trunk/xwiki-core/src/main/resources/ ApplicationResources_fr.properties 2009-04-28 14:29:14 UTC (rev 19161) +++ platform/core/trunk/xwiki-core/src/main/resources/ ApplicationResources_fr.properties 2009-04-28 15:46:00 UTC (rev 19162)

[snip]

-XWiki.XWikiPreferences_smtp_server=Serveur -XWiki.XWikiPreferences_smtp_port=Port +XWiki.XWikiPreferences_smtp_server=Serveur SMTP

This is not correct for example. There are other places too probably. You need to check the merge. Thanks -Vincent