langpacks/english: update

16 files changed, 73 insertions, 75 deletions

diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index e8d71b4239..800bd78c06 100644
--- a/langpacks/english/Plugins/AVS.txt
+++ b/langpacks/english/Plugins/AVS.txt
@@ -47,6 +47,7 @@
 [Avatars]

 [My Avatars]

 [My Global Avatar Cache]

+[Avatar]

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

 [Global avatar for %s accounts]

 [Global avatar]

@@ -58,9 +59,6 @@
 [Protocols]

 [Contact avatars]

 [Own avatars]

-[No avatar]

-[Are you sure you want to remove your avatar?]

-[Avatar]

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

 [All files]

 [Windows bitmaps]

@@ -72,3 +70,6 @@
 [Grow avatar to fit max allowed protocol size]

 [Set my avatar]

 [Set my avatar for %s]

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

+[No avatar]

+[Are you sure you want to remove your avatar?]

diff --git a/langpacks/english/Plugins/Actman.txt b/langpacks/english/Plugins/Actman.txt
index 7d761ad9bf..3458a87f98 100644
--- a/langpacks/english/Plugins/Actman.txt
+++ b/langpacks/english/Plugins/Actman.txt
@@ -62,8 +62,8 @@
 [last result]

 [parameter]

 [structure]

-[Ansi message]

-[Ansi caption]

+[ANSI message]

+[ANSI caption]

 [Structure]

 [Structure editor]

 [alias]

@@ -94,7 +94,7 @@
 [Structure help]

 [Name]

 [Plugin]

-[Descr]

+[Description]

 [&Change]

 [Result]

 [Result type]

@@ -127,7 +127,7 @@
 [Start minimized]

 [Start maximized]

 [Program path]

-[Program args]

+[Program arguments]

 [Service]

 [Miranda service help]

 [Alias]

@@ -151,12 +151,14 @@
 [Math]

 [> greater]

 [< lesser]

-[= equ]

+[= equal]

+[^ xor]

 [& and]

 [Text]

 [Case sensitive]

 [Opposite order]

 [empty]

+[equal]

 [contains]

 [starts with]

 [ends with]

@@ -164,7 +166,7 @@
 [Operation]

 [BREAK]

 [JUMP]

-[^s - selected (and replaced) part\r\n^e - replaced by empty string\r\n^v - paste text from Clipboard\r\n^t - replaced by tabulation\r\n^l - replaced by last result as unicode\r\n^h - replaced by last result as hex\r\n^f(name[,str])\r\n     paste line from text file.\r\n     brackets contents must be w/o spaces]

+[^s - selected (and replaced) part\r\n^e - replaced by empty string\r\n^v - paste text from Clipboard\r\n^t - replaced by tabulation\r\n^l - replaced by last result as Unicode\r\n^h - replaced by last result as hex\r\n^f(name[,str])\r\n     paste line from text file.\r\n     brackets contents must be w/o spaces]

 [Process script after]

 [MessageBox]

 [Text <last> replacing\r\nby last result\r\n\r\nReturns:\r\n--------\r\nOK\t= 1\r\nCANCEL\t= 2\r\nABORT\t= 3\r\nRETRY\t= 4\r\nIGNORE\t= 5\r\nYES\t= 6\r\nNO\t= 7\r\nCLOSE\t= 8]

@@ -290,7 +292,7 @@
 [Show or hide netlog console window]

 [int Value]

 [Returns contact amount, excluding user account]

-[Ansi Text]

+[ANSI Text]

 [Removes all settings for the specified module]

 [int 0]

 [Import settings/contacts from file]

@@ -321,7 +323,7 @@
 [Restarts Miranda]

 [Station name]

 [wParam is Handle]

-[wParam is Ansi station name]

+[wParam is ANSI station name]

 [wParam is Unicode station name]

 [Starting or stopping radio station]

 [Stop cycle]

@@ -353,8 +355,8 @@
 [displays the Account Manager]

 [Show the dialog to select the contact]

 [filter text]

-[wParam is unicode]

-[wParam is Ansi]

+[wParam is Unicode]

