langpacks/english: update

10 files changed, 89 insertions, 59 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index caf78659c2..0247458d3b 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -494,7 +494,6 @@
 [Enable icons]

 [Show accounts in the following order,\ndrag to choose another order:]

 [Account order and visibility]

-[Note: Miranda NG will have to be restarted for changes to take effect.]

 [Key bindings]

 [Shortcut:]

 [Add]

@@ -573,6 +572,7 @@
 [Enable groups]

 [Ask before deleting contacts]

 [Remove temporary contacts on exit]

+[Enable icon blinking]

 [Search works as filter]

 ['Hide offline' means to hide:]

 [Tray]

@@ -1343,6 +1343,7 @@
 [<core modules>]

 [Loading... %d%%]

 [%s options]

+[Options dialog is disabled by the system administrator. Contact him if you need to edit options]

 [Miranda NG options]

 ;file \src\mir_app\src\path.cpp

 [Avatars]

diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index 800bd78c06..d1459876eb 100644
--- a/langpacks/english/Plugins/AVS.txt
+++ b/langpacks/english/Plugins/AVS.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: AVS.dll

 ;  Plugin: Avatar service

-;  Version: 0.98.1.4

+;  Version: 0.98.1.6

 ;  Authors: Nightwish, Pescuma

 ;============================================================

 [Loads and manages contact pictures for other plugins.]

@@ -43,6 +43,11 @@
 [Use per protocol avatars]

 ;file \plugins\AVS\src\acc.cpp

 [Protocols have different avatars]

+;file \plugins\AVS\src\contact_ava.cpp

+[Contact has no avatar]

+[Set avatar options for %s]

+[Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?]

+[Reset contact picture]

 ;file \plugins\AVS\src\main.cpp

 [Avatars]

 [My Avatars]

@@ -51,10 +56,6 @@
 ;file \plugins\AVS\src\options.cpp

 [Global avatar for %s accounts]

 [Global avatar]

-[Set avatar options for %s]

-[Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?]

-[Reset contact picture]

-[Contact has no avatar]

 [Contacts]

 [Protocols]

 [Contact avatars]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 9c42909fb5..a0845843da 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: ICQ.dll

 ;  Plugin: ICQ-WIM protocol

-;  Version: 0.96.1.9

+;  Version: 0.96.2.2

 ;  Authors: George Hazan

 ;============================================================

 [ICQ protocol support for Miranda NG.]

@@ -31,6 +31,7 @@
 [Nick:]

 [Member since:]

 [Last seen:]

+[Phone number:]

 [Enter ICQ Password]

 [Enter a password:]

 [Remember this session password]

@@ -49,6 +50,7 @@
 [You have %d unread emails]

 ;file \protocols\ICQ-WIM\src\proto.cpp

 [Synchronize server groups]

+[Edit my web profile]

 [Name]

 [Rename]

 [Delete]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index c6e85a2402..274eb7bd56 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -352,6 +352,9 @@
 [Change nickname in %s]

 [Reason to destroy %s]

 ;file \protocols\JabberG\src\jabber_console.cpp

+[Filter mode]

+[Refresh list]

