- langpacks/english: updated

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

9 files changed, 50 insertions, 52 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 065bf5c6c1..4fa8079fd1 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -852,6 +852,7 @@
 [The topic is '%s' (set by %s)]

 [Look up '%s':]

 [No word to look up]

+[&Message %s]

 ;file \src\core\stdchat\src\window.cpp

 [Insert a smiley]

 [Make the text bold (CTRL+B)]

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index dc842c438d..e83cc19a53 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -853,6 +853,7 @@
 [The topic is '%s' (set by %s)]

 [Look up '%s':]

 [No word to look up]

+[&Message %s]

 ;file \src\core\stdchat\src\window.cpp

 [Insert a smiley]

 [Make the text bold (CTRL+B)]

@@ -2545,7 +2546,7 @@
 ;============================================================

 ;  File: AVS.dll

 ;  Plugin: Avatar service

-;  Version: 0.11.0.1

+;  Version: 0.11.0.2

 ;  Authors: Nightwish, Pescuma

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

 [Loads and manages contact pictures for other plugins.]

@@ -5650,7 +5651,7 @@
 [You have %d unread emails ...]

 [You have one unread email ...]

 [Exchange email]

-[Do you want to see the email headers?]

+[Do you want to see the email headers ?]

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

 [Check exchange mailbox]

 [Exchange notify]

