summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-10-29 10:01:23 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-10-29 10:01:23 +0000
commitcd527af4c935731fc24724d8628751dce6d9c61e (patch)
tree7f66a9f51829bb43a1f7d8fa9b454ee88d3a90b9
parentfacfb0f99578c5e7ded905933b228468696b7575 (diff)
SkypeClassic added to solutions and russian langpack
git-svn-id: http://svn.miranda-ng.org/main/trunk@6674 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--bin10/mir_full.sln10
-rw-r--r--bin10/mir_full_pro.sln11
-rw-r--r--bin11/mir_full.sln12
-rw-r--r--langpacks/english/=CORE=.txt2
-rw-r--r--langpacks/english/Plugins/AdvancedAutoAway.txt2
-rw-r--r--langpacks/english/Plugins/ICQ.txt2
-rw-r--r--langpacks/english/Plugins/KeepStatus.txt2
-rw-r--r--langpacks/english/Plugins/MSN.txt2
-rw-r--r--langpacks/english/Plugins/NotesReminders.txt2
-rw-r--r--langpacks/english/Plugins/Nudge.txt4
-rw-r--r--langpacks/english/Plugins/SecureIM.txt4
-rw-r--r--langpacks/english/Plugins/SendSS.txt10
-rw-r--r--langpacks/english/Plugins/SimpleStatusMsg.txt2
-rw-r--r--langpacks/english/Plugins/SkypeClassic.txt113
-rw-r--r--langpacks/english/Plugins/StartupSilence.txt40
-rw-r--r--langpacks/english/Plugins/StartupStatus.txt2
-rw-r--r--langpacks/english/Plugins/TabSRMM.txt2
-rw-r--r--langpacks/english/Plugins/Tlen.txt2
-rw-r--r--langpacks/english/Plugins/VKontakte.txt2
-rw-r--r--langpacks/english/Plugins/WebView.txt145
-rw-r--r--langpacks/english/Plugins/Xfire.txt4
-rw-r--r--langpacks/russian/Plugins/SkypeClassic.txt (renamed from langpacks/russian/Deprecated/Skype.txt)10
22 files changed, 284 insertions, 101 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 30e401edec..133d9febed 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -413,6 +413,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VKontakte", "..\protocols\V
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugins\StartupSilence\StartupSilence_10.vcxproj", "{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkypeClassic", "..\protocols\SkypeClassic\SkypeClassic_10.vcxproj", "{5F9243AE-C6C9-4F42-B670-67A97767A50B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1853,6 +1855,14 @@ Global
{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}.Release|Win32.Build.0 = Release|Win32
{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}.Release|x64.ActiveCfg = Release|x64
{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}.Release|x64.Build.0 = Release|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|Win32.Build.0 = Debug|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|x64.ActiveCfg = Debug|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|x64.Build.0 = Debug|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|Win32.ActiveCfg = Release|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|Win32.Build.0 = Release|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|x64.ActiveCfg = Release|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 60dd8415b7..9792811beb 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -449,6 +449,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VKontakte", "..\protocols\V
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugins\StartupSilence\StartupSilence_10.vcxproj", "{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkypeClassic", "..\protocols\SkypeClassic\SkypeClassic_10.vcxproj", "{5F9243AE-C6C9-4F42-B670-67A97767A50B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1889,6 +1891,14 @@ Global
{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}.Release|Win32.Build.0 = Release|Win32
{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}.Release|x64.ActiveCfg = Release|x64
{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}.Release|x64.Build.0 = Release|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|Win32.Build.0 = Debug|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|x64.ActiveCfg = Debug|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|x64.Build.0 = Debug|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|Win32.ActiveCfg = Release|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|Win32.Build.0 = Release|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|x64.ActiveCfg = Release|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1985,6 +1995,7 @@ Global
{F5282DBC-756B-4071-B186-3E82C0E8E1F7} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{475ED6ED-C311-4188-ACB2-1C41830B22EE} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{BF6E1942-7E42-4564-9DF5-FD0A00D71173} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{987F026D-EB1F-4013-ADA8-2406ACCDA526} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}
{D9057E63-AAAA-4FE7-800A-20C02F4761F3} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}
{56997126-0098-407A-94E1-7C5748C1C9EF} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}
diff --git a/bin11/mir_full.sln b/bin11/mir_full.sln
index 92e7afb5ae..7c3cdac03c 100644
--- a/bin11/mir_full.sln
+++ b/bin11/mir_full.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
+# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32_11.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
ProjectSection(ProjectDependencies) = postProject
{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60} = {D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}
@@ -413,6 +413,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VKontakte", "..\protocols\V
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugins\StartupSilence\StartupSilence_11.vcxproj", "{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkypeClassic", "..\protocols\SkypeClassic\SkypeClassic_11.vcxproj", "{5F9243AE-C6C9-4F42-B670-67A97767A50B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1853,6 +1855,14 @@ Global
{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}.Release|Win32.Build.0 = Release|Win32
{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}.Release|x64.ActiveCfg = Release|x64
{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}.Release|x64.Build.0 = Release|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|Win32.Build.0 = Debug|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|x64.ActiveCfg = Debug|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Debug|x64.Build.0 = Debug|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|Win32.ActiveCfg = Release|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|Win32.Build.0 = Release|Win32
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|x64.ActiveCfg = Release|x64
+ {5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 9bec441c75..b21a2eab8e 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -647,7 +647,7 @@
[Nope, not here.]
[I'm hiding from the mafia.]
[That'll be the phone.]
-[Mmm...food.]
+[Mmm... food.]
[idleeeeeeee]
[Status]
;file \src\core\stdchat\src\clist.cpp
diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index f803a30d21..be79dea790 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -150,7 +150,7 @@
[Nope, not here.]
[I'm hiding from the mafia.]
[That'll be the phone.]
-[Mmm...food.]
+[Mmm... food.]
[idleeeeeeee]
;file \Plugins\StatusPlugins\confirmdialog.cpp
[Set %s message for %s.]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 13e78909d6..949a3bcf19 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -50,7 +50,7 @@
[Messaging]
[Enable unicode messaging support]
[Send all messages in unicode if possible]
-[Use this codepage for Ansi <-> Unicode translation :]
+[Use this codepage for Ansi <-> Unicode translation:]
[Make me temporarily visible to contacts I send message to]
[Notify me when a message delivery has failed (recommended)]
[Never use legacy messaging (server acknowledgements)]
diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 7970a9cce2..3aa62f5c79 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -165,7 +165,7 @@
[Nope, not here.]
[I'm hiding from the mafia.]
[That'll be the phone.]
-[Mmm...food.]
+[Mmm... food.]
[idleeeeeeee]
;file \Plugins\StatusPlugins\confirmdialog.cpp
[Set %s message for %s.]
diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index e641e9291f..4775581aa8 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -94,7 +94,7 @@
[Subject: %s]
[Hotmail from %s (%S)]
[Hotmail from %s]
-[Unread mail is available: %d in Inbox and %d in other folders).]
+[Unread mail is available: %d in Inbox and %d in other folders.]
;file \protocols\MSN\src\msn_menu.cpp
[&Unblock]
[&Block]
diff --git a/langpacks/english/Plugins/NotesReminders.txt b/langpacks/english/Plugins/NotesReminders.txt
index f9ba3fea31..4e100d5206 100644
--- a/langpacks/english/Plugins/NotesReminders.txt
+++ b/langpacks/english/Plugins/NotesReminders.txt
@@ -24,7 +24,7 @@
[Add Reminder closes dialog]
[Use MCI to play alert sounds]
[Note Transparency (Minimum Win 2k/XP)]
-[Send Reminders through E-mail / SMS :]
+[Send Reminders through E-mail/SMS:]
[Open links with this program instead:]
[Reset to defaults]
[(Using MCI allows different sounds to be played simultaneously, may not be needed or desired when a custom sound plugin is installed.)]
diff --git a/langpacks/english/Plugins/Nudge.txt b/langpacks/english/Plugins/Nudge.txt
index 692f1b0aaa..80ee409815 100644
--- a/langpacks/english/Plugins/Nudge.txt
+++ b/langpacks/english/Plugins/Nudge.txt
@@ -21,8 +21,8 @@
[Sending text]
[Receiving text]
[Privacy]
-[Allow sending* one nudge to the same contact every :]
-[Allow receiving one nudge from the same contact every :]
+[Allow sending* one nudge to the same contact every:]
+[Allow receiving one nudge from the same contact every:]
[* Nudge sending delay is hardcoded and cannot be changed.]
[Preview]
[Text]
diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index 29890f7ea2..0a3700ebc8 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -18,9 +18,9 @@
[Not secured for NotOnList]
[Auto accept RSA key (NOT SECURED)]
[Mode in Context Menu]
-[Key Exchange Timeout :]
+[Key Exchange Timeout:]
[sec]
-[Offline Key Timeout :]
+[Offline Key Timeout:]
[days]
[PGP]
[GPG]
diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index ef2b3757db..3a349b7419 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -15,9 +15,9 @@
[Send screenshot]
[Send screenshot to\n<unknown>]
[Ti&med capture]
-[Time (secs) :]
-[&Format :]
-[Send B&y :]
+[Time (secs):]
+[&Format:]
+[Send B&y:]
[E&xplore]
[&Fill description textbox.]
[Delete &after send]
@@ -29,8 +29,8 @@
[&Close]
[Edit]
[C&lient Area]
-[Caption :]
-[Size (HxW) :]
+[Caption:]
+[Size (HxW):]
[Target Tool]
;file \plugins\SendScreenshotPlus\src\CSend.cpp
[GCHAT error]
diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index f8928ae433..648d6be5a6 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -142,5 +142,5 @@
[Nope, not here.]
[I'm hiding from the mafia.]
[That'll be the phone.]
-[Mmm...food.]
+[Mmm... food.]
[idleeeeeeee]
diff --git a/langpacks/english/Plugins/SkypeClassic.txt b/langpacks/english/Plugins/SkypeClassic.txt
new file mode 100644
index 0000000000..cc4864837b
--- /dev/null
+++ b/langpacks/english/Plugins/SkypeClassic.txt
@@ -0,0 +1,113 @@
+#muuid {a71f8335-7b87-4432-b8a3-81479431c6f5}
+;============================================================
+; File: SkypeClassic.dll
+; Plugin: Skype Protocol (Classic)
+; Version: 0.0.0.54
+; Authors: leecher - tweety - jls17
+;============================================================
+[Skype protocol support for Miranda NG. Classic implemetation which requires running original Skype client.]
+;file \protocols\SkypeClassic\res\Resource.rc
+[Set]
+[Delete]
+[Start Skype with Miranda IM if not running using the following command line options:]
+[/NOSPLASH - Don't show splash screen on startup]
+[/MINIMIZED - Start Skype minimized]
+[/NOTRAY - Skype tray icon becomes grey and is therefore "invisible"]
+[/REMOVEABLE - For running portable skype]
+[/SECONDARY - This is the second instance]
+[/DATAPATH - Specify Skype data folder*]
+[Use custom Skype executable*]
+[* Relative path root is Miranda IM folder]
+[Shutdown Skype when you close Miranda IM]
+[Unload Skype when you change to Offline status]
+[Try at least]
+[times to connect to Skype API before giving up]
+[User name:]
+[Password:]
+[Dial]
+[Number:]
+[Cancel]
+[%s is calling]
+[Join conference with %s]
+[Answer call; set call to %s on hold]
+[Hang up]
+[OK]
+[Dialog]
+[Use Skype proxy connection over network instead of local Skype API]
+[Host:]
+[Port:]
+[* You must restart Miranda IM in order to let the settings take effect]
+[This Skype proxy requires password authentication:]
+[Name:]
+[Birthday:]
+[Sex:]
+[City:]
+[Country:]
+[Province:]
+[Home phone:]
+[Office phone:]
+[Homepage:]
+[Save]
+[Enable Skype menu options (currently: Find/Add user)]
+[Use popup plugin for displaying messages ]
+[Suppress all error messages (not recommended, but if it annoys you... ;)]
+[Use group chat interface for conversations (requires group chat module)]
+[Mark group chat message as read to avoid notification]
+[Keep requested online status on startup under every circumstance]
+[Use time zone patch]
+[Ignore time zones]
+[Show default skype avatar for contacts]
+[Suppress call summary chat message]
+[Disable support for N/A and SkypeMe status (for Skype 4+)]
+[Show full name in contact list instead of nickname]
+[SkypeOut contacts are in status:]
+[Cleanup Nicknames]
+[Skype Popups]
+[Incoming Calls]
+[Show incoming calls]
+[seconds]
+[Background]
+[Use Windows colors]
+[Text]
+[Preview]
+[Error Messages]
+[Display error messages]
+;file \protocols\SkypeClassic\src\contacts.cpp
+[Call (Skype)]
+[Call using SkypeOut]
+[Hang up call (Skype)]
+[Hang up SkypeOut call]
+[Hold call]
+[Resume call]
+[&File]
+[&Open groupchat]
+[Import Skype history]
+[Add Skype contact]
+;file \protocols\SkypeClassic\src\gchat.cpp
+[Unknown]
+[&Invite user...]
+[Me]
+[&Leave chat session]
+[Set &Topic...]
+[User &details]
+[User &history]
+[&Kick user]
+;file \protocols\SkypeClassic\src\skype.cpp
+[Do a SkypeOut-call]
+[invited ]
+[Phonecall]
+[Incoming Skype Call]
+[Incoming call from %s]
+[Connection to Skype lost]
+[This seems to be the first time that you're running the Skype protocol plugin. Do you want to enable the protocol for this Miranda-Profile? (If you chose NO, you can always enable it in the plugin options later.]
+;file \protocols\SkypeClassic\src\skypeopt.cpp
+[Preview Error Message]
+[Skype default]
+[Skype advanced]
+[Skype proxy]
+[Avatar]
+[Details]
+[MALE]
+[FEMALE]
+;file \protocols\SkypeClassic\src\skypesvc.cpp
+[Skype ID]
diff --git a/langpacks/english/Plugins/StartupSilence.txt b/langpacks/english/Plugins/StartupSilence.txt
new file mode 100644
index 0000000000..af87edf5a6
--- /dev/null
+++ b/langpacks/english/Plugins/StartupSilence.txt
@@ -0,0 +1,40 @@
+#muuid {7b856b6a-d48f-4f54-b8d6-c8d86d02ffc2}
+;============================================================
+; File: StartupSilence.dll
+; Plugin: StartupSilence
+; Version: 0.1.0.0
+; Authors: Vladimir Lyubimov
+;============================================================
+[Disables ALL popups and sounds for 10-300 sec at Miranda startup and enables them always for Miranda NG (Automatically per computer settings).]
+;file \plugins\StartupSilence\res\StartupSilence.rc
+[Silence at Startup]
+[Settings for the next Computer Name:]
+[Enable silence at startup]
+[spin1]
+[for]
+[10-300 seconds (Default 20)]
+[Show Popup notification]
+[spin2]
+[Popup time 1-30 seconds (Default 5)]
+[Main Menu Item (plugin reload or Miranda restart required)]
+[TopToolBar button (Miranda restart required)]
+[Reset to default\r\n(for this computer)]
+[You need configure it once for each computer, where you run your Miranda NG.]
+[No Apply button required.]
+;file \plugins\StartupSilence\src\main.cpp
+[Events]
+;file \plugins\StartupSilence\src\StartupSilence.h
+[Silence at startup]
+[Toggle Silence OFF]
+[Toggle Silence ON]
+[Toggle Silence OFF TTB]
+[Toggle Silence ON TTB]
+[Sounds and popups are enabled]
+[Sounds and popups are disabled temporarily]
+[Silent Startup mode changed to ON]
+[Silent Startup mode changed to OFF]
+[Silence At Startup is ON]
+[Silence At Startup is OFF]
+[Toggle Silence At Startup]
+[You have to install TopToolBar to use this option.]
+[You have to install "YAPP" or "Popup+" to use this option.]
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 1fee14e450..a32614bcfa 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -169,7 +169,7 @@
[Nope, not here.]
[I'm hiding from the mafia.]
[That'll be the phone.]
-[Mmm...food.]
+[Mmm... food.]
[idleeeeeeee]
;file \Plugins\StatusPlugins\confirmdialog.cpp
[Set %s message for %s.]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 2004990092..602cbf93e2 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -50,7 +50,7 @@
[Line markers in the message log]
[Highlight user names]
[Enable highlighting for user names]
-[Also look in user ids]
+[Also look in user IDs]
[Names to highlight, wildcards like * and ? are allowed, separate multiple entries with spaces]
[Highlight message text]
[Enable highlighting for message text]
diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
index e76bd515f4..ea357ab59b 100644
--- a/langpacks/english/Plugins/Tlen.txt
+++ b/langpacks/english/Plugins/Tlen.txt
@@ -128,7 +128,7 @@
[You cannot create more than %s chat rooms.]
[You cannot join more than %s chat rooms.]
[Anonymous nicknames are not allowed in this chat room.]
-[Unknown error code : %d]
+[Unknown error code: %d]
;file \protocols\Tlen\src\tlen_opt.cpp
[General]
[Advanced]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index be287ae369..bc43b2a02e 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.0.4
+; Version: 0.1.0.5
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/WebView.txt b/langpacks/english/Plugins/WebView.txt
index d92882c94e..f703ffe3ed 100644
--- a/langpacks/english/Plugins/WebView.txt
+++ b/langpacks/english/Plugins/WebView.txt
@@ -14,102 +14,101 @@
[seconds]
[Hide icon on status bar]
[Disable main menu items]
-[Load Page on Window Open]
-[Update data on start-up]
-[Only Update Window on Alert]
-[Window Appearance]
-[Background Color:]
-[Text Color:]
+[Load page on window open]
+[Update data on startup]
+[Only update window on alert]
+[Window appearance]
+[Background color:]
+[Text color:]
[Bold]
[Italic]
[Underline]
-[Save Individual Window Positions]
-[Error Messages]
+[Save individual window positions]
+[Error messages]
[Suppress error messages]
[Display using Popup or OSD plugin]
-[Expert Options]
-[Disable Download Protection]
-[(Not Recommended)]
-[Display Data in Popup on Alert]
-[Display Data in Popup]
+[Expert options]
+[Disable download protection]
+[(not recommended)]
+[Display data in popup on alert]
+[Display data in popup]
[You may need to restart Miranda NG for this change to take effect.]
[Contact name:]
[URL:]
[Display]
-[Between Start and End strings]
+[Between start and end strings]
[Whole web page]
[Start:]
[End:]
-[Copy Strings to Alerts]
+[Copy strings to alerts]
[Double click action]
-[Opens Web page]
-[Opens Data Window]
-[Display Clean-up]
+[Opens web page]
+[Opens data window]
+[Display clean-up]
[Remove HTML]
[OK]
[Cancel]
[Apply]
[Find]
-[&Find Next]
-[Find What:]
+[&Find next]
+[Find what:]
[Search was completed.]
-[Alert Options]
-[Events And Alerts]
-[Enable Alerts]
-[Always Log To File]
-[Add Time And Date Of Alert To Contact Name]
+[Alert options]
+[Events and alerts]
+[Enable alerts]
+[Always log to file]
+[Add time and date of alert to contact name]
[Use 24 hour time format instead of 12 hour]
-[Add As Prefix]
-[Add As Suffix]
-[Alert When:]
-[Alert Type:]
-[Test Conditions]
-[Alert When String Is Present On Web Page]
+[Add as prefix]
+[Add as suffix]
+[Alert when:]
+[Alert type:]
+[Test conditions]
+[Alert when string is present on web page]
[String:]
-[Alert When Specific Area Of Web Page Changes]
-[Log To file]
-[Log File:]
+[Alert when specific area of web page changes]
+[Log to file]
+[Log file:]
[Append data to file]
[Save as raw data]
-[Popup Delay]
+[Popup delay]
[Delay]
-[From Popup Plugin]
+[From Popup plugin]
[Permanent]
[Preview]
[Colors]
-[Use Custom Colors]
+[Use custom colors]
[Background]
[Text]
-[Use Windows Colors]
-[Use Same Colors As Data Window]
-[Left Click Action]
-[Open Data Display Window]
-[Open Web Page]
-[Dismiss Popup]
-[Right Click Action]
+[Use Windows colors]
+[Use same colors as data window]
+[Left click action]
+[Open data display window]
+[Open web page]
+[Dismiss popup]
+[Right click action]
[Log]
[&Copy]
[C&ut]
[&Delete]
[&Paste]
-[Co&py All]
-[&Select All]
-[C&lear All]
+[Co&py all]
+[&Select all]
+[C&lear all]
;file \plugins\WebView\src\main.cpp
-[Alert Event]
-[Auto Update Disabled]
-[Auto Update Enabled]
-[Update All Webview Sites]
-[Mark All Webview Sites Read]
-[Open Cache Folder]
-[%d Minutes to Update]
-[Open web page]
+[Alert event]
+[Auto update disabled]
+[Auto update enabled]
+[Update all Webview sites]
+[Mark all Webview sites read]
+[Open cache folder]
+[%d minutes to update]
[Open/Close window]
-[Update Data]
-[Contact Options]
-[Contact Alert Options]
-[Ping Web Site]
-[Stop Data Processing]
+[Update data]
+[Contact options]
+[Contact alert options]
+[Ping web site]
+[Stop data processing]
;file \plugins\WebView\src\webview.cpp
[All Webview sites have been updated.]
[Network]
@@ -122,21 +121,20 @@
[The string]
[has been found on the web page]
[Download successful; about to process data...]
-[Unknown Alert Type.]
+[Unknown alert type.]
[Cannot read from file]
[Cannot write to file 1]
-[The Web Page Has Changed.]
+[The web page has changed.]
[Cannot write to file 2]
-[Specific Part Of The Web Page Has Changed.]
+[Specific part of the web page has changed.]
[Cannot read from cache file]
-[Loaded From Cache]
+[Loaded from cache]
;file \plugins\WebView\src\webview_datawnd.cpp
[ERROR: You have two or more Webview contacts with the same URL and contact name.]
-[Stop Processing]
+[Stop processing]
[Click here to open this URL in a browser window.]
[Stick to the front]
-[Disable Stick to the Front]
-[Disable Stick to the front]
+[Disable stick to the front]
;file \plugins\WebView\src\webview_getdata.cpp
[URL not supplied]
[Download in progress, please wait...]
@@ -167,12 +165,11 @@
[Medium level of whitespace removal]
[Large level of whitespace removal]
[Remove all whitespace]
-[Popup Plugin]
-[Log To File]
-[Use OSD Plugin]
-[A String Is Present]
-[The Web Page Changes]
-[A Specific Part of Web Page Changes]
+[Popup plugin]
+[Use OSD plugin]
+[A string is present]
+[The web page changes]
+[A specific part of web page changes]
[This is a preview popup.]
[You need to supply a search string.]
[You need to supply a start string.]
@@ -185,4 +182,4 @@
[Cache folder does not exist.]
[Missing "psite.bat" file.]
[Site URL]
-[Please select site in Find/Add Contacts...]
+[Please select site in Find/Add contacts...]
diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index 7eff575217..32b11b4b33 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -95,7 +95,7 @@
[XFire Options]
[Please choose one game in the list!]
[If you add a mod of a Xfire supported game, then you can specify what game ID will be sent to Xfire. So if you add a Half-Life mod, you can set the Half-Life game ID and if you start the game, your Xfire buddies will see the Half-Life game icon next to your name and the game time will be tracked.]
-[Every game in Xfire needs an ID. Use a number above the last used ID to avoid problems with used ids. Every number above 10000 should be save. This ID will not be sent to Xfire, when you start a game.]
+[Every game in Xfire needs an ID. Use a number above the last used ID to avoid problems with used IDs. Every number above 10000 should be save. This ID will not be sent to Xfire, when you start a game.]
[Please enter a game name.]
[Please enter a game ID.]
[Please enter a game ID above 1.]
@@ -111,7 +111,7 @@
[Give a guy some peace, would ya?]
[Well, I would talk to you if Miranda ICQ supported chat]
[That'll be the phone.]
-[Mmm...food.]
+[Mmm... food.]
;file \protocols\Xfire\src\iniupdater.cpp
[The xfire_games.ini was updated.]
[Error during xfire_games Update.]
diff --git a/langpacks/russian/Deprecated/Skype.txt b/langpacks/russian/Plugins/SkypeClassic.txt
index 60308602bb..c0383bbc92 100644
--- a/langpacks/russian/Deprecated/Skype.txt
+++ b/langpacks/russian/Plugins/SkypeClassic.txt
@@ -1,7 +1,9 @@
-;============================================================
-; File: skype.dll
-; Module: Skype
-; Versions: 0.0.0.50
+#muuid {a71f8335-7b87-4432-b8a3-81479431c6f5}
+;============================================================
+; File: SkypeClassic.dll
+; Plugin: Skype Protocol (Classic)
+; Version: 0.0.0.54
+; Authors: leecher - tweety - jls17
;============================================================
[Support for Skype network]
Поддержка сети Skype