From b3e7785b3ab5ea70675e0d944b3a746464c4143f Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Tue, 26 Jan 2016 03:53:40 -0500 Subject: [PATCH] Merge branch 'master' into 'stable-3.1' --- interface/web/admin/lib/lang/fr_language_complete.lng | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/web/admin/lib/lang/fr_language_complete.lng b/interface/web/admin/lib/lang/fr_language_complete.lng index b5200ff..30dea02 100644 --- a/interface/web/admin/lib/lang/fr_language_complete.lng +++ b/interface/web/admin/lib/lang/fr_language_complete.lng @@ -1,7 +1,7 @@ <?php -$wb['list_head_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.'; -$wb['language_select_txt'] = 'Select language'; -$wb['btn_save_txt'] = 'Merge files now'; -$wb['btn_cancel_txt'] = 'Back'; -$wb['list_desc_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.'; +$wb['list_head_txt'] = 'Fusion de langages'; +$wb['language_select_txt'] = 'Sélectionnez le langage'; +$wb['btn_save_txt'] = 'Fusionner les fichiers'; +$wb['btn_cancel_txt'] = 'Précédent'; +$wb['list_desc_txt'] = 'Fusionne le langage sélectionné avec le langage principal anglais. <br />Ceci ajoute les élements manquants en anglais au fichier sélectionné.'; ?> -- Gitblit v1.9.1