- langpacks/english: updated

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

14 files changed, 79 insertions, 41 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 0087d00793..cdc599451d 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -381,7 +381,7 @@
 [Size upwards]

 [If window is partially covered, bring to front instead of hiding]

 [Enable docking]

-[Translucency options (Windows 2000/XP only)]

+[Translucency options]

 [Fade contact list in/out]

 [Transparent contact list]

 [Inactive opacity:]

@@ -516,7 +516,7 @@
 [Windows]

 [Miranda]

 [Become idle if the screen saver is active]

-[Become idle if the computer is locked (2000/XP+ only)]

+[Become idle if the computer is locked]

 [Become idle if a terminal session is disconnected]

 [Do not let protocols report any idle information]

 [minute(s)]

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 422e8a31d9..e1426c74a9 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -381,7 +381,7 @@
 [Size upwards]

 [If window is partially covered, bring to front instead of hiding]

 [Enable docking]

-[Translucency options (Windows 2000/XP only)]

+[Translucency options]

 [Fade contact list in/out]

 [Transparent contact list]

 [Inactive opacity:]

@@ -516,7 +516,7 @@
 [Windows]

 [Miranda]

 [Become idle if the screen saver is active]

-[Become idle if the computer is locked (2000/XP+ only)]

+[Become idle if the computer is locked]

 [Become idle if a terminal session is disconnected]

 [Do not let protocols report any idle information]

 [minute(s)]

@@ -2975,7 +2975,7 @@
 [OK]

 [Cancel]

 [EN]

-[Workstation is Locked (2000/XP+)]

+[Workstation is Locked]

 [Screen Saver is running]

 [Windows is inactive]

 [Hide Miranda when:]

@@ -3315,7 +3315,7 @@
 [% of screen]

 [Size upwards]

 [Title bar text:]

-[Translucency options (Windows 2000/XP only)]

+[Translucency options]

 [Fade contact list in/out]

 [Transparent contact list]

 [Inactive opacity:]

@@ -3615,7 +3615,7 @@
 [Title bar text:]

 [Tool style main window]

 [Minimize to tray]

-[Translucency options (Windows 2000/XP+)]

+[Translucency options]

 [Enable drop shadow (restart required)]

 [Frames]

 [Between frames:]

@@ -4042,7 +4042,7 @@
 [% of screen]

 [Size upwards]

 [Title bar text:]

-[Translucency options (Windows 2000/XP only)]

+[Translucency options]

 [Fade contact list in/out]

 [Transparent contact list]

 [Inactive opacity:]

@@ -4315,7 +4315,7 @@
 [Embedded frames border]

 [Clip border by]

 [Gap between frames]

-[Translucency options (Windows 2000/XP only)]

+[Translucency options]

 [Transparent contact list]

 [Inactive opacity:]

 [Active opacity:]

@@ -5590,7 +5590,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.1.0.0

