- langpacks/english: updated

- langpacks/russian: StatusChange.txt restored


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

30 files changed, 197 insertions, 12 deletions

diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index a47c8fcb58..f38a0f746b 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -71,6 +71,8 @@
 [&Deny]

 [Message]

 [Room]

+;file \protocols\AimOscar\src\avatars.cpp

+[Avatars]

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

 [Me]

 [Others]

diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index bd142bbdb0..1a33344609 100644
--- a/langpacks/english/Plugins/AVS.txt
+++ b/langpacks/english/Plugins/AVS.txt
@@ -56,8 +56,10 @@
 [Set My Avatar]

 [Set My Avatar for %s]

 [Global avatar for %s accounts]

-[Contacts]

 [Avatars]

+[My Avatars]

+[My Global Avatar Cache]

+[Contacts]

 [Protocols]

 [Contact Avatars]

 [Own Avatars]

diff --git a/langpacks/english/Plugins/BASS_interface.txt b/langpacks/english/Plugins/BASS_interface.txt
index b343119852..9d20e14694 100644
--- a/langpacks/english/Plugins/BASS_interface.txt
+++ b/langpacks/english/Plugins/BASS_interface.txt
@@ -36,5 +36,6 @@
 [Disable sounds]

 [Enable sounds]

 [Frame Background]

+[Bass library]

 [Sounds enabled]

 [Sounds disabled]

diff --git a/langpacks/english/Plugins/CrashDumper.txt b/langpacks/english/Plugins/CrashDumper.txt
index aad4e96e7c..7ab24e5f09 100644
--- a/langpacks/english/Plugins/CrashDumper.txt
+++ b/langpacks/english/Plugins/CrashDumper.txt
@@ -30,6 +30,7 @@
 [Version Information To File]

 [Show Version Information]

 [Upload Version Information]

+[Crash Reports]

 [Version Information]

 [Copy to clipboard]

 [Store to file]

diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index 86c8768587..5495d76299 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -31,6 +31,8 @@
 ;file \plugins\Db_autobackups\src\main.cpp

 [Backup Profile]

 [Save Profile As...]

+[Database Backups]

+[Backup Folder]

 [Database]

 [Database/Database Backups]

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

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 99c3dd0ca0..c8f4aaa7bc 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -54,6 +54,13 @@
 ;file \protocols\FacebookRM\src\connection.cpp

 [Please enter a username.]

 [Please enter a password.]

+;file \protocols\FacebookRM\src\constants.h

+[Most Recent]

+[Wall Posts]

+[Top News]

+[Photos]

+[Links]

+[Apps and Games]

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

 [Contact was removed from your server list.]

 [Error occured when removing contact from server.]

@@ -81,6 +88,7 @@
 [Notification]

 [News Feed]

 [Other Event]

+[Avatars]

 [Network]

 [Account]

 [Advanced]

diff --git a/langpacks/english/Plugins/FlashAvatars.txt b/langpacks/english/Plugins/FlashAvatars.txt
index f7dfba958f..a1d9816448 100644
--- a/langpacks/english/Plugins/FlashAvatars.txt
+++ b/langpacks/english/Plugins/FlashAvatars.txt
@@ -12,3 +12,4 @@
 [Bugged Flash detected!]

 [You have installed Flash 8.\r\nThis version of Flash contains a bug which can causes random crashes.\r\nIt is recommended to upgrade or downgrade your Flash library]

 [Flash Avatars]

+[Avatars]

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 0de9dd4d8a..4b17fd6a11 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -147,6 +147,7 @@
 [Contact list]

 ;file \protocols\Gadu-Gadu\src\gg_proto.cpp

 [%s connection]

+[Avatars]

 [Gadu-Gadu Number]

 ;file \protocols\Gadu-Gadu\src\groupchat.cpp

 [Open &conference...]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index cfb6bec13c..31096adc09 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -205,6 +205,7 @@
 [** This message was blocked by the ICQ server ** You are too evil.]

 [** Unknown missed message event.]

 ;file \protocols\IcqOscarJ\src\icq_avatar.cpp

+[Avatars]

 [Error uploading avatar to server, server temporarily unavailable.]

 [Error uploading avatar to server, server refused to accept the image.]

 ;file \protocols\IcqOscarJ\src\icq_constants.h

@@ -825,6 +826,7 @@
 [Writing]

 [%s Custom Status]

 [None]

+[Custom Status]

 ;file \protocols\IcqOscarJ\src\icq_xtraz.cpp

 [Greeting card:]

 ;file \protocols\IcqOscarJ\src\init.cpp

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index d713a65a96..0ae0547ec8 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -456,6 +456,7 @@
 ;file \protocols\JabberG\src\jabber_message_handlers.cpp

 ;file \protocols\JabberG\src\jabber_misc.cpp

 [CHAT plugin is required for conferences. Install it before chatting]

