From 75318db284d34e83651a1a9a025baef7d92e4a87 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 15 Jul 2013 12:41:33 +0000 Subject: - langpacks/english: updated git-svn-id: http://svn.miranda-ng.org/main/trunk@5363 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Langpack_english.txt | 28 +++++++++++++++++++--------- langpacks/english/Plugins/FileAsMessage.txt | 1 - langpacks/english/Plugins/NewsAggregator.txt | 2 +- langpacks/english/Plugins/Quotes.txt | 13 ++++++------- langpacks/english/Plugins/Skype.txt | 8 ++++++++ langpacks/english/Plugins/Spamotron.txt | 4 ++++ 6 files changed, 38 insertions(+), 18 deletions(-) (limited to 'langpacks/english') diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt index a930e0b8df..c314db4e69 100644 --- a/langpacks/english/Langpack_english.txt +++ b/langpacks/english/Langpack_english.txt @@ -5886,7 +5886,6 @@ [File As Message...] ;file \plugins\FileAsMessage\src\main.h [File As Message] -[If you see this "garbage", probably you have no "fileAsMessage" plugin installed, see http://miranda-ng.org/p/FileAsMessage/ for more information and download.] #muuid {687364af-58b0-4af2-a4ee-20f40a8d9afb} ;============================================================ ; File: Fingerprint.dll @@ -11926,8 +11925,8 @@ [NewsAggregator HTTP connection] [Feed] [%s\nis a valid feed's address.] +[%s\nis not a valid feed's address.] [New Aggregator] -[%s\nis a not valid feed's address.] [empty] [OPML files] [Not valid import file.] @@ -13765,13 +13764,6 @@ [Last Year] [User-Defined] ;file \plugins\Quotes\src\QuoteInfoDlg.cpp -;file \plugins\Quotes\src\QuotesProviderBase.cpp -[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.] @@ -13801,6 +13793,12 @@ [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 @@ -15263,6 +15261,14 @@ [Outlaw (&ban)] [Copy &skypename] [Copy room &uri] +[Creator] +[Master] +[Helper] +[User] +[Listener] +[Applicant] +[Retried] +[Outlaw] [me] [waits to join] [Incoming group call finished] @@ -15622,6 +15628,10 @@ [Messages] [Bayes] [Popups] +;file \plugins\Spamotron\src\popups.cpp +[Message blocked due to preview action] +[Message approved due to preview action] +[Challenge sent to preview contact] ;file \plugins\Spamotron\src\spamotron.cpp [Contact %s approved.] [Message from %s rejected because it reached a maximum for challenge requests per day.] diff --git a/langpacks/english/Plugins/FileAsMessage.txt b/langpacks/english/Plugins/FileAsMessage.txt index 7903d1d6e3..3f12fa5ffd 100644 --- a/langpacks/english/Plugins/FileAsMessage.txt +++ b/langpacks/english/Plugins/FileAsMessage.txt @@ -55,4 +55,3 @@ [File As Message...] ;file \plugins\FileAsMessage\src\main.h [File As Message] -[If you see this "garbage", probably you have no "fileAsMessage" plugin installed, see http://miranda-ng.org/p/FileAsMessage/ for more information and download.] diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt index a374404684..b7b7b1f866 100644 --- a/langpacks/english/Plugins/NewsAggregator.txt +++ b/langpacks/english/Plugins/NewsAggregator.txt @@ -69,8 +69,8 @@ [NewsAggregator HTTP connection] [Feed] [%s\nis a valid feed's address.] +[%s\nis not a valid feed's address.] [New Aggregator] -[%s\nis a not valid feed's address.] [empty] [OPML files] [Not valid import file.] diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt index 6478a658c8..24a01bfb44 100644 --- a/langpacks/english/Plugins/Quotes.txt +++ b/langpacks/english/Plugins/Quotes.txt @@ -120,13 +120,6 @@ [Last Year] [User-Defined] ;file \plugins\Quotes\src\QuoteInfoDlg.cpp -;file \plugins\Quotes\src\QuotesProviderBase.cpp -[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.] @@ -156,3 +149,9 @@ [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 f6b2f65ea9..29fe5b79fc 100644 --- a/langpacks/english/Plugins/Skype.txt +++ b/langpacks/english/Plugins/Skype.txt @@ -134,6 +134,14 @@ [Outlaw (&ban)] [Copy &skypename] [Copy room &uri] +[Creator] +[Master] +[Helper] +[User] +[Listener] +[Applicant] +[Retried] +[Outlaw] [me] [waits to join] [Incoming group call finished] diff --git a/langpacks/english/Plugins/Spamotron.txt b/langpacks/english/Plugins/Spamotron.txt index d58a59a08a..be1f657b91 100644 --- a/langpacks/english/Plugins/Spamotron.txt +++ b/langpacks/english/Plugins/Spamotron.txt @@ -80,6 +80,10 @@ [Messages] [Bayes] [Popups] +;file \plugins\Spamotron\src\popups.cpp +[Message blocked due to preview action] +[Message approved due to preview action] +[Challenge sent to preview contact] ;file \plugins\Spamotron\src\spamotron.cpp [Contact %s approved.] [Message from %s rejected because it reached a maximum for challenge requests per day.] -- cgit v1.2.3