- langpacks/english: updated

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

20 files changed, 46 insertions, 40 deletions

diff --git a/langpacks/english/Plugins/AuthState.txt b/langpacks/english/Plugins/AuthState.txt
index 240a62f615..a8bfa38f20 100644
--- a/langpacks/english/Plugins/AuthState.txt
+++ b/langpacks/english/Plugins/AuthState.txt
@@ -18,6 +18,6 @@
 [Auth]

 [Grant]

 [Auth & Grant]

+[Auth State]

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

 [Icons]

-[Auth State]

diff --git a/langpacks/english/Plugins/AutoShutdown.txt b/langpacks/english/Plugins/AutoShutdown.txt
index 47007153d9..efc0252692 100644
--- a/langpacks/english/Plugins/AutoShutdown.txt
+++ b/langpacks/english/Plugins/AutoShutdown.txt
@@ -39,14 +39,14 @@
 ;file \plugins\AutoShutdown\src\frame.cpp

 [Shutdown at:]

 [Time left:]

-[Progress Bar]

-[Background]

-[Countdown on Frame]

 [Paused]

 [&Unpause Countdown]

 [&Pause Countdown]

 [&Cancel Countdown]

 [AutoShutdown]

+[Countdown on Frame]

+[Background]

+[Progress Bar]

 ;file \plugins\AutoShutdown\src\main.cpp

 [Header]

 [Active]

diff --git a/langpacks/english/Plugins/BuddyExpectator.txt b/langpacks/english/Plugins/BuddyExpectator.txt
index a62fbb534a..50187c0205 100644
--- a/langpacks/english/Plugins/BuddyExpectator.txt
+++ b/langpacks/english/Plugins/BuddyExpectator.txt
@@ -57,6 +57,7 @@
 [Contact still absent]

 [Miss you event]

 [Hide contact event]

+[Buddy Expectator]

 [Hide contact]

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

 [weeks]

@@ -67,7 +68,6 @@
 [Contact name]

 [has returned after being absent since %d days]

 [Contacts]

-[Buddy Expectator]

 [PopUps]

 [not detected]

 [not found]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 78cc254494..d7a88cad26 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -101,9 +101,10 @@
 [Set options per account]

 [Enable custom account settings]

 [Hide account completely]

-[Show xStatus Name]

+[Show status name]

+[Show xStatus name]

 [Show protocol icon]

-[Use connecting Icon]

+[Use connecting icon]

 [Show xStatus icon]

 [Show both icons]

 [Show normal status as overlay]

diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index 1d6c9a457c..fffb164a9e 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -32,6 +32,8 @@
 [Multi-protocol clients]

 [Other (rare) protocols]

 [Other icons]

+;file \plugins\FingerprintNG\src\fingerprint.cpp

+[Fingerprint]

 ;file \plugins\FingerprintNG\src\finger_groups.h

 [Client icons]

 [Pack overlays]

@@ -136,4 +138,3 @@
 [SecureIM overlay]

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

 [Icons]

-[Fingerprint]

diff --git a/langpacks/english/Plugins/Flags.txt b/langpacks/english/Plugins/Flags.txt
index f347bba755..8ae3d73343 100644
--- a/langpacks/english/Plugins/Flags.txt
+++ b/langpacks/english/Plugins/Flags.txt
@@ -14,3 +14,4 @@
 [Use &unknown flag if the country can not be determined]

 ;file \plugins\CountryFlags\src\extraimg.cpp

 [Icons]

+[Country flag]

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index c2b2fb3ca6..26f95ace8d 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -116,11 +116,6 @@
 [Conference]

 [Advanced]

 [<Last Status>]

-[Online]

-[Away]

-[DND]

-[Free for chat]

-[Invisible]

 [System tray icon]

 [Popup window]

 [Message with [img] BBCode]

diff --git a/langpacks/english/Plugins/GTalkExt.txt b/langpacks/english/Plugins/GTalkExt.txt
index 03e8aca7a7..8c0ea05ff2 100644
--- a/langpacks/english/Plugins/GTalkExt.txt
+++ b/langpacks/english/Plugins/GTalkExt.txt
@@ -1,13 +1,16 @@
 #muuid {08B86253-EC6E-4d09-B7A9-64ACDF0627B8}

-;langpack template for GTalkExt

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

+;  File: GTalkExt.dll

+;  Plugin: GTalk Extension

+;  Version: 0.0.1.1

+;  Authors: bems

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

+[GTalk extensions for Jabber protocol]

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

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

+[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]

-[Notify in contact list]

-[Clear pseudocontact history before adding new events]

-[Mark history event read when popup closed]

 [Add message snip to notification]

 [Try to login before open mailbox]

 [This works only if password is saved in the database. Has no effect on links in pseudocontact message log]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 31096adc09..54a8099a5d 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -830,6 +830,7 @@
 ;file \protocols\IcqOscarJ\src\icq_xtraz.cpp

 [Greeting card:]

 ;file \protocols\IcqOscarJ\src\init.cpp

+[ICQ XStatus]

 ;file \protocols\IcqOscarJ\src\log.cpp

 [ICQ Warning]

 [ICQ Error]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index d66887b882..fc7514a191 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -229,6 +229,8 @@
 [Jabber Link Protocol]

 [Frame title]

 [Frame text]

+[Jabber Activity]

