Sort properties and display version in startup message

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@576 3d1905a2-6b24-0410-a738-b14d5a86fcbd

src/java/davmail/DavGateway.java

@@ -1,6 +1,7 @@
 package davmail;
 
 import davmail.caldav.CaldavServer;
+import davmail.exception.DavMailException;
 import davmail.exchange.ExchangeSessionFactory;
 import davmail.http.DavGatewayHttpClientFacade;
 import davmail.http.DavGatewaySSLProtocolSocketFactory;
@@ -9,7 +10,6 @@ import davmail.ldap.LdapServer;
 import davmail.pop.PopServer;
 import davmail.smtp.SmtpServer;
 import davmail.ui.tray.DavGatewayTray;
-import davmail.exception.DavMailException;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -20,7 +20,6 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.BindException;
 import java.util.ArrayList;
 
 /**
@@ -116,14 +115,15 @@ public class DavGateway {
             }
         }
 
-        DavGatewayTray.info(new BundleMessage("LOG_DAVMAIL_GATEWAY_LISTENING", messages));
+        String currentVersion = getCurrentVersion();
+        DavGatewayTray.info(new BundleMessage("LOG_DAVMAIL_GATEWAY_LISTENING",
+                currentVersion==null?"":currentVersion, messages));
         if (!errorMessages.isEmpty()) {
             DavGatewayTray.error(new BundleMessage("LOG_MESSAGE", errorMessages));
         }
 
         // check for new version
         String releasedVersion = getReleasedVersion();
-        String currentVersion = getCurrentVersion();
         if (currentVersion != null && releasedVersion != null && currentVersion.compareTo(releasedVersion) < 0) {
             DavGatewayTray.info(new BundleMessage("LOG_NEW_VERSION_AVAILABLE", releasedVersion));
         }

src/java/davmailmessages.properties

@@ -1,8 +1,49 @@
+EXCEPTION_AUTHENTICATION_FAILED=Authentication failed: invalid user or password
+EXCEPTION_AUTHENTICATION_FAILED_PASSWORD_EXPIRED=Authentication failed: password expired ?
+EXCEPTION_AUTHENTICATION_FAILED_RETRY=Authentication failed: invalid user or password, retry with domain\\user
+EXCEPTION_AUTHENTICATION_FORM_NOT_FOUND=Authentication form not found at {0}
+EXCEPTION_CONNECTION_FAILED=Unable to connect to OWA at {0}, status code {1}, check configuration
+EXCEPTION_DAVMAIL_CONFIGURATION=DavMail configuration exception: \n{0}
+EXCEPTION_END_OF_STREAM=End of stream reached reading content
+EXCEPTION_EVENT_NOT_FOUND=Calendar event not found
+EXCEPTION_EXCHANGE_LOGIN_FAILED=Exchange login exception: {0}
+EXCEPTION_INVALID_CALDAV_REQUEST=Invalid Caldav request: {0}
+EXCEPTION_INVALID_CONTENT_LENGTH=Invalid content length: {0}
+EXCEPTION_INVALID_CONTENT_TYPE=Invalid content type: {0}
+EXCEPTION_INVALID_CREDENTIALS=Invalid credentials
+EXCEPTION_INVALID_DATE=Invalid date: {0}
+EXCEPTION_INVALID_DATES=Invalid dates: {0}
+EXCEPTION_INVALID_FOLDER_URL=Invalid folder URL: {0}
+EXCEPTION_INVALID_HEADER=Invalid header: {0}
+EXCEPTION_INVALID_ICS_LINE=Invalid ICS line: {0}
+EXCEPTION_INVALID_KEEPALIVE=Invalid Keep-Alive: {0}
+EXCEPTION_INVALID_MAIL_PATH=Invalid mail path: {0}
+EXCEPTION_INVALID_MESSAGE_CONTENT=Invalid calendar message content: {0}
+EXCEPTION_INVALID_MESSAGE_URL=Invalid message URL: {0}
+EXCEPTION_INVALID_RECIPIENT=Invalid recipient: {0}
+EXCEPTION_INVALID_REQUEST=Invalid request: {0}
+EXCEPTION_INVALID_SEARCH_PARAMETERS=Invalid search parameters: {0}
+EXCEPTION_NETWORK_DOWN=All network interfaces down or host unreachable !
+EXCEPTION_UNABLE_TO_CREATE_MESSAGE=Unable to create message {0}: {1}{2}{3}
+EXCEPTION_UNABLE_TO_FIND_USERS={0} Unable to find users from: {1}
+EXCEPTION_UNABLE_TO_GET_EMAIL=Unable to get user email from: {0}
+EXCEPTION_UNABLE_TO_GET_FOLDER=Unable to get folder at {0}
+EXCEPTION_UNABLE_TO_GET_FREEBUSY=Unable to get free-busy from: {0}
+EXCEPTION_UNABLE_TO_GET_MAIL_FOLDER=Unable to get mail folder
+EXCEPTION_UNABLE_TO_GET_MAIL_FOLDERS=Unable to get mail folders
+EXCEPTION_UNABLE_TO_GET_PROPERTY=Unable to get property {0}
+EXCEPTION_UNABLE_TO_MOVE_FOLDER=Unable to move folder, target already exists
+EXCEPTION_UNABLE_TO_MOVE_MESSAGE=Unable to move message, target already exists
+EXCEPTION_UNABLE_TO_PATCH_MESSAGE=Unable to patch message {0}: {1}{2}{3}
+EXCEPTION_UNABLE_TO_UPDATE_MESSAGE=Unable to update message properties
+EXCEPTION_UNKNOWN_HOST=Unknown host {0}
+EXCEPTION_UNSUPPORTED_AUTHORIZATION_MODE=Unsupported authorization mode: {0}
+EXCEPTION_UNSUPPORTED_VALUE=Unsupported value: {0}
 LOG_CLIENT_CLOSED_CONNECTION=Client closed connection
 LOG_CLOSE_CONNECTION_ON_TIMEOUT=Closing connection on timeout
 LOG_CONNECTION_CLOSED=Connection closed
 LOG_CONNECTION_FROM=Connection from {0} on port {1,number,#}
-LOG_DAVMAIL_GATEWAY_LISTENING=DavMail Gateway listening on {0}
+LOG_DAVMAIL_GATEWAY_LISTENING=DavMail Gateway {0} listening on {1}
 LOG_DAVMAIL_STARTED=DavMail Gateway started
 LOG_ERROR_CLOGING_CONFIG_FILE=Error closing configuration file
 LOG_ERROR_LOADING_OSXADAPTER=Error while loading the OSXAdapter
@@ -16,11 +57,11 @@ LOG_EXCEPTION_CLOSING_CLIENT_SOCKET=Exception closing client socket
 LOG_EXCEPTION_CLOSING_CONNECTION_ON_TIMEOUT=Exception closing connection on timeout
 LOG_EXCEPTION_CLOSING_SERVER_SOCKET=Exception closing server socket
 LOG_EXCEPTION_CREATING_SERVER_SOCKET=Exception creating server socket
+LOG_EXCEPTION_CREATING_SSL_SERVER_SOCKET=Unable to bind server socket for {0} on port {1,number,#}: Exception creating secured server socket : {2}
 LOG_EXCEPTION_GETTING_SOCKET_STREAMS=Exception while getting socket streams
 LOG_EXCEPTION_LISTENING_FOR_CONNECTIONS=Exception while listening for connections
 LOG_EXCEPTION_SENDING_ERROR_TO_CLIENT=Exception sending error to client
 LOG_EXCEPTION_WAITING_SERVER_THREAD_DIE=Exception waiting for server thread to die
-LOG_EXCEPTION_CREATING_SSL_SERVER_SOCKET=Unable to bind server socket for {0} on port {1,number,#}: Exception creating secured server socket : {2}
 LOG_EXECUTE_FOLLOW_REDIRECTS=executeFollowRedirects({0})
 LOG_EXECUTE_FOLLOW_REDIRECTS_COUNT=executeFollowRedirects: {0} redirectCount:{1}
 LOG_EXTERNAL_CONNECTION_REFUSED=Connection from external client refused
@@ -32,7 +73,7 @@ LOG_INVALID_DEPTH=Invalid depth value: {0}
 LOG_INVALID_SETTING_VALUE=Invalid setting value in {0}
 LOG_INVALID_URL=Invalid URL: {0}
 LOG_JAVA6_DESKTOP_UNAVAILABLE=Java 6 Desktop class not available
-LOG_LDAP_IGNORE_FILTER_ATTRIBUTE=Ignoring filter attribute: {0} = {1}
+LOG_LDAP_IGNORE_FILTER_ATTRIBUTE=Ignoring filter attribute: {0}= {1}
 LOG_LDAP_REPLACED_UID_FILTER=Replaced {0} with {1} in uid filter
 LOG_LDAP_REQ_ABANDON_SEARCH=LDAP_REQ_ABANDON {0} for search {1}
 LOG_LDAP_REQ_BIND=LDAP_REQ_UNBIND {0}
@@ -56,7 +97,7 @@ LOG_LISTING_EVENT=Listing event {0}/{1}
 LOG_MESSAGE={0}
 LOG_NEW_VERSION_AVAILABLE=A new version ({0}) of DavMail Gateway is available !
 LOG_OPEN_LINK_NOT_SUPPORTED=Open link not supported (tried AWT Desktop and SWT Program)
-LOG_PROTOCOL_PORT= {0} port {1,number,# }
+LOG_PROTOCOL_PORT={0} port {1,number,# }
 LOG_READ_CLIENT_AUTHORIZATION=< Authorization: ********
 LOG_READ_CLIENT_AUTH_PLAIN=< AUTH PLAIN ********
 LOG_READ_CLIENT_LINE=< {0}
@@ -71,10 +112,12 @@ LOG_SEND_CLIENT_MESSAGE=> {0}
 LOG_SEND_CLIENT_PREFIX_MESSAGE=> {0}{1}
 LOG_SET_SOCKET_TIMEOUT=Set socket timeout to {0} seconds
 LOG_SOCKET_BIND_FAILED=Unable to bind server socket for {0} on port {1,number,#}: port not allowed or in use by another process\n
+LOG_STARTING_DAVMAIL=Starting DavMail Gateway...
 LOG_STOPPING_DAVMAIL=Stopping DavMail Gateway...
 LOG_SWT_NOT_AVAILABLE=SWT not available, fallback to JDK 1.6 system tray support
 LOG_SYSTEM_TRAY_NOT_AVAILABLE=JDK 1.6 needed for system tray support
 LOG_UNABLE_TO_CREATE_ICON=Unable to create icon
+LOG_UNABLE_TO_CREATE_LOG_FILE_DIR=Unable to create log file directory
 LOG_UNABLE_TO_CREATE_TRAY=Unable to create tray
 LOG_UNABLE_TO_GET_PARSEINTWITHTAG=Unable to get BerDecoder.parseIntWithTag method
 LOG_UNABLE_TO_GET_RELEASED_VERSION=Unable to get released version
@@ -82,6 +125,7 @@ LOG_UNABLE_TO_LOAD_IMAGE=Unable to load image
 LOG_UNABLE_TO_LOAD_SETTINGS=Unable to load settings:
 LOG_UNABLE_TO_OPEN_LINK=Unable to open link
 LOG_UNABLE_TO_SET_ICON_IMAGE=Unable to set JDialog icon image (not available under Java 1.5)
+LOG_UNABLE_TO_SET_LOG_FILE_PATH=Unable to set log file path
 LOG_UNABLE_TO_SET_LOOK_AND_FEEL=Unable to set look and feel
 LOG_UNABLE_TO_SET_SYSTEM_LOOK_AND_FEEL=Unable to set system look and feel
 LOG_UNABLE_TO_STORE_SETTINGS=Unable to store settings:
@@ -106,6 +150,7 @@ UI_CALDAV_PORT=Caldav HTTP port:
 UI_CALDAV_PORT_HELP=Local Caldav server port to configure in Caldav (calendar) client
 UI_CALENDAR_PAST_EVENTS=Calendar past events:
 UI_CALENDAR_PAST_EVENTS_HELP=Get events in the past not older than specified days count, leave empty for no limits
+UI_CERTIFICATE=Certificate
 UI_CURRENT_VERSION=Current version: {0}<br>
 UI_DAVMAIL_GATEWAY=DavMail Gateway
 UI_DAVMAIL_SETTINGS=DavMail Gateway Settings
@@ -124,6 +169,16 @@ UI_ISSUED_BY=Issued by
 UI_ISSUED_TO=Issued to
 UI_KEEP_DELAY=Trash keep delay:
 UI_KEEP_DELAY_HELP=Number of days to keep messages in trash
+UI_KEY_PASSWORD=Key password:
+UI_KEY_PASSWORD_HELP=SSL key password inside key store
+UI_KEY_STORE=Key store:
+UI_KEY_STORE_HELP=SSL certificate key store file path
+UI_KEY_STORE_PASSWORD=Key store password:
+UI_KEY_STORE_PASSWORD_HELP=Key store password
+UI_KEY_STORE_TYPE=Key store type:
+UI_KEY_STORE_TYPE_HELP=Choose key store type
+UI_LAST_LOG=Last log
+UI_LAST_MESSAGE=Last message
 UI_LATEST_VERSION=Latest version available: {0} <br>A new version of DavMail Gateway is available.<br><a href=\"http://sourceforge.net/project/platformdownload.php?group_id=184600\">Download latest version</a><br>
 UI_LDAP_PORT=Local LDAP port:
 UI_LDAP_PORT_HELP=Local LDAP server port to configure in directory (addresse book) client
@@ -154,65 +209,10 @@ UI_SHOW_LOGS=Show logs...
 UI_SMTP_PORT=Local SMTP port:
 UI_SMTP_PORT_HELP=Local SMTP server port to configure in mail client
 UI_TAB_ADVANCED=Advanced
+UI_TAB_ENCRYPTION=Encryption
 UI_TAB_MAIN=Main
 UI_TAB_PROXY=Proxy
 UI_UNTRUSTED_CERTIFICATE=Server provided an untrusted certificate,\n you can choose to accept or deny access.\n Accept certificate (y/n)?
 UI_UNTRUSTED_CERTIFICATE_HTML=<html><b>Server provided an untrusted certificate,<br> you can choose to accept or deny access</b></html>
 UI_VALID_FROM=Valid from
 UI_VALID_UNTIL=Valid until
-LOG_UNABLE_TO_CREATE_LOG_FILE_DIR=Unable to create log file directory
-LOG_UNABLE_TO_SET_LOG_FILE_PATH=Unable to set log file path
-EXCEPTION_INVALID_DATE=Invalid date: {0}
-EXCEPTION_INVALID_CREDENTIALS=Invalid credentials
-EXCEPTION_AUTHENTICATION_FAILED=Authentication failed: invalid user or password
-EXCEPTION_AUTHENTICATION_FAILED_RETRY=Authentication failed: invalid user or password, retry with domain\\user
-EXCEPTION_AUTHENTICATION_FAILED_PASSWORD_EXPIRED=Authentication failed: password expired ?
-EXCEPTION_AUTHENTICATION_FORM_NOT_FOUND=Authentication form not found at {0}
-EXCEPTION_INVALID_HEADER=Invalid header: {0}
-EXCEPTION_INVALID_CONTENT_LENGTH=Invalid content length: {0}
-EXCEPTION_END_OF_STREAM=End of stream reached reading content
-EXCEPTION_INVALID_KEEPALIVE=Invalid Keep-Alive: {0}
-EXCEPTION_INVALID_REQUEST=Invalid request: {0}
-EXCEPTION_UNSUPPORTED_AUTHORIZATION_MODE=Unsupported authorization mode: {0}
-EXCEPTION_INVALID_CALDAV_REQUEST=Invalid Caldav request: {0}
-EXCEPTION_UNABLE_TO_GET_MAIL_FOLDERS=Unable to get mail folders
-EXCEPTION_UNABLE_TO_CREATE_MESSAGE=Unable to create message {0}: {1}{2}{3}
-EXCEPTION_UNABLE_TO_PATCH_MESSAGE=Unable to patch message {0}: {1}{2}{3}
-EXCEPTION_UNABLE_TO_UPDATE_MESSAGE=Unable to update message properties
-EXCEPTION_INVALID_FOLDER_URL=Invalid folder URL: {0}
-EXCEPTION_UNABLE_TO_MOVE_MESSAGE=Unable to move message, target already exists
-EXCEPTION_UNABLE_TO_MOVE_FOLDER=Unable to move folder, target already exists
-EXCEPTION_INVALID_MESSAGE_URL=Invalid message URL: {0}
-EXCEPTION_INVALID_MESSAGE_CONTENT=Invalid calendar message content: {0}
-EXCEPTION_EVENT_NOT_FOUND=Calendar event not found
-EXCEPTION_INVALID_ICS_LINE=Invalid ICS line: {0}
-EXCEPTION_UNABLE_TO_GET_FOLDER=Unable to get folder at {0}
-EXCEPTION_UNABLE_TO_GET_PROPERTY=Unable to get property {0}
-EXCEPTION_INVALID_MAIL_PATH=Invalid mail path: {0}
-EXCEPTION_UNABLE_TO_GET_MAIL_FOLDER=Unable to get mail folder
-EXCEPTION_UNABLE_TO_GET_EMAIL=Unable to get user email from: {0}
-EXCEPTION_UNABLE_TO_FIND_USERS={0} Unable to find users from: {1}
-EXCEPTION_INVALID_DATES=Invalid dates: {0}
-EXCEPTION_UNABLE_TO_GET_FREEBUSY=Unable to get free-busy from: {0}
-EXCEPTION_INVALID_RECIPIENT=Invalid recipient: {0}
-EXCEPTION_UNSUPPORTED_VALUE=Unsupported value: {0}
-EXCEPTION_INVALID_CONTENT_TYPE=Invalid content type: {0}
-EXCEPTION_INVALID_SEARCH_PARAMETERS=Invalid search parameters: {0}
-EXCEPTION_NETWORK_DOWN=All network interfaces down or host unreachable !
-EXCEPTION_DAVMAIL_CONFIGURATION=DavMail configuration exception: \n{0}
-EXCEPTION_UNKNOWN_HOST=Unknown host {0}
-EXCEPTION_CONNECTION_FAILED=Unable to connect to OWA at {0}, status code {1}, check configuration
-EXCEPTION_EXCHANGE_LOGIN_FAILED=Exchange login exception: {0}
-UI_LAST_MESSAGE=Last message
-UI_LAST_LOG=Last log
-LOG_STARTING_DAVMAIL=Starting DavMail Gateway...
-UI_KEY_STORE_TYPE=Key store type:
-UI_KEY_STORE_TYPE_HELP=Choose key store type
-UI_KEY_STORE=Key store:
-UI_KEY_STORE_PASSWORD=Key store password:
-UI_KEY_PASSWORD=Key password:
-UI_KEY_STORE_HELP=SSL certificate key store file path
-UI_KEY_STORE_PASSWORD_HELP=Key store password
-UI_KEY_PASSWORD_HELP=SSL key password inside key store
-UI_TAB_ENCRYPTION=Encryption
-UI_CERTIFICATE=Certificate

src/java/davmailmessages_fr.properties

@@ -1,8 +1,49 @@
+EXCEPTION_AUTHENTICATION_FAILED=Echec d''authentification : identifiant ou mot de passe invalide
+EXCEPTION_AUTHENTICATION_FAILED_PASSWORD_EXPIRED=Echec d''authentification : mot de passe expiré ?
+EXCEPTION_AUTHENTICATION_FAILED_RETRY=Echec d''authentification : identifiant ou mot de passe invalide, réessayer avec domaine\\utilisateur
+EXCEPTION_AUTHENTICATION_FORM_NOT_FOUND=Formulaire d''authentification non trouvé à l''adresse {0}
+EXCEPTION_CONNECTION_FAILED=Connection OWA à {0} impossible, code retour {1}, vérifier la configuration
+EXCEPTION_DAVMAIL_CONFIGURATION=Erreur de configuration DavMail : \n{0}
+EXCEPTION_END_OF_STREAM=Fin de flux âtteint pendant la lecture du contenu
+EXCEPTION_EVENT_NOT_FOUND=Evènement non trouvé
+EXCEPTION_EXCHANGE_LOGIN_FAILED=Exception lors de la connexion Exchange : {0}
+EXCEPTION_INVALID_CALDAV_REQUEST=Reuqête Caldav invalide : {0}
+EXCEPTION_INVALID_CONTENT_LENGTH=Longueur du contenu invalide : {0}
+EXCEPTION_INVALID_CONTENT_TYPE=Type de contenu invalide : {0}
+EXCEPTION_INVALID_CREDENTIALS=Identifiant ou mot de passe invalide
+EXCEPTION_INVALID_DATE=Date invalide {0}
+EXCEPTION_INVALID_DATES=Dates invalides : {0}
+EXCEPTION_INVALID_FOLDER_URL=URL du dossier invalide : {0}
+EXCEPTION_INVALID_HEADER=Entête invalide : {0}
+EXCEPTION_INVALID_ICS_LINE=Ligne ICS invalide : {0}
+EXCEPTION_INVALID_KEEPALIVE=Keep-Alive invalide : {0}
+EXCEPTION_INVALID_MAIL_PATH=Chemin de messagerie invalide : {0}
+EXCEPTION_INVALID_MESSAGE_CONTENT=Contenu du message invalide : {0}
+EXCEPTION_INVALID_MESSAGE_URL=URL de message invalide : {0}
+EXCEPTION_INVALID_RECIPIENT=Destinataire invalide : {0}
+EXCEPTION_INVALID_REQUEST=Requête invalide {0}
+EXCEPTION_INVALID_SEARCH_PARAMETERS=Paremètres de recherche invalides : {0}
+EXCEPTION_NETWORK_DOWN=Toutes les interfaces réseaux sont indisponibles ou serveur non joignable !
+EXCEPTION_UNABLE_TO_CREATE_MESSAGE=Impossible de créer le message {0} : {1}{2}{3}
+EXCEPTION_UNABLE_TO_FIND_USERS={0} Impossible de chercher les utilisateurs à l''adresse : {1}
+EXCEPTION_UNABLE_TO_GET_EMAIL=Impossible d''obtenir l''adresse de messagerie depuis : {0}
+EXCEPTION_UNABLE_TO_GET_FOLDER=Impossible d''obtenir le dossier {0}
+EXCEPTION_UNABLE_TO_GET_FREEBUSY=Impossible d''obtenir les informations de disponibilité depuis : {0}
+EXCEPTION_UNABLE_TO_GET_MAIL_FOLDER=Impossible d''obtenir le dossier de messagerie
+EXCEPTION_UNABLE_TO_GET_MAIL_FOLDERS=Impossible d''obtenir les répertoires de messagerie
+EXCEPTION_UNABLE_TO_GET_PROPERTY=Impossible d''obtenir la propriété {0}
+EXCEPTION_UNABLE_TO_MOVE_FOLDER=Impossible de déplacer le dossier, la cible existe
+EXCEPTION_UNABLE_TO_MOVE_MESSAGE=Impossible de déplacer le message, la cible existe
+EXCEPTION_UNABLE_TO_PATCH_MESSAGE=Impossible de mettre ) jour le message {0} : {1}{2}{3}
+EXCEPTION_UNABLE_TO_UPDATE_MESSAGE=Impossible de mettre à jour les propriétés du message
+EXCEPTION_UNKNOWN_HOST=Nom de serveur {0} invalide
+EXCEPTION_UNSUPPORTED_AUTHORIZATION_MODE=Mode d'authentification invalide : {0}
+EXCEPTION_UNSUPPORTED_VALUE=Valeur non supportée : {0}
 LOG_CLIENT_CLOSED_CONNECTION=Connection fermée par le client
 LOG_CLOSE_CONNECTION_ON_TIMEOUT=Connection fermée sur expiration
 LOG_CONNECTION_CLOSED=Connection fermée
 LOG_CONNECTION_FROM=Connection de {0} sur le port {1,number,#}
-LOG_DAVMAIL_GATEWAY_LISTENING=Passerelle DavMail en écoute sur {0}
+LOG_DAVMAIL_GATEWAY_LISTENING=Passerelle DavMail {0} en écoute sur {1}
 LOG_DAVMAIL_STARTED=Passerelle DavMail démarrée
 LOG_ERROR_CLOGING_CONFIG_FILE=Erreur à la fermeture du fichier de configuration
 LOG_ERROR_LOADING_OSXADAPTER=Erreur au chargement de OSXAdapter
@@ -16,6 +57,7 @@ LOG_EXCEPTION_CLOSING_CLIENT_SOCKET=Erreur
 LOG_EXCEPTION_CLOSING_CONNECTION_ON_TIMEOUT=Erreur à la fermeture de la connexion sur expiration
 LOG_EXCEPTION_CLOSING_SERVER_SOCKET=Erreur à la fermeture du port d''écoute serveur
 LOG_EXCEPTION_CREATING_SERVER_SOCKET=Erreur lors de la création du port d''écoute serveur
+LOG_EXCEPTION_CREATING_SSL_SERVER_SOCKET=Impossible d''ouvrir le port d''écoute {1,number,#} pour {0} : Erreur lors de la création du port d''écoute serveur sécurisé : {2}
 LOG_EXCEPTION_GETTING_SOCKET_STREAMS=Erreur lors de l''établissement des flux de la connexion
 LOG_EXCEPTION_LISTENING_FOR_CONNECTIONS=Erreur pendant l''attente des connexion entrantes
 LOG_EXCEPTION_SENDING_ERROR_TO_CLIENT=Erreur d''envoi du message d''erreur au client
@@ -55,7 +97,7 @@ LOG_LISTING_EVENT=Liste
 LOG_MESSAGE={0}
 LOG_NEW_VERSION_AVAILABLE=Une nouvelle version ({0}) de la Passerelle DavMail est disponible !
 LOG_OPEN_LINK_NOT_SUPPORTED=Ouverture de lien impossible (avec AWT Desktop et SWT Program)
-LOG_PROTOCOL_PORT= port {0} : {1,number,# }
+LOG_PROTOCOL_PORT=port {0} : {1,number,# }
 LOG_READ_CLIENT_AUTHORIZATION=< Authorization: ********
 LOG_READ_CLIENT_AUTH_PLAIN=< AUTH PLAIN ********
 LOG_READ_CLIENT_LINE=< {0}
@@ -70,10 +112,12 @@ LOG_SEND_CLIENT_MESSAGE=> {0}
 LOG_SEND_CLIENT_PREFIX_MESSAGE=> {0}{1}
 LOG_SET_SOCKET_TIMEOUT=Expiration de lecture de la connection positionnée à {0} secondes
 LOG_SOCKET_BIND_FAILED=Impossible d''ouvrir le port d''écoute {1,number,#} pour {0} : port non autorisé ou utilisé par un autre processus\n
+LOG_STARTING_DAVMAIL=Démarrage de la passerelle DavMail...
 LOG_STOPPING_DAVMAIL=Arrêt de la passerelle DavMail...
 LOG_SWT_NOT_AVAILABLE=SWT non disponible, bascule vers le support icône de notification de Java 1.6
 LOG_SYSTEM_TRAY_NOT_AVAILABLE=JDK 1.6 nécessaire pour le support de l''icône de notification
 LOG_UNABLE_TO_CREATE_ICON=Impossible de créer l''icône
+LOG_UNABLE_TO_CREATE_LOG_FILE_DIR=Impossible de créer le répertoire de traces
 LOG_UNABLE_TO_CREATE_TRAY=Impossible de créer l''icône de notification
 LOG_UNABLE_TO_GET_PARSEINTWITHTAG=Erreur d''accès à la méthode BerDecoder.parseIntWithTag
 LOG_UNABLE_TO_GET_RELEASED_VERSION=Impossible de récupérer le numéro de dernière version
@@ -81,6 +125,7 @@ LOG_UNABLE_TO_LOAD_IMAGE=Impossible de charger l''image
 LOG_UNABLE_TO_LOAD_SETTINGS=Impossible de charger la configuration :
 LOG_UNABLE_TO_OPEN_LINK=Impossible d''ouvrir le lien
 LOG_UNABLE_TO_SET_ICON_IMAGE=Impossible de positionner l''icône de JDialog (non disponible en Java 1.5)
+LOG_UNABLE_TO_SET_LOG_FILE_PATH=Echec à la mise à jour du chemin du fichier de traces
 LOG_UNABLE_TO_SET_LOOK_AND_FEEL=Impossible de définir le style de l''interface
 LOG_UNABLE_TO_SET_SYSTEM_LOOK_AND_FEEL=Impossible de définir le style natif sur l''interface
 LOG_UNABLE_TO_STORE_SETTINGS=Impossible d''enregistrer la configuration
@@ -105,6 +150,7 @@ UI_CALDAV_PORT=Port HTTP Caldav :
 UI_CALDAV_PORT_HELP=Port local Caldav à configurer dans le client Caldav (agenda)
 UI_CALENDAR_PAST_EVENTS=Jours passés du calendrier :
 UI_CALENDAR_PAST_EVENTS_HELP=Limiter les évènements remontés
+UI_CERTIFICATE=Certificat
 UI_CURRENT_VERSION=Version actuelle : {0}<br>
 UI_DAVMAIL_GATEWAY=Passerelle DavMail
 UI_DAVMAIL_SETTINGS=Configuration Passerelle DavMail
@@ -123,6 +169,16 @@ UI_ISSUED_BY=Emis par
 UI_ISSUED_TO=Emis pour
 UI_KEEP_DELAY=Délai de rétention corbeille :
 UI_KEEP_DELAY_HELP=Nombre de jours de conservation des messages dans la corbeille
+UI_KEY_PASSWORD=Mot de passe clé :
+UI_KEY_PASSWORD_HELP=Mot de passe clé SSL contenue dans le fichier des clés
+UI_KEY_STORE=Fichier clés :
+UI_KEY_STORE_HELP=Chemin du fichier contenant les clés et certificats SSL
+UI_KEY_STORE_PASSWORD=Mot de passe fichier clés :
+UI_KEY_STORE_PASSWORD_HELP=Mot de passe du fichier des clés
+UI_KEY_STORE_TYPE=Type de fichier clés :
+UI_KEY_STORE_TYPE_HELP=Choix du type de fichier de clés
+UI_LAST_LOG=Dernière trace
+UI_LAST_MESSAGE=Dernier message
 UI_LATEST_VERSION=Dernière version disponible : {0} <br>Une nouvelle version de la Passerelle DavMail est disponible.<br><a href=\"http://sourceforge.net/project/platformdownload.php?group_id=184600\">Télécharcher la dernière version</a><br>
 UI_LDAP_PORT=Port LDAP local :
 UI_LDAP_PORT_HELP=Port LDAP local à configurer dans le client annuaire (carnet d''adresse)
@@ -153,66 +209,10 @@ UI_SHOW_LOGS=Afficher les traces...
 UI_SMTP_PORT=Port SMTP local :
 UI_SMTP_PORT_HELP=Port SMTP local à configurer dans le client de messagerie
 UI_TAB_ADVANCED=Avancé
+UI_TAB_ENCRYPTION=Chiffrement
 UI_TAB_MAIN=Général
 UI_TAB_PROXY=Proxy
 UI_UNTRUSTED_CERTIFICATE=Le certificat fourni par le serveur n''est certifié par aucune autorité de confiance,\n vous pouvez choisir d''accepter ou de rejeter l''accès
 UI_UNTRUSTED_CERTIFICATE_HTML=<html><b>Le certificat fourni par le serveur n''est certifié par aucune autorité de confiance,<br> vous pouvez choisir d''accepter ou de rejeter l''accès</b></html>
 UI_VALID_FROM=Emis le
 UI_VALID_UNTIL=Expire le
-LOG_UNABLE_TO_CREATE_LOG_FILE_DIR=Impossible de créer le répertoire de traces
-LOG_UNABLE_TO_SET_LOG_FILE_PATH=Echec à la mise à jour du chemin du fichier de traces
-EXCEPTION_INVALID_DATE=Date invalide {0}
-EXCEPTION_INVALID_CREDENTIALS=Identifiant ou mot de passe invalide
-EXCEPTION_AUTHENTICATION_FAILED=Echec d''authentification : identifiant ou mot de passe invalide
-EXCEPTION_AUTHENTICATION_FAILED_RETRY=Echec d''authentification : identifiant ou mot de passe invalide, réessayer avec domaine\\utilisateur
-EXCEPTION_AUTHENTICATION_FAILED_PASSWORD_EXPIRED=Echec d''authentification : mot de passe expiré ?
-EXCEPTION_AUTHENTICATION_FORM_NOT_FOUND=Formulaire d''authentification non trouvé à l''adresse {0}
-EXCEPTION_INVALID_HEADER=Entête invalide : {0}
-EXCEPTION_INVALID_CONTENT_LENGTH=Longueur du contenu invalide : {0}
-EXCEPTION_END_OF_STREAM=Fin de flux âtteint pendant la lecture du contenu
-EXCEPTION_INVALID_KEEPALIVE=Keep-Alive invalide : {0}
-EXCEPTION_INVALID_REQUEST=Requête invalide {0}
-EXCEPTION_UNSUPPORTED_AUTHORIZATION_MODE=Mode d'authentification invalide : {0}
-EXCEPTION_INVALID_CALDAV_REQUEST=Reuqête Caldav invalide : {0}
-EXCEPTION_UNABLE_TO_GET_MAIL_FOLDERS=Impossible d''obtenir les répertoires de messagerie
-EXCEPTION_UNABLE_TO_CREATE_MESSAGE=Impossible de créer le message {0} : {1}{2}{3}
-EXCEPTION_UNABLE_TO_PATCH_MESSAGE=Impossible de mettre ) jour le message {0} : {1}{2}{3}
-EXCEPTION_UNABLE_TO_UPDATE_MESSAGE=Impossible de mettre à jour les propriétés du message
-EXCEPTION_INVALID_FOLDER_URL=URL du dossier invalide : {0}
-EXCEPTION_UNABLE_TO_MOVE_MESSAGE=Impossible de déplacer le message, la cible existe
-EXCEPTION_UNABLE_TO_MOVE_FOLDER=Impossible de déplacer le dossier, la cible existe
-EXCEPTION_INVALID_MESSAGE_URL=URL de message invalide : {0}
-EXCEPTION_INVALID_MESSAGE_CONTENT=Contenu du message invalide : {0}
-EXCEPTION_EVENT_NOT_FOUND=Evènement non trouvé
-EXCEPTION_INVALID_ICS_LINE=Ligne ICS invalide : {0}
-EXCEPTION_UNABLE_TO_GET_FOLDER=Impossible d''obtenir le dossier {0}
-EXCEPTION_UNABLE_TO_GET_PROPERTY=Impossible d''obtenir la propriété {0}
-EXCEPTION_INVALID_MAIL_PATH=Chemin de messagerie invalide : {0}
-EXCEPTION_UNABLE_TO_GET_MAIL_FOLDER=Impossible d''obtenir le dossier de messagerie
-EXCEPTION_UNABLE_TO_GET_EMAIL=Impossible d''obtenir l''adresse de messagerie depuis : {0}
-EXCEPTION_UNABLE_TO_FIND_USERS={0} Impossible de chercher les utilisateurs à l''adresse : {1}
-EXCEPTION_INVALID_DATES=Dates invalides : {0}
-EXCEPTION_UNABLE_TO_GET_FREEBUSY=Impossible d''obtenir les informations de disponibilité depuis : {0}
-EXCEPTION_INVALID_RECIPIENT=Destinataire invalide : {0}
-EXCEPTION_UNSUPPORTED_VALUE=Valeur non supportée : {0}
-EXCEPTION_INVALID_CONTENT_TYPE=Type de contenu invalide : {0}
-EXCEPTION_INVALID_SEARCH_PARAMETERS=Paremètres de recherche invalides : {0}
-EXCEPTION_NETWORK_DOWN=Toutes les interfaces réseaux sont indisponibles ou serveur non joignable !
-EXCEPTION_DAVMAIL_CONFIGURATION=Erreur de configuration DavMail : \n{0}
-EXCEPTION_UNKNOWN_HOST=Nom de serveur {0} invalide
-EXCEPTION_CONNECTION_FAILED=Connection OWA à {0} impossible, code retour {1}, vérifier la configuration
-EXCEPTION_EXCHANGE_LOGIN_FAILED=Exception lors de la connexion Exchange : {0}
-LOG_STARTING_DAVMAIL=Démarrage de la passerelle DavMail...
-UI_LAST_LOG=Dernière trace
-UI_LAST_MESSAGE=Dernier message
-LOG_EXCEPTION_CREATING_SSL_SERVER_SOCKET=Impossible d''ouvrir le port d''écoute {1,number,#} pour {0} : Erreur lors de la création du port d''écoute serveur sécurisé : {2}
-UI_KEY_PASSWORD=Mot de passe clé :
-UI_KEY_PASSWORD_HELP=Mot de passe clé SSL contenue dans le fichier des clés
-UI_KEY_STORE=Fichier clés :
-UI_KEY_STORE_HELP=Chemin du fichier contenant les clés et certificats SSL
-UI_KEY_STORE_PASSWORD=Mot de passe fichier clés :
-UI_KEY_STORE_PASSWORD_HELP=Mot de passe du fichier des clés
-UI_KEY_STORE_TYPE=Type de fichier clés :
-UI_KEY_STORE_TYPE_HELP=Choix du type de fichier de clés
-UI_TAB_ENCRYPTION=Chiffrement
-UI_CERTIFICATE=Certificat