From a9a59fbc57e6b6ba7964cc7ab37b65da54453d46 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 17 Aug 2013 07:14:27 +0000 Subject: - langpacks/english: updated git-svn-id: http://svn.miranda-ng.org/main/trunk@5725 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Langpack_english.txt | 39 ++++++++++++---------------- langpacks/english/Plugins/AIM.txt | 2 +- langpacks/english/Plugins/GTalkExt.txt | 9 +++---- langpacks/english/Plugins/MRA.txt | 1 + langpacks/english/Plugins/NewEventNotify.txt | 5 +--- langpacks/english/Plugins/Quotes.txt | 13 +++++----- langpacks/english/Plugins/TabSRMM.txt | 2 +- langpacks/english/Plugins/WebView.txt | 2 +- langpacks/english/Plugins/WhoUsesMyFiles.txt | 3 +-- langpacks/english/Plugins/Yahoo.txt | 2 +- 10 files changed, 34 insertions(+), 44 deletions(-) diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt index 5f1e722822..fa051cebd1 100644 --- a/langpacks/english/Langpack_english.txt +++ b/langpacks/english/Langpack_english.txt @@ -1959,7 +1959,7 @@ [Instant Idle on Login] [Force Proxy File Transfers] [Masquerade as a Sidekick/Hiptop User] -[*Aim must be reconnected for some option to take effect.] +[*Aim must be reconnected for some option to take effect] [Connection] [Port:] [Reset] @@ -6605,11 +6605,10 @@ ;file \protocols\GTalkExt\src\options.cpp [Popups] [Network] -[* Primitive type system\n] -[* No overloading\n] -[* Limited possibility of data abstraction, polymorphism, subtyping and code reuse\n] -[* No metaprogramming except preprocessor macros\n] -[* No exceptions] +[Why C sucks] +[brickstrace@gmail.com [1]] +[ bems \n] +[* Primitive type system\n* No overloading\n* Limited possibility of data abstraction, polymorphism, subtyping and code reuse\n* No metaprogramming except preprocessor macros\n* No exceptions] ;file \protocols\GTalkExt\src\options.h [GMail notifications] [subject\n %s\nfrom\n%s\n%s\n] @@ -11195,6 +11194,7 @@ [Reply to %s blog status] [Set my blog status] [Writed] +[Your password expired. Please reenter password in the Options dialog] ;file \protocols\MRA\src\Mra_options.cpp [Network] [Account] @@ -11840,9 +11840,6 @@ [Edit] [No popups for RSS contacts] [No popups for read messages] -;file \plugins\NewEventNotify\src\main.cpp -[Message Session] -[Message Received] ;file \plugins\NewEventNotify\src\menuitem.cpp [Popups] ;file \plugins\NewEventNotify\src\neweventnotify.h @@ -11866,7 +11863,7 @@ [This is a sample file event :-D] [This is a sample other event ;-D] [Plugin Test] -[Number of new message: ] +[[b]Number of new message(s): %d[/b]\n] #muuid {56cc3f29-ccbf-4546-a8ba-9856248a412a} ;============================================================ ; File: NewsAggregator.dll @@ -13794,7 +13791,12 @@ [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.] @@ -13824,12 +13826,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 @@ -16136,7 +16132,7 @@ [You can add the user by user name or his id. Wildcards are allowed and recommended.] [OK] [Cancel] -[ Show these events] +[Show these events] [Actions] [Messages] [Nick changes] @@ -19726,7 +19722,7 @@ [(Not Recommended)] [Display Data in Popup on Alert] [Display Data in Popup] -[You may need to restart Miranda IM for this change to take effect.] +[You may need to restart Miranda NG for this change to take effect.] [Contact name:] [URL:] [Display] @@ -20077,7 +20073,6 @@ [Use default Popup colors] [Choose colors] [File access filter && logging settings] -[Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher] [Log into text file] [Log folders access] [Alerts on folders access] @@ -20096,7 +20091,7 @@ [Error opening file] [Error memory allocation] ;file \plugins\WhoUsesMyFiles\src\wumfplug.cpp -[Error crerating menu] +[Error creating menu] [Popup plugin not found!] [Error] [Enable WUMF popups] @@ -20452,7 +20447,7 @@ [Yahoo Ignore] [Please enter a valid buddy name to ignore.] [The buddy is already on your ignore list.] -[You need to be connected to Yahoo to remove from the Ignore List.] +[You need to be connected to Yahoo to remove from the ignore list.] [Please select a buddy on the ignore list to remove.] [Network] [Account] diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt index c0d68b6c1a..ae647c38ff 100644 --- a/langpacks/english/Plugins/AIM.txt +++ b/langpacks/english/Plugins/AIM.txt @@ -25,7 +25,7 @@ [Instant Idle on Login] [Force Proxy File Transfers] [Masquerade as a Sidekick/Hiptop User] -[*Aim must be reconnected for some option to take effect.] +[*Aim must be reconnected for some option to take effect] [Connection] [Port:] [Reset] diff --git a/langpacks/english/Plugins/GTalkExt.txt b/langpacks/english/Plugins/GTalkExt.txt index 29be1487c0..c03bbf7876 100644 --- a/langpacks/english/Plugins/GTalkExt.txt +++ b/langpacks/english/Plugins/GTalkExt.txt @@ -30,11 +30,10 @@ ;file \protocols\GTalkExt\src\options.cpp [Popups] [Network] -[* Primitive type system\n] -[* No overloading\n] -[* Limited possibility of data abstraction, polymorphism, subtyping and code reuse\n] -[* No metaprogramming except preprocessor macros\n] -[* No exceptions] +[Why C sucks] +[brickstrace@gmail.com [1]] +[ bems \n] +[* Primitive type system\n* No overloading\n* Limited possibility of data abstraction, polymorphism, subtyping and code reuse\n* No metaprogramming except preprocessor macros\n* No exceptions] ;file \protocols\GTalkExt\src\options.h [GMail notifications] [subject\n %s\nfrom\n%s\n%s\n] diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt index f4b1d7109d..1c924925f1 100644 --- a/langpacks/english/Plugins/MRA.txt +++ b/langpacks/english/Plugins/MRA.txt @@ -173,6 +173,7 @@ [Reply to %s blog status] [Set my blog status] [Writed] +[Your password expired. Please reenter password in the Options dialog] ;file \protocols\MRA\src\Mra_options.cpp [Network] [Account] diff --git a/langpacks/english/Plugins/NewEventNotify.txt b/langpacks/english/Plugins/NewEventNotify.txt index 4ab9b63a1b..e53f5ff155 100644 --- a/langpacks/english/Plugins/NewEventNotify.txt +++ b/langpacks/english/Plugins/NewEventNotify.txt @@ -41,9 +41,6 @@ [Edit] [No popups for RSS contacts] [No popups for read messages] -;file \plugins\NewEventNotify\src\main.cpp -[Message Session] -[Message Received] ;file \plugins\NewEventNotify\src\menuitem.cpp [Popups] ;file \plugins\NewEventNotify\src\neweventnotify.h @@ -67,4 +64,4 @@ [This is a sample file event :-D] [This is a sample other event ;-D] [Plugin Test] -[Number of new message: ] +[[b]Number of new message(s): %d[/b]\n] diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt index 2176da904b..6478a658c8 100644 --- a/langpacks/english/Plugins/Quotes.txt +++ b/langpacks/english/Plugins/Quotes.txt @@ -121,7 +121,12 @@ [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.] @@ -151,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/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index 37d0b0c515..595a57080a 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -10,7 +10,7 @@ [You can add the user by user name or his id. Wildcards are allowed and recommended.] [OK] [Cancel] -[ Show these events] +[Show these events] [Actions] [Messages] [Nick changes] diff --git a/langpacks/english/Plugins/WebView.txt b/langpacks/english/Plugins/WebView.txt index a2ce155b59..d92882c94e 100644 --- a/langpacks/english/Plugins/WebView.txt +++ b/langpacks/english/Plugins/WebView.txt @@ -32,7 +32,7 @@ [(Not Recommended)] [Display Data in Popup on Alert] [Display Data in Popup] -[You may need to restart Miranda IM for this change to take effect.] +[You may need to restart Miranda NG for this change to take effect.] [Contact name:] [URL:] [Display] diff --git a/langpacks/english/Plugins/WhoUsesMyFiles.txt b/langpacks/english/Plugins/WhoUsesMyFiles.txt index d9039002f4..e90f335619 100644 --- a/langpacks/english/Plugins/WhoUsesMyFiles.txt +++ b/langpacks/english/Plugins/WhoUsesMyFiles.txt @@ -22,7 +22,6 @@ [Use default Popup colors] [Choose colors] [File access filter && logging settings] -[Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher] [Log into text file] [Log folders access] [Alerts on folders access] @@ -41,7 +40,7 @@ [Error opening file] [Error memory allocation] ;file \plugins\WhoUsesMyFiles\src\wumfplug.cpp -[Error crerating menu] +[Error creating menu] [Popup plugin not found!] [Error] [Enable WUMF popups] diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt index 26b58f0e9e..bb3e9e71bd 100644 --- a/langpacks/english/Plugins/Yahoo.txt +++ b/langpacks/english/Plugins/Yahoo.txt @@ -83,7 +83,7 @@ [Yahoo Ignore] [Please enter a valid buddy name to ignore.] [The buddy is already on your ignore list.] -[You need to be connected to Yahoo to remove from the Ignore List.] +[You need to be connected to Yahoo to remove from the ignore list.] [Please select a buddy on the ignore list to remove.] [Network] [Account] -- cgit v1.2.3