update langpacks/english & langpacks/russian

FacebookRM typo fix

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

26 files changed, 42 insertions, 50 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 1915642d3b..0f06fb08ee 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -942,7 +942,6 @@
 [Message log]

 [** New contacts **]

 [** Unknown contacts **]

-[Show balloon popup (unsupported system)]

 [Messaging log]

 [Typing notify]

 ;file \src\core\stdmsg\src\msgs.cpp

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index 82a17303f0..dedd897ab4 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -83,7 +83,7 @@
 [Show when a connection attempt is made]

 [Show when reconnection has finished]

 [Show other messages]

-[From Popup plugin]

+[From popup plugin]

 [Custom]

 [Permanent]

 [Show additional information in popups]

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index fb8f7b9f2b..f8828dd406 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -27,7 +27,7 @@
 [Use Windows colors]

 [Use default colors]

 [Delay]

-[From Popup plugin]

+[From popup plugin]

 [Custom]

 [Permanent]

 [Actions]

diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index d9038d2e50..670c4fd0f5 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -31,7 +31,7 @@
 [Back]

 [Text]

 [Timeout]

-[From Popup plugin]

+[From popup plugin]

 [Permanent]

 [Custom]

 [On left click]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 3ebca0c5c8..aa4de0d27c 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Clist_modern.dll

 ;  Plugin: Modern contact list

-;  Version: 0.9.1.4

+;  Version: 0.9.1.5

 ;  Authors: Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven

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

 [Displays contacts, event notifications, protocol status with advanced visual modifications. Supported multi-window modifications, enhanced metacontact cooperation.]

@@ -206,7 +206,7 @@
 [Round corners]

 [Non-layered mode]

 [Disable skin engine]

-[Enable Aero Glass (Vista+)]

+[Enable Aero Glass (Vista, Win 7)]

 [Order of items:]

 [Minimum row height:]

 [Row border:]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 5bebfcb6cd..4b584373a5 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.14.3

+;  Version: 0.3.0.0

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -53,8 +53,8 @@
 [Multi user chats]

 [Enable multi user chats support]

 [Do not open chat windows on creation]

+[Automatically join active chats that exist in contact list]

 [History synchronization]

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

@@ -143,6 +143,9 @@
 ;file \protocols\FacebookRM\src\process.cpp

 [Contact is back on server-list.]

 [Contact is no longer on server-list.]

+[Loading history started.]

+[Loading messages: %d/%d]

+[Loading history completed.]

 [<attachment without text>]

 [On this day]

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

@@ -160,6 +163,8 @@
 [Loading friendship requests...]

 [Loading notifications...]

 [Loading memories...]

