summaryrefslogtreecommitdiff
path: root/langpacks/french/Untranslated/BasicHistory.txt
diff options
context:
space:
mode:
Diffstat (limited to 'langpacks/french/Untranslated/BasicHistory.txt')
-rw-r--r--langpacks/french/Untranslated/BasicHistory.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/langpacks/french/Untranslated/BasicHistory.txt b/langpacks/french/Untranslated/BasicHistory.txt
index 8739532348..17a4124a67 100644
--- a/langpacks/french/Untranslated/BasicHistory.txt
+++ b/langpacks/french/Untranslated/BasicHistory.txt
@@ -115,7 +115,7 @@
[Save WinSCP log file]
[Browse CSS file]
[Export and Delete]
-[Import and Marge]
+[Import and Merge]
[Minute]
[Hour]
[At Start]