- langpacks/english: update;

- langpacks/russian: update; 



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

8 files changed, 31 insertions, 24 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 1668550f25..671a45fc46 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -8,7 +8,7 @@
 [Choose the protocol type]

 [Specify the internal account name (optional)]

 [Cancel]

-[Add %s]

+[Add contact]

 [&Add]

 [&Cancel]

 [Send "You were added"]

@@ -1008,7 +1008,7 @@
 ;file \src\mir_core\src\ui_utils.cpp

 [Account]

 ;file \src\modules\addcontact\addcontact.cpp

-[Add contact]

+[Add %s]

 [Please authorize my request and add me to your contact list.]

 ;file \src\modules\chat\chat_opts.cpp

 [Others nicknames]

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index e9e74b5e19..d8d6bcf7b7 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -36,6 +36,7 @@
 [Reset status on return]

 [Confirm resetting status]

 [Only set if current status is]

+[Command line]

 [Copy to clipboard]

 [Command line:]

 [Create shortcut]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index a31a7e2aad..e4c57f29b4 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -314,15 +314,6 @@
 [&Rename group]

 [&Delete group]

 ;file \plugins\Clist_modern\src\modern_clc.cpp

-[Skins]

-[Modern contact list]

-[Avatar overlay]

-[Status overlay]

-[Contact list smileys]

-[List background]

-[Menu background]

-[Status bar background]

-[Frames title bar background]

 [Do you want contact '%s' to be converted to metacontact and '%s' be added to it?]

 [Converting to metacontact]

 [Do you want contact '%s' to be converted to metacontact and '%s' be added to it (remove it from '%s')?]

@@ -333,6 +324,17 @@
 [Set default contact]

 [Do you want contact '%s' to be removed from metacontact '%s' and added to '%s'?]

 [Changing metacontacts (moving)]

+[Clist Modern requires AVS plugin to be present. Install it using PluginUpdater or download from http://miranda-ng.org]

+[Error loading plugin]

+[Skins]

+[Modern contact list]

+[Avatar overlay]

+[Status overlay]

+[Contact list smileys]

+[List background]

+[Menu background]

+[Status bar background]

+[Frames title bar background]

 ;file \plugins\Clist_modern\src\modern_clcopts.cpp

 [Contact names]

 [Row items]

@@ -412,7 +414,6 @@
 [Icon]

 [Text]

 [Extra icons]

-[Animate avatars (GDI+ and Avatar service module (avs.dll) are required)]

 [Left align group names]

 [Center group names]

 [Right align group names]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 9ef86ec007..6615406a1d 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: ICQ.dll

 ;  Plugin: IcqOscarJ protocol

-;  Version: 0.11.3.2

+;  Version: 0.11.3.3

 ;  Authors: Joe Kucera, Bio, Martin Öberg, Richard Hughes, Jon Keating, etc.

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

 [ICQ protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 8fa4cb31c5..e2c728d80a 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -36,6 +36,7 @@
 [Reset status on return]

 [Confirm resetting status]

 [Only set if current status is]

+[Command line]

 [Copy to clipboard]

 [Command line:]

 [Create shortcut]

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 76ffae2514..63636d6c42 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SkypeWeb.dll

 ;  Plugin: Skype protocol (Web)

-;  Version: 0.11.0.2

+;  Version: 0.11.0.3

 ;  Authors: Miranda NG Team

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

 [Skype protocol support for Miranda NG. Based on new Skype for Web.]

@@ -19,11 +19,7 @@
 [Others]

 [Automatic messages synchronization]

 [Use local time for received messages]

-[Mark message as read...]

-[on read]

-[on receive]

-[on reply]

-[on typing]

+[Always notify as unread for all incoming message]

 [Enter password]

 [Save password]

 [Enter the password to continue.]

@@ -43,6 +39,12 @@
 [&User]

 ;file \protocols\SkypeWeb\src\skype_contacts.cpp

 [Are you sure?]

+;file \protocols\SkypeWeb\src\skype_events.cpp

+[Incoming call]

+[Action]

+[Call information.]

+[Calls]

+[Notifications]

 ;file \protocols\SkypeWeb\src\skype_history_sync.cpp

 [Edited at]

 [Call started]

@@ -52,6 +54,7 @@
 [File name]

 [Size]

 [bytes]

+[Image]

 ;file \protocols\SkypeWeb\src\skype_icons.cpp

 [Protocol icon]

 [Create new chat icon]

@@ -59,6 +62,7 @@
 [Block user icon]

 [Unblock user icon]

 [Incoming call icon]

+[Notification icon]

 [Protocols]

 ;file \protocols\SkypeWeb\src\skype_menus.cpp

 [Request authorization]

@@ -68,15 +72,12 @@
 [Unblock contact]

 [Create new chat]

 ;file \protocols\SkypeWeb\src\skype_messages.cpp

-[Incoming call]

 ;file \protocols\SkypeWeb\src\skype_options.cpp

 [Network]

 ;file \protocols\SkypeWeb\src\skype_proto.cpp

 [%s connection]

-[Action]

 [Incoming call sound]

 [Incoming call canceled sound]

-[Calls]

-[Notifications]

 ;file \protocols\SkypeWeb\src\skype_trouter.cpp

+[Failed establish a TRouter connection.]

 [Incoming call from %s]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index ec643bf3b7..f49acca813 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -36,6 +36,7 @@
 [Reset status on return]

 [Confirm resetting status]

 [Only set if current status is]

+[Command line]

 [Copy to clipboard]

 [Command line:]

 [Create shortcut]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index 7194042143..065b54d32b 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Steam.dll

 ;  Plugin: Steam protocol

-;  Version: 0.11.3.2

+;  Version: 0.11.3.3

 ;  Authors: unsane, Robert Pösel

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

 [Steam protocol support for Miranda NG.]

@@ -24,6 +24,8 @@
 [Enter the password to continue.]

 ;file \protocols\Steam\src\main.cpp

 [Steam game]

+;file \protocols\Steam\src\steam_account.cpp

+[Connection token expired. Please login again.]

 ;file \protocols\Steam\src\steam_contacts.cpp

 [Looking to play]

 [Looking to trade]