+[Jabber Mood]

 ;file \protocols\JabberG\src\jabber.h

 [I'm happy Miranda NG user. Get it at http://miranda-ng.org/.]

 [/me slaps %s around a bit with a large trout]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index b17c04e54b..d4c5571166 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -162,6 +162,8 @@
 [PopUps]

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

 [%s connection]

+[Mail.ru Xstatus]

+[Mail.ru extra info]

 [E-mail address]

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

 [Unread mail is available: %lu/%lu messages]

diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index f296a927af..e800869b41 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -14,17 +14,16 @@
 [General]

 [Cycle through protocols every:]

 [seconds]

-[Global on avatar]

+[...avatar]

 [RTL]

 [Align text to right]

-[Global on nickname]

+[...nickname]

 [Auto-resize frame]

 [Use contact list smileys]

-[Global on status]

+[...status]

 [Replace Smileys]

 [Resize Smileys]

-[Global on status message]

-[Frame Options]

+[...status message]

 [Top:]

 [Bottom:]

 [Left:]

@@ -33,13 +32,15 @@
 [Custom size:]

 [pixels]

 [Allow it to grow]

-[Draw border on avatar]

-[Round corners of avatars]

+[Draw border]

+[Round corners]

 [Custom corner size:]

 [Use free space (under avatar) to other texts]

 [Protocol]

 [Show protocol name]

 [Show protocol cycle button]

+[Global On...]

+[Frame Options]

 [Set My Status Message for All Status]

 [Status Message:]

 [Status popup]

diff --git a/langpacks/english/Plugins/Rate.txt b/langpacks/english/Plugins/Rate.txt
index c1021eda9f..5ed993b928 100644
--- a/langpacks/english/Plugins/Rate.txt
+++ b/langpacks/english/Plugins/Rate.txt
@@ -11,3 +11,4 @@
 [Rate medium]

 [Rate low]

 [Contact Rate]

+[Contact rate]

diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index 5d3cd82cf2..c8e564020a 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -20,7 +20,6 @@
 [Enable 'Missed Ones' feature]

 [Count times]

 [Protocols to watch:]

-[Popup interoperability missing or disabled. You need Popups plugin]

 [Use popups]

 [Title]

 [Text]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 0493663ddb..7c1de5c4c8 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: StartupStatus.dll

 ;  Plugin: StartupStatus

-;  Version: 0.8.0.44

+;  Version: 0.8.0.45

 ;  Authors: P Boon

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

 [StartupStatus, allows you to define the status Miranda should set on startup, configurable per protocol.]

diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
index 51d269212a..e0693cd9d7 100644
--- a/langpacks/english/Plugins/Tlen.txt
+++ b/langpacks/english/Plugins/Tlen.txt
@@ -107,12 +107,6 @@
 [Ignore images from unauthorized contacts]

 [Ignore all images]

 [<Last message>]

-[Online]

-[Away]

-[NA]

-[DND]

-[Free for chat]

-[Invisible]

 [Forwarding]

 [SOCKS4]

 [SOCKS5]

diff --git a/langpacks/english/Plugins/TooltipNotify.txt b/langpacks/english/Plugins/TooltipNotify.txt
index 39ec199167..3841f22d6a 100644
--- a/langpacks/english/Plugins/TooltipNotify.txt
+++ b/langpacks/english/Plugins/TooltipNotify.txt
@@ -48,12 +48,6 @@
 [PopUps]

 [** New contacts **]

 [** Unknown contacts **]

-[Away]

-[N/A]

-[Occupied]

-[DND]

-[Free for chat]

-[Invisible]

 [Not Idle]

 [Unknown]

 [is]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index e6b662e942..5bd15c1a15 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -559,10 +559,16 @@
 ;file \plugins\UserInfoEx\src\svc_email.cpp

 [Send e-mail]

 [Memory allocation error!]

+[E-mail (uinfoex)]

+;file \plugins\UserInfoEx\src\svc_gender.cpp

+[Gender (uinfoex)]

 ;file \plugins\UserInfoEx\src\svc_homepage.cpp

 [User has no valid homepage]

 [View Homepage]

 [&Homepage]

+[Homepage (uinfoex)]

+;file \plugins\UserInfoEx\src\svc_phone.cpp

+[(uinfoex)]

 ;file \plugins\UserInfoEx\src\svc_refreshci.cpp

 [[b]%s (%S)...[/b]\n%d Contacts remaning]

 [Abort Refreshing Contact Details]

@@ -585,6 +591,7 @@
 [\n%s becomes %d years old.]

 [No anniversaries to remind of]

 [Backing up and syncing all birthdays complete!]

+[Reminder (uinfoex)]

 [Birthday reminder]

 [Birthday reminder: it's coming]

 [Anniversary Reminder]

@@ -635,4 +642,6 @@
 [Import took %f msec]

 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]

 [FATAL: An exception was thrown while importing contacts from xmlCard!]

+;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp

+[Flags (uinfoex)]

 ;file \plugins\UserInfoEx\src\Flags\svc_flagsicons.cpp

diff --git a/langpacks/english/Plugins/VersionInfo.txt b/langpacks/english/Plugins/VersionInfo.txt
index 57f02261da..77f9177ef8 100644
--- a/langpacks/english/Plugins/VersionInfo.txt
+++ b/langpacks/english/Plugins/VersionInfo.txt
@@ -28,7 +28,7 @@
 [Password]

 [Highlight version number using]

 [Show disabled plugins too]

-[Attempt to find unloadable plugins (doesn't work on Windows 98)]

+[Attempt to find unloadable plugins]

 [Suppress header information]

 [Enable debug messages]

 [Show plugin UUIDs]

diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index 0b00090277..cd22420ab3 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -152,6 +152,8 @@
 [&Rescan my Games ...]

 [Set &Nickname]

 [Protocols/XFire]

+[XFire game icon]

+[XFire voice icon]

 [XFire does not support offline messaging!]

 [Username]

 [Unable to connect to XFire.]