- langpacks/english: updated

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

9 files changed, 62 insertions, 28 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index e3d6dbfc6b..6d7b35256f 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -430,7 +430,7 @@
 [Show resize grip indicator]

 [Ordering:]

 [Contact list:]

-[If window is partially covered, bring iy to front]

+[If window is partially covered, bring it to front]

 [Window:]

 [Contact list background:]

 [&Status]

@@ -542,7 +542,7 @@
 [Support control up/down in message area to show previously sent messages]

 [Delete temporary contacts when closing message window]

 [Enable avatar support in the message window]

-[Limit avatar height to ]

+[Limit avatar height to]

 [Max Number of Flashes]

 [Send Error]

 [An error has occured. The protocol reported the following error:]

@@ -740,7 +740,7 @@
 [Show icon for highlights]

 [Show icon for users leaving]

 [Show icon for users kicking other user]

-[Show icon for notices ]

+[Show icon for notices]

 [Show icon for name changes]

 [Show icon for information messages]

 [Show icon for status changes]

@@ -753,7 +753,7 @@
 [Show icon in tray for highlights]

 [Show icon in tray for users leaving]

 [Show icon in tray for users kicking other user]

-[Show icon in tray for notices ]

+[Show icon in tray for notices]

 [Show icon in tray for name changes]

 [Show icon in tray for information messages]

 [Show icon in tray for status changes]

@@ -766,7 +766,7 @@
 [Show popup for highlights]

 [Show popup for users leaving]

 [Show popup for users kicking other user]

-[Show popup for notices ]

+[Show popup for notices]

 [Show popup for name changes]

 [Show popup for information messages]

 [Show popup for status changes]

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 672adbc2ff..a930e0b8df 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -431,7 +431,7 @@
 [Show resize grip indicator]

 [Ordering:]

 [Contact list:]

-[If window is partially covered, bring iy to front]

+[If window is partially covered, bring it to front]

 [Window:]

 [Contact list background:]

 [&Status]

@@ -543,7 +543,7 @@
 [Support control up/down in message area to show previously sent messages]

 [Delete temporary contacts when closing message window]

 [Enable avatar support in the message window]

-[Limit avatar height to ]

+[Limit avatar height to]

 [Max Number of Flashes]

 [Send Error]

 [An error has occured. The protocol reported the following error:]

@@ -741,7 +741,7 @@
 [Show icon for highlights]

 [Show icon for users leaving]

 [Show icon for users kicking other user]

-[Show icon for notices ]

+[Show icon for notices]

 [Show icon for name changes]

 [Show icon for information messages]

 [Show icon for status changes]

@@ -754,7 +754,7 @@
 [Show icon in tray for highlights]

 [Show icon in tray for users leaving]

 [Show icon in tray for users kicking other user]

-[Show icon in tray for notices ]

+[Show icon in tray for notices]

 [Show icon in tray for name changes]

 [Show icon in tray for information messages]

 [Show icon in tray for status changes]

@@ -767,7 +767,7 @@
 [Show popup for highlights]

 [Show popup for users leaving]

 [Show popup for users kicking other user]

-[Show popup for notices ]

+[Show popup for notices]

 [Show popup for name changes]

 [Show popup for information messages]

 [Show popup for status changes]

@@ -2989,9 +2989,8 @@
 [Hide Miranda NG]

 [Hide]

 [Hide/Show Miranda]

-[BossKey\tget the BossKey name]

+[get the BossKey name]

 ;file \plugins\BossKeyPlus\src\Options.cpp

-[Open String Formatting Help]

 [Events]

 [Main]

 [Advanced]

@@ -3581,11 +3580,10 @@
 [Cycle icons every]

 [seconds, when statuses differ]

 [Show multiple icons]

-[Only when statuses differ]

+[only when statuses differ]

 [System tray icon]

 [System tray icon mode]

 [Use xStatus icon]

-[only when statuses differ]

 [Ignore Empty Extra icons places (arrange to right).]

 [Use 'Meta' protocol icons for Metacontacts]

 [Expand metacontacts]

@@ -14266,7 +14264,7 @@
 [Show icon in tray for highlights]

 [Show icon in tray for users leaving]

 [Show icon in tray for users kicking other user]

-[Show icon in tray for notices ]

+[Show icon in tray for notices]

 [Show icon in tray for name changes]

 [Show icon in tray for information messages]

 [Show icon in tray for status changes]

@@ -14279,7 +14277,7 @@
 [Show popup for highlights]

 [Show popup for users leaving]

 [Show popup for users kicking other user]

-[Show popup for notices ]

+[Show popup for notices]

 [Show popup for name changes]

 [Show popup for information messages]

 [Show popup for status changes]

@@ -14462,7 +14460,7 @@
 [SecureIM established...]

 [Key exchange failed...]

 [Key from disabled...]

-[Sended back message received...]

+[Sent back message received...]

 [Sending back secure message...]

 [SecureIM disabled...]

 [Sending Key...]

@@ -15086,8 +15084,10 @@
 [Status Message]

 [Status Message...]

 [%s (locked)]

-[External Applications\tretrieves song name of the song currently playing in Winamp (Simple Status Message compatible)]

-[Miranda Related\tget the date (Simple Status Message compatible)]

+[External Applications]

+[retrieves song name of the song currently playing in Winamp (Simple Status Message compatible)]

+[Miranda Related]