+[Loading history is already in progress. It can't run for more contacts at once so please wait until it finishes.]

+[This will load all messages from the server. To avoid having duplicate messages in your history, delete existing messages manually before continuing.\nLoading process might take a while, so be patient.\n\nDo you want to continue?]

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

 [Client errors]

 [Wall posts]

@@ -194,6 +199,7 @@
 [Wow]

 [Visit friendship details]

 [Visit conversation]

+[Load history]

 [Cancel friendship]

 [Cancel friendship request]

 [Request friendship]

diff --git a/langpacks/english/Plugins/FileAsMessage.txt b/langpacks/english/Plugins/FileAsMessage.txt
index 9235d21f78..37746812ad 100644
--- a/langpacks/english/Plugins/FileAsMessage.txt
+++ b/langpacks/english/Plugins/FileAsMessage.txt
@@ -23,6 +23,8 @@
 [Use only alphanumeric encoding on transfer]

 [Go to Options -> Events -> File Transfers, "Receiving files" group for extra settings]

 ;file \plugins\FileAsMessage\src\dialog.cpp

+[Receive file]

+[Send file]

 [File already exists. Overwrite?]

 [Couldn't open a file]

 [Size: %d bytes]

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 937d7559c5..2714d4e29c 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -169,8 +169,8 @@
 [%us]

 [online since %s, idle %s]

 [Change nickname]

-[IRC error]

 [Unknown]

+[IRC error]

 [Please enter the hostmask (nick!user@host)\nNOTE! Contacts on your contact list are never ignored]

 [Ignore]

 [Please enter the reason]

@@ -328,7 +328,6 @@
 [Please enter the notice text]

 [Please enter the channel name to invite to]

 [Invite to channel]

-[NickServ]

 [Register nick]

 [Auth nick]

 [Remind password]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 04adcbb3d9..c0124840ef 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -86,7 +86,6 @@
 [Home]

 [Work]

 [Internet]

-[X400]

 [Jabber vCard: Add Phone Number]

 [Phone number:]

 [Voice]

@@ -95,10 +94,7 @@
 [Text/Messaging]

 [Cellular]

 [Video]

-[BBS]

 [Modem]

-[ISDN]

-[PCS]

 [Load]

 [Save]

 [Delete]

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 52aa358fc9..1170a32724 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -83,7 +83,7 @@
 [Show when a connection attempt is made]

 [Show when reconnection has finished]

 [Show other messages]

-[From Popup plugin]

+[From popup plugin]

 [Custom]

 [Permanent]

 [Show additional information in popups]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 5e33150bfc..1d6a4d69c2 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -31,7 +31,6 @@
 [Blocked contact]

 [Somebody included you in his/her server list]

 [Refresh]

-[Hotmail]

 [Enable Popup notifications]

 [Enable Contact List notifications]

 [Enable Tray notifications]

diff --git a/langpacks/english/Plugins/MirandaG15.txt b/langpacks/english/Plugins/MirandaG15.txt
index e5056147af..33d95571da 100644
--- a/langpacks/english/Plugins/MirandaG15.txt
+++ b/langpacks/english/Plugins/MirandaG15.txt
@@ -101,7 +101,6 @@
 [Close chat after]

 [When in background]

 ;file \plugins\MirandaG15\src\CConfig.cpp

-[MirandaG15]

 [Appearance]

 [Notifications]

 [Chat sessions]

diff --git a/langpacks/english/Plugins/NotesReminders.txt b/langpacks/english/Plugins/NotesReminders.txt
index bcd3207f5e..9ad954f142 100644
--- a/langpacks/english/Plugins/NotesReminders.txt
+++ b/langpacks/english/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: NotesReminders.dll

 ;  Plugin: Sticky Notes & Reminders

-;  Version: 0.0.5.1

+;  Version: 0.1.0.1

 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer

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

 [Sticky Notes & Reminders Implementation for Miranda NG.]

@@ -134,7 +134,7 @@
 [Aqua]

 [White]

 [Are you sure you want to delete this note?]

-[Visible]

+[bVisible]

 [Top]

 [Notes]

 [Note text]

diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index 981eba7443..1c671fd602 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -43,7 +43,7 @@
 [Background color]

 [Text color]

 [Delay]

-[From Popup plugin]

+[From popup plugin]

 [Custom]

 [Permanent]

 [Do not add to popup's history]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index bddfe2aab3..150302508a 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -143,7 +143,6 @@
 [Wikipedia (en)]

 [Google Maps]

 [Google Translate]

-[Foodnetwork]

 [C&lear log]

 [&Open link]

 [&Copy link]

@@ -302,7 +301,6 @@
 [On the phone]

 [** New contacts **]

 [** Unknown contacts **]

-[Show balloon popup (unsupported system)]

 [Message sessions]

 [Typing notify]

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

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 92843369af..21f5e65c55 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SkypeWeb.dll

 ;  Plugin: Skype protocol (Web)

-;  Version: 0.12.2.2

+;  Version: 0.12.2.3

 ;  Authors: Miranda NG Team

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

 [Skype protocol support for Miranda NG. Based on new Skype for Web.]

@@ -36,12 +36,12 @@
 [Warning]

 [&Invite user...]

 [&Leave chat session]

-[&Change topic]

+[&Change topic...]

 [Kick &user]

 [Set &role]

 [&Admin]

 [&User]

-[Change nick]

+[Change nick...]

 [Enter new chatroom topic]

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

 [Are you sure?]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index fbb8d69a83..d52d61d1a9 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -83,7 +83,7 @@
 [Show when a connection attempt is made]

 [Show when reconnection has finished]

 [Show other messages]

-[From Popup plugin]

+[From popup plugin]

 [Custom]

 [Permanent]

 [Show additional information in popups]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index e5003234f6..cd6372c636 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -17,7 +17,6 @@
 [Show chat state events (i.e., user closed chat session)]

 [Captcha]

 [Cancel]

-[Steam Guard]

 [As an added account security measure, you'll need to grant access by entering the special code we've just sent to your email address.]

 [Go to email domain]

 [Block]

@@ -58,7 +57,6 @@
 [Protocol icon]

 [Gaming icon]

 [%s connection]

-[SteamID]

 [You cannot send messages when you are offline.]

 ;file \protocols\Steam\src\steam_utils.cpp

 [closed chat session]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 7b9b73ed97..b929b413d4 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.12

+;  Version: 3.4.1.2

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

@@ -252,7 +252,7 @@
 [Only &one popup for each contact]

 [Show &entry in the main menu]

 [...is typing]

-[From Popup plugin]

+[From popup plugin]

 [From protocol]

 [Permanent]

 [Custom]

@@ -687,7 +687,6 @@
 [You have chosen to use an external plugin for displaying the message history in the chat window. Most of the settings on this page are for the standard message log viewer only and will have no effect. To change the appearance of the message log, you must configure either IEView or History++.]

 [** New contacts **]

 [** Unknown contacts **]

-[Show balloon popup (unsupported system)]

 [Always]

 [Always, but no popup when window is focused]

 [Only when no message window is open]

diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
index 677fccc84d..cd4a6560f9 100644
--- a/langpacks/english/Plugins/Tlen.txt
+++ b/langpacks/english/Plugins/Tlen.txt
@@ -46,7 +46,7 @@
 [Background]

 [Text]

 [Delay]

-[&From Popup plugin]

+[&From popup plugin]

 [&Custom]

 [P&ermanent]

 [Preview]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index c03205be9e..6b525fbe77 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -71,7 +71,7 @@
 [Use Windows colors]

 [Use default colors]

 [Delay]

-[From Popup plugin]

+[From popup plugin]

 [Custom]

 [Permanent]

 [Show reminder messages as popups (if reminder is enabled)]

@@ -311,11 +311,8 @@
 [Main]

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

 [Extended user info]

-[Extended user info/Zodiacs]

-[Extended user info/Dialogs]

-[Extended user info/Buttons]

-[Extended user info/Treeview]

-[Extended user info/Reminder]

+[Dialogs]

+[Buttons]

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

 [Export/import contact]

 [User &details]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index e6311d455e..2a06ef4166 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.2.4

+;  Version: 0.1.2.5

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

@@ -120,10 +120,12 @@
 [VKontakte]

 [Access denied! Data will not be sent or received.]

 [Error]

-[You must validate your account before use VK in Miranda NG]

+[You have to validate your account before you can use VK in Miranda NG]

 [Error %d. Data will not be sent or received.]

 [One of the parameters specified was missing or invalid]

 [Access to adding post denied]

+[Enter the missing digits between %s and %s of the phone number linked to your account]

+[Attention!]

 [Enter confirmation code]

 [Enter new nickname]

 [Message read: %s]

@@ -188,7 +190,7 @@
 [%s is typing a message...]

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

 [Enter the text you see]

-[Wall message for]

+[Wall message for %s]

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

 [New news]

 [New notifications]

@@ -222,13 +224,12 @@
 [Unknown error occurred]

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

 [Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]

-[Attention!]

 [Are you sure you want to reload all messages for all contacts from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a very long time and/or corrupt Miranda database.\nWe recommend check your database before reloading messages and after it (Miranda32.exe /svc:dbchecker or Miranda64.exe /svc:dbchecker).\nDo you want to continue?]

-[Error loading message history from server]

-[Loading messages for all contacts is completed]

+[Error loading message history from server.]

+[Loading messages for all contacts is completed.]

 [Loading history]

-[for]

-[Loading messages for %s is completed]

+[Error loading message history for %s from server.]

+[Loading messages for %s is completed.]

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

 [Network]

 [Account]

@@ -281,6 +282,7 @@
 ;file \protocols\VKontakte\src\vk_struct.cpp

 [I\'m back]

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

+[Service message]

 [Interests]

 [Activities]

 [Music]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index 8bfea68814..0f62440b13 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -80,7 +80,7 @@
 [Popup Delay]

 [Delay]

 [seconds]

-[From Popup plugin]

+[From popup plugin]

 [Permanent]

 [Popup Text]

 [Popup Title]

diff --git a/langpacks/english/Plugins/WebView.txt b/langpacks/english/Plugins/WebView.txt
index f6621f9f93..b18973ec45 100644
--- a/langpacks/english/Plugins/WebView.txt
+++ b/langpacks/english/Plugins/WebView.txt
@@ -71,7 +71,7 @@
 [Save as raw data]

 [Popup delay]

 [Delay]

-[From Popup plugin]

+[From popup plugin]

 [Permanent]

 [Preview]

 [Colors]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index 61386a1f14..114a3661bd 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -17,7 +17,6 @@
 [Name:]

 [Server:]

 [Port:]

-[APOP]

 [User Name:]

 [Password:]

 [Codepage:]

diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index e079ec2509..1c54d9f47a 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -17,7 +17,6 @@
 [Auto login to Yahoo Website(s)]

 [Display Yahoo notifications]

 [Show Errors]

-[Yahoo Japan]

 [Create a new Yahoo account]

 [Connection Settings]

 [Login server:]