18 files changed, 27 insertions, 50 deletions

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index 95df156ec4..1e7d739208 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -40,12 +40,12 @@
 [Preview]

 [Avatar History: Select how to store history avatars]

 [Please select how the avatar history should be stored. This setting CANNOT be changed in future, because it would cause all previous history to be lost.]

-[Store history in miranda history and all history avatars in same folder]

-[Store history in miranda history and history avatars in per protocol folders]

-[Store history in miranda history and history avatars in per contact folders using shortcuts]

+[Store history in Miranda history and all history avatars in same folder]

+[Store history in Miranda history and history avatars in per protocol folders]

+[Store history in Miranda history and history avatars in per contact folders using shortcuts]

 [Store history avatars in per contact folders using shortcuts]

 [Store history avatars in per contact folders]

-[History is stored inside miranda db. It can be seen by History++ or Avatar History internal viewer.]

+[History is stored inside Miranda database. It can be seen by History++ or Avatar History internal viewer.]

 [All avatars are stored as <Profile>\\Avatars History\\<Avatar Hash>]

 [All avatars are stored as <Profile>\\Avatars History\\<Protocol>\\<Avatar Hash>]

 [All avatars are stored as <Profile>\\Avatars History\\<Protocol>\\<Avatar Hash> and have a shortcut per history entry in <Profile>\\Avatars History\\<Protocol>\\<Contact ID>\\<Timestamp>]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index c9056f715a..a5b2758830 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -57,7 +57,7 @@
 [Login error, probably bad login credentials.]

 [Your account requires HTTPS connection. Activating.]

 [Something happened to Facebook. Maybe there was some major update so you should wait for an update.]

-[Need confirmation for sending messages to other clients.\nOpen facebook website and try to send message to this contact again!]

+[Need confirmation for sending messages to other clients.\nOpen Facebook website and try to send message to this contact again!]

 [Timeout when sending message.]

 [Status update was successful.]

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

diff --git a/langpacks/english/Plugins/Folders.txt b/langpacks/english/Plugins/Folders.txt
index d856cd5606..107f82de35 100644
--- a/langpacks/english/Plugins/Folders.txt
+++ b/langpacks/english/Plugins/Folders.txt
@@ -22,9 +22,9 @@
 [be saved to the database, they will only be valid for this session.]

 [Variable string]

 [What it expands to:]

-[Expands to your miranda path (e.g: c:\\program files\\miranda ng).]

+[Expands to your Miranda path (e.g: c:\\program files\\miranda ng).]

 [Expands to your profile path - the value found in mirandaboot.ini,]

