summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordartraiden <wowemuh@gmail.com>2019-03-26 15:44:00 +0300
committerdartraiden <wowemuh@gmail.com>2019-03-26 15:44:00 +0300
commit1a27a8a86e65867f858aed6f49ba81d74b6e4ad5 (patch)
tree8c730e138e71fca8284fc625822959d44a96dea3
parentbbc5e83e6a1c388baf1babefe04b9e2764fc5fd7 (diff)
langpacks/english: update
-rw-r--r--langpacks/english/=CORE=.txt71
-rw-r--r--langpacks/english/Plugins/ChangeKeyboardLayout.txt1
-rw-r--r--langpacks/english/Plugins/Clist_modern.txt10
-rw-r--r--langpacks/english/Plugins/CloudFile.txt18
-rw-r--r--langpacks/english/Plugins/CmdLine.txt3
-rw-r--r--langpacks/english/Plugins/ConnectionNotify.txt6
-rw-r--r--langpacks/english/Plugins/CrashDumper.txt2
-rw-r--r--langpacks/english/Plugins/CurrencyRates.txt45
-rw-r--r--langpacks/english/Plugins/Db_autobackups.txt6
-rw-r--r--langpacks/english/Plugins/Discord.txt9
-rw-r--r--langpacks/english/Plugins/FTPFile.txt2
-rw-r--r--langpacks/english/Plugins/Facebook.txt2
-rw-r--r--langpacks/english/Plugins/GG.txt2
-rw-r--r--langpacks/english/Plugins/GmailNotifier.txt8
-rw-r--r--langpacks/english/Plugins/ICQ.txt12
-rw-r--r--langpacks/english/Plugins/Import.txt1
-rw-r--r--langpacks/english/Plugins/Jabber.txt149
-rw-r--r--langpacks/english/Plugins/LotusNotify.txt4
-rw-r--r--langpacks/english/Plugins/MSN.txt1
-rw-r--r--langpacks/english/Plugins/MenuEx.txt6
-rw-r--r--langpacks/english/Plugins/MinecraftDynmap.txt1
-rw-r--r--langpacks/english/Plugins/MirOTR.txt15
-rw-r--r--langpacks/english/Plugins/MirandaG15.txt2
-rw-r--r--langpacks/english/Plugins/MsgPopup.txt2
-rw-r--r--langpacks/english/Plugins/NewsAggregator.txt20
-rw-r--r--langpacks/english/Plugins/NimContact.txt14
-rw-r--r--langpacks/english/Plugins/NotesReminders.txt27
-rw-r--r--langpacks/english/Plugins/PasteIt.txt6
-rw-r--r--langpacks/english/Plugins/PluginUpdater.txt2
-rw-r--r--langpacks/english/Plugins/PopupPlus.txt (renamed from langpacks/english/Plugins/Popup.txt)444
-rw-r--r--langpacks/english/Plugins/SkypeWeb.txt2
-rw-r--r--langpacks/english/Plugins/SmileyAdd.txt2
-rw-r--r--langpacks/english/Plugins/StatusManager.txt2
-rw-r--r--langpacks/english/Plugins/TabSRMM.txt7
-rw-r--r--langpacks/english/Plugins/UInfoEx.txt11
-rw-r--r--langpacks/english/Plugins/VKontakte.txt2
-rw-r--r--langpacks/english/Plugins/Weather.txt34
-rw-r--r--langpacks/english/Plugins/WebView.txt16
-rw-r--r--langpacks/english/Plugins/WhoUsesMyFiles.txt3
-rw-r--r--langpacks/english/Plugins/YAMN.txt20
-rw-r--r--langpacks/english/Plugins/YAPP.txt85
41 files changed, 481 insertions, 594 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index b52fb236b8..43f01fc230 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -289,6 +289,31 @@
[Select &all]
[Paste and send]
[Delete]
+;file \src\core\stdpopup\res\resource.rc
+[Popup history]
+[Case sensitive]
+[Default timeout]
+[Never timeout]
+[Set timeout:]
+[Width:]
+[Maximum height:]
+[Opacity (%):]
+[Border]
+[Round corners (window)]
+[Preview]
+[Transparent background]
+[Layout]
+[Avatar size:]
+[Disable when]
+[Global hover]
+[Sidebar width:]
+[Text indent:]
+[Padding:]
+[Round corners (avatar)]
+[Text color:]
+[Background color:]
+[Set timeout]
+[Timeout value (0 = default):]
;file \src\core\stduihist\res\resource.rc
[Find]
[&Find next]
@@ -893,6 +918,50 @@
[Contact stopped typing]
;file \src\core\stdmsg\src\msgtimedout.cpp
[An unknown error has occurred.]
+;file \src\core\stdpopup\src\icons.cpp
+[Popups are enabled]
+[Popups are disabled]
+;file \src\core\stdpopup\src\notify_imp.cpp
+;file \src\core\stdpopup\src\options.cpp
+[Example]
+[The quick brown fox jumped over the lazy dog.]
+[Example With a Long Title]
+[Thequickbrownfoxjumpedoverthelazydog.]
+[An avatar.]
+[Bottom right]
+[Bottom left]
+[Top right]
+[Top left]
+[Icon on left]
+[Icon on right]
+[No time]
+[Time on left]
+[Time on right]
+[Time above avatar]
+[No avatar]
+[Left avatar]
+[Right avatar]
+[Full-screen app running]
+[No animate]
+[Horizontal animate]
+[Vertical animate]
+[You cannot set a default timeout of 0.\nValue has been reset.]
+[Settings]
+[Classes]
+;file \src\core\stdpopup\src\services.cpp
+[Disable popups]
+[Enable popups]
+;file \src\core\stdpopup\src\yapp.cpp
+[Toggle popups]
+[First line]
+[Second line]
+[Time]
+[Sidebar]
+[Title underline]
+;file \src\core\stdpopup\src\yapp_history_dlg.cpp
+[Copy title to clipboard]
+[Copy message to clipboard]
+[Copy timestamp to clipboard]
;file \src\core\stdssl\src\netlibssl.cpp
[Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]
[Host we are connecting to is not the one certificate was issued for]
@@ -1365,7 +1434,6 @@
[Empty blob]
[Unicode plugin]
[ANSI plugin]
-[Unused]
[Show/Hide]
[Exit]
[Join chat]
@@ -1373,6 +1441,7 @@
[Move to group]
[On]
[Off]
+[Unused]
[Frames]
[Add group]
[Warning]
diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index aa1bd96d39..f9620c0400 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -45,6 +45,5 @@
[Message sessions]
[Popups]
;file \plugins\ChangeKeyboardLayout\src\main.cpp
-[Popup]
;file \plugins\ChangeKeyboardLayout\src\stdafx.h
[ChangeKeyboardLayout]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 6d22dc5c5a..c7a2320af6 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -379,6 +379,7 @@
[Last message time]
[Account name]
[Rate]
+[Last online]
[-Nothing-]
[Hide to tray]
[Behind left edge]
@@ -411,7 +412,6 @@
[Center group names]
[Right align group names]
[Row]
-[Row design]
;file \plugins\Clist_modern\src\modern_clistsettings.cpp
[(Unknown contact)]
;file \plugins\Clist_modern\src\modern_clui.cpp
@@ -426,14 +426,6 @@
[Close Miranda]
[Restore last status]
[Show/Hide offline users]
-;file \plugins\Clist_modern\src\modern_rowtemplateopt.cpp
-[Empty %s cell]
-[column]
-[line]
-[columns]
-[lines]
-[%s, contain %s]
-[ layered]
;file \plugins\Clist_modern\src\modern_skinopt.cpp
[( unknown )]
[%s\n\n%s\n\nAuthor(s):\t %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s]
diff --git a/langpacks/english/Plugins/CloudFile.txt b/langpacks/english/Plugins/CloudFile.txt
index c32294b37b..0ecc5ee71c 100644
--- a/langpacks/english/Plugins/CloudFile.txt
+++ b/langpacks/english/Plugins/CloudFile.txt
@@ -6,7 +6,7 @@
; Authors: Miranda NG team
;============================================================
[Allows you to transfer files via cloud services.]
-;file \plugins\CloudFile\res\resource.rc
+;file \protocols\CloudFile\res\resource.rc
[Default service]
[General]
[Autosend download link to contact]
@@ -24,22 +24,22 @@
[Go to this link]
[Request access]
[Revoke access]
-;file \plugins\CloudFile\src\icons.cpp
+;file \protocols\CloudFile\src\icons.cpp
[Upload file(s)]
[Dropbox]
[Google Drive]
[OneDrive]
[Yandex.Disk]
-;file \plugins\CloudFile\src\menus.cpp
+;file \protocols\CloudFile\src\menus.cpp
[Upload to...]
[Upload]
-;file \plugins\CloudFile\src\options.cpp
+;file \protocols\CloudFile\src\options.cpp
[None]
[Services]
-;file \plugins\CloudFile\src\srmm.cpp
+;file \protocols\CloudFile\src\srmm.cpp
[Upload files to...]
-;file \plugins\CloudFile\src\Services\dropbox_service.cpp
+;file \protocols\CloudFile\src\Services\dropbox_service.cpp
[Server does not respond]
-;file \plugins\CloudFile\src\Services\google_service.cpp
-;file \plugins\CloudFile\src\Services\microsoft_service.cpp
-;file \plugins\CloudFile\src\Services\yandex_service.cpp
+;file \protocols\CloudFile\src\Services\google_service.cpp
+;file \protocols\CloudFile\src\Services\microsoft_service.cpp
+;file \protocols\CloudFile\src\Services\yandex_service.cpp
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index c42c6d765e..bb610c4799 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -102,6 +102,3 @@
;file \plugins\CmdLine\src\services.cpp
[Could not create CommandLine listening server!]
[You can only run one instance of CmdLine plugin.]
-;file \plugins\CmdLine\src\utils.cpp
-[Notify]
-[Warning]
diff --git a/langpacks/english/Plugins/ConnectionNotify.txt b/langpacks/english/Plugins/ConnectionNotify.txt
index 4d9b86a3e3..eb144e583c 100644
--- a/langpacks/english/Plugins/ConnectionNotify.txt
+++ b/langpacks/english/Plugins/ConnectionNotify.txt
@@ -6,7 +6,7 @@
; Authors: MaKaR
;============================================================
[Notify with popup if some connection established]
-;file \plugins\ConnectionNotify\res\ConnectionNotify.rc
+;file \protocols\ConnectionNotify\res\ConnectionNotify.rc
[Set popup colors]
[Popup options]
[Background]
@@ -31,7 +31,7 @@
[Cancel]
[* and ? wildcard characters also available (for port enter number or *)]
[Remote IP:Port]
-;file \plugins\ConnectionNotify\src\ConnectionNotify.cpp
+;file \protocols\ConnectionNotify\src\ConnectionNotify.cpp
[Show]
[Hide]
[Always show popup]
@@ -43,5 +43,5 @@
[Action]
[Plugins]
[New Connection Notification]
-;file \plugins\ConnectionNotify\src\filter.cpp
+;file \protocols\ConnectionNotify\src\filter.cpp
[First close options window]
diff --git a/langpacks/english/Plugins/CrashDumper.txt b/langpacks/english/Plugins/CrashDumper.txt
index 280e71b2cd..f0977ad8a7 100644
--- a/langpacks/english/Plugins/CrashDumper.txt
+++ b/langpacks/english/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
;============================================================
; File: CrashDumper.dll
; Plugin: Crash dumper
-; Version: 0.1.0.2
+; Version: 0.1.0.3
; Authors: borkra
;============================================================
[Crash Dumper and Version Information for Miranda NG.]
diff --git a/langpacks/english/Plugins/CurrencyRates.txt b/langpacks/english/Plugins/CurrencyRates.txt
index 884e2fb47e..38671e590c 100644
--- a/langpacks/english/Plugins/CurrencyRates.txt
+++ b/langpacks/english/Plugins/CurrencyRates.txt
@@ -2,11 +2,11 @@
;============================================================
; File: CurrencyRates.dll
; Plugin: Currency Rates
-; Version: 0.1.0.101
+; Version: 0.2.0.3
; Authors: Dioksin
;============================================================
[Shows currency rates.]
-;file \plugins\CurrencyRates\res\Forex.rc
+;file \protocols\CurrencyRates\res\Forex.rc
[Variable List]
[Edit Settings]
[Use contact specific settings]
@@ -55,28 +55,24 @@
[&Display in Contact List as:]
[&Status Message:]
[&Tendency:]
+[&Personal key:]
[&Advanced Settings...]
[Rate Info]
-;file \plugins\CurrencyRates\src\Chart.h
+;file \protocols\CurrencyRates\src\Chart.h
[There is nothing to show]
-;file \plugins\CurrencyRates\src\CommonOptionDlg.cpp
+;file \protocols\CurrencyRates\src\CommonOptionDlg.cpp
[Seconds]
[Minutes]
[Hours]
[Enter integer value between 1 and 60.]
[Enter integer value between 1 and 24.]
[Enter text to display in contact list.]
-;file \plugins\CurrencyRates\src\CurrencyConverter.cpp
+;file \protocols\CurrencyRates\src\CurrencyConverter.cpp
[Info provided by]
[Enter positive number.]
-;file \plugins\CurrencyRates\src\CurrencyRateInfoDlg.cpp
+;file \protocols\CurrencyRates\src\CurrencyRateInfoDlg.cpp
[Currency Rate]
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
-[Error occurred during HTML parsing.]
-[Error occurred during site access.]
-;file \plugins\CurrencyRates\src\CurrencyRatesProviderVisitorFormatSpecificator.cpp
-[Currency Symbol]
-[Currency Name]
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderBase.cpp
[Source of Information]
[Rate Value]
[Previous Rate Value]
@@ -86,19 +82,15 @@
[Percentage Character (%)]
[Tabulation]
[Left slash (\\)]
-[Open Price]
-[Percent Change to After Hours]
-[Percent Change to Yesterday Close]
-[Day's High]
-[Day's Low]
-[Previous Close]
-[Change]
+;file \protocols\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
+[Error occurred during HTML parsing.]
+[Error occurred during site access.]
[From Currency Full Name]
[From Currency Short Name]
[Into Currency Full Name]
[Into Currency Short Name]
[Short notation for "%f/%i"]
-;file \plugins\CurrencyRates\src\Forex.cpp
+;file \protocols\CurrencyRates\src\Forex.cpp
[Auto Update Enabled]
[Auto Update Disabled]
[Currency Rates]
@@ -114,10 +106,12 @@
[Enable/Disable Currency Rates Auto Update]
[Currency Rates Auto Update Enabled]
[Currency Rates Auto Update Disabled]
+[Currency Symbol]
[Network]
-;file \plugins\CurrencyRates\src\HTTPSession.cpp
+;file \protocols\CurrencyRates\src\HTTPSession.cpp
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
[CurrencyRates HTTP connections]
-;file \plugins\CurrencyRates\src\IconLib.cpp
+;file \protocols\CurrencyRates\src\IconLib.cpp
[Protocol icon]
[Currency Rate up]
[Currency Rate down]
@@ -126,13 +120,12 @@
[Export]
[Swap button]
[Import]
-;file \plugins\CurrencyRates\src\ImportExport.cpp
+;file \protocols\CurrencyRates\src\ImportExport.cpp
[XML File (*.xml)]
[All files (*.*)]
-;file \plugins\CurrencyRates\src\ModuleInfo.cpp
-[Miranda could not load CurrencyRates plugin. XML parser is missing.]
+;file \protocols\CurrencyRates\src\ModuleInfo.cpp
[Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
-;file \plugins\CurrencyRates\src\SettingsDlg.cpp
+;file \protocols\CurrencyRates\src\SettingsDlg.cpp
[Log Files (*.txt,*.log)]
[Enter integer value]
[Enter log file name.]
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index 1e4bc7715d..25b73688a7 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Db_autobackups.dll
; Plugin: Db autobackuper
-; Version: 0.1.0.2
+; Version: 0.1.0.3
; Authors: chaos.persei, sje, Kildor, Billy_Bons
;============================================================
[Database autobackuper plugin.]
@@ -20,7 +20,6 @@
[Compress backup to zip-archive]
[Backup profile folder]
[Disable progress bar]
-[Disable popups]
[Use CloudFile]
[Backup NOW]
[Backup progress]
@@ -33,12 +32,15 @@
[Database backed up]
[Database back up in process...]
;file \plugins\Db_autobackups\src\main.cpp
+[Enable &AutoBackups notification]
+[Disable &AutoBackups notification]
[Miranda NG databases]
[Compressed Miranda NG databases]
[All files]
[Database]
[Backup profile]
[Save profile as...]
+[Popups]
[Database backups]
[Backup folder]
;file \plugins\Db_autobackups\src\options.cpp
diff --git a/langpacks/english/Plugins/Discord.txt b/langpacks/english/Plugins/Discord.txt
index 6f3c60b1a6..073ee2bcdb 100644
--- a/langpacks/english/Plugins/Discord.txt
+++ b/langpacks/english/Plugins/Discord.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Discord.dll
; Plugin: Discord protocol
-; Version: 0.6.1.1
+; Version: 0.6.2.1
; Authors: George Hazan
;============================================================
[Discord support for Miranda NG.]
@@ -12,8 +12,9 @@
[Password:]
[Contacts]
[Default group:]
+[Enable group chats]
[Do not open chat windows on creation]
-[Use subgroups for guild's channels (requires restart)]
+[Use subgroups for server channels (requires restart)]
[Nick:]
;file \protocols\Discord\src\dispatch.cpp
[edited at]
@@ -34,11 +35,15 @@
[Enter channel name]
[Enter invitation code you received]
[Do you really want to leave the guild?]
+[Disable sync]
+[Enable sync]
[Join guild]
[Copy my Discord ID]
[Leave guild]
[Create new channel]
[Copy Discord ID]
+[Enable guild sync]
+[Load server history]
;file \protocols\Discord\src\options.cpp
[Network]
[Account]
diff --git a/langpacks/english/Plugins/FTPFile.txt b/langpacks/english/Plugins/FTPFile.txt
index d4aca5c82f..17a834e2ed 100644
--- a/langpacks/english/Plugins/FTPFile.txt
+++ b/langpacks/english/Plugins/FTPFile.txt
@@ -2,7 +2,7 @@
;============================================================
; File: FTPFile.dll
; Plugin: FTP File YM
-; Version: 0.6.0.4
+; Version: 0.6.0.5
; Authors: yaho
;============================================================
[FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index d00fc9a986..def9ab7f90 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -75,10 +75,10 @@
[User &history]
[Delete conversation]
[This will permanently delete the conversation history]
-[Former]
[Myself]
[Friend]
[User]
+[Former]
[Notifications]
[%s and more (%d)]
;file \protocols\FacebookRM\src\communication.cpp
diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 5b00434f34..979e2d98d3 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -2,7 +2,7 @@
;============================================================
; File: GG.dll
; Plugin: Gadu-Gadu protocol
-; Version: 0.11.0.4
+; Version: 0.95.11.1
; Authors: Bartosz Bialek, Adam Strzelecki
;============================================================
[Gadu-Gadu protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/GmailNotifier.txt b/langpacks/english/Plugins/GmailNotifier.txt
index 755a3e023f..7acd62ef57 100644
--- a/langpacks/english/Plugins/GmailNotifier.txt
+++ b/langpacks/english/Plugins/GmailNotifier.txt
@@ -6,7 +6,7 @@
; Authors: Mixwind
;============================================================
[Check your Gmail inboxes locally.]
-;file \plugins\GmailNotifier\res\options.rc
+;file \protocols\GmailNotifier\res\options.rc
[Gmail account]
[Name:]
[Password:]
@@ -30,17 +30,17 @@
[Enable icon selection and icon in status bar (restart)]
[This is a shared computer so disable auto login]
[Log unread threads into database (enable history)]
-;file \plugins\GmailNotifier\src\check.cpp
+;file \protocols\GmailNotifier\src\check.cpp
[Checking...]
[Can't send account data!]
[Wrong name or password!]
[Can't get RSS feed!]
-;file \plugins\GmailNotifier\src\main.cpp
+;file \protocols\GmailNotifier\src\main.cpp
[Other]
[Gmail: New thread(s)]
[Gmail Notifier connection]
[&Check all Gmail inboxes]
[&Check Gmail inbox]
-;file \plugins\GmailNotifier\src\options.cpp
+;file \protocols\GmailNotifier\src\options.cpp
[GmailNotifier]
[Network]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 89b0656f58..a540f63a6c 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
;============================================================
; File: ICQ.dll
; Plugin: ICQ-WIM protocol
-; Version: 0.95.11.1
+; Version: 0.95.11.4
; Authors: George Hazan
;============================================================
[ICQ protocol support for Miranda NG.]
@@ -11,7 +11,9 @@
[Password:]
[Sign in/sign up using phone]
[Do not open chat windows on creation]
-[Advanced]
+[Use tray icon notifications]
+[E-mail]
+[Launch mailbox in a browser on click]
[If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]
[After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]
[Send group chat invitation]
@@ -34,10 +36,16 @@
;file \protocols\ICQ-WIM\src\ignore.cpp
[Do you really want to remove it from ignore list?]
;file \protocols\ICQ-WIM\src\main.cpp
+[E-mail notification]
[Ignore]
[Remove Ignore]
;file \protocols\ICQ-WIM\src\options.cpp
[Network]
+[General]
+[Advanced]
+;file \protocols\ICQ-WIM\src\poll.cpp
+[You received e-mail from %s: %s]
+[You have %d unread emails]
;file \protocols\ICQ-WIM\src\proto.cpp
[%s server connection]
[Synchronize server groups]
diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index 80d20fe836..0db96313b5 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -59,7 +59,6 @@
[Skipping contact, account %S cannot be mapped.]
[Skipping contact, %S not installed.]
[Skipping non-IM contact (%S)]
-[Skipping %S contact, ID not found]
[Skipping duplicate %S contact %s]
[Failed to add %S contact %s]
[Added %S contact %s, '%s']
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index c1123b62a2..de1c2f5834 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -166,6 +166,7 @@
[Refresh]
[JID:]
[Node:]
+[Filter:]
[Member Information]
[Role:]
[Set role]
@@ -200,15 +201,8 @@
[Jabber Activity]
[Jabber Mood]
;file \protocols\JabberG\src\jabber_adhoc.cpp
-[Error %s %s]
-[Select Command]
-[Not supported]
[Done]
-[In progress. Please Wait...]
[Execute]
-[Requesting command list. Please wait...]
-[Jabber Ad-Hoc commands at %s]
-[Sending Ad-Hoc command to %s]
;file \protocols\JabberG\src\jabber_agent.cpp
[Jabber Agent Registration]
[No message]
@@ -279,19 +273,11 @@
[Visitor]
[Participant]
[Moderator]
-[Visitors]
-[Participants]
-[Moderators]
[Owners]
-[User %s is now banned.]
-[User %s changed status to %s with message: %s]
-[User %s changed status to %s]
-[Room configuration was changed.]
-[Outcast]
-[Affiliation of %s was changed to '%s'.]
+[Moderators]
+[Participants]
+[Visitors]
[Role of %s was changed to '%s'.]
-[because room is now members-only]
-[user banned]
[Change &nickname]
[&Invite a user]
[&Roles]
@@ -341,8 +327,6 @@
[Real &JID: %s]
[Invite Users to\n%s]
[%s (not on roster)]
-[%s from\n%s]
-[Real JID not available]
[Reason to kick %s]
[Reason to ban %s]
[Invite %s to %s]
@@ -379,28 +363,16 @@
[Copy JID]
[Copy node name]
[Copy node information]
-;file \protocols\JabberG\src\jabber_disco.h
-[Identities]
-[category]
-[type]
-[Category]
-[Type]
-[Supported features]
-[Info request error]
-[Items request error]
-;file \protocols\JabberG\src\jabber_filterlist.cpp
-[Set filter...]
;file \protocols\JabberG\src\jabber_groupchat.cpp
[Failed to retrieve room list from server.]
[No rooms available on server.]
[Room list request timed out.]
-[<no nick>]
[Loading...]
[Please wait for room list to download.]
[Please specify group chat directory first.]
[Bookmarks...]
[Change nickname in <%s>]
-[has set the subject to:]
+[Error]
[Group chat invitation to\n%s]
;file \protocols\JabberG\src\jabber_icolib.cpp
[Status icons]
@@ -449,7 +421,7 @@
[Privacy]
;file \protocols\JabberG\src\jabber_iqid.cpp
[Authentication failed for %s.]
-[Jabber Authentication]
+[Authentication]
[Registration successful]
[Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]
[Password cannot be changed.]
@@ -749,12 +721,6 @@
[Role changes]
[Status changes]
[Don't notify history messages]
-[Group]
-[Subscription]
-[Uploading...]
-[Downloading...]
-[XML for MS Excel (UTF-8 encoded)]
-[Connecting...]
[Network]
[Account]
[Advanced]
@@ -772,7 +738,6 @@
[S.ms]
[Some changes will take effect the next time you connect to the Jabber network.]
;file \protocols\JabberG\src\jabber_password.cpp
-[Set New Password for %s@%S]
[New password does not match.]
[Current password is incorrect.]
;file \protocols\JabberG\src\jabber_privacy.cpp
@@ -787,6 +752,26 @@
[Default privacy list successfully declined]
[Error occurred while setting default list]
[Allow]
+[List has no rules, empty lists will be deleted then changes applied]
+[allow ]
+[deny ]
+[all.]
+[messages]
+[ and ]
+[incoming presences]
+[outgoing presences]
+[queries]
+[Else ]
+[If Jabber ID is ']
+[ (nickname: ]
+[If group is ']
+[If subscription is ']
+[then ]
+[ (act., def.)]
+[ (active)]
+[ (default)]
+[Ready.]
+[Privacy lists are not saved, discard any changes and exit?]
[Simple mode]
[Advanced mode]
[Add JID]
@@ -809,26 +794,6 @@
[Presence (in)]
[Presence (out)]
[Query]
-[List has no rules, empty lists will be deleted then changes applied]
-[allow ]
-[deny ]
-[all.]
-[messages]
-[ and ]
-[incoming presences]
-[outgoing presences]
-[queries]
-[Else ]
-[If Jabber ID is ']
-[ (nickname: ]
-[If group is ']
-[If subscription is ']
-[then ]
-[ (act., def.)]
-[ (active)]
-[ (default)]
-[Ready.]
-[Privacy lists are not saved, discard any changes and exit?]
[Please save list before activating]
[First, save the list]
[Please save list before you make it the default list]
@@ -841,44 +806,15 @@
[No compatible file transfer mechanism exists]
[Protocol is offline or no JID]
[No valid OMEMO session exists]
-;file \protocols\JabberG\src\jabber_rc.cpp
-[Command completed successfully]
-[Error occurred during processing command]
-[Set status]
-[Set options]
-[Forward unread messages]
-[Leave group chats]
-[Lock workstation]
-[Quit Miranda NG]
-[Change Status]
-[Choose the status and status message]
-[Status]
-[Extended away (Not available)]
-[Invisible]
-[Offline]
-[Priority]
-[Status message]
-[Change global status]
-[Set Options]
-[Set the desired options]
-[Automatically Accept File Transfers]
-[Play sounds]
-[Disable remote controlling (check twice what you are doing)]
-[There is no messages to forward]
-[Forward options]
-[%d message(s) to be forwarded]
-[Mark messages as read]
-[%d message(s) forwarded]
-[Workstation successfully locked]
-[Error %d occurred during workstation lock]
-[Confirmation needed]
-[Please confirm Miranda NG shutdown]
-[There is no group chats to leave]
-[Choose the group chats you want to leave]
+;file \protocols\JabberG\src\jabber_roster.cpp
+[Group]
+[Subscription]
+[Uploading...]
+[Downloading...]
+[Connecting...]
+[XML for MS Excel (UTF-8 encoded)]
;file \protocols\JabberG\src\jabber_search.cpp
-[Error %s %s\r\nPlease select other server]
[Error: unknown reply received\r\nPlease select other server]
-[Error %s %s\r\nTry to specify more detailed]
[Search error]
[Select/type search service URL above and press <Go>]
[Please wait...\r\nConnecting search server...]
@@ -890,6 +826,7 @@
[declined subscription]
[sent error presence]
[sent unknown presence type]
+[Outcast]
[Nick:]
[Status:]
[Real JID:]
@@ -899,19 +836,15 @@
[Error: Cannot connect to the server]
[Error: Connection lost]
[Requesting registration instruction...]
-[Authentication failed for %s@%S.]
-[Message redirected from: %s\r\n%s]
+[Registration canceled]
[Sending registration information...]
;file \protocols\JabberG\src\jabber_userinfo.cpp
-[Resource]
[<not specified>]
+[Resource]
[Software]
[Version]
[System]
-[unknown]
-[Idle since]
-[Client capabilities]
-[Software information]
+[Last activity]
[Operating system]
[Operating system version]
[Software version]
@@ -919,16 +852,10 @@
[Mood]
[Activity]
[Tune]
-[both]
-[to]
-[from]
-[none]
[Last logoff time]
[Uptime]
[Logoff message]
-[<no information available>]
[Last active resource]
-[Please switch online to see more details.]
[Copy]
[Copy only this value]
[format]
@@ -954,8 +881,8 @@
[Service unavailable]
[Remote server timeout]
[Unknown error]
-[Error]
[Unknown error message]
+[Offline]
[Advanced Status]
[Set mood...]
[Set activity...]
diff --git a/langpacks/english/Plugins/LotusNotify.txt b/langpacks/english/Plugins/LotusNotify.txt
index d08ea82b7b..b2021b2405 100644
--- a/langpacks/english/Plugins/LotusNotify.txt
+++ b/langpacks/english/Plugins/LotusNotify.txt
@@ -6,7 +6,7 @@
; Authors: MaKaRSoFT - http://maciej.wycik.pl/miranda
;============================================================
[Notify about new mail in Lotus Database]
-;file \plugins\LotusNotify\res\LotusNotify.rc
+;file \protocols\LotusNotify\res\LotusNotify.rc
[Lotus connection settings]
[Primary server:]
[Secondary server:]
@@ -36,7 +36,7 @@
[Subject]
[To / CopyTo]
[Offline status mean:]
-;file \plugins\LotusNotify\src\LotusNotify.cpp
+;file \protocols\LotusNotify\src\LotusNotify.cpp
[Unable to load all required Lotus API functions]
[Lotus Notes Client not detected. Check plugin configuration description at https://miranda-ng.org/p/LotusNotify]
[Unable to initialize Notes.]
diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index bd3b5c42ef..9df477d6bc 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -70,7 +70,6 @@
[&Op user]
[&Deop user]
;file \protocols\MSN\src\msn_commands.cpp
-[%I64u bytes]
[MSN Alert]
;file \protocols\MSN\src\msn_errors.cpp
[User not online]
diff --git a/langpacks/english/Plugins/MenuEx.txt b/langpacks/english/Plugins/MenuEx.txt
index d7e93f11c8..f5a4a715d1 100644
--- a/langpacks/english/Plugins/MenuEx.txt
+++ b/langpacks/english/Plugins/MenuEx.txt
@@ -2,7 +2,7 @@
;============================================================
; File: MenuEx.dll
; Plugin: Menu item ext
-; Version: 1.3.1.0
+; Version: 1.3.2.0
; Authors: Heiko Schillinger, Baloo, Billy_Bons, Robert Pösel
;============================================================
[Adds some useful options to a contacts menu.]
@@ -13,7 +13,6 @@
[Hide from list]
[Ignore]
[Copy to Account (Ctrl+click for move to Account)]
-[Request Authorization]
[Browse Received Files]
[Copy IP]
[Copy MirVer]
@@ -43,10 +42,7 @@
[User Online]
[Authorization]
[Typing Notify]
-[Please authorize me to add you to my contact list.]
-[Do you want to send authorization request\nto new contact?]
[Open ignore settings]
-[Request authorization]
[MenuItemEx]
;file \plugins\MenuItemEx\src\options.cpp
[Customize]
diff --git a/langpacks/english/Plugins/MinecraftDynmap.txt b/langpacks/english/Plugins/MinecraftDynmap.txt
index de3ce74766..faa4882cf5 100644
--- a/langpacks/english/Plugins/MinecraftDynmap.txt
+++ b/langpacks/english/Plugins/MinecraftDynmap.txt
@@ -10,7 +10,6 @@
[Server:]
[Visible name:]
;file \protocols\MinecraftDynmap\src\chat.cpp
-[Server]
[Admin]
[Normal]
[You]
diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index e6481bdc02..f852efedab 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
;============================================================
; File: MirOTR.dll
; Plugin: Miranda OTR
-; Version: 0.14.1.17
+; Version: 0.14.2.1
; Authors: ProgAndy & CHEF-KOCH
;============================================================
[OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]
@@ -43,6 +43,12 @@
[&Refresh OTR session]
[Sto&p OTR session]
[&Verify Fingerprint]
+;file \plugins\MirOTR\src\icons.cpp
+[OTR private]
+[OTR unverified]
+[OTR finished]
+[OTR not secure]
+[Refresh]
;file \plugins\MirOTR\src\language.h
[Start OTR]
[Stop OTR]
@@ -53,7 +59,6 @@
[OTR Encryption: UNVERIFIED]
[OTR Encryption: Private]
[OTR Encryption: Finished]
-[&Convert HTML (for Pidgin)]
[OTR encrypted session with '%s' has been terminated]
[Requesting OTR encrypted session with '%s']
[Beginning OTR encrypted session with '%s']
@@ -69,11 +74,6 @@
[OTR Information]
[OTR encrypted session with '%s' is now using a VERIFIED fingerprint]
[OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
-[OTR unverified]
-[OTR finished]
-[OTR private]
-[OTR not secure]
-[Refresh]
[Generating new private key for protocol '%s'.\nPlease Wait...]
[General]
[Protocols]
@@ -122,6 +122,7 @@
;file \plugins\MirOTR\src\mirotrmenu.cpp
[MirOTR menu]
[OTR Status]
+[&Convert HTML (for Pidgin)]
;file \plugins\MirOTR\src\options.cpp
[Private Data]
[Services]
diff --git a/langpacks/english/Plugins/MirandaG15.txt b/langpacks/english/Plugins/MirandaG15.txt
index 4b13f96841..03fcac3476 100644
--- a/langpacks/english/Plugins/MirandaG15.txt
+++ b/langpacks/english/Plugins/MirandaG15.txt
@@ -2,7 +2,7 @@
;============================================================
; File: MirandaG15.dll
; Plugin: MirandaG15
-; Version: 0.1.2.0
+; Version: 0.1.2.1
; Authors: Martin Kleinhans
;============================================================
[Provides an interface to use Miranda from the LCD of various Logitech devices.]
diff --git a/langpacks/english/Plugins/MsgPopup.txt b/langpacks/english/Plugins/MsgPopup.txt
index e3fe4506dc..a855164240 100644
--- a/langpacks/english/Plugins/MsgPopup.txt
+++ b/langpacks/english/Plugins/MsgPopup.txt
@@ -2,7 +2,7 @@
;============================================================
; File: MsgPopup.dll
; Plugin: Message popup
-; Version: 0.1.2.1
+; Version: 0.1.2.2
; Authors: StDenis
;============================================================
[Plugin replaces message boxes (those having only OK button) with popups.]
diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt
index 87234e3280..f668a283b2 100644
--- a/langpacks/english/Plugins/NewsAggregator.txt
+++ b/langpacks/english/Plugins/NewsAggregator.txt
@@ -2,11 +2,11 @@
;============================================================
; File: NewsAggregator.dll
; Plugin: News aggregator
-; Version: 0.1.0.4
+; Version: 0.1.0.5
; Authors: Mataes, FREAK_THEMIGHTY
;============================================================
[RSS/Atom news aggregator.]
-;file \plugins\NewsAggregator\Res\Resource.rc
+;file \protocols\NewsAggregator\Res\Resource.rc
[Add]
[Change]
[Remove]
@@ -39,16 +39,16 @@
[Import from:]
[Feeds to be imported:]
[&Import]
-;file \plugins\NewsAggregator\Src\Authentication.cpp
+;file \protocols\NewsAggregator\Src\Authentication.cpp
[Enter your username]
[Error]
[Enter your password]
-;file \plugins\NewsAggregator\Src\CheckFeed.cpp
+;file \protocols\NewsAggregator\Src\CheckFeed.cpp
[%s\nis a valid feed's address.]
[News Aggregator]
[%s\nis not a valid feed's address.]
[empty]
-;file \plugins\NewsAggregator\Src\Icons.cpp
+;file \protocols\NewsAggregator\Src\Icons.cpp
[Protocol icon]
[Check All Feeds]
[Add Feed]
@@ -56,11 +56,11 @@
[Export Feeds]
[Auto Update Enabled]
[Auto Update Disabled]
-;file \plugins\NewsAggregator\Src\Menus.cpp
+;file \protocols\NewsAggregator\Src\Menus.cpp
[Check feed]
[Change feed]
-;file \plugins\NewsAggregator\Src\NewsAggregator.cpp
-;file \plugins\NewsAggregator\Src\Options.cpp
+;file \protocols\NewsAggregator\Src\NewsAggregator.cpp
+;file \protocols\NewsAggregator\Src\Options.cpp
[OPML files]
[Not valid import file.]
[Imported %d feed(s)\r\nNot imported %d duplicate(s).]
@@ -83,8 +83,8 @@
[Feed]
[Contact deleting]
[Network]
-;file \plugins\NewsAggregator\Src\Services.cpp
+;file \protocols\NewsAggregator\Src\Services.cpp
[Avatars]
[Enable/disable auto update]
-;file \plugins\NewsAggregator\Src\Utils.cpp
+;file \protocols\NewsAggregator\Src\Utils.cpp
[NewsAggregator HTTP connections]
diff --git a/langpacks/english/Plugins/NimContact.txt b/langpacks/english/Plugins/NimContact.txt
index a8b3f1ce59..8ac5d0b621 100644
--- a/langpacks/english/Plugins/NimContact.txt
+++ b/langpacks/english/Plugins/NimContact.txt
@@ -6,7 +6,7 @@
; Authors: Jonathan Gordon
;============================================================
[Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)]
-;file \plugins\Non-IM Contact\res\resource.rc
+;file \protocols\Non-IM Contact\res\resource.rc
[View/Edit Files]
[Add File]
[Add URL]
@@ -57,26 +57,26 @@
[Co&py Non-IM Contact]
[Type one replace string per line in the format "original text,new text"]
[EXAMPLE: %fn1,%fn2]
-;file \plugins\Non-IM Contact\src\contactinfo.cpp
+;file \protocols\Non-IM Contact\src\contactinfo.cpp
[Select Folder]
[Non-IM Contact protocol timer is Disabled]
[Timer intervals... Non-IM Contact Protocol timer is %d seconds]
[New Non-IM Contact]
-;file \plugins\Non-IM Contact\src\dialog.cpp
+;file \protocols\Non-IM Contact\src\dialog.cpp
[String replacing variables...\r\nThe following are all the valid variables that can be used. Refer to the wiki.miranda-ng.org for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth separator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome examples...\r\nfilename(0) <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0))) <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1))) <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4))) <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17)) <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
[Contacts Display Info]
[Link and Contact list Settings]
[Copy Contact]
[Files]
[Edit Non-IM Contact "%s"]
-;file \plugins\Non-IM Contact\src\files.cpp
+;file \protocols\Non-IM Contact\src\files.cpp
[Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
[File couldn't be opened]
[File couldn't be opened,2]
[line(%-3d) = | %s]
-;file \plugins\Non-IM Contact\src\http.cpp
+;file \protocols\Non-IM Contact\src\http.cpp
[Non-IM Contacts]
-;file \plugins\Non-IM Contact\src\main.cpp
+;file \protocols\Non-IM Contact\src\main.cpp
[Plugins]
[Main Icon]
[Non-IM Contact]
@@ -87,7 +87,7 @@
[&Import Non-IM Contacts]
[&String Maker]
[E&dit Contact Settings]
-;file \plugins\Non-IM Contact\src\namereplacing.cpp
+;file \protocols\Non-IM Contact\src\namereplacing.cpp
[%s - ERROR: no line specified or line not found (in %s)]
[%s - ERROR: file couldn't be opened (in %s)]
[%s - ERROR: no file specified in settings (in %s)]
diff --git a/langpacks/english/Plugins/NotesReminders.txt b/langpacks/english/Plugins/NotesReminders.txt
index 625b85e437..649ecb847f 100644
--- a/langpacks/english/Plugins/NotesReminders.txt
+++ b/langpacks/english/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
;============================================================
; File: NotesReminders.dll
; Plugin: Sticky Notes & Reminders
-; Version: 0.1.0.1
+; Version: 0.2.0.2
; Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
;============================================================
[Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -28,9 +28,9 @@
[Reset to defaults]
[(Using MCI allows different sounds to be played simultaneously, may not be needed or desired when a custom sound plugin is installed.)]
[Add Reminder]
-[Trigger On Time && Date:]
[Date]
[Time]
+[Repeat each day]
[Reminder Note:]
[None]
[Daily]
@@ -54,7 +54,6 @@
[New &Reminder]
[&Delete Reminder]
[D&elete All Reminders]
-[Context Menu Note Popup]
[&Hide Note]
[&Always On Top]
[&New Note]
@@ -79,16 +78,12 @@
[Always &On Top]
[Delete &All Notes]
[&Show / Hide Notes]
-;file \plugins\NotesAndReminders\src\globals.h
-[Notes & Reminders]
;file \plugins\NotesAndReminders\src\hotkeys.cpp
[New Note]
[Toggle Notes Visibility]
[Bring All Notes to Front]
[New Reminder]
;file \plugins\NotesAndReminders\src\main.cpp
-[Are you sure you want to delete all notes?]
-[Are you sure you want to delete all reminders?]
[Delete All Notes]
[Show/Hide Notes]
[On Top Caption Icon]
@@ -102,19 +97,18 @@
[Play Sound Icon]
[View Notes]
[Sticky Notes]
-[Plugins]
[Add New Note]
[Add New Reminder]
-[Alerts]
-[Reminder triggered]
-[Reminder triggered (Alternative 1)]
-[Reminder triggered (Alternative 2)]
[Notes && Reminders]
[New &Note]
[Vie&w Notes]
[&Delete All Notes]
[&Bring All to Front]
[Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]
+[Alerts]
+[Reminder triggered]
+[Reminder triggered (Alternative 1)]
+[Reminder triggered (Alternative 2)]
;file \plugins\NotesAndReminders\src\notes.cpp
[Black]
[Maroon]
@@ -139,21 +133,23 @@
[Notes]
[Note text]
[Date/Title]
+[Are you sure you want to delete all notes?]
;file \plugins\NotesAndReminders\src\options.cpp
[Sticky Note Caption]
[Sticky Note Background Color]
[Sticky Note Body]
[Executable Files\0*.exe\0All Files\0*.*\0\0]
[Select Executable]
+[Plugins]
;file \plugins\NotesAndReminders\src\reminders.cpp
[Minutes]
[Hours]
+[The specified time is invalid due to begin of daylight saving (summer time).]
+[The specified time is invalid.]
[Hour]
[Day]
[Days]
[Week]
-[The specified time is invalid due to begin of daylight saving (summer time).]
-[The specified time is invalid.]
[The specified time offset is invalid.]
[&Update Reminder]
[Every]
@@ -164,4 +160,7 @@
[Alternative 2]
[Reminder text]
[Date of activation]
+[Are you sure you want to delete all reminders?]
[Are you sure you want to delete this reminder?]
+;file \plugins\NotesAndReminders\src\stdafx.h
+[Notes & Reminders]
diff --git a/langpacks/english/Plugins/PasteIt.txt b/langpacks/english/Plugins/PasteIt.txt
index 1b812b2398..cf3a2d3b34 100644
--- a/langpacks/english/Plugins/PasteIt.txt
+++ b/langpacks/english/Plugins/PasteIt.txt
@@ -2,7 +2,7 @@
;============================================================
; File: PasteIt.dll
; Plugin: Paste it
-; Version: 1.0.0.3
+; Version: 1.0.0.4
; Authors: Krzysztof Kral
;============================================================
[Uploads the text to web page and sends the URL to your friends.]
@@ -76,9 +76,9 @@
[Cannot open file '%s']
[File '%s' is empty]
;file \plugins\PasteIt\src\PasteToWeb1.cpp
-[Error during sending text to web page: %s]
+[Error during sending text to web page: %S]
[Error during sending text to web page]
-[Error during getting user key from web page: %s]
+[Error during getting user key from web page: %S]
[Paste expire date]
[Never]
[10 minutes]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index ee98e8602f..00c1b230e7 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
;============================================================
; File: PluginUpdater.dll
; Plugin: Plugin updater
-; Version: 0.2.0.2
+; Version: 0.2.0.3
; Authors: Mataes, George Hazan
;============================================================
[Installs and updates plugins and other Miranda NG components.]
diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/PopupPlus.txt
index 50d0b0925f..7f1d8edf3e 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/PopupPlus.txt
@@ -1,223 +1,221 @@
-#muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
-;============================================================
-; File: Popup.dll
-; Plugin: Popup plus
-; Version: 2.1.1.15
-; Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
-;============================================================
-[Provides popup notification services for different plugins.]
-;file \plugins\Popup\res\resource.rc
-[Content and Style]
-[Go to Customize -> Fonts and Colors for fonts and colors options]
-[Miscellaneous]
-[Effects]
-[Live Preview]
-[Size && Position]
-[History]
-[Enable popup history]
-[Store last]
-[events]
-[Use History++ to render log]
-[Avatars]
-[Draw avatar borders]
-[Draw borders for semitransparent avatars too]
-[Round corners by]
-[pixels]
-[Avatar size:]
-[Enable avatar updates]
-[Multimonitor]
-[Start the popups in the monitor with]
-[Miranda's window]
-[the active window]
-[Transparency]
-[Use transparency]
-[opacity:]
-[Opaque popups under cursor]
-[Slide popup]
-[Effect:]
-[Time (in):]
-[ms]
-[Time (out):]
-[Limit window amount to:]
-[Skins]
-[* - built-in skins]
-[Skin options]
-[Preview]
-[Download more skins]
-[Popup History]
-[Desktop]
-[Popup area]
-[pixel(s)]
-[Distance between popups]
-[Configure popup area]
-[Close]
-[General]
-[Enable popup actions]
-[Popup actions are those tiny buttons below notification text.]
-[Common actions]
-[Please choose in what cases default actions should be added:]
-[Add info && menu for IM contacts only]
-[Add default actions for contacts only]
-[Don't close popups on default actions]
-[Size and position]
-[Use large icons]
-[Popup actions will be displayed as:]
-[Icons and labels below text]
-[Icons on the left]
-[Icons aligned to the right]
-[Show actions: (requires apply)]
-[Mouse actions overwrite]
-[Left button]
-[Middle button]
-[Right button]
-[Notifications]
-[General options]
-[Enable this notification]
-[Popup timeout:]
-[Left click action:]
-[Right click action:]
-[Disable when global status is...]
-[Disable when relevant protocol's status is...]
-[Colors can be configured in\r\nCustomize -> Fonts and colors]
-[More...]
-[Disable if message window is open]
-[Sec]
-[0 = Default]
-[-1 = Infinite]
-[Per-contact settings]
-[Show always]
-[Ignore fullscreen]
-[Never show]
-[Show default]
-[Default timeout]
-[Infinite popup delay]
-[Popup delay:]
-[seconds]
-[Do not close hovered popups]
-[Dynamically resize the popups]
-[Minimum width]
-[Maximum width]
-[Position:]
-[Layout:]
-[Reorder popups]
-[Disable when:]
-[Always (has priority)]
-[Fullscreen mode]
-[Debug]
-;file \plugins\Popup\src\actions.cpp
-[Quick reply]
-[Send message]
-[User details]
-[Contact menu]
-[Add permanently]
-[Pin popup]
-[Dismiss popup]
-[Copy to clipboard]
-[No overwrite]
-[Action]
-;file \plugins\Popup\src\config.cpp
-[The Jabberwocky]
-[`Twas brillig, and the slithy toves\r\nDid gyre and gimble in the wabe:\r\nAll mimsy were the borogoves,\r\nAnd the mome raths outgrabe.\r\n\t[b][i]Lewis Carroll, 1855[/i][/b]]
-[Test preview for the popup plugin settings. This is supposed to be long enough not to fit in one line...]
-[This is a special test preview for the popup plugin settings. The text and title are quite long so you can tweak your skin and plugin settings to best fit your needs :)]
-[This is a notification message]
-[This is a warning message]
-[This is an error message]
-;file \plugins\Popup\src\effects.cpp
-[Square fading]
-;file \plugins\Popup\src\font.h
-[Popups]
-[Title]
-[Clock]
-[Text]
-[Hovered action]
-[Background]
-[Border]
-[Sidebar]
-[Title underline]
-[Avatar border]
-;file \plugins\Popup\src\history.cpp
-[Popup History is disabled]
-[Popup History message]
-;file \plugins\Popup\src\icons.cpp
-[Popups are enabled]
-[Popups are disabled]
-[With "favorite" overlay]
-[With "fullscreen" overlay]
-[Information]
-[Warning]
-[Error]
-[Refresh skin list]
-[Popup placement]
-[Cancel]
-[Popup group]
-[Favorite contact]
-[Show in fullscreen]
-[Blocked contact]
-[Pinned popup]
-[Add contact permanently]
-;file \plugins\Popup\src\main.cpp
-[Classes]
-[Actions]
-[Contacts]
-[Advanced]
-[Toggle Popups]
-[Enable Popups]
-[Disable Popups]
-[Popup Plus]
-[Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
-;file \plugins\Popup\src\opt_adv.cpp
-[No effect]
-[Fade in/out]
-;file \plugins\Popup\src\opt_class.cpp
-[CLASS Plugins]
-[Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn!]
-;file \plugins\Popup\src\opt_gen.cpp
-[Offline]
-[Online]
-[Invisible]
-[Away]
-[Not available]
-[Occupied]
-[Do not disturb]
-[Free for chat]
-[Out to lunch]
-[On the phone]
-[Width]
-[Upper left corner]
-[Lower left corner]
-[Lower right corner]
-[Upper right corner]
-[Horizontal]
-[Vertical]
-[Global Status]
-[Protocol Status]
-[You cannot specify a value lower than %d and higher than %d.]
-['Reorder popups' option is currently disabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewXstatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n]
-[Popup plus warning]
-;file \plugins\Popup\src\opt_skins.cpp
-[Failed to register %s class.]
-[Skin preview]
-[Just take a look at this skin... ;)]
-[Show clock]
-[Drop shadow effect]
-[non rectangular]
-[Enable Aero Glass (Vista+)]
-[Use Windows colors]
-[Use advanced text render]
-[Global settings]
-[Refresh List]
-;file \plugins\Popup\src\popup_thread.cpp
-;file \plugins\Popup\src\popup_wnd2.cpp
-[Failed to GetClassInfoExW from EDIT class.]
-[Failed to register custom edit box window class.\r\n\r\ncbSize: %i\r\nstyle: %p\r\nlpfnWndProc: %i\r\ncbClsExtra: %i\r\ncbWndExtra: %i\r\nhInstance: %i\r\nhIcon: %i\r\nhCursor: %i\r\nhbrBackground: %i\r\nlpszMenuName: %s\r\nlpszClassName: %s\r\nhIconSm: %i\r\n]
-;file \plugins\Popup\src\services.cpp
-[Notify]
-;file \plugins\Popup\src\srmm_menu.cpp
-[Auto]
-[Favorite]
-[Block]
-[Popup Mode: Auto]
-[Popup Mode: Favorite]
-[Popup Mode: Ignore fullscreen]
-[Popup Mode: Block contact]
+#muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}
+;============================================================
+; File: PopupPlus.dll
+; Plugin: Popup plus
+; Version: 2.1.1.15
+; Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
+;============================================================
+[Provides popup notification services for different plugins.]
+;file \plugins\Popup\res\resource.rc
+[Content and Style]
+[Go to Customize -> Fonts and Colors for fonts and colors options]
+[Miscellaneous]
+[Effects]
+[Live Preview]
+[Size && Position]
+[History]
+[Enable popup history]
+[Store last]
+[events]
+[Use History++ to render log]
+[Avatars]
+[Draw avatar borders]
+[Draw borders for semitransparent avatars too]
+[Round corners by]
+[pixels]
+[Avatar size:]
+[Enable avatar updates]
+[Multimonitor]
+[Start the popups in the monitor with]
+[Miranda's window]
+[the active window]
+[Transparency]
+[Use transparency]
+[opacity:]
+[Opaque popups under cursor]
+[Slide popup]
+[Effect:]
+[Time (in):]
+[ms]
+[Time (out):]
+[Limit window amount to:]
+[Skins]
+[* - built-in skins]
+[Skin options]
+[Preview]
+[Download more skins]
+[Popup history]
+[Desktop]
+[Popup area]
+[pixel(s)]
+[Distance between popups]
+[Configure popup area]
+[Close]
+[General]
+[Enable popup actions]
+[Popup actions are those tiny buttons below notification text.]
+[Common actions]
+[Please choose in what cases default actions should be added:]
+[Add info && menu for IM contacts only]
+[Add default actions for contacts only]
+[Don't close popups on default actions]
+[Size and position]
+[Use large icons]
+[Popup actions will be displayed as:]
+[Icons and labels below text]
+[Icons on the left]
+[Icons aligned to the right]
+[Show actions: (requires apply)]
+[Mouse actions overwrite]
+[Left button]
+[Middle button]
+[Right button]
+[Notifications]
+[General options]
+[Enable this notification]
+[Popup timeout:]
+[Left click action:]
+[Right click action:]
+[Disable when global status is...]
+[Disable when relevant protocol's status is...]
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
+[More...]
+[Disable if message window is open]
+[Sec]
+[0 = Default]
+[-1 = Infinite]
+[Per-contact settings]
+[Show always]
+[Ignore fullscreen]
+[Never show]
+[Show default]
+[Default timeout]
+[Infinite popup delay]
+[Popup delay:]
+[seconds]
+[Do not close hovered popups]
+[Dynamically resize the popups]
+[Minimum width]
+[Maximum width]
+[Position:]
+[Layout:]
+[Reorder popups]
+[Disable when:]
+[Always (has priority)]
+[Fullscreen mode]
+[Debug]
+;file \plugins\Popup\src\actions.cpp
+[Quick reply]
+[Send message]
+[User details]
+[Contact menu]
+[Add permanently]
+[Pin popup]
+[Dismiss popup]
+[Copy to clipboard]
+[No overwrite]
+[Action]
+;file \plugins\Popup\src\config.cpp
+[The Jabberwocky]
+[`Twas brillig, and the slithy toves\r\nDid gyre and gimble in the wabe:\r\nAll mimsy were the borogoves,\r\nAnd the mome raths outgrabe.\r\n\t[b][i]Lewis Carroll, 1855[/i][/b]]
+[Test preview for the popup plugin settings. This is supposed to be long enough not to fit in one line...]
+[This is a special test preview for the popup plugin settings. The text and title are quite long so you can tweak your skin and plugin settings to best fit your needs :)]
+[This is a notification message]
+[This is a warning message]
+[This is an error message]
+;file \plugins\Popup\src\effects.cpp
+[Square fading]
+;file \plugins\Popup\src\font.h
+[Popups]
+[Title]
+[Clock]
+[Text]
+[Hovered action]
+[Background]
+[Border]
+[Sidebar]
+[Title underline]
+[Avatar border]
+;file \plugins\Popup\src\history.cpp
+[Popup history is disabled]
+[Popup history message]
+;file \plugins\Popup\src\icons.cpp
+[With "favorite" overlay]
+[With "fullscreen" overlay]
+[Information]
+[Warning]
+[Error]
+[Refresh skin list]
+[Popup placement]
+[Cancel]
+[Popup group]
+[Favorite contact]
+[Show in fullscreen]
+[Blocked contact]
+[Pinned popup]
+[Add contact permanently]
+;file \plugins\Popup\src\main.cpp
+[Classes]
+[Actions]
+[Contacts]
+[Advanced]
+[Toggle popups]
+[Enable popups]
+[Disable popups]
+[Popup plus]
+[Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
+;file \plugins\Popup\src\opt_adv.cpp
+[No effect]
+[Fade in/out]
+;file \plugins\Popup\src\opt_class.cpp
+[CLASS Plugins]
+[Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn!]
+;file \plugins\Popup\src\opt_gen.cpp
+[Offline]
+[Online]
+[Invisible]
+[Away]
+[Not available]
+[Occupied]
+[Do not disturb]
+[Free for chat]
+[Out to lunch]
+[On the phone]
+[Width]
+[Upper left corner]
+[Lower left corner]
+[Lower right corner]
+[Upper right corner]
+[Horizontal]
+[Vertical]
+[Global Status]
+[Protocol Status]
+[You cannot specify a value lower than %d and higher than %d.]
+['Reorder popups' option is currently disabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewXstatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n]
+[Popup plus warning]
+;file \plugins\Popup\src\opt_skins.cpp
+[Failed to register %s class.]
+[Skin preview]
+[Just take a look at this skin... ;)]
+[Show clock]
+[Drop shadow effect]
+[non rectangular]
+[Enable Aero Glass (Vista+)]
+[Use Windows colors]
+[Use advanced text render]
+[Global settings]
+[Refresh List]
+;file \plugins\Popup\src\popup_thread.cpp
+;file \plugins\Popup\src\popup_wnd2.cpp
+[Failed to GetClassInfoExW from EDIT class.]
+[Failed to register custom edit box window class.\r\n\r\ncbSize: %i\r\nstyle: %p\r\nlpfnWndProc: %i\r\ncbClsExtra: %i\r\ncbWndExtra: %i\r\nhInstance: %i\r\nhIcon: %i\r\nhCursor: %i\r\nhbrBackground: %i\r\nlpszMenuName: %s\r\nlpszClassName: %s\r\nhIconSm: %i\r\n]
+;file \plugins\Popup\src\services.cpp
+[Notify]
+;file \plugins\Popup\src\srmm_menu.cpp
+[Auto]
+[Favorite]
+[Block]
+[Popup Mode: Auto]
+[Popup Mode: Favorite]
+[Popup Mode: Ignore fullscreen]
+[Popup Mode: Block contact]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 5e2abace38..69efb642af 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
;============================================================
; File: SkypeWeb.dll
; Plugin: Skype protocol (Web)
-; Version: 0.12.3.1
+; Version: 0.12.3.3
; Authors: Miranda NG team
;============================================================
[Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 2dea1f26e1..e843e23407 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
;============================================================
; File: SmileyAdd.dll
; Plugin: SmileyAdd
-; Version: 0.3.1.0
+; Version: 0.3.1.1
; Authors: Peacow, nightwish, bid, borkra
;============================================================
[Smiley support for Miranda NG.]
diff --git a/langpacks/english/Plugins/StatusManager.txt b/langpacks/english/Plugins/StatusManager.txt
index b7ee8b2715..03a8a3c401 100644
--- a/langpacks/english/Plugins/StatusManager.txt
+++ b/langpacks/english/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
;============================================================
; File: StatusManager.dll
; Plugin: Status manager
-; Version: 1.2.0.4
+; Version: 1.2.0.5
; Authors: P Boon
;============================================================
[A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index ce3ff1694c..2ca2f1613b 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
;============================================================
; File: TabSRMM.dll
; Plugin: TabSRMM
-; Version: 3.5.0.12
+; Version: 3.5.0.13
; Authors: The Miranda developers team and contributors
;============================================================
[IM and group chat module for Miranda NG.]
@@ -93,7 +93,6 @@
[Group chats]
[Errors]
[Use the message log color theme for group chat popups]
-[No compatible popup plugin was found. The event notification\nsystem is not available.]
[Dialog]
[Cancel]
[All modes]
@@ -863,8 +862,6 @@
[Clock symbol (for the info panel clock)]
[Feature disabled (used as overlay)]
[Feature enabled (used as overlay)]
-[Enable typing notification]
-[Disable typing notification]
;file \plugins\TabSRMM\src\msgs.h
[Message windows - IM]
[Message windows - all]
@@ -1013,8 +1010,8 @@
;file \plugins\TabSRMM\src\typingnotify.cpp
[Disable &typing notification]
[Enable &typing notification]
-[...is typing a message.]
[...has stopped typing.]
+[...is typing a message.]
[Contact started typing]
[Contact stopped typing]
;file \plugins\TabSRMM\src\userprefs.cpp
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 39ac90673e..c1ecc93597 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
;============================================================
; File: UInfoEx.dll
; Plugin: User info ext
-; Version: 0.8.5.1
+; Version: 0.8.5.2
; Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
;============================================================
[Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]
@@ -570,9 +570,8 @@
;file \plugins\UserInfoEx\src\svc_refreshci.cpp
[[b]%s (%S)...[/b]\n%d Contacts remaining]
[Abort Refreshing Contact Details]
-[Do you want to cancel the current refresh procedure?]
[Miranda must be online for refreshing contact information!]
-[The function caused an exception!]
+[Do you want to cancel the current refresh procedure?]
;file \plugins\UserInfoEx\src\svc_reminder.cpp
[%s has %s today.]
[an anniversary]
@@ -627,20 +626,14 @@
[Import User Details from VCard]
;file \plugins\UserInfoEx\src\ex_import\svc_ExImXML.cpp
[Can't create xml file!\n%S]
-[Export took %f ms]
[Contact: %s (%S)]
-[Importing %s caused error %d]
-[Loading contact %s from xml failed with error %d]
-[Importing Owner caused error %d]
[Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]
[The selected file is no valid XMLCard]
[The version of the XMLCard is not supported by UserInfoEx]
[Complete]
[Owner contact successfully imported.]
[Selected XMLCard does not contain an owner contact!]
-[Import took %f ms]
[added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
-[FATAL: An exception was thrown while importing contacts from xmlCard!]
;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp
[Flags (UInfoEx)]
;file \plugins\UserInfoEx\src\Flags\svc_flagsicons.cpp
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 32737f5dea..92dc8e72f4 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.8.1
+; Version: 0.1.9.0
; Authors: Miranda NG team
;============================================================
[VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index 52579fd606..8e204852d0 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -6,7 +6,7 @@
; Authors: Miranda NG team
;============================================================
[Retrieves weather information and displays it in your contact list.]
-;file \plugins\Weather\res\resource.rc
+;file \protocols\Weather\res\resource.rc
[Update]
[Brief Info]
[Webpage]
@@ -130,7 +130,7 @@
[Show user detail]
[To old setting]
[To default]
-;file \plugins\Weather\src\stdafx.h
+;file \protocols\Weather\src\stdafx.h
[N/A]
[Invalid ID format, missing "/" (10)]
[Invalid service (11)]
@@ -172,20 +172,20 @@
[Here is a list of custom variables that are currently available]
[The URL for complete forecast has not been set. You can set it from the Edit Settings dialog.]
[The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
-;file \plugins\Weather\src\weather.cpp
+;file \protocols\Weather\src\weather.cpp
[Enable/disable auto update]
[Auto Update Enabled]
[Auto Update Disabled]
[Condition Changed]
[Alert Issued]
-;file \plugins\Weather\src\weather_addstn.cpp
+;file \protocols\Weather\src\weather_addstn.cpp
[Current weather information for %s.]
[%s is now the default weather station]
[Weather Protocol]
[Please try again after weather update is completed.]
[<Enter station name here>]
[<Enter station ID here>]
-;file \plugins\Weather\src\weather_contacts.cpp
+;file \protocols\Weather\src\weather_contacts.cpp
[Weather condition was not logged.]
[Get city name from ID]
[Weather INI information]
@@ -194,19 +194,19 @@
[Reset to default]
[Text Files]
[All Files]
-;file \plugins\Weather\src\weather_conv.cpp
+;file \protocols\Weather\src\weather_conv.cpp
[mb]
[in]
[mm]
[<unknown time>]
[<Error>]
[HTTP Error %i]
-;file \plugins\Weather\src\weather_data.cpp
+;file \protocols\Weather\src\weather_data.cpp
[<Enter city name here>]
[Error when obtaining data: %s]
-;file \plugins\Weather\src\weather_http.cpp
+;file \protocols\Weather\src\weather_http.cpp
[Weather HTTP connections]
-;file \plugins\Weather\src\weather_icons.cpp
+;file \protocols\Weather\src\weather_icons.cpp
[Protocol icon]
[Update Disabled]
[View Log]
@@ -217,7 +217,7 @@
[Popup]
[No Popup]
[Edit Settings]
-;file \plugins\Weather\src\weather_info.cpp
+;file \protocols\Weather\src\weather_info.cpp
[Name]
[Author]
[File Version]
@@ -237,22 +237,22 @@
[Memory Used:]
[bytes]
[Description:]
-;file \plugins\Weather\src\weather_ini.cpp
+;file \protocols\Weather\src\weather_ini.cpp
[All update data has been reloaded.]
[Invalid ini format for: %s]
[No update data file is found. Please check your Plugins\\Weather directory.]
-;file \plugins\Weather\src\weather_mwin.cpp
+;file \protocols\Weather\src\weather_mwin.cpp
[Frame Font]
[Frame Title Font]
[Frame Background]
-;file \plugins\Weather\src\weather_opt.cpp
+;file \protocols\Weather\src\weather_opt.cpp
[Weather Protocol Text Preview]
[Network]
[General]
[Display]
[Popups]
-;file \plugins\Weather\src\weather_popup.cpp
-;file \plugins\Weather\src\weather_svcs.cpp
+;file \protocols\Weather\src\weather_popup.cpp
+;file \protocols\Weather\src\weather_svcs.cpp
[Station ID]
[Disable &weather notification]
[Enable &weather notification]
@@ -266,9 +266,9 @@
[Remove Old Data then Update All]
[Weather Notification]
[Display in a frame]
-;file \plugins\Weather\src\weather_update.cpp
+;file \protocols\Weather\src\weather_update.cpp
[Unable to retrieve weather information for %s]
-;file \plugins\Weather\src\weather_userinfo.cpp
+;file \protocols\Weather\src\weather_userinfo.cpp
[Variable]
[Information]
[Retrieving new data, please wait...]
diff --git a/langpacks/english/Plugins/WebView.txt b/langpacks/english/Plugins/WebView.txt
index 3993897063..15a3e04f57 100644
--- a/langpacks/english/Plugins/WebView.txt
+++ b/langpacks/english/Plugins/WebView.txt
@@ -6,7 +6,7 @@
; Authors: Vincent Joyce
;============================================================
[Adds web pages as contacts to your contact list and can display text and/or issue change alerts from those pages in a window.]
-;file \plugins\WebView\res\webview.rc
+;file \protocols\WebView\res\webview.rc
[Webview]
[Update data every]
[minutes]
@@ -93,7 +93,7 @@
[Co&py all]
[&Select all]
[C&lear all]
-;file \plugins\WebView\src\main.cpp
+;file \protocols\WebView\src\main.cpp
[Alert event]
[Auto update disabled]
[Auto update enabled]
@@ -107,11 +107,11 @@
[Contact alert options]
[Ping web site]
[Stop data processing]
-;file \plugins\WebView\src\webview.cpp
+;file \protocols\WebView\src\webview.cpp
[All Webview sites have been updated.]
[Network]
[Popups]
-;file \plugins\WebView\src\webview_alerts.cpp
+;file \protocols\WebView\src\webview_alerts.cpp
[Cannot write to file]
[Last updated on]
[Start/end strings not found or strings not set.]
@@ -127,14 +127,14 @@
[Specific part of the web page has changed.]
[Cannot read from cache file]
[Loaded from cache]
-;file \plugins\WebView\src\webview_datawnd.cpp
+;file \protocols\WebView\src\webview_datawnd.cpp
[ERROR: You have two or more Webview contacts with the same URL and contact name.]
[Alert options]
[Stop processing]
[Click here to open this URL in a browser window.]
[Stick to the front]
[Disable stick to the front]
-;file \plugins\WebView\src\webview_getdata.cpp
+;file \protocols\WebView\src\webview_getdata.cpp
[URL not supplied]
[Download in progress, please wait...]
[Updating...]
@@ -158,7 +158,7 @@
[Bytes in display]
[Bytes downloaded]
[Alert test conditions not met; press the refresh button to view content.]
-;file \plugins\WebView\src\webview_opts.cpp
+;file \protocols\WebView\src\webview_opts.cpp
[No whitespace removal]
[Minimal level of whitespace removal]
[Medium level of whitespace removal]
@@ -177,7 +177,7 @@
[You need to supply a URL.]
[You need to supply a name for the contact.]
[Invalid symbol present in contact name.]
-;file \plugins\WebView\src\webview_services.cpp
+;file \protocols\WebView\src\webview_services.cpp
[Cache folder does not exist.]
[Missing "psite.bat" file.]
[Site URL]
diff --git a/langpacks/english/Plugins/WhoUsesMyFiles.txt b/langpacks/english/Plugins/WhoUsesMyFiles.txt
index 1d3c874f4c..ecdcbc10e1 100644
--- a/langpacks/english/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/english/Plugins/WhoUsesMyFiles.txt
@@ -31,9 +31,8 @@
[Disabled options will be available in the next version]
[Show current connections]
;file \plugins\WhoUsesMyFiles\src\options.cpp
-[Popup plugin not found!]
-[Error]
[Common Dialog Error 0x%lx]
+[Error]
[Not implemented yet...]
[Who uses my files]
[Services]
diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index 5e2b2dd981..2ee0aad159 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -6,7 +6,7 @@
; Authors: y_b, tweety, majvan
;============================================================
[Mail notifier and browser for Miranda NG. Included POP3 protocol.]
-;file \plugins\YAMN\res\YAMN.rc
+;file \protocols\YAMN\res\YAMN.rc
[Installed plugins]
[Version:]
[Description:]
@@ -81,7 +81,7 @@
[Preview]
[Background color]
[Text color]
-;file \plugins\YAMN\src\main.cpp
+;file \protocols\YAMN\src\main.cpp
[Check &mail (All Account)]
[Check &mail (This Account)]
[Launch application]
@@ -89,18 +89,18 @@
[YAMN Account Folder]
[Check mail]
[Connect Fail]
-;file \plugins\YAMN\src\main.h
+;file \protocols\YAMN\src\main.h
[New mail message]
[Connect failed]
-;file \plugins\YAMN\src\services.cpp
+;file \protocols\YAMN\src\services.cpp
[Nick]
[No new mail message]
-;file \plugins\YAMN\src\browser\badconnect.cpp
+;file \protocols\YAMN\src\browser\badconnect.cpp
[%s - connection error]
[An error occurred. Error code: %d]
[Unknown error]
[ - connection error]
-;file \plugins\YAMN\src\browser\mailbrowser.cpp
+;file \protocols\YAMN\src\browser\mailbrowser.cpp
[%s - %d new mail messages, %d total]
[%s : %d new mail message(s), %d total]
[%d new mail message(s), %d total]
@@ -120,12 +120,12 @@
[Date]
[Do you really want to delete %d selected mails?]
[Delete confirmation]
-;file \plugins\YAMN\src\mails\mime.cpp
+;file \protocols\YAMN\src\mails\mime.cpp
[Translate header error]
[Part]
-;file \plugins\YAMN\src\proto\netlib.cpp
+;file \protocols\YAMN\src\proto\netlib.cpp
[%s connection]
-;file \plugins\YAMN\src\proto\pop3\pop3comm.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3comm.cpp
[Disconnected]
[POP3 protocol (internal)]
[Found new version of account book, not compatible with this version of YAMN.]
@@ -164,7 +164,7 @@
[Cannot write SSL data.]
[Cannot read SSL data.]
[Error %d-%d-%d-%d:]
-;file \plugins\YAMN\src\proto\pop3\pop3opt.cpp
+;file \protocols\YAMN\src\proto\pop3\pop3opt.cpp
[Network]
[Accounts]
[General]
diff --git a/langpacks/english/Plugins/YAPP.txt b/langpacks/english/Plugins/YAPP.txt
deleted file mode 100644
index 3b743d45b6..0000000000
--- a/langpacks/english/Plugins/YAPP.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-#muuid {efd15f16-7ae4-40d7-a8e3-a411ed747bd5}
-;============================================================
-; File: YAPP.dll
-; Plugin: YAPP
-; Version: 0.5.0.12
-; Authors: Scott Ellis
-;============================================================
-[Yet Another Popup Plugin - Provides popup notification window services to other plugins.]
-;file \plugins\YAPP\res\yapp.rc
-[Popup history]
-[Close]
-[Case sensitive]
-[Default Timeout]
-[Never timeout]
-[Set timeout:]
-[Width:]
-[Maximum height:]
-[Options]
-[Opacity (%):]
-[Border]
-[Round corners (window)]
-[Preview]
-[Transparent background]
-[Layout]
-[Avatar size:]
-[Disable when]
-[Global hover]
-[Sidebar width:]
-[Text indent:]
-[Padding:]
-[Round corners (avatar)]
-[Text color:]
-[Background color:]
-[Set timeout]
-[Timeout value (0 = default):]
-;file \plugins\YAPP\src\icons.cpp
-[Popups are enabled]
-[Popups are disabled]
-[Popup History]
-;file \plugins\YAPP\src\notify_imp.cpp
-[YAPP Popups]
-;file \plugins\YAPP\src\options.cpp
-[Example]
-[The quick brown fox jumped over the lazy dog.]
-[Example With a Long Title]
-[Thequickbrownfoxjumpedoverthelazydog.]
-[An avatar.]
-[Bottom right]
-[Bottom left]
-[Top right]
-[Top left]
-[Icon on left]
-[Icon on right]
-[No time]
-[Time on left]
-[Time on right]
-[Time above avatar]
-[No avatar]
-[Left avatar]
-[Right avatar]
-[Status]
-[Full-screen app running]
-[No animate]
-[Horizontal animate]
-[Vertical animate]
-[You cannot set a default timeout of 0.\nValue has been reset.]
-[Error]
-[Popups]
-[Settings]
-[Classes]
-;file \plugins\YAPP\src\services.cpp
-[Disable Popups]
-[Enable Popups]
-;file \plugins\YAPP\src\yapp.cpp
-[Toggle Popups]
-[First line]
-[Second line]
-[Time]
-[Background]
-[Sidebar]
-[Title underline]
-;file \plugins\YAPP\src\yapp_history_dlg.cpp
-[Copy title to clipboard]
-[Copy message to clipboard]
-[Copy timestamp to clipboard]