- XSoundNotify - adopted

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

11 files changed, 45 insertions, 24 deletions

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index bd07281a31..d66e2f4151 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: AvatarHistory.dll

 ;  Plugin: Avatar history

-;  Version: 0.0.3.3

+;  Version: 0.1.0.1

 ;  Authors: Matthew Wild (MattJ), Ricardo Pescuma Domenecci

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

 [This plugin keeps backups of all your contacts' avatar changes and/or shows popups.]

@@ -64,22 +64,14 @@
 [Save Avatar for %s]

 [Save Avatar]

 ;file \plugins\AvatarHistory\src\AvatarHistory.cpp

-[Contact changed avatar]

-[Contact removed avatar]

-[Avatars]

-[Avatar History: Unable to create shortcut]

-[AVH Debug: Shortcut created successfully]

 [AVH Debug]

-[Invalid contact/avatar... skipping]

-[Invalid protocol... skipping]

-[Ignoring metacontacts notification]

 [Removed avatar, no avatar before...skipping]

 [Hashes are the same... skipping]

 [Avatar History: Unable to save avatar]

 [AVH Debug: File copied successfully]

-[Unknown UIN]

-[Unknown Protocol]

-[AVH Debug: GetOldStyleAvatarName]

+[Avatars]

+[Contact changed avatar]

+[Contact removed avatar]

 ;file \plugins\AvatarHistory\src\AvatarHistory.h

 [removed his/her avatar]

 [changed his/her avatar]

@@ -87,12 +79,18 @@
 [History]

 [Avatar Overlay]

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

-[Avatar]

-[PopUps]

-[Avatar Change]

 [Do nothing]

 [Close popup]

 [Show avatar history]

 [Show contact history]

 [Test Contact]

 [Test description]

+[Avatar]

+[PopUps]

+[Avatar Change]

+;file \plugins\AvatarHistory\src\utils.cpp

+[Unknown UIN]

+[Unknown Protocol]

+[AVH Debug: GetOldStyleAvatarName]

+[Avatar History: Unable to create shortcut]

+[AVH Debug: Shortcut created successfully]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index d7a88cad26..f7daa1817e 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -43,7 +43,7 @@
 [Tile vertically according to Row Height]

 [Use Windows Colors]

 [Available skins]

-[Browse]

+[Rescan]

 [Apply]

 [Info]

 [\n\n\nPlease select one of available skins. \n\nOr browse for skin not in list.]

@@ -332,6 +332,8 @@
 [&Rename Group]

 [&Delete Group]

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

+[Skins]

+[Modern contact list]

 [Avatar Overlay]

 [Status Overlay]

 [Contact List smileys]

@@ -386,7 +388,6 @@
 [General]

 [List]

 [Window]

-[Skins]

 [List Background]

 [Not focused]

 [Offline]

@@ -503,7 +504,6 @@
 [Skin editor contains not stored changes.\n\nAll changes will be lost.\n\n Continue to load new skin?]

 [Warning!]

 [Current skin was not saved to file.\n\nAll changes will be lost.\n\n Continue to load new skin?]

-[Miranda skin file]

 [Preview is not available\n\n%s\n----------------------\n\n%s\n\nAUTHOR(S):\n%s\n\nCONTACT:\n%s\n\nHOMEPAGE:\n%s]

 [%s\n\n%s\n\nAUTHORS:\n%s\n\nCONTACT:\n%s\n\nWEB:\n%s\n\n\n]

 [graphics by Angeli-Ka\ntemplate by FYR]

diff --git a/langpacks/english/Plugins/GTalkExt.txt b/langpacks/english/Plugins/GTalkExt.txt
index 8c0ea05ff2..2c89a26cfd 100644
--- a/langpacks/english/Plugins/GTalkExt.txt
+++ b/langpacks/english/Plugins/GTalkExt.txt
@@ -7,7 +7,6 @@
 ;============================================================

 [GTalk extensions for Jabber protocol]

 ;file \protocols\GTalkExt\res\settings.rc

-[NOTE!\nThis will work only if this Jabber account is actually GTalk]

 [Popup notifications (needs popup plugin)]

 [Notify in fullscreen mode too]

 [Use this if your popup plugin does not correctly detect fullscreen mode. It will take away your keyboard focus]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index fc7514a191..de2d6334e6 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -728,6 +728,7 @@
 [LiveJournal Talk]

 [Facebook Chat]

 [Vkontakte]

+[Odnoklassniki]

 [Some changes will take effect the next time you connect to the Jabber network.]

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

 [Set New Password for]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index d4c5571166..f656375185 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -97,8 +97,8 @@
 [Spam bot blocked]

 [Spam bot contact deleted]

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

+[Avatars' plugin connections]

 [Avatars]

-[plugin connections]

 [Avatars: server return HTTP code: %lu]

 [Avatars: cant open file %s, error]

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

diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt
index 594d499a2a..ef5d880b54 100644
--- a/langpacks/english/Plugins/NewsAggregator.txt
+++ b/langpacks/english/Plugins/NewsAggregator.txt
@@ -61,6 +61,8 @@
 [Wait...]

 [Change Feed]

 [Contact deleting]

+[OPML files]

+[Not valid import file.]

 [Network]

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

 [Avatars]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index f0d434709f..0855ee1471 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -631,7 +631,7 @@
 ;file \plugins\TabSRMM\src\mim.cpp

 [TabSRMM]

 [Data path]

-[Skins root]

+[Skins]

 [Avatars]

 [Saved TabSRMM avatars]

 [Group chat logs root]

@@ -735,7 +735,6 @@
 [Event notifications]

 [Message window]

 [Load and apply]

-[Skins]

 [Window layout tweaks]

 [Group Chats]

 [Settings]

diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index 04b53bb025..eaa7801178 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -246,7 +246,6 @@
 [Values]

 [Tray title]

 [Tipper]

-[Tipper skins]

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

 [Female]

 [Male]

diff --git a/langpacks/english/Plugins/Watrack_MPD.txt b/langpacks/english/Plugins/Watrack_MPD.txt
index dbb1b75595..5186bf443b 100644
--- a/langpacks/english/Plugins/Watrack_MPD.txt
+++ b/langpacks/english/Plugins/Watrack_MPD.txt
@@ -10,6 +10,8 @@
 [MPD Host]

 [Port]

 [Password]

+;file \plugins\Watrack_MPD\src\init.cpp

+[Watrack MPD connection]

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

 [Winamp Track]

 [Plugins]

diff --git a/langpacks/english/Plugins/XSoundNotify.txt b/langpacks/english/Plugins/XSoundNotify.txt
new file mode 100644
index 0000000000..ee71e37594
--- /dev/null
+++ b/langpacks/english/Plugins/XSoundNotify.txt
@@ -0,0 +1,21 @@
+#muuid {08b86253-ec6e-4d09-b7a9-64acdf0627b8}

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

+;  File: XSoundNotify.dll

+;  Plugin: XSoundNotify

+;  Version: 1.0.0.0

+;  Authors: Roman Torsten

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

+[Provides extended options for sound notifications.]

+;file \plugins\XSoundNotify\res\XSoundNotify.rc

+[XSoundNotify settings]

+[OK]

+[Cancel]

+[Protocol :]

+[Nick :]

+[Sound :]

+[Not set]

+[Choose]

+[Test play]

+[Reset]

+;file \plugins\XSoundNotify\src\xsn_main.cpp

+[&XSoundNotify Plugin]

diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index cd22420ab3..3ba37a175e 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -138,7 +138,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 und icons.dll?\r\nWithout the ini xfire cant 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 ini xfire can't detect any games on your computer.]

 [&XFire Online Profile]

 [XFire &Clan Site]

 [C&opy Server Address and Port]