+[Presences]

 [Can't send data while you are offline.]

 [Jabber Error]

 [Outgoing XML parsing error]

@@ -912,12 +915,12 @@
 [Enter password for %s]

 [Error: Not enough memory]

 [Error: Cannot connect to the server]

+[SSL intialization failed]

 [Error: Connection lost]

 [Requesting registration instruction...]

 [Authentication failed for %s@%s.]

 [Message redirected from: %s\r\n]

 [Unable to decrypt a carbon copy of the encrypted outgoing message]

-[Description]

 [Registration canceled]

 [Sending registration information...]

 ;file \protocols\JabberG\src\jabber_userinfo.cpp

@@ -984,9 +987,6 @@
 [Jabber vCard: Edit Phone Number]

 [Contacts]

 [Note]

-;file \protocols\JabberG\src\jabber_voip.cpp

-[Accept call from %S?\r\nIt will disclose IP address to the peer and his server]

-[Incoming call]

 ;file \protocols\JabberG\src\jabber_xstatus.cpp

 [<advanced status slot>]

 [Afraid]

diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index b550b59933..7e92e418ad 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MyDetails.dll

 ;  Plugin: My details

-;  Version: 0.1.0.1

+;  Version: 0.1.0.2

 ;  Authors: Ricardo Pescuma Domenecci, Drugwash

 ;============================================================

 [Shows and allows you to edit your details for all accounts.]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 060f3226f5..b40518adec 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -148,10 +148,6 @@
 [Do you want to remove key from entire metacontact (all subcontacts)?]

 [Export public key]

 [.asc pubkey file]

-[Failed to allocate memory]

-[Failed to lock memory with error %d]

-[Failed write to clipboard with error %d]

-[Failed to open clipboard with error %d]

 [Set log file]

 [LOG files]

 [Choose gpg.exe]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index d8fb30dd62..ebf7199b24 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -2,18 +2,11 @@
 ;============================================================

 ;  File: SmileyAdd.dll

 ;  Plugin: SmileyAdd

-;  Version: 0.3.2.1

+;  Version: 0.3.2.2

 ;  Authors: Peacow, nightwish, bid, borkra

 ;============================================================

 [Smiley support for Miranda NG.]

 ;file \plugins\SmileyAdd\res\resource.rc

-[Smiley categories]

-[Specify smiley pack for each category]

-[Name:]

-[Author:]

-[Version:]

-[Preview]

-[Use per protocol global smiley packs]

 [Display]

 [Replace only smileys surrounded by spaces]

 [Scale smiley to text height]

@@ -29,6 +22,13 @@
 [Use first smiley for selection size]

 [IEView style window]

 [Horizontal sorting]

+[Download more smileys]

+[Specify smiley pack for each category]

+[Name:]

+[Author:]

+[Version:]

+[Preview]

+[Use per protocol global smiley packs]

 ;file \plugins\SmileyAdd\src\dlgboxsubclass.cpp

 [Show smiley selection window]

 ;file \plugins\SmileyAdd\src\download.cpp

@@ -45,6 +45,8 @@
 [All files]

 [Smileys]

 [Customize]

+[General]

+[Categories]

 ;file \plugins\SmileyAdd\src\services.cpp

 [Protocol specific]

 ;file \plugins\SmileyAdd\src\smileys.cpp

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 4b752d7364..ffbf040890 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TabSRMM.dll

 ;  Plugin: TabSRMM

-;  Version: 3.6.2.5

+;  Version: 3.6.2.6

 ;  Authors: The Miranda developers team and contributors

 ;============================================================

 [IM and group chat module for Miranda NG.]

@@ -70,7 +70,6 @@
 [Input history size]

 [entries]

 [More about advanced tweaks]

-[Revert to (safe) defaults]

 [Dialog]

 [Cancel]

 [All modes]

@@ -462,7 +461,6 @@
 [Nick list background]

 [Group chat log background]

 [Appearance and functionality of chat room windows]

-[Appearance of the message log]

 [Open new chat rooms in the default container]

 [Flash window when someone speaks]

 [Flash window when a word is highlighted]

@@ -472,11 +470,11 @@
 [Colorize nicknames in member list (you need to adjust colors)]

 [Show topic as status message on the contact list]

 [Do not pop up the window when joining a chat room]

-[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 nick list]

 [Use alternative sorting method in member list]

+[Appearance of the message log]

 [Prefix all events with a timestamp]

 [Only prefix with timestamp if it has changed]

 [Timestamp has same color as the event]

@@ -729,11 +727,11 @@
 [Do you want to also read message templates from the theme?\nCaution: This will overwrite the stored template set which may affect the look of your message window significantly.\nSelect Cancel to not load anything at all.]

 [Load theme]

 [Message window behavior]

+[Always flash contact list and tray icon for new messages]

+[Delete temporary contacts on close]

 [Sending messages]

 [Minimize the message window on send]

 [Close the message window on send]

-[Always flash contact list and tray icon for new messages]

-[Delete temporary contacts on close]

 [Enable "Paste and send" feature]

 [Allow BBCode formatting in outgoing messages]

 [Automatically split long messages (experimental, use with care)]

@@ -748,33 +746,33 @@
 [This will reset the template set to the default built-in templates. Are you sure you want to do this?]

 [Template set was successfully reset, please close and reopen all message windows. This template editor window will now close.]

 [Message log appearance]

-[Support for external plugins]

-[Timestamp settings (note: timestamps also depend on your templates)]

-[Message log icons]

-[Show dates in timestamps]

-[Show seconds in timestamps]

-[Use contacts local time (if timezone info available)]

 [Draw grid lines]

 [Log status changes]

-[Use incoming/outgoing icons]

 [Use message grouping]

 [Simple text formatting (*bold*, etc.)]

 [Support BBCode formatting]

 [Place a separator in the log after a window lost its foreground status]

 [Only place a separator when an incoming event is announced with a popup]

+[Use normal templates (uncheck to use simple templates if your template set supports them)]

+[Support for external plugins]

 [Show events at the new line (IEView Compatibility Mode)]

 [Underline timestamp/nickname (IEView Compatibility Mode)]

 [Show timestamp after nickname (IEView Compatibility Mode)]

-[Use normal templates (uncheck to use simple templates if your template set supports them)]

+[Timestamp settings (note: timestamps also depend on your templates)]

+[Show dates in timestamps]

+[Show seconds in timestamps]

+[Use contacts local time (if timezone info available)]

+[Message log icons]

+[Use incoming/outgoing icons]

 [** New contacts **]

 [** Unknown contacts **]

 [Always]

 [Always, but no popup when window is focused]

 [Only when no message window is open]

-[How to create tabs and windows for incoming messages]

 [Show status text on tabs]

 [Prefer xStatus icons when available]

 [Detailed tooltip on tabs (requires Tipper plugin)]

+[How to create tabs and windows for incoming messages]

 [ALWAYS activate new message sessions (has PRIORITY over the options below)]

 [Automatically create new message sessions without activating them]

 [New windows are minimized (the option above MUST be active)]

@@ -788,14 +786,14 @@
 [Close or hide window, depends on the close button setting above]

 [Do nothing (ignore Esc key)]

 [Message window tweaks]

-[Display metacontact icons]

-[Error feedback]

 [Close current tab on send]

 [Enable unattended send (experimental feature, required for multisend and send later)]

 [Show client description in info panel]

+[Display metacontact icons]

 [On tab control]

 [On the button bar]

-[Disable error popups on sending failures]

+[Error feedback]

+[Enable error popups on sending failures]

 [Choose status modes]

 [General]

 [Tabs and layout]

@@ -917,6 +915,8 @@
 [Set messaging options for %s]

 ;file \plugins\TabSRMM\src\utils.cpp

 [TabSRMM message (%s)]

+;file \plugins\TabSRMM\src\warning.cpp

+[TabSRMM warning message]

 [Save file|Unable to save temporary file]

 [Edit user notes|You are editing the user notes. Click the button again or use the hotkey (default: Alt+N) to save the notes and return to normal messaging mode]

 [Missing component|The icon pack is missing. Please install it to the default icons folder.\n\nNo icons will be available]

@@ -927,4 +927,3 @@
 [Closing Window|You are about to close a window with multiple tabs open.\n\nProceed?]

 [Closing options dialog|To reflect the changes done by importing a theme in the options dialog, the dialog must be closed after loading a theme \\b1 and unsaved changes might be lost\\b0 .\n\nDo you want to continue?]

 [Loading a theme|Loading a color and font theme can overwrite the settings defined by your skin.\n\nDo you want to continue?]

-[TabSRMM warning message]

diff --git a/langpacks/english/Plugins/VoiceService.txt b/langpacks/english/Plugins/VoiceService.txt
index daeaea520d..30dfc11ae8 100644
--- a/langpacks/english/Plugins/VoiceService.txt
+++ b/langpacks/english/Plugins/VoiceService.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VoiceService.dll
 ;  Plugin: Voice Service
-;  Version: 0.1.3.0
+;  Version: 0.1.3.1
 ;  Authors: Ricardo Pescuma Domenecci
 ;============================================================
 [Provide services for protocols that support voice calls.]
@@ -21,6 +21,8 @@
 [On right click:]
 [On left click:]
 [Preview]
+[Show incoming call dialog immediately ]
+[Catch focus on this dialog]
 [New Voice Call]
 [%s wants to start a voice call with you. What you want to do?\n\nIf you answer the call, the current call will be put on hold.]
 [Answer]
@@ -45,10 +47,6 @@
 [Answer call]
 [Drop call]
 [Hold call]
-;file \plugins\VoiceService\src\frame.cpp
-[Show dialpad]
-[Call with %s]
-[Voice Calls]
 ;file \plugins\VoiceService\src\hooks.cpp
 [Main]
 [Dialpad]
@@ -59,6 +57,7 @@
 [On Hold]
 [Ended]
 [Busy]
+[Ready]
 [Make Voice Call]
 [Answer Voice Call]
 [Hold Voice Call]
@@ -69,10 +68,11 @@
 [End of call]
 [Busy signal]
 [Call %s with %s]
+[Call with %s]
 [Call]
 [%s with %s]
 [with %s]
-[Background]
+[Voice Calls]
 [Dialpad press]
 ;file \plugins\VoiceService\src\options.cpp
 [Do nothing]
@@ -80,11 +80,7 @@
 [Test Contact]
 [Test description]
 [Popups]
-[General]
 [Auto actions]
-;file \plugins\VoiceService\src\services.cpp
-[%s wants to start a voice call with you. What you want to do?]
-[%s wants to start a voice call with you. What you want to do?\n\nIf you answer the call, the current call will be dropped.]
 ;file \plugins\VoiceService\src\VoiceCall.cpp
 [Voice call started]
 [Voice call ringing]
@@ -92,10 +88,6 @@
 [Voice call on hold]
 [Voice call ended]
 [Voice call busy]
-[Call from %s has started]
-[Call from %s is ringing]
-[Calling %s]
-[Call from %s is on hold]
-[Call from %s has ended]
-[%s is busy]
+[Voice call ready]
 [Unknown number]
+[Call is over %s]
diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
new file mode 100644
index 0000000000..4cd6f00946
--- /dev/null
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -0,0 +1,37 @@
+#muuid {008b9ce1-154b-44e4-9823-97c1aab00c3c}
+;============================================================
+;  File: WhatsApp.dll
+;  Plugin: WhatsApp protocol
+;  Version: 0.0.1.1
+;  Authors: George Hazan
+;============================================================
+[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]
+[Nick:]
+[Default group:]
+[Do not open chat windows on creation]
+[Invite users]
+[Choose a user]
+[Other user:]
+[&Invite]
+[Cancel]
+;file \protocols\WhatsApp\src\chats.cpp
+[Owner]
+[SuperAdmin]
+[Admin]
+[Participant]
+;file \protocols\WhatsApp\src\main.cpp
+[WhatsApp (HTTP)]
+;file \protocols\WhatsApp\src\options.cpp
+[Network]
+[Account]
+;file \protocols\WhatsApp\src\proto.cpp
+[%s (server)]
+[You need to specify nick name in the Options dialog]
+[Error]
+[Operation failed with server error status %d]
+;file \protocols\WhatsApp\src\utils.cpp
+[%s error notifications]
+[Errors]