- langpacks/english: updated

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

5 files changed, 6 insertions, 154 deletions

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 3bfad13be2..a3a11085f1 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -15382,30 +15382,20 @@ Miranda Language Pack Version 1
 [High Quality smiley scaling]

 [Min smiley height]

 ;file \plugins\SmileyAdd\src\dlgboxsubclass.cpp

-[Edit]

 [Show Smiley Selection Window]

 ;file \plugins\SmileyAdd\src\download.cpp

 [\\SmileyCache]

 [%miranda_userdata%\\SmileyCache]

 [SmileyAdd HTTP connections]

-;file \plugins\SmileyAdd\src\general.cpp

-[jpg]

-[bmp]

-[png]

-[gif]

-[GDI+ not installed.\n]

-[GDI+ can be downloaded here: http://www.microsoft.com/downloads]

-[Miranda SmileyAdd]

 ;file \plugins\SmileyAdd\src\imagecache.cpp

 [dll]

 [ico]

 [icl]

+[gif]

 [tif]

 [tiff]

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

 [Button Smiley]

-[Only one instance of SmileyAdd could be executed.\n]

-[Remove duplicate instances from 'Plugins' directory]

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

 [Smileys]

 [Customize]

@@ -15414,44 +15404,13 @@ Miranda Language Pack Version 1
 [Bottom]

 [Smiley Packs]

 [All Files]

-[msl]

 ;file \plugins\SmileyAdd\src\services.cpp

-[<None>]

-[Standard]

 [Protocol specific]

-;file \plugins\SmileyAdd\src\smileyroutines.cpp

-[THppRichEdit]

-[Time elapsed: %u]

 ;file \plugins\SmileyAdd\src\smileys.cpp

-[hContact]

-[(?:ftp|https|http|file|aim|webcal|irc|msnim|xmpp|gopher|mailto|news|nntp|telnet|wais|prospero)://?[\\w.?%:/$+;]*]

-[[\\s"][a-zA-Z]:[\\\\/][\\w.\\-\\\\/]*]

-[Nothing loaded]

-[Smiley Pack %s not found.\n]

-[Select correct Smiley Pack in the Miranda Options | Customize | Smileys.]

+[Smiley Pack %s not found.\nSelect correct Smiley Pack in the Miranda Options | Customize | Smileys.]

 [There were problems loading smiley pack (it should be corrected).\nSee Network Log for details.]

-[^\\s*(Name|Author|Date|Version|ButtonSmiley)\\s*=\\s*"(.*)"]

-[Name]

-[Author]

-[Date]

-[Version]

-[ButtonSmiley]

-[^\\s*(Selection|Window)Size\\s*=\\s*(\\d+)\\s*,\\s*(\\d+)]

-[Selection]

-[Window]

-[(?:[\\s,]+(R|S)?"(.*?)\]

 [Smiley #%u in file %s for Smiley Pack %s not found.]

-[&lt;]

-[&gt;]

-[<DataBaseName>\\s*"(.*?)"\\s*</DataBaseName>]

-[<PackageAuthor>\\s*"(.*?)"\\s*</PackageAuthor>]

-[<settings>(.*?)</settings>]

-[<record.*?ImageIndex="(.*?)".*?>(?:\\s*"(.*?)\]

-[<Expression>\\s*"(.*?)"\\s*</Expression>]

-[<PasteText>\\s*"(.*?)"\\s*</PasteText>]

-[<images>(.*?)</images>]

-[<Image>(.*?)</Image>]

-[Test String]

+[Standard]

 [Regular Expression "%s" in smiley pack "%s" could produce "empty matches".]

 [Regular Expression "%s" in smiley pack "%s" malformed.]

 ;file \plugins\SmileyAdd\src\smltool.cpp

@@ -15496,8 +15455,6 @@ Miranda Language Pack Version 1
 [Message ID:]

 [Source:]

 [Network:]

-;file \plugins\SMS\src\SMSConstans.h

-[Arial]

 ;file \plugins\SMS\src\SMS_svc.cpp

 [Incoming SMS Message]

 [Incoming SMS Confirmation]

@@ -15552,11 +15509,6 @@ Miranda Language Pack Version 1
 [Tagalog (Philippines)]

 [de_frami_neu]

 [German (Germany)]

-[Thunderbird]

-[Firefox]

-[Software\\Microsoft\\Windows\\ShellNoRoam\\MUICache]

-[Path]

-[%s\\Dictionaries]

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

 [Message Sessions]

 [Auto-replacements]

@@ -15573,7 +15525,6 @@ Miranda Language Pack Version 1
 [Dictionaries]

 [Custom Dictionaries]

 [Flags DLL]

-[Spell Checker/Flags]

 [Enable/disable spell checker]

 [Enabled]

 [Disabled]

@@ -15621,34 +15572,9 @@ Miranda Language Pack Version 1
 [Call Splash Service]

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

 [Graphic files]

-[Set path]

 [Sound Files]

-[Set sound path]

 [Skins]

 [Splash Screen]

-;file \plugins\SplashScreen\src\services.cpp

-[PNG and BMP files\0*.png;*.bmp\0\0]

-;file \plugins\SplashScreen\src\splash.cpp

-[WM_LOADED]

-[called]

-[Timer ID]

-[ShowTime value]

-[Showtime timer]

-[triggered]

-[On Modules Loaded timer]

-[On Modules Loaded workaround]

-[WM_DESTROY]

-[Verdana]

-[Timer TimeToShow]

-[set]

-[Timer Modules loaded]

-[Loading splash file]

-[Thread]

-[start]

-[Preview]

-[yes]

-[Timeout]

-[end]

 #muuid {211f6277-6f9b-4b77-a939-84d04b26b38c}

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

 ;  File: StartPosition.dll

diff --git a/langpacks/english/Plugins/SMS.txt b/langpacks/english/Plugins/SMS.txt
index 75d57ac0f9..bb8931a231 100644
--- a/langpacks/english/Plugins/SMS.txt
+++ b/langpacks/english/Plugins/SMS.txt
@@ -37,8 +37,6 @@
 [Message ID:]

 [Source:]

 [Network:]

-;file \plugins\SMS\src\SMSConstans.h

-[Arial]

 ;file \plugins\SMS\src\SMS_svc.cpp

 [Incoming SMS Message]

 [Incoming SMS Confirmation]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index be721621f8..cb329fa965 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -34,30 +34,20 @@
 [High Quality smiley scaling]

 [Min smiley height]

 ;file \plugins\SmileyAdd\src\dlgboxsubclass.cpp

-[Edit]

 [Show Smiley Selection Window]

 ;file \plugins\SmileyAdd\src\download.cpp

 [\\SmileyCache]

 [%miranda_userdata%\\SmileyCache]

 [SmileyAdd HTTP connections]

-;file \plugins\SmileyAdd\src\general.cpp

-[jpg]

-[bmp]

-[png]

-[gif]

-[GDI+ not installed.\n]

-[GDI+ can be downloaded here: http://www.microsoft.com/downloads]

-[Miranda SmileyAdd]

 ;file \plugins\SmileyAdd\src\imagecache.cpp

 [dll]

 [ico]

 [icl]

+[gif]

 [tif]

 [tiff]

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

 [Button Smiley]

-[Only one instance of SmileyAdd could be executed.\n]

-[Remove duplicate instances from 'Plugins' directory]

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

 [Smileys]

 [Customize]

@@ -66,44 +56,13 @@
 [Bottom]

 [Smiley Packs]

 [All Files]

-[msl]

 ;file \plugins\SmileyAdd\src\services.cpp

-[<None>]

-[Standard]

 [Protocol specific]

-;file \plugins\SmileyAdd\src\smileyroutines.cpp

-[THppRichEdit]

-[Time elapsed: %u]

 ;file \plugins\SmileyAdd\src\smileys.cpp

-[hContact]

-[(?:ftp|https|http|file|aim|webcal|irc|msnim|xmpp|gopher|mailto|news|nntp|telnet|wais|prospero)://?[\\w.?%:/$+;]*]

-[[\\s"][a-zA-Z]:[\\\\/][\\w.\\-\\\\/]*]

-[Nothing loaded]

-[Smiley Pack %s not found.\n]

-[Select correct Smiley Pack in the Miranda Options | Customize | Smileys.]

+[Smiley Pack %s not found.\nSelect correct Smiley Pack in the Miranda Options | Customize | Smileys.]

 [There were problems loading smiley pack (it should be corrected).\nSee Network Log for details.]

-[^\\s*(Name|Author|Date|Version|ButtonSmiley)\\s*=\\s*"(.*)"]

-[Name]

-[Author]

-[Date]

-[Version]

-[ButtonSmiley]

-[^\\s*(Selection|Window)Size\\s*=\\s*(\\d+)\\s*,\\s*(\\d+)]

-[Selection]

-[Window]

-[(?:[\\s,]+(R|S)?"(.*?)\]

 [Smiley #%u in file %s for Smiley Pack %s not found.]

-[&lt;]

-[&gt;]

-[<DataBaseName>\\s*"(.*?)"\\s*</DataBaseName>]

-[<PackageAuthor>\\s*"(.*?)"\\s*</PackageAuthor>]

-[<settings>(.*?)</settings>]

-[<record.*?ImageIndex="(.*?)".*?>(?:\\s*"(.*?)\]

-[<Expression>\\s*"(.*?)"\\s*</Expression>]

-[<PasteText>\\s*"(.*?)"\\s*</PasteText>]

-[<images>(.*?)</images>]

-[<Image>(.*?)</Image>]

-[Test String]

+[Standard]

 [Regular Expression "%s" in smiley pack "%s" could produce "empty matches".]

 [Regular Expression "%s" in smiley pack "%s" malformed.]

 ;file \plugins\SmileyAdd\src\smltool.cpp

diff --git a/langpacks/english/Plugins/SpellChecker.txt b/langpacks/english/Plugins/SpellChecker.txt
index 60d4223843..499be07fd3 100644
--- a/langpacks/english/Plugins/SpellChecker.txt
+++ b/langpacks/english/Plugins/SpellChecker.txt
@@ -49,11 +49,6 @@
 [Tagalog (Philippines)]

 [de_frami_neu]

 [German (Germany)]

-[Thunderbird]

-[Firefox]

-[Software\\Microsoft\\Windows\\ShellNoRoam\\MUICache]

-[Path]

-[%s\\Dictionaries]

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

 [Message Sessions]

 [Auto-replacements]

@@ -70,7 +65,6 @@
 [Dictionaries]

 [Custom Dictionaries]

 [Flags DLL]

-[Spell Checker/Flags]

 [Enable/disable spell checker]

 [Enabled]

 [Disabled]

diff --git a/langpacks/english/Plugins/SplashScreen.txt b/langpacks/english/Plugins/SplashScreen.txt
index ba0e742fca..84345df5e7 100644
--- a/langpacks/english/Plugins/SplashScreen.txt
+++ b/langpacks/english/Plugins/SplashScreen.txt
@@ -30,31 +30,6 @@
 [Call Splash Service]

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

 [Graphic files]

-[Set path]

 [Sound Files]

-[Set sound path]

 [Skins]

 [Splash Screen]

-;file \plugins\SplashScreen\src\services.cpp

-[PNG and BMP files\0*.png;*.bmp\0\0]

-;file \plugins\SplashScreen\src\splash.cpp

-[WM_LOADED]

-[called]

-[Timer ID]

-[ShowTime value]

-[Showtime timer]

-[triggered]

-[On Modules Loaded timer]

-[On Modules Loaded workaround]

-[WM_DESTROY]

-[Verdana]

-[Timer TimeToShow]

-[set]

-[Timer Modules loaded]

-[Loading splash file]

-[Thread]

-[start]

-[Preview]

-[yes]

-[Timeout]

-[end]