summaryrefslogtreecommitdiff
path: root/langpacks/english/Plugins/BasicHistory.txt
diff options
context:
space:
mode:
authordartraiden <wowemuh@gmail.com>2017-11-16 22:58:25 +0300
committerdartraiden <wowemuh@gmail.com>2017-11-16 22:58:25 +0300
commitd2c41f8125a5329ab4185ced3e384a6d57297e2e (patch)
tree44dc6e545825132cb1535d780aa0dbefdd53350d /langpacks/english/Plugins/BasicHistory.txt
parentc589cd1a36407cd2ea6e34eb229030b3bc9f6d94 (diff)
langpacks/english: update
Diffstat (limited to 'langpacks/english/Plugins/BasicHistory.txt')
-rw-r--r--langpacks/english/Plugins/BasicHistory.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index f7eb151bb2..8e87f3483a 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -182,7 +182,7 @@
[Invalid codepage]
[Browse CSS file]
[Export and Delete]
-[Import and Marge]
+[Import and Merge]
[Minute]
[Hour]
[At Start]