@@ -5668,9 +5669,11 @@
 [Password:]

 [Create a new Facebook account]

 [What's on your mind?]

+[Wall:]

+[Visibility:]

 [Text:]

+[URL:]

 [Place:]

-[Visibility:]

 [Share]

 [Cancel]

 [User Details]

@@ -5680,19 +5683,13 @@
 [Use bigger avatars]

 [Load contacts with 'On the Mobile' status]

 [Event notifications]

-[Colors]

-[Back]

-[Text]

 [Notifications]

-[Default]

 [News feeds]

+[News Feed types to notify:]

 [Other events]

 [Client notifications]

-[Timeout (sec.)]

-[(0 = default, -1 = infinite)]

 [Preview]

 [Use balloon notifications in system tray instead of popups]

-[News Feed types to notify:]

 [Advanced Settings]

 [Force secure (HTTPS) connection]

 [Post Miranda statuses to Wall]

@@ -5702,8 +5699,8 @@
 [Map non-standard statuses to Invisible (instead of Online)]

 [Enable support for Custom smileys (EXPERIMENTAL + BUGGY!)]

 [Use local time for received messages]

-[Send "Seen" info when marking messages as read]

 [Use this server for opening links:]

+[Allow posting statuses to my pages (may slow down login)]

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

 [Login error: %s]

 [Unknown error]

@@ -5740,6 +5737,7 @@
 [Request for friendship was canceled.]

 [Error occured when canceling friendship request.]

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

+[Default]

 [What's on your mind, %s?]

 [Note: Make sure you have disabled 'Validate SSL certificates' option in Network options to work properly.]

 [Sample event]

@@ -5754,23 +5752,24 @@
 [Contact is back on server-list.]

 [Contact is no longer on server-list.]

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

-[Show Mind Window]

 [%s server connection]

 [Unable to get Netlib connection for Facebook]

-[Notification]

-[News Feed]

-[Other Event]

 [Avatars]

 [Facebook ID must be numeric value.]

 [Network]

 [Account]

-[Advanced]

-[Popups]

 [Events]

+[Advanced]

+[Share status...]

+[Own wall]

 [Loading newsfeeds...]

 [Checking friend requests...]

 [Refreshing buddy list...]

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

+[Show 'Share status' window]

+[Notification]

+[News Feed]

+[Other Event]

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

 [Facebook icon]

 [Mind]

@@ -5783,7 +5782,6 @@
 [Cancel friendship request]

 [Request friendship]

 [Approve friendship]

-[Mind...]

 [Services...]

 [Refresh Buddy List]

 [Services]

@@ -10223,7 +10221,7 @@
 [%s login error (next retry (%d) in %d s)]

 [%s status error (next retry (%d) in %d s)]

 [Status error (next retry (%d) in %d s)]

-[will be set to]

+[%s\t(will be set to %s)\r\n]

 [Resetting status... (last try (%d))%s]

 [Resetting status... (next retry (%d) in %d s)%s]

 [No internet connection seems available... (last try (%d))]

@@ -13788,13 +13786,6 @@
 [Last Year]

 [User-Defined]

 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp

-;file \plugins\Quotes\src\QuotesProviderBase.cpp

-[Log Files (*.txt,*.log)]

-[Enter integer value]

-[Enter log file name.]

-[Enter log file format.]

-[Enter history format.]

-[Enter popup window format.]

 ;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp

 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp

 [Error occurred during html parsing.]

@@ -13824,6 +13815,12 @@
 [Previous Close]

 [Change]

 ;file \plugins\Quotes\src\SettingsDlg.cpp

+[Log Files (*.txt,*.log)]

+[Enter integer value]

+[Enter log file name.]

+[Enter log file format.]

+[Enter history format.]

+[Enter popup window format.]

 #muuid {45230488-977b-405b-856d-ea276d7083b7}

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

 ;  File: Rate.dll

@@ -14360,6 +14357,7 @@
 [Notice from %s: %s]

 [The topic is '%s']

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

+[&Message %s]

 ;file \plugins\Scriver\src\chat\window.cpp

 [Italic]

 [Underline]

@@ -17274,6 +17272,7 @@
 [The topic is '%s' (set by %s)]

 [Look up '%s':]

 [No word to look up]

+[&Message %s]

 [Highlight User...]

 [Edit Highlight List...]

 ;file \plugins\TabSRMM\src\chat\window.cpp

diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index 3d85e8035f..04430efa38 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.11.0.1

+;  Version: 0.11.0.2

 ;  Authors: Nightwish, Pescuma

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

 [Loads and manages contact pictures for other plugins.]

diff --git a/langpacks/english/Plugins/Exchange.txt b/langpacks/english/Plugins/Exchange.txt
index 4746641c89..31ab6ddcea 100644
--- a/langpacks/english/Plugins/Exchange.txt
+++ b/langpacks/english/Plugins/Exchange.txt
@@ -32,7 +32,7 @@
 [You have %d unread emails ...]

 [You have one unread email ...]

 [Exchange email]

-[Do you want to see the email headers?]

+[Do you want to see the email headers ?]

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

 [Check exchange mailbox]

 [Exchange notify]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index ac236ffc22..29b271500c 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -11,9 +11,11 @@
 [Password:]

 [Create a new Facebook account]

 [What's on your mind?]

+[Wall:]

+[Visibility:]

 [Text:]

+[URL:]

 [Place:]

-[Visibility:]

 [Share]

 [Cancel]

 [User Details]

@@ -23,19 +25,13 @@
 [Use bigger avatars]

 [Load contacts with 'On the Mobile' status]

 [Event notifications]

-[Colors]

-[Back]

-[Text]

 [Notifications]

-[Default]

 [News feeds]

+[News Feed types to notify:]

 [Other events]

 [Client notifications]

-[Timeout (sec.)]

-[(0 = default, -1 = infinite)]

 [Preview]

 [Use balloon notifications in system tray instead of popups]

-[News Feed types to notify:]

 [Advanced Settings]

 [Force secure (HTTPS) connection]

 [Post Miranda statuses to Wall]

@@ -45,8 +41,8 @@
 [Map non-standard statuses to Invisible (instead of Online)]

 [Enable support for Custom smileys (EXPERIMENTAL + BUGGY!)]

 [Use local time for received messages]

-[Send "Seen" info when marking messages as read]

 [Use this server for opening links:]

+[Allow posting statuses to my pages (may slow down login)]

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

 [Login error: %s]

 [Unknown error]

@@ -83,6 +79,7 @@
 [Request for friendship was canceled.]

 [Error occured when canceling friendship request.]

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

+[Default]

 [What's on your mind, %s?]

 [Note: Make sure you have disabled 'Validate SSL certificates' option in Network options to work properly.]

 [Sample event]

@@ -97,23 +94,24 @@
 [Contact is back on server-list.]

 [Contact is no longer on server-list.]

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

-[Show Mind Window]

 [%s server connection]

 [Unable to get Netlib connection for Facebook]

-[Notification]

-[News Feed]

-[Other Event]

 [Avatars]

 [Facebook ID must be numeric value.]

 [Network]

 [Account]

-[Advanced]

-[Popups]

 [Events]

+[Advanced]

+[Share status...]

+[Own wall]

 [Loading newsfeeds...]

 [Checking friend requests...]

 [Refreshing buddy list...]

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

+[Show 'Share status' window]

+[Notification]

+[News Feed]

+[Other Event]

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

 [Facebook icon]

 [Mind]

@@ -126,7 +124,6 @@
 [Cancel friendship request]

 [Request friendship]

 [Approve friendship]

-[Mind...]

 [Services...]

 [Refresh Buddy List]

 [Services]

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 8e071f3f59..07663253ef 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -141,7 +141,7 @@
 [%s login error (next retry (%d) in %d s)]

 [%s status error (next retry (%d) in %d s)]

 [Status error (next retry (%d) in %d s)]

-[will be set to]

+[%s\t(will be set to %s)\r\n]

 [Resetting status... (last try (%d))%s]

 [Resetting status... (next retry (%d) in %d s)%s]

 [No internet connection seems available... (last try (%d))]

diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index 6478a658c8..24a01bfb44 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -120,13 +120,6 @@
 [Last Year]

 [User-Defined]

 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp

-;file \plugins\Quotes\src\QuotesProviderBase.cpp

-[Log Files (*.txt,*.log)]

-[Enter integer value]

-[Enter log file name.]

-[Enter log file format.]

-[Enter history format.]

-[Enter popup window format.]

 ;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp

 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp

 [Error occurred during html parsing.]

@@ -156,3 +149,9 @@
 [Previous Close]

 [Change]

 ;file \plugins\Quotes\src\SettingsDlg.cpp

+[Log Files (*.txt,*.log)]

+[Enter integer value]

+[Enter log file name.]

+[Enter log file format.]

+[Enter history format.]

+[Enter popup window format.]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index c4202887b7..13242f1526 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -485,6 +485,7 @@
 [Notice from %s: %s]

 [The topic is '%s']

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

+[&Message %s]

 ;file \plugins\Scriver\src\chat\window.cpp

 [Italic]

 [Underline]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index cd6d666bb5..2e46b4681f 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -1160,6 +1160,7 @@
 [The topic is '%s' (set by %s)]

 [Look up '%s':]

 [No word to look up]

+[&Message %s]

 [Highlight User...]

 [Edit Highlight List...]

 ;file \plugins\TabSRMM\src\chat\window.cpp