+[wParam is ANSI]

 [Reserved]

 [Open main QuickSearch window with text filter]

 [Plays sound added through Skin/Sounds/AddNew. If sound not found, standard Windows sound plays]

@@ -364,7 +366,7 @@
 [Open contact received file directory]

 [Send file to contact.]

 [Opens message window for contact with handle in wparam]

-[remove all temporary contacts from db]

+[remove all temporary contacts from database]

 [Call avatar option dialog for contact]

 [Filename]

 [Set (and optionally protect) a local contact picture for the given hContact. If lParam = NIL, the service will open a file selection dialog.]

@@ -372,8 +374,8 @@
 [Open URL in current window]

 [0 - Open URL in current window]

 [Open URL in default browser]

-[With formating]

-[Don't use formating]

+[With formatting]

+[Don't use formatting]

 [Returns a string containing the versioninfo post]

 [Show or save (call default action) Modules version Info]

 [Show popup or Info window with current music information.]

diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index 01771b2c6f..0faa8ce325 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -65,7 +65,7 @@
 [Export to]

 [Compress output files]

 [Password]

-[Upload to FTP (WinSCP requred)]

+[Upload to FTP (WinSCP required)]

 [Session name]

 [Path to file**]

 [Export imported messages]

@@ -202,7 +202,7 @@
 [Invalid '%s' value.\n%s]

 [** Use <ext> to insert extension, <contact> to insert contact name]

 [Input files are compressed]

-[Download from FTP (WinSCP requred)]

+[Download from FTP (WinSCP required)]

 [Import from]

 [** Use <date> to insert date, <ext> to insert extension, <contact> to insert contact name]

 ;file \plugins\BasicHistory\src\Options.h

diff --git a/langpacks/english/Plugins/Boltun.txt b/langpacks/english/Plugins/Boltun.txt
index 313f1c762d..25f63f0731 100644
--- a/langpacks/english/Plugins/Boltun.txt
+++ b/langpacks/english/Plugins/Boltun.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.0.3.1

 ;  Authors: Alexander S. Kiselev, Valentin Pavlyuchenko

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

-[Boltun, the chat bot in the russian language.]

+[Boltun, the chat bot in the Russian language.]

 ;file \plugins\Boltun\res\Boltun.rc

 [Boltun]

 [Boltun Autochat everybody]

@@ -23,7 +23,7 @@
 [Engine]

 [Base of remarks]

 [Reload]

-[Stay silent if have no good aswers]

+[Stay silent if have no good answers]

 [Start answers with a lowercase letter]

 [Don't use "I don't understand"-like answers]

 ;file \plugins\Boltun\src\stdafx.h

diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index eee2138423..fcc8d870b0 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -2,13 +2,13 @@
 ;============================================================

 ;  File: Db_autobackups.dll

 ;  Plugin: Db autobackuper

-;  Version: 0.1.0.6

+;  Version: 0.1.0.7

 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons

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

 [Database autobackuper plugin.]

 ;file \plugins\Db_autobackups\res\db_autobackups.rc

 [Automatic backups]

-[Disabled]

+[Enabled]

 [When Miranda starts]

 [When Miranda exits]

 [Every:]

@@ -19,7 +19,7 @@
 [Backup file mask:]

 [Compress backup to zip-archive]

 [Backup profile folder]

-[Disable progress bar]

+[Enable progress bar]

 [Use CloudFile]

 [Backup NOW]

 [Backup progress]

diff --git a/langpacks/english/Plugins/Flags.txt b/langpacks/english/Plugins/Flags.txt
index 2ef86f9117..0360cdce1e 100644
--- a/langpacks/english/Plugins/Flags.txt
+++ b/langpacks/english/Plugins/Flags.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.1.0.4

 ;  Authors: H. Herkenrath

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

-[Service offering misc country utilities as flag icons and an IP-to-Country database.]

+[Service offering miscellaneous country utilities as flag icons and an IP-to-Country database.]

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

 [Country Flags]

 [Show country flag as &status icon on message window]

diff --git a/langpacks/english/Plugins/Folders.txt b/langpacks/english/Plugins/Folders.txt
index 404a1e5b9f..f58afcb092 100644
--- a/langpacks/english/Plugins/Folders.txt
+++ b/langpacks/english/Plugins/Folders.txt
@@ -22,7 +22,7 @@
 [Expands to your Miranda path (e.g., c:\\program files\\miranda ng).]

 [Expands to your profile path - the value found in mirandaboot.ini,]

 [ProfileDir section (usually inside Miranda's folder).]

-[Expands to your current profile name without the extenstion.]

+[Expands to your current profile name without the extension.]

 [(e.g., default if your your profile is default.dat).]

 [Environment variables]

 [The plugin can also expand environment variables; the variables are specified like in any other]

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 8db353bfc8..0b462f5a7c 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -108,9 +108,6 @@
 [You are logged in at another location]

 [Incoming image]

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

-[Male]

-[Female]

-[<not specified>]

 [<Last Status>]

 [System tray icon]

 [Popup window]

@@ -122,6 +119,9 @@
 [General]

 [Conference]

 [Advanced]

+[Male]

+[Female]

+[<not specified>]

 [Your details has been uploaded to the public directory.]

 [You have to be logged in before you can change your details.]

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

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index eed4e79e05..71479c51e2 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -266,6 +266,10 @@
 [Supports direct chat invitations (XEP-0249)]

 [Receives information about OMEMO devices]

 [Supports message carbons (XEP-0280)]

+[Jingle ICE-UDP Transport]

+[Jingle RTP]

+[Jingle DTLS]

+[Jingle RTP Audio]

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

 [Enter the text you see]

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

@@ -477,6 +481,7 @@
 [Jabber Resource]

 [Last Active]

 [Server's Choice]

+[Voice call]

 [Services...]

 [Registered Transports]

 [Local Server Transports]

@@ -723,8 +728,9 @@
 [Enable server-side history (XEP-0136)]

 [Enable Message Archive Management (XEP-0313)]

 [Enable carbon copies (XEP-0280)]

-[Use Stream Management (XEP-0198) if possible (Testing)]

+[Enable VOIP(for developers)]

 [Server options]

+[Use Stream Management (XEP-0198) if possible (Testing)]

 [Disable SASL authentication (for old servers)]

 [Enable stream compression (if possible)]

 [Other]

@@ -733,7 +739,6 @@
 [Automatically add contact when accept authorization]

 [Automatically accept authorization requests]

 [Fix incorrect timestamps in incoming messages]

-[Disable frame]

 [Enable XMPP link processing (requires AssocMgr)]

 [Embrace picture URLs with [img]]

 [Ignore server roster (groups and nick names)]

@@ -741,7 +746,6 @@
 [Allow local time and timezone requests (XEP-0202)]

 [Allow servers to request version (XEP-0092)]

 [Show information about operating system in version replies]

-[Accept only in band incoming filetransfers (don't disclose own IP)]

 [Accept HTTP Authentication requests (XEP-0070)]

 [Use OMEMO encryption for messages if possible (XEP-0384) (Basic support without GUI)]

 [General]

@@ -763,7 +767,6 @@
 [Public XMPP Network]

 [Secure XMPP Network]

 [Secure XMPP Network (old style)]

-[Google Talk!]

 [Hipchat]

 [LiveJournal Talk]

 [League Of Legends (EU Nordic)]

@@ -972,9 +975,6 @@
 [Remote server timeout]

 [Unknown error]

 [Unknown error message]

-[Advanced Status]

-[Set mood...]

-[Set activity...]

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

 [Male]

 [Female]

@@ -984,6 +984,9 @@
 [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]

+[Incomig call]

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

 [<advanced status slot>]

 [Afraid]

@@ -1070,6 +1073,7 @@
 [Undefined]

 [Weak]

 [Worried]

+[Set mood...]

 [Set Mood]

 [Mood: %s]

 [Doing chores]

@@ -1149,6 +1153,7 @@
 [in a meeting]

 [studying]

 [writing]

+[Set activity...]

 [Set Activity]

 [Activity: %s]

 [Listening To]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 1b6e018580..e6b6f21a5d 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -138,7 +138,7 @@
 [Add ':' to auto-completed names]

 [Prefix all events with a timestamp]

 [Only prefix with timestamp if it has changed]

-[Timestamp has same color as event]

+[Timestamp has same color as the event]

 [Indent the second line of a message]

 [Limit user names to 20 characters]

 [Strip colors from messages]

@@ -210,7 +210,7 @@
 [Leave (10x10)]

 [Quit (10x10)]

 [Kick (10x10)]

-[Nickchange (10x10)]

+[Nick change (10x10)]

 [Topic (10x10)]

 [Highlight (10x10)]

 [Information (10x10)]

diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index f5d37fd2ae..22ef4f3cbb 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -43,6 +43,7 @@
 [last seen history]

 [Date: %d.%m.%y(%Y) \n Date desc: %W - %w - %E - %e \n Time: %H:%M:%S (%h-%p) \n user: %n - %u \n Status: %s \n IP: %i - %r]

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

+[Clock]

 [LastSeen]

 [User status change]

 [Changed to Online]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index d024632c32..14305ed37a 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Steam.dll

 ;  Plugin: Steam protocol

-;  Version: 0.95.12.2

+;  Version: 0.96.1.1

 ;  Authors: Miranda NG team, Robert Pösel

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

 [Steam protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index ba0af2219c..ca777a4745 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.2

+;  Version: 3.6.2.4

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

@@ -22,11 +22,12 @@
 [Popup]

 [Tray]

 [Options]

+[Text for autocomplete]

 [Add new rooms to group:]

 [Log files]

 [Enable logging to disk]

 [Log directory]

-[Maximum size for log files (in KB)]

+[Split into files (in KB)]

 [Group chat log formatting]

 [Your name]

 [Other name]

@@ -442,7 +443,7 @@
 [Quit (10x10)]

 [Kick (10x10)]

 [Notice (10x10)]

-[Nickchange (10x10)]

+[Nick change (10x10)]

 [Topic (10x10)]

 [Highlight (10x10)]

 [Information (10x10)]

@@ -468,7 +469,7 @@
 [Create tabs or windows for highlight events]

 [Activate chat window on highlight]

 [Show list of users in the chat room]

-[Colorize nicknames in member list]

+[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]

@@ -481,8 +482,6 @@
 [Timestamp has same color as the event]

 [Indent the second line of a message]

 [Limit user names in the message log to 20 characters]

-[Add a colon (:) to auto-completed user names]

-[Add a comma instead of a colon to auto-completed user names]

 [Start private conversation on double click in nick list (insert nick if unchecked)]

 [Strip colors from messages in the log]

 [Enable the 'event filter' for new rooms]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 0c4ce9b551..727f7c6516 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -61,7 +61,6 @@
 [Enabled]

 [Perform check on each startup]

 [Time of last check:]

-[Automatically backup and keep protocol based birthdays up to date]

 [Play sound]

 [Use ignore list]

 [Birthday popup colors]

@@ -105,7 +104,6 @@
 [Metacontacts]

 [Scan subcontacts for missing information]

 [Enable extended 'send/receive e-mail' service (*)]

-[Use Windows timezone]

 [(*) Requires Miranda to be restarted.]

 [Reset factory defaults]

 [Protocol's information]

@@ -303,7 +301,6 @@
 [View/change my &details...]

 [Export all contacts]

 [Import all contacts]

-[Backup birthdays]

 [Export/import group]

 [&Export group]

 [&Import group]

@@ -573,7 +570,6 @@
 [\nHe becomes %d years old.]

 [\nShe becomes %d years old.]

 [No anniversaries to remind of]

-[Backing up and syncing all birthdays complete!]

 [Reminders]

 [Birthday reminder]

 [Birthday reminder: it's coming]

diff --git a/langpacks/english/Plugins/Watrack.txt b/langpacks/english/Plugins/Watrack.txt
index 7cceae4225..4c7f428522 100644
--- a/langpacks/english/Plugins/Watrack.txt
+++ b/langpacks/english/Plugins/Watrack.txt
@@ -251,7 +251,7 @@
 [Tunes]

 [Check all marked players for active (started and playing) or stop at first founded]

 [Check all players]

-[Emulate multimedia keys presses to control palyer]

+[Emulate multimedia keys presses to control player]

 [User music info text]

 [(%artist%, %title%, %album% and %year% macros can be used only)]

 [Disable Plugin]

diff --git a/langpacks/english/Plugins/WhenWasIt.txt b/langpacks/english/Plugins/WhenWasIt.txt
index bf9de01f85..e5f3f14273 100644
--- a/langpacks/english/Plugins/WhenWasIt.txt
+++ b/langpacks/english/Plugins/WhenWasIt.txt
@@ -2,12 +2,11 @@
 ;============================================================

 ;  File: WhenWasIt.dll

 ;  Plugin: Birthday reminder

-;  Version: 0.3.3.6

+;  Version: 0.4.0.1

 ;  Authors: Cristian Libotean

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

 [Notifies you of upcoming birthdays.]

 ;file \plugins\WhenWasIt\res\WhenWasIt.rc

-[Notify of birthdays:]

 [Popups]

 [Popup timeout:]

 [Preview]

@@ -24,8 +23,6 @@
 [Check every]

 [hours]

 [Only notify once per day.]

-[By default use]

-[to save birthday data.]

 [Show]

 [in birthday list window]

 [Dialog]

@@ -45,37 +42,21 @@
 [Save]

 [Delete]

 [Upcoming birthdays]

-;file \plugins\WhenWasIt\src\dlg_handlers.cpp

-[Upcoming age]

-[Current age]

-[UserInfo module]

-[Protocol module]

-[Nothing]

-[Dismiss]

-[Message window]

-[All contacts]

-[All contacts except hidden ones]

-[All contacts except ignored ones]

-[All contacts except hidden and ignored ones]

-[Set popup delay when notifying of upcoming birthdays.\nFormat: default delay [ | delay for birthdays occurring today]]

-[Please select the module where you want the date of birth to be saved.\r\n"UserInfo" is the default location.\r\nUse "Protocol module" to make the data visible in User Details.\n"mBirthday module" uses the same module as mBirthday plugin.]

+;file \plugins\WhenWasIt\src\add_birthday.cpp

 [Set birthday for %s:]

-[%S protocol]

+;file \plugins\WhenWasIt\src\dlg_handlers.cpp

 [N/A]

-[Unknown]

+[Protocol iModule]

 [Birthday list (%d)]

+[Unknown]

 [Protocol]

 [Contact]

 [DTB]

 [Birthday]

 [Age]

 [Module]

-[Closing in %d seconds]

-[Closing in %d second]

 ;file \plugins\WhenWasIt\src\hooked_events.cpp

 [Check for birthdays]

-[Birthdays]

-[Contacts]

 ;file \plugins\WhenWasIt\src\icons.cpp

 [WhenWasIt]

 [Check birthdays menu item]

@@ -103,6 +84,21 @@
 [He/She]

 [%s\n%s will be %d years old.]

 [%s\n%s just turned %d.]

+[Closing in %d seconds]

+[Closing in %d second]

+;file \plugins\WhenWasIt\src\options.cpp

+[Upcoming age]

+[Current age]

+[Nothing]

+[Dismiss]

+[Message window]

+[All contacts]

+[All contacts except hidden ones]

+[All contacts except ignored ones]

+[All contacts except hidden and ignored ones]

+[Set popup delay when notifying of upcoming birthdays.\nFormat: default delay [ | delay for birthdays occurring today]]

+[Birthdays]

+[Contacts]

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

 [Starting to refresh user details]

 [Done refreshing user details]

@@ -120,8 +116,6 @@
 [Warning]

 [Could not open file to export birthdays]

 [Please do not edit this file by hand. Use the export function of WhenWasIt plugin.\n]

-[Warning! Please do not mix Unicode and Ansi exported birthday files. You should use the same version (Ansi/Unicode) of WhenWasIt that was used to export the info.\n]

-[This file was exported with a Unicode version of WhenWasIt. Please only use a Unicode version of the plugin to import the birthdays.\n]

 ;file \plugins\WhenWasIt\src\WhenWasIt.cpp

 [Birthdays (When Was It)]

 [Add/change user &birthday]