+[Avatars]

 [To]

 [From]

 [Both]

@@ -1064,5 +1065,7 @@
 [Activity: %s]

 [Set Activity]

 [Listening To]

+[Moods]

+[Activities]

 ;file \protocols\JabberG\src\ui_utils.cpp

 [Set filter...]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index f645f76e28..b17c04e54b 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -146,7 +146,19 @@
 [Send files: requested file: %S - not found in send files list.]

 ;file \protocols\MRA\src\MraFilesQueue_mod.cpp

 [No description given]

+;file \protocols\MRA\src\MraIcons.cpp

+[Main Menu]

+[Contact Menu]

+[Extra status]

+[Custom Status]

 ;file \protocols\MRA\src\MraPopUp.cpp

+[None]

+[Debug]

+[Information]

+[Question]

+[Warning]

+[Error]

+[NewMail]

 [PopUps]

 ;file \protocols\MRA\src\MraProto.cpp

 [%s connection]

@@ -181,4 +193,53 @@
 [MRIM_CS_SMS_ACK: not found in queue]

 [Mail.ru System notify]

 ;file \protocols\MRA\src\Mra_svcs.cpp

+[Sick]

+[Home]

+[Eating]

+[Compass]

+[On WC]

+[Cooking]

+[Walking]

+[Alien]

+[Shrimp]

+[Got lost]

+[Crazy]

+[Duck]

+[Playing]

+[Smoking]

+[Office]

+[Meeting]

+[Beer]

+[Coffee]

+[Working]

+[Relaxing]

+[On the phone]

+[In institute]

+[At school]

+[Wrong number]

+[Laughing]

+[Malicious]

+[Imp]

+[Blind]

+[Disappointed]

+[Almost crying]

+[Fearful]

+[Angry]

+[Vampire]

+[Ass]

+[Love]

+[Sleeping]

+[Cool!]

+[Peace!]

+[Cock a snook]

+[Get out]

+[Death]

+[Rocket]

+[Devil-fish]

+[Heavy metal]

+[Things look bad]

+[Squirrel]

+[Star]

+[Music]

+[Dating]

 [Are you sure?]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 47258db22c..f68d631945 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -106,6 +106,8 @@
 [&Block]

 [&Start Netmeeting]

 ;file \protocols\MSN\src\msn_misc.cpp

+[Avatars]

+[Custom Smileys]

 [Notify]

 [Error]

 ;file \protocols\MSN\src\msn_msgqueue.cpp

diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index 63f7dde524..012c0e78fc 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -133,4 +133,5 @@
 ;file \plugins\MirOTR\MirOTR\src\mirotrmenu.cpp

 [OTR Status]

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

+[Private Data]

 [Services]

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index fe065cc815..68ff30a0b9 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -152,6 +152,8 @@
 [User: On The Phone]

 [Enable status notification]

 [Disable status notification]

+[Notification enabled]

+[Notification disabled]

 [User: from offline (has priority!)]

 [Extra status changed]

 [Extra status message changed]

diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt
index 18537d4ceb..594d499a2a 100644
--- a/langpacks/english/Plugins/NewsAggregator.txt
+++ b/langpacks/english/Plugins/NewsAggregator.txt
@@ -63,6 +63,7 @@
 [Contact deleting]

 [Network]

 ;file \plugins\NewsAggregator\Src\Services.cpp

+[Avatars]

 [Enable/disable auto update]

 ;file \plugins\NewsAggregator\Src\Utils.cpp

 [NewsAggregator HTTP connection]

diff --git a/langpacks/english/Plugins/QuickReplies.txt b/langpacks/english/Plugins/QuickReplies.txt
index bbcbe78af5..3da0614156 100644
--- a/langpacks/english/Plugins/QuickReplies.txt
+++ b/langpacks/english/Plugins/QuickReplies.txt
@@ -7,7 +7,7 @@
 ;============================================================

 [Plugin for quick insert (or sending) pre-defined messages in message input area.]

 ;file \plugins\QuickReplies\res\resources.rc

-[QuickReplies]

+[Quick Replies]

 [Send replies immediately]

 [- Add your replies, one per line.]

 [Variables]

@@ -19,4 +19,3 @@
 [Quick Replies\r\nLeft button - open menu\r\nRight button - options page]

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

 [Message Sessions]

-[Quick Replies]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 2ffa537c1b..a34fa3ac8b 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -135,6 +135,7 @@
 [Word lookup]

 [Google]

 [Bing]

+[Yandex]

 [Wikipedia (en)]

 [Google Maps]

 [Google Translate]

diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index ce809c57bc..c94e81505c 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -171,7 +171,29 @@
 [SecureIM auto accepted RSA Public key from: %s uin: %s SHA1: %s]

 [SecureIM received NEW RSA Public Key from "%s"\n\nNew SHA1: %s\n\nOld SHA1: %s\n\nDo you Replace this Key ?]

 [SecureIM auto accepted NEW RSA Public key from: %s uin: %s New SHA1: %s Old SHA1: %s]

+;file \plugins\SecureIM\src\loadicons.cpp

+[Contact List]

+[Connection Disabled]

+[Connection Established]

+[Contact Menu]

+[Disable Secure Connection]

+[Establishe Secure Connection]

+[Message Window]

+[Popups]

+[Secure Connection Disabled]

+[Secure Connection Established]

+[Secure Connection In Process]

+[Recv Secured Message]

+[Sent Secured Message]

+[Menu State]

+[Always Try]

+[Overlays]

+[Native mode]

+[PGP mode]

+[GPG mode]

+[RSA/AES mode]

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

+[Icons]

 [Incoming Secure Message]

 [Outgoing Secure Message]

 [SecureIM status]

@@ -191,4 +213,7 @@
 [Load Public Key File]

 [Services]

 ;file \plugins\SecureIM\src\popupOptions.cpp

+[Key Popup]

+[Secure Popup]

+[Message Popup]

 [PopUps]

diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 57e9480973..27c8150403 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -66,12 +66,14 @@
 [Retry]

 [Yes]

 [No]

-[Abord]

+[Abort]

 [Ignore]

 ;file \plugins\SendScreenshotPlus\src\global.h

 [SendScreenshot - Error]

 ;file \plugins\SendScreenshotPlus\src\Main.cpp

 [Fatal error, image services not found. Send Screenshot will be disabled.]

+[SendSS]

+[Screenshots]

 [SendSS HTTP connections]

 [Could not create main dialog.]

 [Send Screenshot]

@@ -79,6 +81,29 @@
 [Take a screenshot]

 [Could not register miranda service.]

 [Could not create Screenshot folder (error code: %d):\n%s\nDo you have write permissions?]

+;file \plugins\SendScreenshotPlus\src\mir_icolib.cpp

+[Screenshot Icon1]

+[Screenshot Icon2]

+[Target Cursor]

+[Target Desktop]

+[Default]

+[overlay on]

+[overlay off]

+[Help]

+[Open Folder]

+[description off]

+[description on]

+[delete off]

+[delete on]

+[Prev]

+[Next]

+[Update]

+[Ok]

+[Apply]

+[Down arrow]

+;file \plugins\SendScreenshotPlus\src\mir_icolib.h

+[Buttons]

+[overlays]

 ;file \plugins\SendScreenshotPlus\src\UAboutForm.cpp

 [Credits]

 [< Copyright]

@@ -97,7 +122,6 @@
 [FTP File]

 [ImageShack]

 [Information]

-[Open Folder]

 [Fill description textbox.]

 [Delete after send]

 [Capture]

diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index 2c7fea4f83..76ee7cbb67 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -139,6 +139,7 @@
 [Recent Message]

 [Predefined Message]

 [Go to URL in Away Message]

