From 29032a76231e31714602e4eb0a9304a5cce2c4d7 Mon Sep 17 00:00:00 2001 From: Dart Raiden Date: Fri, 17 Jun 2016 20:30:50 +0000 Subject: - wipe some junk from langpacks - langpacks/english: update git-svn-id: http://svn.miranda-ng.org/main/trunk@17002 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/AIM.txt | 1 - langpacks/english/Plugins/ConnectionNotify.txt | 7 ++++--- langpacks/english/Plugins/GTalkExt.txt | 2 -- langpacks/english/Plugins/IRC.txt | 1 - langpacks/english/Plugins/MSN.txt | 1 - langpacks/english/Plugins/MirLua.txt | 2 +- langpacks/english/Plugins/Scriver.txt | 2 -- langpacks/english/Plugins/SecureIM.txt | 2 -- langpacks/english/Plugins/Tlen.txt | 1 - langpacks/english/Plugins/Tox.txt | 2 +- langpacks/english/Plugins/YAMN.txt | 1 - langpacks/english/Plugins/Yahoo.txt | 1 - protocols/GTalkExt/src/options.cpp | 4 ++-- tools/lpgen/lpgen.js | 4 ++-- 14 files changed, 10 insertions(+), 21 deletions(-) diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt index a7249fcb18..29c0f48187 100644 --- a/langpacks/english/Plugins/AIM.txt +++ b/langpacks/english/Plugins/AIM.txt @@ -187,7 +187,6 @@ [Confirmed] [Not Confirmed] [Blocked list] -[AOL] [Foreground Color] [Background Color] [Bold] diff --git a/langpacks/english/Plugins/ConnectionNotify.txt b/langpacks/english/Plugins/ConnectionNotify.txt index 34e129ebbb..569ef3e2dd 100644 --- a/langpacks/english/Plugins/ConnectionNotify.txt +++ b/langpacks/english/Plugins/ConnectionNotify.txt @@ -18,11 +18,12 @@ [Version:] [Show notification if no filter defined] [Attempt interval (ms)] -[X] +[Delete] ['Online' means:] [Filters] -[DN] -[UP] +[Move down] +[Move up] +[Add] [Rule editor] [Application name] [Local IP:Port] diff --git a/langpacks/english/Plugins/GTalkExt.txt b/langpacks/english/Plugins/GTalkExt.txt index 696a41c9a7..d3c3a82429 100644 --- a/langpacks/english/Plugins/GTalkExt.txt +++ b/langpacks/english/Plugins/GTalkExt.txt @@ -37,8 +37,6 @@ [Popups] [Network] [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] diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt index 296160acfe..5cdcaf4dd9 100644 --- a/langpacks/english/Plugins/IRC.txt +++ b/langpacks/english/Plugins/IRC.txt @@ -11,7 +11,6 @@ [Enable] [Server name] [Internet address] -[SSL] [Port range] [Password] [&Add] diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt index c37d3c7a12..80f9ef64e5 100644 --- a/langpacks/english/Plugins/MSN.txt +++ b/langpacks/english/Plugins/MSN.txt @@ -7,7 +7,6 @@ ;============================================================ [Microsoft Network (MSN) protocol support for Miranda NG.] ;file \protocols\MSN\res\msn.rc -[MSN] [Live ID:] [Password:] [Nickname:] diff --git a/langpacks/english/Plugins/MirLua.txt b/langpacks/english/Plugins/MirLua.txt index fce83fb5e9..89f3393ba5 100644 --- a/langpacks/english/Plugins/MirLua.txt +++ b/langpacks/english/Plugins/MirLua.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: MirLua.dll ; Plugin: MirLua -; Version: 0.11.7.2 +; Version: 0.11.8.0 ; Authors: Miranda NG team ;============================================================ [Extends Miranda NG functionality with Lua scripts.] diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index 3dceb593ba..bddfe2aab3 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -139,12 +139,10 @@ [Co&py all] [Select &all] [Word lookup] -[Bing] [Yandex] [Wikipedia (en)] [Google Maps] [Google Translate] -[Yahoo] [Foodnetwork] [C&lear log] [&Open link] diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt index 47eabfe62b..fab0a75e74 100644 --- a/langpacks/english/Plugins/SecureIM.txt +++ b/langpacks/english/Plugins/SecureIM.txt @@ -22,8 +22,6 @@ [sec] [Offline Key Timeout:] [days] -[PGP] -[GPG] [Reset All] [Protocols] [Split Messages] diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt index 38afe0b60c..677fccc84d 100644 --- a/langpacks/english/Plugins/Tlen.txt +++ b/langpacks/english/Plugins/Tlen.txt @@ -11,7 +11,6 @@ [Password:] [Save password] [Create new account] -[Tlen] [Options] [Automatically reconnect after unintentional disconnection] [Leave status message after disconnection] diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt index 12902e6779..f1918e15a0 100644 --- a/langpacks/english/Plugins/Tox.txt +++ b/langpacks/english/Plugins/Tox.txt @@ -15,7 +15,6 @@ [Name:] [Password:] [Default group:] -[Tox] [Create Tox profile] [Import Tox profile] [Copy Tox ID] @@ -88,6 +87,7 @@ [Change node] [Enter IPv4] [Error] +[Enter port] [Enter public key] [Common nodes] [User nodes] diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt index 52c9bba93a..61386a1f14 100644 --- a/langpacks/english/Plugins/YAMN.txt +++ b/langpacks/english/Plugins/YAMN.txt @@ -17,7 +17,6 @@ [Name:] [Server:] [Port:] -[SSL] [APOP] [User Name:] [Password:] diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt index 414a5e693b..c8bc55d945 100644 --- a/langpacks/english/Plugins/Yahoo.txt +++ b/langpacks/english/Plugins/Yahoo.txt @@ -7,7 +7,6 @@ ;============================================================ [Yahoo protocol support for Miranda NG.] ;file \protocols\Yahoo\res\Yahoo.rc -[Yahoo] [ID:] [Password:] [Nick:] diff --git a/protocols/GTalkExt/src/options.cpp b/protocols/GTalkExt/src/options.cpp index 30987c66b6..604ef0013d 100644 --- a/protocols/GTalkExt/src/options.cpp +++ b/protocols/GTalkExt/src/options.cpp @@ -32,8 +32,8 @@ #define NOTIFY_SETTINGS_FROM_MOD_NAME SHORT_PLUGIN_NAME ".NotifySettingsFromModName" #define TEST_LETTER_SUBJECT LPGENT("Why C sucks") -#define TEST_LETTER_INBOX LPGENT("brickstrace@gmail.com [1]") -#define TEST_LETTER_SENDER LPGENT(" bems\n") +#define TEST_LETTER_INBOX _T("brickstrace@gmail.com [1]") +#define TEST_LETTER_SENDER _T(" bems\n") #define TEST_LETTER_SNIP LPGENT("* 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") void CheckControlsEnabled(HWND wnd) diff --git a/tools/lpgen/lpgen.js b/tools/lpgen/lpgen.js index 5e157c34e7..c0d151b1a2 100644 --- a/tools/lpgen/lpgen.js +++ b/tools/lpgen/lpgen.js @@ -430,7 +430,7 @@ function ParseRCFile(FileTextVar,array) { //now make a job, till end of matching regexp while ((string = find.exec(FileTextVar)) != null) { // check for some garbage like "List1","Tab1" etc. in *.rc files, we do not need this. - onestring=string[2].replace(/^(((List|Tab|Tree|Spin|Custom|Slider|DateTimePicker|Radio|Check|HotKey|Progress)\d)|(whiterect|IndSndList|&?[Oo][Kk]|Google|ICQ|Jabber|Miranda|Miranda NG|OSD|SMS|SSL|Tlen|Twitter|WhatsApp|Windows|&\w)|(%.(.*%)?))$/g,""); + onestring=string[2].replace(/^(((List|Tab|Tree|Spin|Custom|Slider|DateTimePicker|Radio|Check|HotKey|Progress)\d)|(whiterect|IndSndList|&?[Oo][Kk]|AOL|Bing|Google|GPG|ICQ|IP|Jabber|Miranda|Miranda NG|MSN|OSD|PGP|SMS|SSL|Tlen|Tox|Twitter|Yahoo|WhatsApp|Windows|&\w)|(%.(.*%)?))$/g,""); // ignore some popup menu craps if (string[1]=="POPUP" && onestring.match(/^([a-zA-Z ]*(menu|context|popup(?!s)))|([A-Z][a-z]+([A-Z][a-z]*)+)|(new item)$/g)) continue; @@ -476,7 +476,7 @@ function ParseSourceFile (FileTextVar,array) { //filter _T() function results function filter_T(string) { //filter for exact matched strings -var filter1=/^(&?[Oo][Kk]|Google|ICQ|Jabber|Miranda|Miranda NG|OSD|SMS|SSL|Tlen|Twitter|WhatsApp|Windows)$/g; +var filter1=/^(&?[Oo][Kk]|AOL|Bing|Google|GPG|ICQ|IP|Jabber|Miranda|Miranda NG|MSN|OSD|PGP|SMS|SSL|Tlen|Tox|Twitter|Yahoo|WhatsApp|Windows)$/g; //filter string starting from following words var filter2=/^(SOFTWARE\\|SYSTEM\\|http|ftp|UTF-|utf-|TEXT|EXE|exe|txt|css|html|dat[^a]|txt|MS\x20|CLVM|TM_|CLCB|CLSID|CLUI|HKEY_|MButton|BUTTON|WindowClass|MHeader|RichEdit|RICHEDIT|STATIC|EDIT|CList|listbox|LISTBOX|combobox|COMBOBOX|TitleB|std\w|iso-|windows-||\w\\\w|urn\:|<\?xml|<\!|h\d|\.!\.).*$/g; //filter string ending with following words -- cgit v1.2.3