- langpacks/english: update;

- langpacks/russian: update;





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

7 files changed, 39 insertions, 50 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index b878cf96d8..8ccb958bc2 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -236,7 +236,6 @@
 [&Set as Default]

 [Move &Up]

 [Move &Down]

-[Force use of default for sending (even if offline)]

 [Send &Offline]

 [Context Menu]

 [Use contact's unique ID]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 2fedb0e539..220fd6be39 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.2.3.0

+;  Version: 0.2.3.1

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/HistoryStats.txt b/langpacks/english/Plugins/HistoryStats.txt
index 72f1307ef7..bc10f5d933 100644
--- a/langpacks/english/Plugins/HistoryStats.txt
+++ b/langpacks/english/Plugins/HistoryStats.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: HistoryStats.dll

 ;  Plugin: HistoryStats

-;  Version: 0.2.0.2

+;  Version: 0.2.0.3

 ;  Authors: Martin Afanasjew

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

 [Creates detailed, colorful and highly customizable statistics using your message history.]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 3811a80304..ce6e19fdaa 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.2.0

+;  Version: 0.11.2.1

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

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

 [ICQ protocol support for Miranda NG.]

@@ -53,7 +53,6 @@
 [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]

-[Never use legacy messaging (server acknowledgements)]

 [Peer-to-peer Messaging]

 [Enable peer-to-peer message connections]

 [Passive mode (i.e., do not initiate new connections)]

diff --git a/langpacks/english/Plugins/LangMan.txt b/langpacks/english/Plugins/LangMan.txt
index b658707cbc..b68ebe4e52 100644
--- a/langpacks/english/Plugins/LangMan.txt
+++ b/langpacks/english/Plugins/LangMan.txt
@@ -2,10 +2,10 @@
 ;============================================================

 ;  File: LangMan.dll

 ;  Plugin: Language pack manager

-;  Version: 1.0.2.3

+;  Version: 0.11.0.1

 ;  Authors: H. Herkenrath

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

-[Helps you manage Language Packs of different languages.]

+[Helps you manage language packs of different languages.]

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

 [Author(s):]

 [E-mail:]

@@ -14,11 +14,10 @@
 [Version:]

 [Locale:]

 [Download more Language Packs]

-[Please restart Miranda NG for your changes to take effect.]

-;file \plugins\LangMan\src\main.cpp

-[Reload langpack]

+[Please restart Miranda NG for your changes to take full effect.]

+[Static]

+[Langpack root folder]

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

-[All installed plugins are included.]

 [(incompatible)]

 [Unknown]

 [Current]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index b2b447a96d..16dc633ae8 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -487,11 +487,6 @@
 [Message Session...]

 [Default container]

 [Attach to]

-[Meta Contact]

-[(Forced)]

-[Autoselect]

-[Use Protocol]

-[Set Default Protocol]

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

 [General options]

 [Window layout]

@@ -643,9 +638,6 @@
 [Delivery failure: %s]

 [The message send timed out]

 [You are editing the user notes. Click the button again or use the hotkey (default: Alt-N) to save the notes and return to normal messaging mode]

-[Unforce failed]

-[The selected protocol cannot be forced at this time]

-[Warning: you have selected a subprotocol for sending the following messages which is currently offline]

 [Contact is offline and this protocol does not support sending files to offline users.]

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

 [Error creating destination directory]

diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index aaea2965a7..254474d5c2 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -7,36 +7,36 @@
 ;============================================================

 [Tool Tip notification windows.]

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

-[Options]

 [Layout]

 [Text indent:]

-[Window]

-[Max width:]

-[Max height:]

-[Avatar size:]

-[Show if list not focused]

+[Title indent:]

+[Value indent:]

 [General padding:]

-[Hover time:]

+[Text padding:]

+[Outer avatar padding:]

+[Inner avatar padding:]

 [Alignment]

 [Labels:]

 [Values:]

+[Window]

+[Max width:]

 [Min width:]

+[Max height:]

 [Min height:]

+[Avatar size:]

 [Sidebar width:]

-[Text padding:]

-[Outer avatar padding:]

+[Hover time:]

+[Show if list not focused]

+[Options]

 [Show title]

 [Status bar tips]

 [Avatar border]

 [Round corners (avatar)]

 [Keep original avatar size]

-[Title indent:]

-[Value indent:]

-[Inner avatar padding:]

 [Substitution]

 [Label:]

-[Contact protocol module]

 [Module:]

+[Contact protocol module]

 [Setting or prefix:]

 [Translation:]

 [OK]

@@ -56,46 +56,46 @@
 [Down]

 [Edit]

 [Separator]

-[Advanced options]

-[Retrieve XStatus details if auto-retrieve is disabled]

 [Extra icons]

 [Smileys support]

 [Enable SmileyAdd support]

-[Resize smileys]

 [Use protocol smileys]

+[Resize smileys]

 [Replace only isolated smileys]

-[Retrieve new status message]

+[Advanced options]

 [Show tooltip after all content is ready (avatar && status message)]

+[Retrieve new status message]

+[Disable in invisible status]

+[Retrieve XStatus details if auto-retrieve is disabled]

 [Status bar and tray tooltip]

 [Limit status messages in status bar and tray tooltips to:]

 [characters]

-[Disable in invisible status]

 [Skins]

-[Opacity (%):]

-[Transparency]

+[Reload skin list]

+[Apply skin]

+[Get more skins]

+[Preview]

+[No preview]

 [Effects]

-[Border]

+[Animation speed:]

 [Shadow]

+[Border]

 [Round corners (window)]

-[Aero Glass (Vista+)]

-[Animation speed:]

-[Preview]

-[No preview]

 [Skin option]

-[Load fonts and colors]

 [Enable skin coloring]

-[Reload skin list]

-[Apply skin]

 [Load tooltip proportions]

-[Get more skins]

+[Load fonts and colors]

+[Transparency]

+[Opacity (%):]

+[Aero Glass (Vista+)]

 [Enable tray tooltips]

 [Handle tray tooltips by Tipper]

-[Favorite contacts]

+[Hide offline protocols]

 [Expand to second level after:]

 [ms]

 [First level tooltip]

 [Second level tooltip]

-[Hide offline protocols]

+[Favorite contacts]

 [Hide offline]

 [Append protocol name]

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