+;  Version: 0.1.1.0

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -5599,6 +5599,9 @@
 [Password:]

 [Create a new Facebook account]

 [What's on your mind?]

+[Text:]

+[Place:]

+[Visibility:]

 [Share]

 [Cancel]

 [User Details]

@@ -5655,6 +5658,9 @@
 [Classic website]

 [Mobile website]

 [Smartphone website]

+[For everyone]

+[For friends]

+[Only for me]

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

 [Contact was removed from your server list.]

 [Error occured when removing contact from server.]

@@ -5663,6 +5669,7 @@
 [Request for friendship was canceled.]

 [Error occured when canceling friendship request.]

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

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

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

 [Sample event]

 [Sample request]

@@ -5670,7 +5677,6 @@
 [Sample notification]

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

 [Message read: %s]

-[Multichat]

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

 [You cannot send messages when you are offline.]

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

@@ -5696,12 +5702,13 @@
 [Facebook icon]

 [Mind]

 [Poke]

+[Newsfeed]

 [Cancel friendship]

 [Cancel friendship request]

 [Request friendship]

 [Approve friendship]

-[Visit profile]

 [Visit friendship details]

+[Visit profile]

 [Mind...]

 [Visit Profile]

 [Services...]

@@ -10208,7 +10215,7 @@
 [Notify when]

 [Full Screen mode]

 [Screen Saver is running]

-[Workstation is Locked (2000/XP)]

+[Workstation is Locked]

 [Defined programs are running]

 [All other situations]

 [Only notify if status is]

@@ -12988,7 +12995,7 @@
 ;============================================================

 ;  File: PluginUpdater.dll

 ;  Plugin: Plugin updater

-;  Version: 0.1.0.3

+;  Version: 0.1.1.0

 ;  Authors: Mataes, George Hazan

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

 [Plugin updater for Miranda NG.]

@@ -13065,13 +13072,14 @@
 [Downloading version info...]

 [An error occured while downloading the update.]

 [No updates found.]

-[List is emply.]

+[List is empty.]

 [Update checking already started!]

 [List loading already started!]

 ;file \plugins\PluginUpdater\src\Utils.cpp

 ['Yes' Button]

 ['No' Button]

 [Plugin info]

+[Plugin list]

 [Plugin Updater HTTP connection]

 #muuid {7eeeb55e-9d83-4e1a-a12f-8f13f1a124fb}

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

@@ -13117,13 +13125,13 @@
 [pixels]

 [Avatar size:]

 [Enable avatar updates]

-[Multimonitor (98/ME/2000/XP)]

+[Multimonitor]

 [Start the popups in the monitor with]

 [Miranda's window]

 [the active window]

 [Transparency]

 [Enable Win 9x/Me transparency]

-[Use transparency (Windows 2000+)]

+[Use transparency]

 [opacity:]

 [Opaque popups under cursor]

 [Slide Popup]

@@ -13287,8 +13295,8 @@
 [Skin preview]

 [Just take a look at this skin... ;)]

 [Show clock]

-[Drop shadow effect (Windows XP+)]

-[Drop shadow effect (Windows XP+)/non rectangular]

+[Drop shadow effect]

+[non rectangular]

 [Enable Aero Glass (Vista+)]

 [Use Windows colours]

 [Use advanced text render]

@@ -15364,8 +15372,14 @@
 ;file \plugins\SMS\src\SMS_svc.cpp

 [Incoming SMS Message]

 [Incoming SMS Confirmation]

-;#muuid for Spamotron not found, please specify manually!

-;langpack template for Spamotron

+#muuid {14331048-5a73-4fdb-b909-2d7e1825a012}

+;============================================================

+;  File: Spamotron.dll

+;  Plugin: Spam-o-tron

+;  Version: 0.0.4.6

+;  Authors: vu1tur

+;============================================================

+[Anti-spam plugin with captcha and Bayes filtering.]

 ;file \plugins\Spamotron\res\spamotron.rc

 [Do not send challenge request if message score above]

 [Auto-learn messages from approved contacts as ham]

@@ -15436,6 +15450,10 @@
 [Will be automatically evaluated from %mathexpr%]

 [Invalid regular expression.\nKeeping previous value.]

 [Message score]

+[Message Sessions]

+[Messages]

+[Bayes]

+[Popups]

 ;file \plugins\Spamotron\src\spamotron.cpp

 [Contact %s approved.]

 [Message from %s rejected because it reached a maximum for challenge requests per day.]

@@ -17681,7 +17699,7 @@
 [Auto positioning]

 [Transparent input]

 [Preview]

-[Translucency options (Windows 2000/XP only)]

+[Translucency options]

 [Transparent tooltip]

 [Contacts]

 [Idle]

diff --git a/langpacks/english/Plugins/BossKey.txt b/langpacks/english/Plugins/BossKey.txt
index 8aad989b94..04d0923c2a 100644
--- a/langpacks/english/Plugins/BossKey.txt
+++ b/langpacks/english/Plugins/BossKey.txt
@@ -23,7 +23,7 @@
 [OK]

 [Cancel]

 [EN]

-[Workstation is Locked (2000/XP+)]

+[Workstation is Locked]

 [Screen Saver is running]

 [Windows is inactive]

 [Hide Miranda when:]

diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index a286db92e6..2eaaf3365b 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -54,7 +54,7 @@
 [% of screen]

 [Size upwards]

 [Title bar text:]

-[Translucency options (Windows 2000/XP only)]

+[Translucency options]

 [Fade contact list in/out]

 [Transparent contact list]

 [Inactive opacity:]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 95596958bd..fd69dada6d 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -216,7 +216,7 @@
 [Title bar text:]

 [Tool style main window]

 [Minimize to tray]

-[Translucency options (Windows 2000/XP+)]

+[Translucency options]

 [Enable drop shadow (restart required)]

 [Frames]

 [Between frames:]

diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt
index 31f0665fb0..a1b661b5a6 100644
--- a/langpacks/english/Plugins/Clist_mw.txt
+++ b/langpacks/english/Plugins/Clist_mw.txt
@@ -71,7 +71,7 @@
 [% of screen]

 [Size upwards]

 [Title bar text:]

-[Translucency options (Windows 2000/XP only)]

+[Translucency options]

 [Fade contact list in/out]

 [Transparent contact list]

 [Inactive opacity:]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 37eefe2952..2351589483 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -117,7 +117,7 @@
 [Embedded frames border]

 [Clip border by]

 [Gap between frames]

-[Translucency options (Windows 2000/XP only)]

+[Translucency options]

 [Transparent contact list]

 [Inactive opacity:]

 [Active opacity:]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index c952cb9a44..179dfeb292 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.1.0.0

+;  Version: 0.1.1.0

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -11,6 +11,9 @@
 [Password:]

 [Create a new Facebook account]

 [What's on your mind?]

+[Text:]

+[Place:]

+[Visibility:]

 [Share]

 [Cancel]

 [User Details]

@@ -67,6 +70,9 @@
 [Classic website]

 [Mobile website]

 [Smartphone website]

+[For everyone]

+[For friends]

+[Only for me]

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

 [Contact was removed from your server list.]

 [Error occured when removing contact from server.]

@@ -75,6 +81,7 @@
 [Request for friendship was canceled.]

 [Error occured when canceling friendship request.]

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

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

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

 [Sample event]

 [Sample request]

@@ -82,7 +89,6 @@
 [Sample notification]

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

 [Message read: %s]

-[Multichat]

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

 [You cannot send messages when you are offline.]

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

@@ -108,12 +114,13 @@
 [Facebook icon]

 [Mind]

 [Poke]

+[Newsfeed]

 [Cancel friendship]

 [Cancel friendship request]

 [Request friendship]

 [Approve friendship]

-[Visit profile]

 [Visit friendship details]

+[Visit profile]

 [Mind...]

 [Visit Profile]

 [Services...]

diff --git a/langpacks/english/Plugins/KeyboardNotify.txt b/langpacks/english/Plugins/KeyboardNotify.txt
index 1cb07a26b3..d27d970a2a 100644
--- a/langpacks/english/Plugins/KeyboardNotify.txt
+++ b/langpacks/english/Plugins/KeyboardNotify.txt
@@ -26,7 +26,7 @@
 [Notify when]

 [Full Screen mode]

 [Screen Saver is running]

-[Workstation is Locked (2000/XP)]

+[Workstation is Locked]

 [Defined programs are running]

 [All other situations]

 [Only notify if status is]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 4048e9da16..479b2cfe80 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: PluginUpdater.dll

 ;  Plugin: Plugin updater

-;  Version: 0.1.0.3

+;  Version: 0.1.1.0

 ;  Authors: Mataes, George Hazan

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

 [Plugin updater for Miranda NG.]

@@ -79,11 +79,12 @@
 [Downloading version info...]

 [An error occured while downloading the update.]

 [No updates found.]

-[List is emply.]

+[List is empty.]

 [Update checking already started!]

 [List loading already started!]

 ;file \plugins\PluginUpdater\src\Utils.cpp

 ['Yes' Button]

 ['No' Button]

 [Plugin info]

+[Plugin list]

 [Plugin Updater HTTP connection]

diff --git a/langpacks/english/Plugins/PopUp.txt b/langpacks/english/Plugins/PopUp.txt
index 769c9c71a0..fc52a43762 100644
--- a/langpacks/english/Plugins/PopUp.txt
+++ b/langpacks/english/Plugins/PopUp.txt
@@ -25,13 +25,13 @@
 [pixels]

 [Avatar size:]

 [Enable avatar updates]

-[Multimonitor (98/ME/2000/XP)]

+[Multimonitor]

 [Start the popups in the monitor with]

 [Miranda's window]

 [the active window]

 [Transparency]

 [Enable Win 9x/Me transparency]

-[Use transparency (Windows 2000+)]

+[Use transparency]

 [opacity:]

 [Opaque popups under cursor]

 [Slide Popup]

@@ -195,8 +195,8 @@
 [Skin preview]

 [Just take a look at this skin... ;)]

 [Show clock]

-[Drop shadow effect (Windows XP+)]

-[Drop shadow effect (Windows XP+)/non rectangular]

+[Drop shadow effect]

+[non rectangular]

 [Enable Aero Glass (Vista+)]

 [Use Windows colours]

 [Use advanced text render]

diff --git a/langpacks/english/Plugins/Spamotron.txt b/langpacks/english/Plugins/Spamotron.txt
index 5722b50f28..d58a59a08a 100644
--- a/langpacks/english/Plugins/Spamotron.txt
+++ b/langpacks/english/Plugins/Spamotron.txt
@@ -1,5 +1,11 @@
-;#muuid for Spamotron not found, please specify manually!

-;langpack template for Spamotron

+#muuid {14331048-5a73-4fdb-b909-2d7e1825a012}

+;============================================================

+;  File: Spamotron.dll

+;  Plugin: Spam-o-tron

+;  Version: 0.0.4.6

+;  Authors: vu1tur

+;============================================================

+[Anti-spam plugin with captcha and Bayes filtering.]

 ;file \plugins\Spamotron\res\spamotron.rc

 [Do not send challenge request if message score above]

 [Auto-learn messages from approved contacts as ham]

@@ -70,6 +76,10 @@
 [Will be automatically evaluated from %mathexpr%]

 [Invalid regular expression.\nKeeping previous value.]

 [Message score]

+[Message Sessions]

+[Messages]

+[Bayes]

+[Popups]

 ;file \plugins\Spamotron\src\spamotron.cpp

 [Contact %s approved.]

 [Message from %s rejected because it reached a maximum for challenge requests per day.]

diff --git a/langpacks/english/Plugins/TooltipNotify.txt b/langpacks/english/Plugins/TooltipNotify.txt
index 23aa9ae3db..6248ca4221 100644
--- a/langpacks/english/Plugins/TooltipNotify.txt
+++ b/langpacks/english/Plugins/TooltipNotify.txt
@@ -34,7 +34,7 @@
 [Auto positioning]

 [Transparent input]

 [Preview]

-[Translucency options (Windows 2000/XP only)]

+[Translucency options]

 [Transparent tooltip]

 [Contacts]

 [Idle]

diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index 59fec6dc79..779c6e4375 100644
--- a/langpacks/russian/Plugins/Facebook.txt
+++ b/langpacks/russian/Plugins/Facebook.txt
@@ -160,4 +160,6 @@
 [Message read: %s]

 Сообщение прочтено в: %s

 [Poke]

-Подмигнуть
\ No newline at end of file
+Подмигнуть

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

+О чём Вы думаете, %s?