summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/english/Plugins/PluginUpdater.txt3
-rw-r--r--langpacks/english/Plugins/Sessions.txt2
-rw-r--r--langpacks/english/Plugins/Twitter.txt4
-rw-r--r--langpacks/english/Plugins/Yahoo.txt2
-rw-r--r--tools/lpgen/lpgen.js4
5 files changed, 9 insertions, 6 deletions
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index eaa68b862a..5bbfa5b3f4 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -27,8 +27,8 @@
[Development version (less stable)]
[Development version with debug symbols]
[Custom version]
-[Platform]
[Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.]
+[Change platform to x86]
[Notifications]
[Restart]
[Errors]
@@ -93,6 +93,7 @@
[Stable version (incompatible with current development version)]
[hours]
[days]
+[Change platform to x64]
[Test]
[Services]
;file \plugins\PluginUpdater\src\PluginUpdater.cpp
diff --git a/langpacks/english/Plugins/Sessions.txt b/langpacks/english/Plugins/Sessions.txt
index fa609700a2..78c204cfda 100644
--- a/langpacks/english/Plugins/Sessions.txt
+++ b/langpacks/english/Plugins/Sessions.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Sessions.dll
; Plugin: Sessions
-; Version: 0.1.3.1
+; Version: 0.1.3.2
; Authors: MaD_CLuSTeR
;============================================================
[Sessions Manager for Miranda NG.]
diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index 7a71e1d89b..d8771ebd08 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Twitter.dll
; Plugin: Twitter protocol
-; Version: 1.3.0.1
+; Version: 1.3.0.2
; Authors: dentist, omniwolf, Thief
;============================================================
[Twitter protocol support for Miranda NG.]
@@ -58,4 +58,6 @@
[Tweet]
[Reply to Tweet]
[Visit Homepage]
+[First tweet from new contact]
+[New tweet]
[Reply...]
diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index 007c4729ce..414a5e693b 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Yahoo.dll
; Plugin: Yahoo protocol
-; Version: 0.11.0.2
+; Version: 0.95.5.1
; Authors: Gennady Feldman
;============================================================
[Yahoo protocol support for Miranda NG.]
diff --git a/tools/lpgen/lpgen.js b/tools/lpgen/lpgen.js
index faf1face8c..dec959451b 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|Twitter|WhatsApp|Windows|x64|x86|&\w)|(%.(.*%)?))$/g,"");
+ 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|Twitter|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|Twitter|WhatsApp|Windows|x64|x86)$/g;
+var filter1=/^(&?[Oo][Kk]|Google|ICQ|Jabber|Miranda|Miranda NG|OSD|SMS|Twitter|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-|<div|<html|<img|<span|<hr|<a\x20|<table|<td|miranda_|kernel32|user32|muc|pubsub|shlwapi|Tahoma|NBRichEdit|CreatePopup|&?[Oo][Kk]|<\/|<\w>|\w\\\w|urn\:|<\?xml|<\!|h\d|\.!\.).*$/g;
//filter string ending with following words