- langpacks/english: updated

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

6 files changed, 92 insertions, 12 deletions

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 03dd4f767b..158c2d7a8b 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -1728,7 +1728,7 @@
 ;  File: AddContactPlus.dll

 ;  Plugin: Add contact+

 ;  Version: 0.9.9.1

-;  Authors: Bartosz 'Dezeath' Białek

+;  Authors: Bartosz 'Dezeath' Biaіek

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

 [Provides the ability to quickly add new contacts.]

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

@@ -5000,7 +5000,7 @@
 ;============================================================

 [Replaces (for the selected contacts only) the Cyrillic letters in the outgoing messages with the phonetically equivalent Latin letter combinations.]

 ;file \plugins\CyrTranslit\src\MirandaContact.cpp

-[&Transliterate (ÔŰÂŔ->FYVA)]

+[&Transliterate (ФЫВА->FYVA)]

 #muuid {a0138fc6-4c52-4501-af93-7d3e20bcae5b}

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

 ;  File: DbChecker.dll

@@ -14873,7 +14873,7 @@
 ;  File: SimpleStatusMsg.dll

 ;  Plugin: Simple status message

 ;  Version: 1.9.0.4

-;  Authors: Bartosz 'Dezeath' Białek, Harven

+;  Authors: Bartosz 'Dezeath' Biaіek, Harven

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

 [Provides a simple way to set status and away messages.]

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

