7 files changed, 25 insertions, 26 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 26d5ad4e7b..f6bf19c080 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -286,7 +286,7 @@
 [&History]
 [&Filter]
 [&Room settings]
-[&Show/Hide nicklist]
+[&Show/Hide nick list]
 [Show these events only:]
 [Actions]
 [Nick changes]
@@ -311,7 +311,7 @@
 [Log directory]
 [Other]
 [Add new rooms to group:]
-[Userlist row distance (pixels):]
+[Nick list row distance (pixels):]
 [Use same style as in the message log]
 [Use default colors]
 [Use custom colors]
@@ -661,9 +661,9 @@
 [Chat module]
 [Group chat log background]
 [Message background]
-[User list background]
-[User list lines]
-[User list background (selected)]
+[Nick list background]
+[Nick list lines]
+[Nick list background (selected)]
 ;file \src\core\stdchat\src\options.cpp
 [Use a tabbed interface]
 [Close tab on double click]
@@ -752,8 +752,8 @@
 [Room settings]
 [Event filter disabled]
 [Event filter enabled]
-[Hide userlist]
-[Show userlist]
+[Hide nick list]
+[Show nick list]
 [Icon overlay]
 [Status 1 (10x10)]
 [Status 2 (10x10)]
@@ -802,7 +802,7 @@
 [Select a background color for the text (CTRL+L)]
 [Select a foreground color for the text (CTRL+K)]
 [Show the history (CTRL+H)]
-[Show/hide the nicklist (CTRL+N)]
+[Show/hide the nick list (CTRL+N)]
 [Control this room (CTRL+O)]
 [Enable/disable the event filter (CTRL+F)]
 [Close current tab (CTRL+F4)]
@@ -1008,8 +1008,8 @@
 [User disables status for ...]
 [Action message]
 [Highlighted message]
-[User list members (online)]
-[User list members (away)]
+[Nick list members (online)]
+[Nick list members (away)]
 [Message typing area]
 [Chat log symbols (Webdings)]
 [Message is highlighted]
diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 6e908d4d3e..63c09bfaf5 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -77,7 +77,6 @@
 [Database is marked as belonging to an unknown version of Miranda]
 [Database is newly created and has no data to process]
 [Processing completed successfully]
-[Can't create file mapping (%u)]
 [Can't create map view of file (%u)]
 ;file \plugins\Db3x_mmap\src\dbtool\modulechain.cpp
 [Processing module name chain]
diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 85ed7c0bd7..061d03b949 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -23,7 +23,7 @@
 [Automatically join on invite]
 ['Old style' mode changes]
 [Update online statuses for users]
-[Update statuses in channel nicklist]
+[Update statuses in channel nick list]
 [Internet address]
 [Port range]
 [Nick]
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index a7eeece0d6..0ab63113ad 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -66,7 +66,7 @@
 [Change private key password]
 [Current password:]
 [New password twice:]
-[Userlist:]
+[User list:]
 [Export PubKey]
 [Turn on debug log]
 [Use Jabber API on Miranda NG (recommended)]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index e3b1a051f5..d80a7e464b 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -68,9 +68,9 @@
 [List loading already started!]
 ;file \plugins\PluginUpdater\src\DlgUpdate.cpp
 [Will be deleted!]
-[Update failed! One of the components wasn't downloaded correctly. Try it again later.]
 [Update complete. Press Yes to restart Miranda now or No to postpone a restart until the exit.]
 [<< Details]
+[Update failed! One of the components wasn't downloaded correctly. Try it again later.]
 [No updates found.]
 [Update checking already started!]
 ;file \plugins\PluginUpdater\src\Options.cpp
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 9ff17d67e9..2f995605a4 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -98,7 +98,7 @@
 [&Background color]
 [&Filter]
 [&Room Settings]
-[&Show/hide nicklist]
+[&Show/hide nick list]
 [Show these events only:]
 [Actions]
 [Messages]
@@ -114,7 +114,7 @@
 [Options]
 [Other]
 [Add new rooms to group:]
-[User list row height]
+[Nick list row height]
 [pixels]
 [Log Options]
 [Your name]
@@ -195,8 +195,8 @@
 [Room settings]
 [Event filter disabled]
 [Event filter enabled]
-[Hide userlist]
-[Show userlist]
+[Hide nick list]
+[Show nick list]
 [Status 1 (10x10)]
 [Status 2 (10x10)]
 [Status 3 (10x10)]
@@ -339,13 +339,13 @@
 ;file \plugins\Scriver\src\chat\colorchooser.cpp
 ;file \plugins\Scriver\src\chat\main.cpp
 [Group chat log background]
-[User list background]
-[User list lines]
-[User list background (selected)]
+[Nick list background]
+[Nick list lines]
+[Nick list background (selected)]
 ;file \plugins\Scriver\src\chat\options.cpp
 [Flash when someone speaks]
 [Flash when a word is highlighted]
-[Show chat user list]
+[Show chat nick list]
 [Enable button context menus]
 [Show topic on your contact list (if supported)]
 [Do not play sounds when focused]
@@ -443,7 +443,7 @@
 [Select a background color for the text (CTRL+L)]
 [Select a foreground color for the text (CTRL+K)]
 [Show the history (CTRL+H)]
-[Show/hide the nicklist (CTRL+N)]
+[Show/hide the nick list (CTRL+N)]
 [Control this room (CTRL+O)]
 [Enable/disable the event filter (CTRL+F)]
 [Nickname]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index f0c2dcc9cf..b43cd3d6fb 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -37,7 +37,7 @@
 [Timestamp (window)]
 [Timestamp (logfile)]
 [Maximum number of events in the message window]
-[Group chat userlist row height (pixels)]
+[Group chat nick list row height (pixels)]
 [Open log file base folder]
 [Default settings for known event types]
 [Show when filter is active]
@@ -1023,7 +1023,7 @@
 [Sync splitter position with standard IM sessions]
 [Show contact's status modes if supported by the protocol]
 [Display contact's status icon before user role icon]
-[Use IRC style status indicators in the user list]
+[Use IRC style status indicators in the nick list]
 [Use alternative sorting method in member list]
 [Prefix all events with a timestamp]
 [Timestamp only when event time differs]
@@ -1073,7 +1073,7 @@
 [Selected text]
 [Incremental search highlight]
 [Fields background]
-[Userlist background]
+[Nick list background]
 [Group chat log background]
 [nick of current contact (if defined)]
 [protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]