langpacks/english: update

git-svn-id: http://svn.miranda-ng.org/main/trunk@16896 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

25 files changed, 65 insertions, 53 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index e95ca5252c..49cc4ce6cb 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1078,6 +1078,13 @@
 [The topic is '%s']

 [The topic is '%s' (set by %s)]

 ;file \src\mir_app\src\clcitems.cpp

+;file \src\mir_app\src\clistgroups.cpp

+[New group]

+[Are you sure you want to delete group '%s'? This operation cannot be undone.]

+[Delete group]

+[You already have a group with that name. Please enter a unique name for the group.]

+[Rename group]

+[This group]

 ;file \src\mir_app\src\clistmod.cpp

 [Connecting]

 [Connecting (attempt %d)]

@@ -1157,13 +1164,6 @@
 [Headers]

 [Generic text]

 [Small text]

-;file \src\mir_app\src\groups.cpp

-[New group]

-[Are you sure you want to delete group '%s'? This operation cannot be undone.]

-[Delete group]

-[You already have a group with that name. Please enter a unique name for the group.]

-[Rename group]

-[This group]

 ;file \src\mir_app\src\hotkey_opts.cpp

 [Browser: Back]

 [Browser: Forward]

@@ -1276,7 +1276,6 @@
 [No online contacts found.]

 [Select metacontact]

 ;file \src\mir_app\src\meta_utils.cpp

-[Sender]

 [Could not retrieve contact protocol]

 [Assignment error]

 [Could not get unique ID of contact]

diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index c9151c9fd8..a7249fcb18 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -11,7 +11,6 @@
 [Screen Name:]

 [Display Name:]

 [Password:]

-[Login Server:]

 [AIM Options]

 [Message Delivery Confirmation]

 [Do Not Autoreply When Away]

@@ -21,18 +20,19 @@
 [Disable Account Type Icons]

 [Disable Extended Status Icons]

 [Notify about new mail]

+[Manage Server Groups]

 [Advanced Options]

 [Instant Idle on Login]

 [Force Proxy File Transfers]

 [Masquerade as a Sidekick/Hiptop User]

-[* Some changes will take effect the next time you connect to the AIM network]

 [Connection]

+[Login Server:]

 [Port:]

 [Reset]

 [Disable SSL]

-[Manage Server Groups]

 [Force Single Client]

 [Use "clientlogin" (recommended)]

+[* Some changes will take effect the next time you connect to the AIM network]

 [Save Profile]

 [Create a new AIM account]

 [AIM Instant Idler]

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index d8d6bcf7b7..82a17303f0 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -55,8 +55,11 @@
 [Timeout]

 [s]

 [Set window location]

+[Left]

+[Top]

 [Set window size]

-[x]

+[Width]

+[Height]

 [Allow override]

 [Note: status profiles can be created in the 'Status profiles' options screen]

 [Window on startup]

diff --git a/langpacks/english/Plugins/AuthState.txt b/langpacks/english/Plugins/AuthState.txt
index 33b4e59810..e818b50761 100644
--- a/langpacks/english/Plugins/AuthState.txt
+++ b/langpacks/english/Plugins/AuthState.txt
@@ -10,7 +10,7 @@
 [Show Request icon]

 [Show Grant icon]

 [Plugin settings]

-[Enable menu item (restart required)]

+[Enable menu item]

 [Show icons only for recently added contacts]

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

 [Request]

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index 64114d7912..fb8f7b9f2b 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -89,8 +89,8 @@
 [removed his/her avatar]

 [changed his/her avatar]

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

-[Unknown UIN]

 [Unknown Protocol]

+[Unknown UIN]

 [AVH Debug: GetOldStyleAvatarName]

 [Avatar History: Unable to create shortcut]

 [AVH Debug: Shortcut created successfully]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 25f526ae00..f0a9fa3946 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -320,7 +320,7 @@
 [Set status modes]

 [The requested action requires a valid contact selection. Please select a contact from the contact list and repeat.]

 [Parameter mismatch]

-[The service %s specified by the %s button definition was not found. You may need to install additional plugins.]

+[The service %S specified by the %S button definition was not found. You may need to install additional plugins.]

 [Service failure]

 [You need the FloatingContacts plugin, cause the embedded floating contacts were removed.]

 [Warning]

@@ -390,7 +390,7 @@
 [Minutes]

 [Hours]

 [Days]

-[Current view mode: %s]

+[Current view mode: %S]

 [Filtering]

 [*** All contacts ***]

 [Really delete this view mode? This cannot be undone]