@@ -16415,7 +16415,7 @@
 [Globally OFF]

 [On, if present, always in bottom display]

 [Don't show them]

-;file \plugins\TabSRMM\src\controls - Kopie.cpp

+;file \plugins\TabSRMM\src\controls.cpp

 [&User]

 [&Room]

 [Sounds are %s. Click to toggle status, hold SHIFT and click to set for all open containers]

@@ -16424,8 +16424,6 @@
 [Sending typing notifications is %s.]

 [Session list.\nClick left for a list of open sessions.\nClick right to access favorites and quickly configure message window behavior]

 [There are %d pending send jobs. Message length: %d bytes, message length limit: %d bytes\n\n%d messages are queued for later delivery]

-;file \plugins\TabSRMM\src\controls working.cpp

-;file \plugins\TabSRMM\src\controls.cpp

 ;file \plugins\TabSRMM\src\eventpopups.cpp

 [One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behaviour, please review the Event Notifications settings page.]

 [Incoming file]

diff --git a/langpacks/english/Plugins/AddContactPlus.txt b/langpacks/english/Plugins/AddContactPlus.txt
index 04031fbee8..783a7126c9 100644
--- a/langpacks/english/Plugins/AddContactPlus.txt
+++ b/langpacks/english/Plugins/AddContactPlus.txt
@@ -3,7 +3,7 @@
 ;  File: AddContactPlus.dll

 ;  Plugin: Add contact+

 ;  Version: 0.9.9.1

-;  Authors: Bartosz 'Dezeath' Białek

+;  Authors: Bartosz 'Dezeath' Biaіek

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

 [Provides the ability to quickly add new contacts.]

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

diff --git a/langpacks/english/Plugins/CyrTranslit.txt b/langpacks/english/Plugins/CyrTranslit.txt
index c3f786a58a..cc7062b272 100644
--- a/langpacks/english/Plugins/CyrTranslit.txt
+++ b/langpacks/english/Plugins/CyrTranslit.txt
@@ -7,4 +7,4 @@
 ;============================================================

 [Replaces (for the selected contacts only) the Cyrillic letters in the outgoing messages with the phonetically equivalent Latin letter combinations.]

 ;file \plugins\CyrTranslit\src\MirandaContact.cpp

-[&Transliterate (ÔŰÂŔ->FYVA)]

+[&Transliterate (ФЫВА->FYVA)]

diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index bb4049d054..76ee7cbb67 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -3,7 +3,7 @@
 ;  File: SimpleStatusMsg.dll

 ;  Plugin: Simple status message

 ;  Version: 1.9.0.4

-;  Authors: Bartosz 'Dezeath' Białek, Harven

+;  Authors: Bartosz 'Dezeath' Biaіek, Harven

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

 [Provides a simple way to set status and away messages.]

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

diff --git a/langpacks/english/Plugins/Spamotron.txt b/langpacks/english/Plugins/Spamotron.txt
new file mode 100644
index 0000000000..5722b50f28
--- /dev/null
+++ b/langpacks/english/Plugins/Spamotron.txt
@@ -0,0 +1,84 @@
+;#muuid for Spamotron not found, please specify manually!

+;langpack template for Spamotron

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

+[Do not send challenge request if message score above]

+[Auto-learn messages from approved contacts as ham]

+[Filtering options]

+[Learning options]

+[Auto-learn outgoing messages as ham]

+[Spam]

+[Ham]

+[Learn message:]

+[Auto approve contact if message score below]

+[Do not enable any of these options until Spam-o-tron have learned at least 20 of ham and 50 of spam messages.]

+[Learned ham messages:]

+[Learned spam messages:]

+[Analyze]

+[Auto-learn messages from contacts if not approved in]

+[days as spam]

+[Enabled]

+[and learn as ham]

+[Enabled accounts:]

+[Do not reply to messages with words in this list:]

+[Do not reply to the same message more than]

+[Flood protection]

+[Do not send more than]

+[messages to one contact per day]

+[times a day]

+[Settings]

+[Outgoing message]

+[Incoming message with any word from list:]

+[Auto approve on:]

+[Hide contact until verified]

+[Add permanently to list on verified]

+[Log actions to system history]

+[Mode:]

+[Responses: (saved in %response%, %response-n% variables)]

+[will be saved in %mathexpr%]

+[Reset to defaults]

+[Reply on success:]

+[Send challenge on authorization request:]

+[Keep blocked messages in contact history]

+[Case-sensitive]

+[Send challenge on incoming message:]

+[and mark them unread after approval]

+[Enable popup notifications]

+[Contact blocked]

+[Contact approved]

+[Appearance]

+[Foreground]

+[Background]

+[Timeout]

+[Default colors]

+[Default timeout]

+[Preview]

+[Windows colors]

+[Challenge sent]

+;file \plugins\Spamotron\src\bayes.cpp

+[Bayes database path]

+;file \plugins\Spamotron\src\common.h

+[Spam-o-tron needs to verify you're not a bot. Reply with "%response%" without quotes.]

+[Spam-o-tron needs to verify you're not a bot. Reply with a result of expression %mathexpr%.]

+[Verified.]

+[Spam-o-tron delayed authorization request. First reply with "%response%" without quotes.]

+[Spam-o-tron delayed authorization request. First reply with a result of expression %mathexpr%.]

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

+[Simple]

+[Math expression]

+[Round-robin]

+[Random]

+[Will be automatically evaluated from %mathexpr%]

+[Invalid regular expression.\nKeeping previous value.]

+[Message score]

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

+[Contact %s approved.]

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

+[Message from %s rejected because it reached a maximum for same responses per day.]

+[Message from %s dropped because it has a word from black list.]

+[Message from %s dropped because of high spam score.]

+[Sending plain challenge to %s.]

+[Sending round-robin challenge to %s.]

+[Sending random challenge to %s.]

+[Sending math expression challenge to %s.]

+;file \plugins\Spamotron\src\utils.cpp

+[Their message was]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 1f1e8df647..9195f692b2 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -533,7 +533,7 @@
 [Globally OFF]

 [On, if present, always in bottom display]

 [Don't show them]

-;file \plugins\TabSRMM\src\controls - Kopie.cpp

+;file \plugins\TabSRMM\src\controls.cpp

 [&User]

 [&Room]

 [Sounds are %s. Click to toggle status, hold SHIFT and click to set for all open containers]

@@ -542,8 +542,6 @@
 [Sending typing notifications is %s.]

 [Session list.\nClick left for a list of open sessions.\nClick right to access favorites and quickly configure message window behavior]

 [There are %d pending send jobs. Message length: %d bytes, message length limit: %d bytes\n\n%d messages are queued for later delivery]

-;file \plugins\TabSRMM\src\controls working.cpp

-;file \plugins\TabSRMM\src\controls.cpp

 ;file \plugins\TabSRMM\src\eventpopups.cpp

 [One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behaviour, please review the Event Notifications settings page.]

 [Incoming file]