+[Simple Status Message]

 [I've been away since %time%.]

 [Give it up, I'm not in!]

 [Not right now.]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 177f3695a9..0781f84832 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -34,6 +34,8 @@
 ;file \plugins\SmileyAdd\src\dlgboxsubclass.cpp

 [Show Smiley Selection Window]

 ;file \plugins\SmileyAdd\src\download.cpp

+[SmileyAdd]

+[Smiley Cache]

 [SmileyAdd HTTP connections]

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

 [Button Smiley]

diff --git a/langpacks/english/Plugins/StatusChange.txt b/langpacks/english/Plugins/StatusChange.txt
new file mode 100644
index 0000000000..0ed9e55e4a
--- /dev/null
+++ b/langpacks/english/Plugins/StatusChange.txt
@@ -0,0 +1,30 @@
+#muuid {1acb2ed1-c1ed-43ee-89bd-086686f6ebb5}

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

+;  File: StatusChange.dll

+;  Plugin: Status change

+;  Version: 1.3.0.0

+;  Authors: Angelo Luiz Tartari

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

+[Change status when you send/receive and event.]

+;file \plugins\StatusChange\res\resource.rc

+[Offline]

+[Online]

+[Away]

+[NA]

+[Occupied]

+[DND]

+[Free for chat]

+[Invisible]

+[On the phone]

+[Out to lunch]

+[On events...]

+[Send]

+[Receive]

+[Message]

+[URL]

+[File transfer]

+[...change status to...]

+[... if status is...]

+;file \plugins\StatusChange\src\main.cpp

+[Status Change]

+[Status]

diff --git a/langpacks/english/Plugins/StopSpamMod.txt b/langpacks/english/Plugins/StopSpamMod.txt
index 3b87f5b1d7..ce39dd4111 100644
--- a/langpacks/english/Plugins/StopSpamMod.txt
+++ b/langpacks/english/Plugins/StopSpamMod.txt
@@ -40,6 +40,8 @@
 [Use math expression in question]

 [Details..]

 ;file \plugins\StopSpamMod\src\init.cpp

+[StopSpam]

+[StopSpam Logs]

 [Remove Temporary Contacts]

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

 [No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer plugin adds him to your contact list so that he can contact you.]

@@ -50,7 +52,6 @@
 [If math expression is turned on you can use following expression in message text:\nXX+XX-X/X*X\neach X will be replaced by one ruandom number and answer will be expression result\nMessage must contain only one expression without spaces]

 [Info]

 [Message Sessions]

-[StopSpam]

 [General]

 [Messages]

 [Accounts]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 8c28b61854..f0d434709f 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -629,6 +629,12 @@
 [Show always (if present)]

 [Never show it at all]

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

+[TabSRMM]

+[Data path]

+[Skins root]

+[Avatars]

+[Saved TabSRMM avatars]

+[Group chat logs root]

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

 [Insert [img] tag / surround selected text with [img][/img]]

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

diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index 2a10f040f9..056943261c 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -245,6 +245,7 @@
 [Labels]

 [Values]

 [Tray title]

+[Tipper skins]

 ;file \plugins\TipperYM\src\translations.cpp

 [Female]

 [Male]

diff --git a/langpacks/english/Plugins/TrafficCounter.txt b/langpacks/english/Plugins/TrafficCounter.txt
index 96dcdef85c..0af368a549 100644
--- a/langpacks/english/Plugins/TrafficCounter.txt
+++ b/langpacks/english/Plugins/TrafficCounter.txt
@@ -28,18 +28,18 @@
 [Tooltip format string:]

 [Display traffic for current]

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

-[Display/]

+[Display]

 [Icon]

 [Account name]

 [Current traffic]

 [Total traffic]

 [Current online]

 [Total online]

-[General/]

+[General]

 [Draw frame as skin element]

 [Show tooltip in traffic window]

 ["Toggle traffic counter" in main menu]

-[Visible accounts/]

+[Visible accounts]

 [Summary traffic for visible accounts]

 [Overall traffic]

 [Hide now]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index 35479b80bb..53c587a1fd 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -44,6 +44,7 @@
 [Failed to get Twitter Access Tokens, please go offline and try again.  If this keeps happening, check your internet connection.]

 [You're missing the Nick key in the database.  This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc).  To fix it either add it manually or reset your twitter account in the miranda account options]

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

+[Avatars]

 [Send Tweet...]

 [Network]

 [Basic]

diff --git a/langpacks/english/Plugins/VersionInfo.txt b/langpacks/english/Plugins/VersionInfo.txt
index 6a8a9d6e3c..d892350bb1 100644
--- a/langpacks/english/Plugins/VersionInfo.txt
+++ b/langpacks/english/Plugins/VersionInfo.txt
@@ -49,6 +49,8 @@
 [Are you sure you want to enable this option ?\nPlease only enable this option if you really know what you're doing and what the option is for or if someone asked you to do it.]

 [Show plugin UUIDs ?]

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

+[VersionInfo]

+[Output folder]

 [Version Information]

 [Services]

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

diff --git a/langpacks/english/Plugins/WhenWasIt.txt b/langpacks/english/Plugins/WhenWasIt.txt
index 78b389daa8..d436514868 100644
--- a/langpacks/english/Plugins/WhenWasIt.txt
+++ b/langpacks/english/Plugins/WhenWasIt.txt
@@ -74,17 +74,17 @@
 [Closing in %d seconds]

 [Closing in %d second]

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

+[Check for birthdays]

+[Birthdays]

+[Contacts]

 [WhenWasIt]

 [Birthday near]

 [Birthday today]

 [Birthdays (When Was It)]

-[Check for birthdays]

 [Refresh user details]

 [Import birthdays]

 [Export birthdays]

 [Add/change user &birthday]

-[Birthdays]

-[Contacts]

 ;file \plugins\WhenWasIt\src\icons.cpp

 [Check birthdays menu item]

 [List birthdays menu item]

diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index 8496a7ea76..4d3e3556b1 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -46,6 +46,8 @@
 [&Cancel]

 [Invitation reason]

 [Add]

+;file \protocols\Yahoo\src\avatar.cpp

+[Avatars]

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

 [[miranda] Got conference invite to room: %s with msg: %s]

 [%s denied invitation with message: %s]