6 files changed, 328 insertions, 18 deletions
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 08c731c58e..82b5d3c1de 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -3599,9 +3599,9 @@
 [MetaContacts stuff]
 [Additional stuff]
 [For other stuff MetaContacts plugin should be loaded.\n\nhttp://miranda-ng.org]
-[Allow internal requesting of away message text]
+[Allow internal requesting of status message text]
 [Subcontacts indent:]
-[Remove away message if contact became offline]
+[Remove status message if contact became offline]
 [Use improved search method in contactlist]
 [Show time only if it is different from current time]
 [Show contact time as row item]
@@ -3669,11 +3669,11 @@
 [Text:]
 [Status]
 [Nickname]
-[Away Message]
+[Status Message]
 [Listening to]
 [Contact time]
-[Show status if there isn't away message]
-[Show listening to if there isn't away message]
+[Show status if there is no status message]
+[Show listening to if there is no status message]
 [XStatus has priority]
 [Use 'XStatus: XMessage']
 [(Variables will be replaced)]
@@ -3885,6 +3885,14 @@
 [%s, contain %s]
 [ layered]
 ;file \plugins\Clist_modern\src\modern_skineditor.cpp
+[- Empty - (do not draw this object)]
+[Solid fill object]
+[Image (draw image)]
+[Fragment (draw portion of image)]
+[Stretch Both directions]
+[Stretch Vertical, Tile Horizontal]
+[Tile Vertical, Stretch Horizontal]
+[Tile Both directions]
 [Image size is]
 ;file \plugins\Clist_modern\src\modern_skinengine.cpp
 [You need an image services plugin to process PNG images.]
@@ -5582,7 +5590,7 @@
 ;============================================================
 ;  File: Facebook.dll
 ;  Plugin: Facebook RM
-;  Version: 0.0.9.5
+;  Version: 0.0.9.6
 ;  Authors: Michal Zelinka, Robert Pösel
 ;============================================================
 [Facebook protocol support for Miranda NG.]
@@ -14533,6 +14541,7 @@
 [internal IP]
 [Client info]
 [Protocol]
+[Account]
 [-- Format --]
 [tabulator]
 [line break]
@@ -14993,6 +15002,151 @@
 [That'll be the phone.]
 [Mmm...food.]
 [idleeeeeeee]
+#muuid {9c448c61-fc3f-42f9-b9f0-4a30e1cf8671}
+;============================================================
+;  File: Skype.dll
+;  Plugin: Skype Protocol
+;  Version: 0.0.0.1
+;  Authors: Unsane, Mataes
+;============================================================
+[Skype protocol support for Miranda NG.]
+;file \protocols\Skype\res\Resource.rc
+[Invite Contact To Chat]
+[sid]
+[&Invite]
+[&Cancel]
+[Add]
+[Enter password]
+[Enter a password for skype name %d:]
+[Remember this session password]
+[OK]
+[Cancel]
+[Skype name:]
+[Status text:]
+[Online since:]
+[Last event date:]
+[Last profile change:]
+[Full name:]
+[Date of birth:]
+[Gender:]
+[Homepage:]
+[Language:]
+[About:]
+[Mood:]
+[E-mail 1:]
+[E-mail 2:]
+[E-mail 3:]
+[Mobile phone:]
+[Home phone:]
+[Office phone:]
+[City:]
+[State:]
+[Country:]
+[Timezone:]
+[Change password]
+[Old password]
+[New password]
+[Confirmation]
+[Password:]
+[Register new account]
+[User Details]
+[Skype login:]
+[Connection]
+[Use port]
+[for incoming connections]
+[Use ports 80 and 443 as alternative incoming]
+[Default group:]
+;file \protocols\Skype\src\skype.cpp
+[Proccess SkypeKit.exe did not start.]
+[Initialization key corrupted or not valid.]
+[SkypeKit did not initialize.]
+[SkypeKit did not start.]
+;file \protocols\Skype\src\skype_account.cpp
+[LOGOUT_CALLED]
+[HTTPS_PROXY_AUTH_FAILED]
+[SOCKS_PROXY_AUTH_FAILED]
+[P2P_CONNECT_FAILED]
+[SERVER_CONNECT_FAILED]
+[SERVER_OVERLOADED]
+[DB_IN_USE]
+[Invalid skypename]
+[Invalid email]
+[Unacceptable password]
+[SKYPENAME_TAKEN]
+[REJECTED_AS_UNDERAGE]
+[NO_SUCH_IDENTITY]
+[Incorrect password]
+[Too many login attempts]
+[PASSWORD_HAS_CHANGED]
+[PERIODIC_UIC_UPDATE_FAILED]
+[DB_DISK_FULL]
+[DB_IO_ERROR]
+[DB_CORRUPT]
+[DB_FAILURE]
+[INVALID_APP_ID]
+[APP_ID_FAILURE]
+[UNSUPPORTED_VERSION]
+[ATO (Account TakeOver) detected, account blocked]
+[Logout from another instance]
+[Password change succeeded]
+[Old password was incorrect]
+[Failed to verify password. No connection to server]
+[Password was set but server didn't like it much]
+[New password was exactly the same as old one]
+[The new password was unacceptable]
+[Account was currently not logged in]
+[You have not entered a Skype name.\n						Configure this in Options->Network->Skype and try again.]
+;file \protocols\Skype\src\skype_chat.cpp
+[&Invite user...]
+[&Leave chat session]
+[User &details]
+[User &history]
+;file \protocols\Skype\src\skype_contacts.cpp
+[Contact already in your contact list]
+;file \protocols\Skype\src\skype_dialogs.cpp
+[Enter a password for Skype Name %s:]
+[<not specified>]
+[Male]
+[Female]
+[You are not currently connected to the Skype network. You must be online in order to update your information on the server.]
+[Contacts]
+[Home]
+[General]
+[You did not select any contact]
+;file \protocols\Skype\src\skype_events.cpp
+[Network]
+[Account]
+[Incoming call]
+;file \protocols\Skype\src\skype_icons.cpp
+[Protocol icon]
+[Call]
+[Invite to conference]
+[Revoke authorization]
+[Request authorization]
+[Grant authorization]
+[Protocols]
+;file \protocols\Skype\src\skype_instances.cpp
+[SkypeKit will only permit you to login to one account at a time. 						  Adding multiple instances of SkypeKit is prohibited in the licence 						  agreement and standard distribution terms.]
+;file \protocols\Skype\src\skype_menus.cpp
+[Hi! I'd like to add you to my contact list]
+;file \protocols\Skype\src\skype_netlib.cpp
+[%s connection]
+;file \protocols\Skype\src\skype_proto.cpp
+[g_skype Name]
+;file \protocols\Skype\src\skype_utils.cpp
+[NOT_VALIDATED]
+[Validation succeeded]
+[Password is too short]
+[The value exceeds max size limit for the given property]
+[Value contains illegal characters]
+[Value contains whitespace]
+[Password cannot be the same as skypename]
+[Value has invalid format]
+[Value contains invalid word]
+[Password is too simple]
+[Value starts with an invalid character]
+[Avatars]
+[Skype Protocol]
 #muuid {2925520b-6677-4658-8bad-5661d13e4692}
 ;============================================================
 ;  File: SkypeStatusChange.dll
@@ -19587,14 +19741,15 @@
 ;============================================================
 [Provides extended options for sound notifications.]
 ;file \plugins\XSoundNotify\res\XSoundNotify.rc
-[Protocol :]
-[Nick :]
-[Sound :]
+[Account:]
+[Nick:]
+[Sound:]
 [Not set]
 [Choose]
 [Test play]
 [Reset]
 [Ignore sound for this contact]
+[XSoundNotify]
 [OK]
 [Cancel]
 ;file \plugins\XSoundNotify\src\xsn_main.cpp
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index f7daa1817e..95596958bd 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -200,9 +200,9 @@
 [MetaContacts stuff]
 [Additional stuff]
 [For other stuff MetaContacts plugin should be loaded.\n\nhttp://miranda-ng.org]
-[Allow internal requesting of away message text]
+[Allow internal requesting of status message text]
 [Subcontacts indent:]
-[Remove away message if contact became offline]
+[Remove status message if contact became offline]
 [Use improved search method in contactlist]
 [Show time only if it is different from current time]
 [Show contact time as row item]
@@ -270,11 +270,11 @@
 [Text:]
 [Status]
 [Nickname]
-[Away Message]
+[Status Message]
 [Listening to]
 [Contact time]
-[Show status if there isn't away message]
-[Show listening to if there isn't away message]
+[Show status if there is no status message]
+[Show listening to if there is no status message]
 [XStatus has priority]
 [Use 'XStatus: XMessage']
 [(Variables will be replaced)]
@@ -486,6 +486,14 @@
 [%s, contain %s]
 [ layered]
 ;file \plugins\Clist_modern\src\modern_skineditor.cpp
+[- Empty - (do not draw this object)]
+[Solid fill object]
+[Image (draw image)]
+[Fragment (draw portion of image)]
+[Stretch Both directions]
+[Stretch Vertical, Tile Horizontal]
+[Tile Vertical, Stretch Horizontal]
+[Tile Both directions]
 [Image size is]
 ;file \plugins\Clist_modern\src\modern_skinengine.cpp
 [You need an image services plugin to process PNG images.]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index c8f4aaa7bc..92475a8739 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.0.9.5
+;  Version: 0.0.9.6
 ;  Authors: Michal Zelinka, Robert Pösel
 ;============================================================
 [Facebook protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index c8e564020a..bbb2d2074d 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -91,6 +91,7 @@
 [internal IP]
 [Client info]
 [Protocol]
+[Account]
 [-- Format --]
 [tabulator]
 [line break]
diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt
new file mode 100644
index 0000000000..9ce08b7545
--- /dev/null
+++ b/langpacks/english/Plugins/Skype.txt
@@ -0,0 +1,145 @@
+#muuid {9c448c61-fc3f-42f9-b9f0-4a30e1cf8671}
+;============================================================
+;  File: Skype.dll
+;  Plugin: Skype Protocol
+;  Version: 0.0.0.1
+;  Authors: Unsane, Mataes
+;============================================================
+[Skype protocol support for Miranda NG.]
+;file \protocols\Skype\res\Resource.rc
+[Invite Contact To Chat]
+[sid]
+[&Invite]
+[&Cancel]
+[Add]
+[Enter password]
+[Enter a password for skype name %d:]
+[Remember this session password]
+[OK]
+[Cancel]
+[Skype name:]
+[Status text:]
+[Online since:]
+[Last event date:]
+[Last profile change:]
+[Full name:]
+[Date of birth:]
+[Gender:]
+[Homepage:]
+[Language:]
+[About:]
+[Mood:]
+[E-mail 1:]
+[E-mail 2:]
+[E-mail 3:]
+[Mobile phone:]
+[Home phone:]
+[Office phone:]
+[City:]
+[State:]
+[Country:]
+[Timezone:]
+[Change password]
+[Old password]
+[New password]
+[Confirmation]
+[Password:]
+[Register new account]
+[User Details]
+[Skype login:]
+[Connection]
+[Use port]
+[for incoming connections]
+[Use ports 80 and 443 as alternative incoming]
+[Default group:]
+;file \protocols\Skype\src\skype.cpp
+[Proccess SkypeKit.exe did not start.]
+[Initialization key corrupted or not valid.]
+[SkypeKit did not initialize.]
+[SkypeKit did not start.]
+;file \protocols\Skype\src\skype_account.cpp
+[LOGOUT_CALLED]
+[HTTPS_PROXY_AUTH_FAILED]
+[SOCKS_PROXY_AUTH_FAILED]
+[P2P_CONNECT_FAILED]
+[SERVER_CONNECT_FAILED]
+[SERVER_OVERLOADED]
+[DB_IN_USE]
+[Invalid skypename]
+[Invalid email]
+[Unacceptable password]
+[SKYPENAME_TAKEN]
+[REJECTED_AS_UNDERAGE]
+[NO_SUCH_IDENTITY]
+[Incorrect password]
+[Too many login attempts]
+[PASSWORD_HAS_CHANGED]
+[PERIODIC_UIC_UPDATE_FAILED]
+[DB_DISK_FULL]
+[DB_IO_ERROR]
+[DB_CORRUPT]
+[DB_FAILURE]
+[INVALID_APP_ID]
+[APP_ID_FAILURE]
+[UNSUPPORTED_VERSION]
+[ATO (Account TakeOver) detected, account blocked]
+[Logout from another instance]
+[Password change succeeded]
+[Old password was incorrect]
+[Failed to verify password. No connection to server]
+[Password was set but server didn't like it much]
+[New password was exactly the same as old one]
+[The new password was unacceptable]
+[Account was currently not logged in]
+[You have not entered a Skype name.\n						Configure this in Options->Network->Skype and try again.]
+;file \protocols\Skype\src\skype_chat.cpp
+[&Invite user...]
+[&Leave chat session]
+[User &details]
+[User &history]
+;file \protocols\Skype\src\skype_contacts.cpp
+[Contact already in your contact list]
+;file \protocols\Skype\src\skype_dialogs.cpp
+[Enter a password for Skype Name %s:]
+[<not specified>]
+[Male]
+[Female]
+[You are not currently connected to the Skype network. You must be online in order to update your information on the server.]
+[Contacts]
+[Home]
+[General]
+[You did not select any contact]
+;file \protocols\Skype\src\skype_events.cpp
+[Network]
+[Account]
+[Incoming call]
+;file \protocols\Skype\src\skype_icons.cpp
+[Protocol icon]
+[Call]
+[Invite to conference]
+[Revoke authorization]
+[Request authorization]
+[Grant authorization]
+[Protocols]
+;file \protocols\Skype\src\skype_instances.cpp
+[SkypeKit will only permit you to login to one account at a time. 						  Adding multiple instances of SkypeKit is prohibited in the licence 						  agreement and standard distribution terms.]
+;file \protocols\Skype\src\skype_menus.cpp
+[Hi! I'd like to add you to my contact list]
+;file \protocols\Skype\src\skype_netlib.cpp
+[%s connection]
+;file \protocols\Skype\src\skype_proto.cpp
+[g_skype Name]
+;file \protocols\Skype\src\skype_utils.cpp
+[NOT_VALIDATED]
+[Validation succeeded]
+[Password is too short]
+[The value exceeds max size limit for the given property]
+[Value contains illegal characters]
+[Value contains whitespace]
+[Password cannot be the same as skypename]
+[Value has invalid format]
+[Value contains invalid word]
+[Password is too simple]
+[Value starts with an invalid character]
+[Avatars]
+[Skype Protocol]
diff --git a/langpacks/english/Plugins/XSoundNotify.txt b/langpacks/english/Plugins/XSoundNotify.txt
index 88023c3e65..d665062785 100644
--- a/langpacks/english/Plugins/XSoundNotify.txt
+++ b/langpacks/english/Plugins/XSoundNotify.txt
@@ -7,14 +7,15 @@
 ;============================================================
 [Provides extended options for sound notifications.]
 ;file \plugins\XSoundNotify\res\XSoundNotify.rc
-[Protocol :]
-[Nick :]
-[Sound :]
+[Account:]
+[Nick:]
+[Sound:]
 [Not set]
 [Choose]
 [Test play]
 [Reset]
 [Ignore sound for this contact]
+[XSoundNotify]
 [OK]
 [Cancel]
 ;file \plugins\XSoundNotify\src\xsn_main.cpp