summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/english/Plugins/Clist_nicer.txt2
-rw-r--r--langpacks/english/Plugins/CmdLine.txt2
-rw-r--r--langpacks/english/Plugins/Fingerprint.txt9
-rw-r--r--langpacks/english/Plugins/HistoryStats.txt1
-rw-r--r--langpacks/english/Plugins/Import.txt2
-rw-r--r--langpacks/english/Plugins/Jabber.txt2
-rw-r--r--langpacks/english/Plugins/MSN.txt5
-rw-r--r--langpacks/english/Plugins/Msg_Export.txt1
-rw-r--r--langpacks/english/Plugins/NewEventNotify.txt2
-rw-r--r--langpacks/english/Plugins/SkypeWeb.txt3
-rw-r--r--langpacks/english/Plugins/TabSRMM.txt2
-rw-r--r--langpacks/english/Plugins/Tox.txt3
-rw-r--r--langpacks/english/Plugins/VKontakte.txt4
13 files changed, 13 insertions, 25 deletions
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 900e4cf4a0..151b0482f7 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -67,7 +67,6 @@
[Move events to the top of list or group]
[Do not separate offline contacts]
[Hide as offline]
-[Tree hide offline]
[Right align contacts]
[Avatars]
[Show avatars]
@@ -132,7 +131,6 @@
[milliseconds]
[Hide vertical scroll bar]
[Gray out entire list when:]
-[Tree gray out]
[Contact list background]
[Use Windows colors]
[Use background image]
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index 0dc9634f4b..c42c6d765e 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -7,7 +7,7 @@
;============================================================
[This plugin lets you control Miranda from the command line.]
;file \plugins\CmdLine\src\CmdLine.cpp
-[Could not initialize CmdLine plugin property]
+[Could not initialize CmdLine plugin properly]
[Error]
;file \plugins\CmdLine\src\mimcmd_data.h
[Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is an optional parameter specifying the account to set the status for. If it's not specified then the command will issue a global status change.]
diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index 09701fd25e..8908a654ac 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -17,6 +17,7 @@
[Unicode overlay]
[Secure overlays]
[Select protocols]
+[Facebook clients]
[Gadu-Gadu clients]
[ICQ clients]
[IRC clients]
@@ -25,10 +26,8 @@
[MSN clients]
[QQ clients]
[RSS clients]
-[Weather clients]
-[Yahoo clients]
-[Facebook clients]
[VKontakte clients]
+[Weather clients]
[Multi-protocol clients]
[Other (rare) protocols]
[Other icons]
@@ -70,7 +69,6 @@
[Jabber overlay]
[MSN overlay]
[QQ overlay]
-[Yahoo overlay]
[Mail.Ru Agent overlay]
[VK overlay]
[Skype overlay]
@@ -80,9 +78,6 @@
[ICQ v6.x overlay]
[ICQ v7.x overlay]
[ICQ v8.x overlay]
-[Yahoo v11.x overlay]
-[Yahoo v10.x overlay]
-[Yahoo v9.x overlay]
[Gadu-Gadu v11 client]
[Gadu-Gadu v10 client]
[Gadu-Gadu v9 client]
diff --git a/langpacks/english/Plugins/HistoryStats.txt b/langpacks/english/Plugins/HistoryStats.txt
index 10d4c6f2a8..9f6986ee56 100644
--- a/langpacks/english/Plugins/HistoryStats.txt
+++ b/langpacks/english/Plugins/HistoryStats.txt
@@ -7,7 +7,6 @@
;============================================================
[Creates detailed, colorful and highly customizable statistics using your message history.]
;file \plugins\HistoryStats\res\resource.rc
-[Band]
[HistoryStats - Working...]
[Cancel]
[HistoryStats - Add column]
diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index e38251d97b..43a21b545b 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -92,7 +92,7 @@
[All Files]
[You cannot import your current profile into itself]
;file \plugins\Import\src\ui.cpp
-[Import history for]
+[Import history for %s]
[JSON file]
;file \plugins\Import\src\utils.cpp
[Skipping duplicate group %s.]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 55dd7afa14..1aa1b1db4c 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -500,7 +500,7 @@
[To]
[From]
[Both]
-[Errors]
+[errors]
;file \protocols\JabberG\src\jabber_notes.cpp
[Incoming note from %s]
[Send note to %s]
diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index d6a8093cb0..5da8275b6a 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -101,8 +101,8 @@
[Setup Live &Alerts]
;file \protocols\MSN\src\msn_misc.cpp
[Custom Smileys]
-[Notify]
-[Error]
+[Notifications]
+[Errors]
[MSN Protocol]
;file \protocols\MSN\src\msn_opts.cpp
[Protocol icon]
@@ -129,7 +129,6 @@
[Account]
[Connection]
[Server list]
-[Notifications]
;file \protocols\MSN\src\msn_proto.cpp
[Live Mail]
[Live Alert]
diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index ca415a1d1d..044cb23621 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -43,7 +43,6 @@
[Copy]
;file \plugins\Msg_Export\src\FileViewer.cpp
[Miranda database contains %d events]
-[With scroll to bottom %d\n]
[Search string was not found!]
[Save as RTF]
[Color...]
diff --git a/langpacks/english/Plugins/NewEventNotify.txt b/langpacks/english/Plugins/NewEventNotify.txt
index 9805f0e0d3..fe35cc25a9 100644
--- a/langpacks/english/Plugins/NewEventNotify.txt
+++ b/langpacks/english/Plugins/NewEventNotify.txt
@@ -2,7 +2,7 @@
;============================================================
; File: NewEventNotify.dll
; Plugin: NewEventNotify
-; Version: 0.2.2.3
+; Version: 0.2.2.4
; Authors: icebreaker, Prezes, vj, vlko, Joe @ Whale
;============================================================
[Notifies you when you receive a message, URL, file or any other event by displaying a popup.]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 099b1e56d5..09d519bc86 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -102,8 +102,7 @@
[Errors]
[Calls]
;file \protocols\SkypeWeb\src\skype_proto.cpp
-[Incoming call sound]
-[Incoming call canceled sound]
+[Incoming call canceled]
[Skypename]
;file \protocols\SkypeWeb\src\skype_trouter.cpp
[Incoming call from %s]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index c2117d4a0e..b02d01bf28 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -647,6 +647,7 @@
[Unknown event]
[New messages: ]
[Unknown module or contact]
+[Event notifications]
;file \plugins\TabSRMM\src\generic_msghandlers.cpp
[Rich Edit file]
[No status message]
@@ -822,7 +823,6 @@
[Containers]
[Message log]
[Typing notify]
-[Event notifications]
[Message window]
[Load and apply]
[Window layout tweaks]
diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index b732d115e5..b172564b9d 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -46,8 +46,6 @@
;file \protocols\Tox\src\main.cpp
[Profiles folder]
[Tox link protocol]
-;file \protocols\Tox\src\tox_connection.cpp
-[Unable to initialize Tox core]
;file \protocols\Tox\src\tox_icons.cpp
[Protocol icon]
[Action icon]
@@ -90,6 +88,7 @@
;file \protocols\Tox\src\tox_proto.cpp
[You cannot add yourself to your contact list]
[Contact already in your contact list]
+[Unable to initialize tox core]
;file \protocols\Tox\src\tox_search.cpp
[Query]
;file \protocols\Tox\src\tox_utils.cpp
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index e5c7382987..cb2df98609 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -277,7 +277,7 @@
[VKontakte protocol]
;file \protocols\VKontakte\src\vk_proto.cpp
[%s server connection]
-[VKontakte newsfeed & notification event]
+[Newsfeed & notification event]
[Mark messages as read]
[Send message to user's wall]
[Add as friend]
@@ -291,7 +291,7 @@
[for last 90 days]
[for all time]
[Errors]
-[Notification]
+[Notifications]
[VK user activate/deactivate action]
[User %s added as friend]
[You cannot add yourself as friend]