From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 30 May 2011 16:40:17 +0000 (+0000)
Subject: Merged r5964 from trunk.
X-Git-Tag: 1.2.0~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eaf430b6302e8219e53506f921c90ae990f41ee4;p=redmine.git

Merged r5964 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5966 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index f0fa145ec..76e5e4696 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -962,7 +962,7 @@ fr:
   text_zoom_in: Zoom avant
   notice_unable_delete_time_entry: Impossible de supprimer le temps passé.
   label_overall_spent_time: Temps passé global
-  field_time_entries: Log time
+  field_time_entries: Temps passé
   project_module_gantt: Gantt
   project_module_calendar: Calendrier
   button_edit_associated_wikipage: "Modifier la page wiki associée: %{page_title}"
@@ -989,5 +989,5 @@ fr:
   text_scm_command: Commande
   text_scm_command_version: Version
   label_git_report_last_commit: Afficher le dernier commit des fichiers et répertoires
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
+  text_scm_config: Vous pouvez configurer les commandes des SCM dans config/configuration.yml. Redémarrer l'application après modification.
+  text_scm_command_not_available: Ce SCM n'est pas disponible. Vérifier les paramètres dans la section administration.