-[ProfileDir section (usually inside miranda's folder).]

+[ProfileDir section (usually inside Miranda's folder).]

 [Expands to your current profile name without the extenstion.]

 [(e.g.default if your your profile is default.dat).]

 [Environment variables]

@@ -35,7 +35,7 @@
 [instead of expanding to Miranda's profile path.]

 [Examples:]

 [If the value for the ProfileDir inside mirandaboot.ini, ProfileDir section is '.\\profiles\', current]

-[profile is 'default.dat' and miranda's path is 'c:\\program files\\miranda ng\' then:]

+[profile is 'default.dat' and Miranda's path is 'c:\\program files\\miranda ng\' then:]

 [will expand to 'c:\\program files\\miranda ng']

 [will expand to 'c:\\program files\\miranda ng\\profiles']

 [will expand to 'default']

diff --git a/langpacks/english/Plugins/HTTPServer.txt b/langpacks/english/Plugins/HTTPServer.txt
index bb82639040..4c8f9aaf36 100644
--- a/langpacks/english/Plugins/HTTPServer.txt
+++ b/langpacks/english/Plugins/HTTPServer.txt
@@ -70,7 +70,7 @@
 [IP Adress: ]

 [You are browsing from]

 [You external ip was detected as %d.%d.%d.%d\r\nby: %s]

-[You need to restart miranda to change the main menu]

+[You need to restart Miranda to change the main menu]

 [HTTP Server]

 [Network]

 [Failed to CreateServiceFunction MS_SHARE_NEW_FILE]

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 6cdbc69d32..66f6cd7b69 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -147,7 +147,7 @@
 ;file \protocols\IRCG\src\commandmonitor.cpp

 [%s sets mode %s]

 [%s sets mode %s%s]

-[CTCP ERROR: Malformed CTCP command received from %s!%s@%s. Possible attempt to take control of your irc client registered]

+[CTCP ERROR: Malformed CTCP command received from %s!%s@%s. Possible attempt to take control of your IRC client registered]

 [CTCP FINGER requested by %s]

 [CTCP VERSION requested by %s]

 [CTCP SOURCE requested by %s]

diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 63a1e06b63..97d3be3295 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -9,7 +9,7 @@
 ;file \plugins\Msg_Export\res\resource.rc

 [Browse]

 [Use internal viewer]

-[Replace miranda history]

+[Replace Miranda history]

 [Use UTF8 in new files]

 [Append extra new line]

 [Use << and >>]

@@ -69,7 +69,7 @@
 [Failed to export at least one contact]

 [Sorting and writing database information ( Phase 2 of 2 )]

 [Max line width must be at least %d]

-[You need to restart miranda to change the history function]

+[You need to restart Miranda to change the history function]

 [Failed to get the path to Msg_Export.dll\nPlease locate Msg_Export.txt your self]

 [File]

 [Nick]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 13ec8afbf8..220d317bf4 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -69,7 +69,7 @@
 [Userlist:]

 [Export PubKey]

 [Turn on debug log]

-[Use jabber api on Miranda NG (recomended)]

+[Use Jabber api on Miranda NG (recommended)]

 [Default key]

 [Encrypt file transfers]

 [Automatic key exchange]

diff --git a/langpacks/english/Plugins/NoHistory.txt b/langpacks/english/Plugins/NoHistory.txt
index a609e381fd..f461b4cd42 100644
--- a/langpacks/english/Plugins/NoHistory.txt
+++ b/langpacks/english/Plugins/NoHistory.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.2.3.0

 ;  Authors: Scott Ellis, NightFox

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

-[Prevent miranda from storing any history.]

+[Prevent Miranda from storing any history.]

 ;file \plugins\NoHistory\res\NoHistory.rc

 [Keep history for this contact]

 [Disable history for this contact]

diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 4938716c79..6dd9966cbc 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -80,7 +80,7 @@
 [Send Screenshot]

 [Send desktop screenshot]

 [Take a screenshot]

-[Could not register miranda service.]

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

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index 56ccde4295..c7dd9ff6e8 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -11,7 +11,7 @@
 [Create a new Twitter account]

 [Default group:]

 [Username:]

-[[Sign in to link your twitter account]]

+[[Sign in to link your Twitter account]]

 [Send Tweet]

 [Send]

 [Cancel]

@@ -42,7 +42,7 @@
 ;file \protocols\Twitter\src\connection.cpp

 [OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorize Miranda to Twitter.com (do the PIN stuff again)]

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

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

 [Send Tweet...]

 [Network]

diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index 50e3454610..4e2d7b2a3c 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -37,7 +37,7 @@
 [Blocked User List]

 [This list contains all your blocked Xfire users. You can remove one, if you wanna allow him to send you a friend request.]

 [You can simply block someone, if you right click on his friend request in clist and choose Block User...]

-[This file is used for the game search, game detection and game ID resolving. It contains all xfire supported games.]

+[This file is used for the game search, game detection and game ID resolving. It contains all Xfire supported games.]

 [This file contains all original game icons. You can also activate the option for icon downloading, if you don't have it.]

 [Be sure you put these files in following folder:]

 [Status Message]

@@ -114,7 +114,7 @@
 [Mmm... food.]

 ;file \protocols\Xfire\src\iniupdater.cpp

 [The xfire_games.ini was updated.]

-[Error during xfire_games Update.]

+[Error during xfire_games.ini update.]

 [There is a new Icons.dll online, do you want to update now?]

 [The Icons.dll was updated.]

 [Error during Icons.dll Update.]

@@ -139,7 +139,7 @@
 [My Voice ServerIP]

 [Xfire Link Protocol]

 [Buddy start a game]

-[It seems that is the first time you use this plugin. Do you want to automatically download the latest available xfire_games.ini and icons.dll?\r\nWithout the ini xfire can't detect any games on your computer.]

+[It seems that is the first time you use this plugin. Do you want to automatically download the latest available xfire_games.ini and icons.dll?\r\nWithout the xfire_games.ini Xfire can't detect any games on your computer.]

 [Away from Keyboard]

 [&XFire Online Profile]

 [XFire &Clan Site]

diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index c935b98aec..20ab1b7735 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -92,7 +92,7 @@
 [%s plugin connections]

 [ID]

 [Please enter your Yahoo ID in Options/Network/Yahoo]

-[Please enter your yahoo password in Options/Network/Yahoo]

+[Please enter your Yahoo password in Options/Network/Yahoo]

 [Yahoo Login Error]

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

 [You need to be connected to set the custom message]

@@ -122,7 +122,7 @@
 [Could not log into Yahoo service - username not recognized. Please verify that your username is correctly typed.]

 [Could not log into Yahoo service - password incorrect. Please verify that your username and password are correctly typed.]

 [Could not log into Yahoo service. Your account has been locked.\nVisit %s to reactivate it.]

-[You have been logged out of the yahoo service, possibly due to a duplicate login.]

+[You have been logged out of the Yahoo service, possibly due to a duplicate login.]

 [Could not connect to the Yahoo service. Check your server/port and proxy settings.]

 [Could not log in, unknown reason: %d.]

 [Unknown error %s]

diff --git a/langpacks/english/Plugins/YahooGroups.txt b/langpacks/english/Plugins/YahooGroups.txt
index c6efa367fc..c213ecfebf 100644
--- a/langpacks/english/Plugins/YahooGroups.txt
+++ b/langpacks/english/Plugins/YahooGroups.txt
@@ -8,7 +8,7 @@
 [This plugin imports and creates the Yahoo groups defined in Yahoo Messenger.]

 ;file \plugins\YahooGroups\res\YahooGroups.rc

 [Dialog]

-[Move yahoo contacts to groups now]

+[Move Yahoo contacts to groups now]

 [Move Yahoo contacts automatically on startup]

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

 [Yahoo Groups]

diff --git a/langpacks/russian/Plugins/HistoryPP.txt b/langpacks/russian/Plugins/HistoryPP.txt
index d4968dab89..abf70ca937 100644
--- a/langpacks/russian/Plugins/HistoryPP.txt
+++ b/langpacks/russian/Plugins/HistoryPP.txt
@@ -505,7 +505,7 @@ HTML файл
 Неизвестная кодовая страница %u

 [History++ module could not be loaded, riched20.dll is missing. Press Yes to continue loading Miranda.]

 Невозможно загрузить History++, так как отсутствует riched20.dll. Нажмите "Да" для продолжения загрузки программы.

-[User %s (%d) changed ICQ client: %s]

+[User %s (%d) changed icq client: %s]

 %s (%d) сменил клиент ICQ: %s

 [Status request by %s (%d):%s]

 Запрос статуса от %s (%d):%s

diff --git a/langpacks/russian/Plugins/MRA.txt b/langpacks/russian/Plugins/MRA.txt
index b3ec1abeaa..f9b81def4f 100644
--- a/langpacks/russian/Plugins/MRA.txt
+++ b/langpacks/russian/Plugins/MRA.txt
@@ -213,14 +213,12 @@ xСтатус "%s"
 Аватары: сервер вернул HTTP код: %lu

 [Avatars: can't open file %s, error]

 Аватары: невозможно открыть %s, ошибка

-;file \protocols\MRA\src\MraChat.cpp

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

 Для конференций требуется модуль Chat или tabSRMM 1.0+.

 [invite sender]

 отправитель приглашения

 [invite new members]

 позвать новых участников

-;file \protocols\MRA\src\MraConstans.h

 [Your contact wakes you]

 Ваш собеседник будит вас

 [Display &Inbox]

@@ -331,7 +329,6 @@ Mail.ru Xstatus
 Mail.ru дополнительно

 [E-mail address]

 Адрес e-mail

-;file \protocols\MRA\src\Mra_functions.cpp

 [Unread mail is available: %lu/%lu messages]

 Непрочитанная почта: %lu/%lu сообщений

 [From: %S\r\nSubject: %S\r\n%s]

@@ -360,7 +357,6 @@ Mail.ru дополнительно
 Файлы

 [Avatars]

 Аватары

-;file \protocols\MRA\src\Mra_proto.cpp

 [Please, setup e-mail in options]

 Пожалуйста, введите e-mail в настройках

 [Please, setup password in options]

diff --git a/langpacks/russian/Untranslated/MRA.txt b/langpacks/russian/Untranslated/MRA.txt
index 57f3d4dbbb..4fc7df80e3 100644
--- a/langpacks/russian/Untranslated/MRA.txt
+++ b/langpacks/russian/Untranslated/MRA.txt
@@ -1,18 +1 @@
-[Zodiak:]

-[Remember]

-[Leave empty if you don't want to change password]

-[OK]

-[Written:]

-[Avatars: can't open file %s, error]

-[invite sender]

-[invite new members]

-[Please authorize me]

-[Receive files: can't allocate disk space for file, size %lu bytes, error]

-[Receive files: can't open file %s, error]

-[Receive files: request for file %s not sent, error]

-[Mail.ru Xstatus]

-[Mail.ru extra info]

-[Closing in %ld]

-[Reply to %s blog status]

-[Written]

-[Dating]

+[OK]

diff --git a/langpacks/russian/Untranslated/ModernOpt.txt b/langpacks/russian/Untranslated/ModernOpt.txt
index c8843dabcd..4fc7df80e3 100644
--- a/langpacks/russian/Untranslated/ModernOpt.txt
+++ b/langpacks/russian/Untranslated/ModernOpt.txt
@@ -1,4 +1 @@
-[Sample page]

-[Use arrow keys to choose category]

-[OK]

-[Miranda NG configuration center]

+[OK]

diff --git a/langpacks/russian/Untranslated/SeenPlugin.txt b/langpacks/russian/Untranslated/SeenPlugin.txt
index 4a0b26fc8a..15b8c8a881 100644
--- a/langpacks/russian/Untranslated/SeenPlugin.txt
+++ b/langpacks/russian/Untranslated/SeenPlugin.txt
@@ -5,6 +5,7 @@
 [Feb.]

 [Mar.]

 [Apr.]

+[Jun.]

 [Jul.]

 [Aug.]

 [Sep.]