- langpacks/english: updated

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

6 files changed, 30 insertions, 38 deletions

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 4c7aff7f17..1c9df79ad2 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -3638,14 +3638,14 @@
 [Draw overlay icons]

 [Round corners of avatars]

 [Ignore size for row height calcs]

-[Border Color:]

+[Border color:]

 [Custom corner size:]

 [Normal overlay icon]

 [Protocol status icon]

 [Contact icon]

 [height]

 [Max width]

-[Use old render method (Fast, but has artefacts)]

+[Use old render method (fast, but has artefacts)]

 [Hide icon when showing avatar]

 [Draw icon in avatar space]

 [Hide groups icon]

@@ -5157,7 +5157,7 @@
 [Put a space or comma between each module name]

 [Changes to this list will take effect next time miranda starts]

 [Popup timeout (0 for infinite)]

-[Background Colour]

+[Background colour]

 [If the module name has a space in it, put a \\ before the space. eg "aaa\\ bbb"]

 [Add a module to contact]

 [Add a module named]

@@ -5639,9 +5639,9 @@
 [Mark as read]

 [Dialog]

 [Connection]

-[Username :]

-[Password :]

-[Server :]

+[Username:]

+[Password:]

+[Server:]

 [Preferences]

 [Check every]

 [seconds]

@@ -5649,7 +5649,7 @@
 [minutes]

 [Check server before trying to connect]

 [Try to connect]

-[times before giving up.]

+[times before giving up]

 [Show email notifications using popup module]

 ;file \plugins\Exchange\src\dlg_handlers.cpp

 [Entry ID]

@@ -5659,7 +5659,7 @@
 [You have %d unread emails ...]

 [You have one unread email ...]

 [Exchange email]

-[Do you want to see the email headers ?]

+[Do you want to see the email headers?]

 ;file \plugins\Exchange\src\hooked_events.cpp

 [Check exchange mailbox]

 [Exchange notify]

@@ -13799,9 +13799,12 @@
 [User-Defined]

 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp

 ;file \plugins\Quotes\src\QuotesProviderBase.cpp

-[Please enter a title for this alarm.]

-[Error]

-[The alarm time you have selected is in the past.]

+[Log Files (*.txt,*.log)]

+[Enter integer value]

+[Enter log file name.]

+[Enter log file format.]

+[Enter history format.]

+[Enter popup window format.]

 ;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp

 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp

 [Error occurred during html parsing.]

@@ -13831,12 +13834,6 @@
 [Previous Close]

 [Change]

 ;file \plugins\Quotes\src\SettingsDlg.cpp

-[Log Files (*.txt,*.log)]

-[Enter integer value]

-[Enter log file name.]

-[Enter log file format.]

-[Enter history format.]

-[Enter popup window format.]

 #muuid {45230488-977b-405b-856d-ea276d7083b7}

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

 ;  File: Rate.dll

@@ -15325,7 +15322,7 @@
 ;file \protocols\Skype\src\skype_events.cpp

 [Spawn conference]

 [Network]

-[Bloked contacts]

+[Blocked contacts]

 [Contacts]

 [Home]

 [General]

@@ -15354,7 +15351,6 @@
 [...by last week]

 [...by last month]

 [...by last 3 month]

-[Blocked contacts]

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

 [Incoming call started]

 [Incoming call finished]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 86e08d6745..2e377e8884 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -242,14 +242,14 @@
 [Draw overlay icons]

 [Round corners of avatars]

 [Ignore size for row height calcs]

-[Border Color:]

+[Border color:]

 [Custom corner size:]

 [Normal overlay icon]

 [Protocol status icon]

 [Contact icon]

 [height]

 [Max width]

-[Use old render method (Fast, but has artefacts)]

+[Use old render method (fast, but has artefacts)]

 [Hide icon when showing avatar]

 [Draw icon in avatar space]

 [Hide groups icon]

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 47cfd4bbed..f804eaaf63 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -32,7 +32,7 @@
 [Put a space or comma between each module name]

 [Changes to this list will take effect next time miranda starts]

 [Popup timeout (0 for infinite)]

-[Background Colour]

+[Background colour]

 [If the module name has a space in it, put a \\ before the space. eg "aaa\\ bbb"]

 [Add a module to contact]

 [Add a module named]

diff --git a/langpacks/english/Plugins/Exchange.txt b/langpacks/english/Plugins/Exchange.txt
index 96293906b7..4746641c89 100644
--- a/langpacks/english/Plugins/Exchange.txt
+++ b/langpacks/english/Plugins/Exchange.txt
@@ -12,9 +12,9 @@
 [Mark as read]

 [Dialog]

 [Connection]

-[Username :]

-[Password :]

-[Server :]

+[Username:]

+[Password:]

+[Server:]

 [Preferences]

 [Check every]

 [seconds]

@@ -22,7 +22,7 @@
 [minutes]

 [Check server before trying to connect]

 [Try to connect]

-[times before giving up.]

+[times before giving up]

 [Show email notifications using popup module]

 ;file \plugins\Exchange\src\dlg_handlers.cpp

 [Entry ID]

@@ -32,7 +32,7 @@
 [You have %d unread emails ...]

 [You have one unread email ...]

 [Exchange email]

-[Do you want to see the email headers ?]

+[Do you want to see the email headers?]

 ;file \plugins\Exchange\src\hooked_events.cpp

 [Check exchange mailbox]

 [Exchange notify]

diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index 115299b0d7..6478a658c8 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -121,9 +121,12 @@
 [User-Defined]

 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp

 ;file \plugins\Quotes\src\QuotesProviderBase.cpp

-[Please enter a title for this alarm.]

-[Error]

-[The alarm time you have selected is in the past.]

+[Log Files (*.txt,*.log)]

+[Enter integer value]

+[Enter log file name.]

+[Enter log file format.]

+[Enter history format.]

+[Enter popup window format.]

 ;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp

 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp

 [Error occurred during html parsing.]

@@ -153,9 +156,3 @@
 [Previous Close]

 [Change]

 ;file \plugins\Quotes\src\SettingsDlg.cpp

-[Log Files (*.txt,*.log)]

-[Enter integer value]

-[Enter log file name.]

-[Enter log file format.]

-[Enter history format.]

-[Enter popup window format.]

diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt
index 476ad9e53b..3d6a2425b2 100644
--- a/langpacks/english/Plugins/Skype.txt
+++ b/langpacks/english/Plugins/Skype.txt
@@ -151,7 +151,7 @@
 ;file \protocols\Skype\src\skype_events.cpp

 [Spawn conference]

 [Network]

-[Bloked contacts]

+[Blocked contacts]

 [Contacts]

 [Home]

 [General]

@@ -180,7 +180,6 @@
 [...by last week]

 [...by last month]

 [...by last 3 month]

-[Blocked contacts]

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

 [Incoming call started]

 [Incoming call finished]