langpacks/english: update

6 files changed, 18 insertions, 28 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 0247458d3b..b270af3322 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -36,21 +36,18 @@
 [Use Options -> Contacts -> Ignore to unhide contacts.]

 [Are you sure you want to delete %s?]

 [This will erase all history and settings for this contact!]

+[Contact list sorting]

 [Sort contacts by name]

 [Sort contacts by status]

 [Sort contacts by protocol]

-[Disable icon blinking]

-[ms delay]

+[Move offline users to bottom]

 [Show]

 [icon when statuses differ]

 [Cycle icons every]

 [seconds, when statuses differ]

 [Show multiple icons]

 [Only when statuses differ]

-[System tray icon]

 [System tray icon when using multiple protocols]

-[Contact list sorting]

-[Don't move offline user to bottom]

 [Window]

 [Always on top]

 [Tool style main window]

@@ -576,6 +573,7 @@
 [Search works as filter]

 ['Hide offline' means to hide:]

 [Tray]

+[ms delay]

 [Single click interface]

 [Always show status in tooltip]

 [Default settings for known event types]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 560a3951d3..d5f1272b52 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -139,8 +139,6 @@
 [milliseconds]

 [Hide vertical scrollbar]

 [Fade out entire list when:]

-[Disable icon blinking]

-[ms, delay between icon blinking]

 [System tray icon]

 [Use xStatus icon]

 [Icon mode]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index ebe8198a0e..27098f2c5f 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -23,9 +23,6 @@
 [Apply last active view mode]

 [Show menu and status buttons]

 [Draw sunken edge]

-[System tray icon]

-[Disable icon blinking]

-[ms]

 [Event area]

 [Set base visibility on the frames menu]

 [Auto mode]

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index f239aae06e..ecd7c33e2f 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -107,18 +107,6 @@
 [You have logged in at another location]

 [You are logged in at another location]

 [Incoming image]

-;file \protocols\Gadu-Gadu\src\dialogs.cpp

-[<Last Status>]

-[System tray icon]

-[Popup window]

-[Message with [img] BBCode]

-[You need to specify your registration e-mail first.]

-[Your password will be sent to your registration e-mail.\nDo you want to continue?]

-[You should disconnect before making any permanent changes with your account.\nDo you want to disconnect now?]

-[Network]

-[General]

-[Conference]

-[Advanced]

 ;file \protocols\Gadu-Gadu\src\filetransfer.cpp

 [Cannot create transfer file. ERROR: %d: %s (dcc)\n%s]

 [Cannot create transfer file. ERROR: %d: %s (dcc7)\n%s]

@@ -131,6 +119,7 @@
 [Unknown HTTP error]

 [&Unblock]

 [&Block]

+[Conference]

 [Contact list]

 ;file \protocols\Gadu-Gadu\src\gg_proto.cpp

 [Images]

@@ -196,9 +185,19 @@
 [Gadu-Gadu account chooser]

 [Gadu-Gadu Link Protocol]

 ;file \protocols\Gadu-Gadu\src\options.cpp

+[<Last Status>]

+[System tray icon]

+[Popup window]

+[Message with [img] BBCode]

+[You need to specify your registration e-mail first.]

+[Your password will be sent to your registration e-mail.\nDo you want to continue?]

+[You should disconnect before making any permanent changes with your account.\nDo you want to disconnect now?]

 [Allow]

 [Ask]

 [Ignore]

+[Network]

+[General]

+[Advanced]

 ;file \protocols\Gadu-Gadu\src\ownerinfo.cpp

 [Password could not be reminded because of error:\n\t%s (Error: %d)]

 [Password was sent to your e-mail.]

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 589848b813..b81cd40ff5 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -184,9 +184,6 @@
 [Outgoing commands are not shown]

 [The time interval for the buddy check function is now at default setting]

 [The time interval for the buddy check function is now %u seconds]

-[This command is not recommended on a network of this size!\r\nIt will probably cause high CPU usage and/or high bandwidth\r\nusage for around %u to %u minute(s).\r\n\r\nDo you want to continue?]

-[IRC warning]

-[Aborted]

 [CTCP %s request sent to %s]

 [DCC ERROR: Unable to automatically resolve external IP]

 [DCC CHAT request sent to %s]

@@ -377,6 +374,7 @@
 [Set these modes for the channel]

 [Set this topic for the channel]

 [You have not applied all changes!\n\nApply before exiting?]

+[IRC warning]

 [Add ban]

 [Add invite]

 [Add exception]

diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
index c883b64d36..3134c4c1d9 100644
--- a/langpacks/english/Plugins/WhatsApp.txt
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -8,7 +8,7 @@
 [WhatsApp protocol support for Miranda NG.]
 ;file \protocols\WhatsApp\res\whatsapp.rc
 [Sign in using QR code]
-[Open WhatsApp application on your mobile phone and use it to read this QR code.\nA window will disappear automatically after it]
+[Open WhatsApp application on your mobile phone, choose "Linked devices" and use it to read this QR code.\nA window will disappear automatically after it.]
 [Nick:]
 [Default group:]
 [Do not open chat windows on creation]
@@ -31,10 +31,10 @@
 [Account]
 ;file \protocols\WhatsApp\src\proto.cpp
 [%s (server)]
-[You need to specify nick name in the Options dialog]
+[Connection cannot be established! You have not completed all necessary fields (Nick).]
 [Error]
 ;file \protocols\WhatsApp\src\server.cpp
-[This account was logged out from another device, you need to register it again]
+[This account was logged out from mobile phone, you need to link it again]
 ;file \protocols\WhatsApp\src\utils.cpp
 [%s error notifications]
 [Errors]