+[get the date (Simple Status Message compatible)]

 ;file \plugins\SimpleStatusMsg\src\msgbox.cpp

 [<startup>]

 [<current>]

@@ -15181,6 +15181,7 @@
 [State:]

 [Country:]

 [Timezone:]

+[Skype credit:]

 [Change password]

 [Old password:]

 [New password:]

@@ -15192,6 +15193,13 @@
 [Use ports 80 and 443 as alternative incoming]

 [Default group:]

 [Block]

+[Allow IMs from...]

+[Anyone]

+[People in my Contact list only]

+[Allow calls from...]

+[Automatically receive video and share screens with...]

+[No one]

+[Allow my online status to be shown on the web]

 [Block this person]

 [Remove from your Contact List]

 [Abuse]

@@ -15280,9 +15288,11 @@
 [Spawn conference]

 [Network]

 [Blocked contacts]

+[Privacy]

 [Contacts]

 [Home]

 [General]

+[Skype account]

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

 [Protocol icon]

 [Call]

@@ -19571,6 +19581,13 @@
 [No Popup]

 [Edit Settings]

 ;file \plugins\Weather\src\weather_info.cpp

+[Name]

+[Author]

+[File Version]

+[INI Version]

+[Items]

+[Display Name]

+[File Name]

 [The corresponding INI file for "%s" is not found.]

 [Weather INI information for "%s":]

 [Name:]

diff --git a/langpacks/english/Plugins/BossKey.txt b/langpacks/english/Plugins/BossKey.txt
index 04d0923c2a..452be2289a 100644
--- a/langpacks/english/Plugins/BossKey.txt
+++ b/langpacks/english/Plugins/BossKey.txt
@@ -39,9 +39,8 @@
 [Hide Miranda NG]

 [Hide]

 [Hide/Show Miranda]

-[BossKey\tget the BossKey name]

+[get the BossKey name]

 ;file \plugins\BossKeyPlus\src\Options.cpp

-[Open String Formatting Help]

 [Events]

 [Main]

 [Advanced]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 956043f719..5c952c8f2a 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -186,11 +186,10 @@
 [Cycle icons every]

 [seconds, when statuses differ]

 [Show multiple icons]

-[Only when statuses differ]

+[only when statuses differ]

 [System tray icon]

 [System tray icon mode]

 [Use xStatus icon]

-[only when statuses differ]

 [Ignore Empty Extra icons places (arrange to right).]

 [Use 'Meta' protocol icons for Metacontacts]

 [Expand metacontacts]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index fd46bcec8e..c4202887b7 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -412,7 +412,7 @@
 [Show icon in tray for highlights]

 [Show icon in tray for users leaving]

 [Show icon in tray for users kicking other user]

-[Show icon in tray for notices ]

+[Show icon in tray for notices]

 [Show icon in tray for name changes]

 [Show icon in tray for information messages]

 [Show icon in tray for status changes]

@@ -425,7 +425,7 @@
 [Show popup for highlights]

 [Show popup for users leaving]

 [Show popup for users kicking other user]

-[Show popup for notices ]

+[Show popup for notices]

 [Show popup for name changes]

 [Show popup for information messages]

 [Show popup for status changes]

diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index ffc4ca0f75..cfdd7dbcc4 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -96,7 +96,7 @@
 [SecureIM established...]

 [Key exchange failed...]

 [Key from disabled...]

-[Sended back message received...]

+[Sent back message received...]

 [Sending back secure message...]

 [SecureIM disabled...]

 [Sending Key...]

diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index 70e471160d..19beb1e5d0 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -101,8 +101,10 @@
 [Status Message]

 [Status Message...]

 [%s (locked)]

-[External Applications\tretrieves song name of the song currently playing in Winamp (Simple Status Message compatible)]

-[Miranda Related\tget the date (Simple Status Message compatible)]

+[External Applications]

+[retrieves song name of the song currently playing in Winamp (Simple Status Message compatible)]

+[Miranda Related]

+[get the date (Simple Status Message compatible)]

 ;file \plugins\SimpleStatusMsg\src\msgbox.cpp

 [<startup>]

 [<current>]

diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt
index 56d5877f13..f6b2f65ea9 100644
--- a/langpacks/english/Plugins/Skype.txt
+++ b/langpacks/english/Plugins/Skype.txt
@@ -52,6 +52,7 @@
 [State:]

 [Country:]

 [Timezone:]

+[Skype credit:]

 [Change password]

 [Old password:]

 [New password:]

@@ -63,6 +64,13 @@
 [Use ports 80 and 443 as alternative incoming]

 [Default group:]

 [Block]

+[Allow IMs from...]

+[Anyone]

+[People in my Contact list only]

+[Allow calls from...]

+[Automatically receive video and share screens with...]

+[No one]

+[Allow my online status to be shown on the web]

 [Block this person]

 [Remove from your Contact List]

 [Abuse]

@@ -151,9 +159,11 @@
 [Spawn conference]

 [Network]

 [Blocked contacts]

+[Privacy]

 [Contacts]

 [Home]

 [General]

+[Skype account]

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

 [Protocol icon]

 [Call]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index 398245d390..1341302d36 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -213,6 +213,13 @@
 [No Popup]

 [Edit Settings]

 ;file \plugins\Weather\src\weather_info.cpp

+[Name]

+[Author]

+[File Version]

+[INI Version]

+[Items]

+[Display Name]

+[File Name]

 [The corresponding INI file for "%s" is not found.]

 [Weather INI information for "%s":]

 [Name:]