diff --git a/langpacks/english/Plugins/Dropbox.txt b/langpacks/english/Plugins/Dropbox.txt
index b846154ab0..0b4f03d315 100644
--- a/langpacks/english/Plugins/Dropbox.txt
+++ b/langpacks/english/Plugins/Dropbox.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Dropbox.dll

 ;  Plugin: Dropbox

-;  Version: 0.12.2.1

+;  Version: 0.12.2.2

 ;  Authors: Miranda NG Team

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

 [Allows you to transfer files via Dropbox.]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index a71616d0ca..486571df7f 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.2.12.1

+;  Version: 0.2.14.0

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -49,7 +49,6 @@
 [Instruction:]

 [Submit]

 [Messages]

-[Receive messages from "inbox" folder only]

 [Keep messages as unread on server (don't send "seen" info)]

 [Show stickers as custom smileys (EXPERIMENTAL)]

 [Multi user chats]

@@ -59,6 +58,9 @@
 [Load last messages (24 hours old) on login (EXPERIMENTAL)]

 [Load last messages on opening message window (EXPERIMENTAL)]

 [Number of messages to load:]

+[Facebook Login Approval]

+[Your security settings requires to input a security code to access your account from unknown browsers.\n\nYou can get the code via Facebook application on your phone or click button below to receive it via SMS.]

+[Send SMS]

 ;file \protocols\FacebookRM\src\captcha.cpp

 [Enter the text you see]

 ;file \protocols\FacebookRM\src\chat.cpp

@@ -73,7 +75,8 @@
 [Login error: %s]

 [Unknown error]

 [Login error: Invalid request.]

-[Login error: Some Facebook things are required.]

+[You entered too many invalid verification codes. Plugin will disconnect.]

+[You entered wrong verification code. Try it again.]

 [Login error: Your account is temporarily locked. You need to confirm this device from web browser.]

 [Login error: Facebook thinks your computer is infected. Solve it by logging in via 'private browsing' mode of your web browser and run their antivirus check.]

 [Login error: Captcha code is required. You need to confirm this device from web browser.]

@@ -85,6 +88,8 @@
 [User cancel captcha challenge.]

 [Timeout when sending message.]

 [Status update was successful.]

+[Error occurred when requesting verification SMS code.]

+[Verification SMS code was sent to your mobile phone.]

 ;file \protocols\FacebookRM\src\connection.cpp

 [Please enter a username.]

 [Please enter a password.]

@@ -153,7 +158,6 @@
 [Own wall]

 [Loading newsfeeds...]

 [Checking friend requests...]

-[Refreshing buddy list...]

 [Do you want to cancel your friendship with '%s'?]

 [News feeds]

 [Friendship events]

@@ -186,6 +190,5 @@
 [Approve friendship]

 [Deny friendship request]

 [Services...]

-[Refresh Buddy List]

 [Check Friends Requests]

 [Check Newsfeeds]

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index e2c728d80a..52aa358fc9 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -55,8 +55,11 @@
 [Timeout]

 [s]

 [Set window location]

+[Left]

+[Top]

 [Set window size]

-[x]

+[Width]

+[Height]

 [Allow override]

 [Note: status profiles can be created in the 'Status profiles' options screen]

 [Window on startup]

diff --git a/langpacks/english/Plugins/MessageState.txt b/langpacks/english/Plugins/MessageState.txt
index c1c20210c0..6da71f473f 100644
--- a/langpacks/english/Plugins/MessageState.txt
+++ b/langpacks/english/Plugins/MessageState.txt
@@ -8,15 +8,15 @@
 [Displays icons in message window showing whether your last outgoing message was read / is still unread.]

 ;file \plugins\MessageState\src\clist_extra.cpp

 [MessageState unread extra icon]

-;file \plugins\MessageState\src\global.h

+;file \plugins\MessageState\src\messagestate.cpp

 [Unread message icon]

 [Read message icon]

 [Failed sending icon]

 [Sending message icon]

 [Unread clist extra icon]

-;file \plugins\MessageState\src\messagestate.cpp

-[Last message read at]

-[Last message read (unknown time)]

 [Last message is not read]

-[Last message was not sent.]

+[Last message read]

+[Last message was not sent]

 [Sending...]

+[Last message read at %X %x]

+[Last message read (unknown time)]

diff --git a/langpacks/english/Plugins/MirFox.txt b/langpacks/english/Plugins/MirFox.txt
index f0db20a105..a74918680f 100644
--- a/langpacks/english/Plugins/MirFox.txt
+++ b/langpacks/english/Plugins/MirFox.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MirFox.dll

 ;  Plugin: MirFox

-;  Version: 0.5.0.0

+;  Version: 0.5.1.0

 ;  Authors: Szymon Tokarz

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

 [MirFox (Miranda NG) - part of Miranda-Firefox integration - http://wsx22.3.xpdev-hosted.com]

@@ -11,6 +11,8 @@
 [on left mouse button click]

 [on right mouse button click]

 [on middle mouse button click\n(note: use middle mouse button to send multiple messages from Firefox)]

+[Firefox menu]

+[Add acount to contact name]

 [Firefox profiles]

 [Show Miranda menu only in these Firefox profiles (comma delimited)]

 [Show these contacts in 'Send ... to' option in Firefox]

@@ -30,6 +32,7 @@
 [Accounts]

 ;file \plugins\MirFox\src\MirandaUtils.cpp

 [MirFox log]

+[Message sent to %s]

 [Message sent to %s (%s)]

 [Message sent]

 [Cannot send message to %s (%s) - %S]

diff --git a/langpacks/english/Plugins/MirLua.txt b/langpacks/english/Plugins/MirLua.txt
index dfdccddea2..fce83fb5e9 100644
--- a/langpacks/english/Plugins/MirLua.txt
+++ b/langpacks/english/Plugins/MirLua.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MirLua.dll

 ;  Plugin: MirLua

-;  Version: 0.11.7.0

+;  Version: 0.11.7.2

 ;  Authors: Miranda NG team

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

 [Extends Miranda NG functionality with Lua scripts.]

diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 501b3139f6..b242eed85a 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Msg_Export.dll

 ;  Plugin: Message export

-;  Version: 3.1.1.5

+;  Version: 3.1.1.6

 ;  Authors: Kennet Nielsen, mod by ring0

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

 [Exports every message, URL or file you receive to a text file.]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index db5ef3f6c1..b0678803a7 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: New_GPG.dll

 ;  Plugin: GPG

-;  Version: 0.0.0.12

+;  Version: 0.0.0.13

 ;  Authors: sss

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

 [New GPG encryption support plugin, based on code from old GPG plugin and SecureIM.]

@@ -153,9 +153,7 @@
 ;file \plugins\New_GPG\src\messages.cpp

 [We received encrypted message from contact with encryption turned off.\nDo you want to turn on encryption for this contact?]

 [Do you want to try to decrypt encrypted message?]

-[failed to decrypt message, GPG returned error, turn on debug log for more details]

 [We're trying to encrypt with untrusted key. Do you want to trust this key permanently?]

-[failed to encrypt message, GPG returned error, turn on debug log for more details]

 [Something is wrong, GPG does not understand us, aborting encryption.]

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

 [Services]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 941c2e24ba..9beb859bc8 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -27,6 +27,9 @@
 [Development version (less stable)]

 [Development version with debug symbols]

 [Custom version]

+[Platform]

+[x86]

+[x64]

 [Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.]

 [Notifications]

 [Restart]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index fa856bd959..3dceb593ba 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -81,7 +81,6 @@
 [Message session]

 [&User menu]

 [User &details]

-[&Emoticons]

 [&Add]

 [&History]

 [&Quote]

@@ -244,7 +243,6 @@
 [Action: Paste and send]

 ;file \plugins\Scriver\src\msgdialog.cpp

 [Quote]

-[Smiley]

 [User menu]

 [User details]

 [History]

@@ -255,13 +253,11 @@
 [View user's details]

 [View user's history]

 [Quote text]

-[Insert emoticon]

 [User menu - %s]

 [Sending in progress: %d message(s) left...]

 [%s is typing a message...]

 [Last message received on %s at %s.]

 ;file \plugins\Scriver\src\msglog.cpp

-[Unknown contact]

 [Me]

 [O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies]

 [to tiny bits, in Thy mercy]

@@ -425,7 +421,6 @@
 [Filter]

 [Manager]

 [Nick list]

-[Insert a smiley]

 [Make the text bold (CTRL+B)]

 [Make the text italicized (CTRL+I)]

 [Make the text underlined (CTRL+U)]

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index df6477c95c..92843369af 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -31,6 +31,7 @@
 ;file \protocols\SkypeWeb\src\skype_chatrooms.cpp

 [Admin]

 [User]

+[Enter new nickname]

 [This chat is going to be destroyed forever with all its contents. This action cannot be undone. Are you sure?]

 [Warning]

 [&Invite user...]

@@ -40,6 +41,7 @@
 [Set &role]

 [&Admin]

 [&User]

+[Change nick]

 [Enter new chatroom topic]

 ;file \protocols\SkypeWeb\src\skype_contacts.cpp

 [Are you sure?]

diff --git a/langpacks/english/Plugins/SpellChecker.txt b/langpacks/english/Plugins/SpellChecker.txt
index dbcfee86b3..a433ec3a03 100644
--- a/langpacks/english/Plugins/SpellChecker.txt
+++ b/langpacks/english/Plugins/SpellChecker.txt
@@ -2,8 +2,8 @@
 ;============================================================

 ;  File: SpellChecker.dll

 ;  Plugin: Spell checker

-;  Version: 0.2.6.3

-;  Authors: Ricardo Pescuma Domenecci, FREAK_THEMIGHTY

+;  Version: 0.2.6.4

+;  Authors: Ricardo Pescuma Domenecci, Wishmaster

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

 [Spell checker for the message windows. Uses Hunspell to do the checking.]

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

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 5a2a2da860..fbb8d69a83 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -55,8 +55,11 @@
 [Timeout]

 [s]

 [Set window location]

+[Left]

+[Top]

 [Set window size]

-[x]

+[Width]

+[Height]

 [Allow override]

 [Note: status profiles can be created in the 'Status profiles' options screen]

 [Window on startup]

@@ -139,7 +142,6 @@
 [<last>]

 [<current>]

 [<unknown>]

-[Left]

 [Right]

 [None]

 [size: %d x %d]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 8b2889385c..9c2e7d0915 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TabSRMM.dll

 ;  Plugin: TabSRMM

-;  Version: 3.4.0.11

+;  Version: 3.4.0.12

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 049fda5da0..12902e6779 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Tox.dll

 ;  Plugin: Tox protocol

-;  Version: 0.11.1.20

+;  Version: 0.11.1.21

 ;  Authors: Miranda NG Team

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

 [Tox protocol support for Miranda NG.]

@@ -30,6 +30,7 @@
 [Cancel]

 [Tox profile is encrypted. Enter the password to continue.]

 [Add]

+[Update]

 [IPv4 address/ Host]

 [IPv6 address (optional)]

 [Port]

@@ -55,8 +56,6 @@
 [To:]

 ;file \protocols\Tox\src\tox_chatrooms.cpp

 [Group chat]

-;file \protocols\Tox\src\tox_core.cpp

-[Unable to initialize Tox core]

 ;file \protocols\Tox\src\tox_events.cpp

 [Profiles folder]

 [Tox URI scheme]

@@ -78,6 +77,8 @@
 [Outgoing call to %s]

 ;file \protocols\Tox\src\tox_netlib.cpp

 [%s connection]

+;file \protocols\Tox\src\tox_network.cpp

+[Unable to initialize Tox core]

 ;file \protocols\Tox\src\tox_options.cpp

 [Tox profile]

 [All files]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 972f661a4e..02a3c72e0d 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -553,8 +553,6 @@
 [jun.]

 [sen.]

 ;file \plugins\UserInfoEx\src\svc_constants.h

-;file \plugins\UserInfoEx\src\svc_contactinfo.cpp

-['(Unknown Contact)']

 ;file \plugins\UserInfoEx\src\svc_email.cpp

 [Send e-mail]

 [Memory allocation error!]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index abe0cb761e..5c4ed560ae 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.1.27

+;  Version: 0.1.1.28

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

@@ -122,6 +122,7 @@
 [One of the parameters specified was missing or invalid]

 [Access to adding post denied]

 [Enter confirmation code]

+[Enter new nickname]

 [Message read: %s]

 [has invited you to a group]

 [has invited you to subscribe to a page]

@@ -177,6 +178,7 @@
 [View/change &title]

 [&Destroy room]

 [&User details]

+[Change nick]

 [&Kick]

 [%s is typing a message...]

 ;file \protocols\VKontakte\src\vk_dialogs.cpp

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index b72be08efc..0b85bc4020 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Weather.dll

 ;  Plugin: Weather

-;  Version: 0.4.0.2

+;  Version: 0.4.0.3

 ;  Authors: Miranda NG Team

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

 [Retrieves weather information and displays it in your contact list.]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index c0ad49c8ff..52c9bba93a 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -11,8 +11,8 @@
 [Version:]

 [Description:]

 [Copyright:]

-[Contact:]

-[WWW:]

+[E-mail:]

+[Homepage:]

 [Account]

 [Name:]

 [Server:]