summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/=CORE=.txt4
-rw-r--r--langpacks/english/Plugins/AssocMgr.txt2
-rw-r--r--langpacks/english/Plugins/BASS_interface.txt2
-rw-r--r--langpacks/english/Plugins/BuddyPounce.txt4
-rw-r--r--langpacks/english/Plugins/Clist_blind.txt4
-rw-r--r--langpacks/english/Plugins/Clist_modern.txt6
-rw-r--r--langpacks/english/Plugins/Clist_nicer.txt4
-rw-r--r--langpacks/english/Plugins/Facebook.txt2
-rw-r--r--langpacks/english/Plugins/HTTPServer.txt3
-rw-r--r--langpacks/english/Plugins/IRC.txt4
-rw-r--r--langpacks/english/Plugins/Jabber.txt3
-rw-r--r--langpacks/english/Plugins/KeyboardNotify.txt2
-rw-r--r--langpacks/english/Plugins/MyDetails.txt2
-rw-r--r--langpacks/english/Plugins/NewAwaySys.txt4
-rw-r--r--langpacks/english/Plugins/NewXstatusNotify.txt2
-rw-r--r--langpacks/english/Plugins/Nudge.txt2
-rw-r--r--langpacks/english/Plugins/Popup.txt2
-rw-r--r--langpacks/english/Plugins/Scriver.txt2
-rw-r--r--langpacks/english/Plugins/SeenPlugin.txt2
-rw-r--r--langpacks/english/Plugins/SkypeWeb.txt4
-rw-r--r--langpacks/english/Plugins/SpellChecker.txt2
-rw-r--r--langpacks/english/Plugins/StartupStatus.txt3
-rw-r--r--langpacks/english/Plugins/StatusChange.txt2
-rw-r--r--langpacks/english/Plugins/VKontakte.txt4
-rw-r--r--langpacks/english/Plugins/WhatsApp.txt2
-rw-r--r--langpacks/english/Plugins/WinterSpeak.txt2
-rw-r--r--langpacks/english/Plugins/YAMN.txt2
-rw-r--r--langpacks/english/Plugins/YARelay.txt2
28 files changed, 41 insertions, 38 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index f1385a4bc3..01c4337c92 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -210,7 +210,7 @@
[&Away\tCtrl+2]
[&Not available\tCtrl+3]
[Occ&upied\tCtrl+4]
-[&DND\tCtrl+5]
+[&Do not disturb\tCtrl+5]
[&Free for chat\tCtrl+6]
[&Invisible\tCtrl+7]
[On the &phone\tCtrl+8]
@@ -840,7 +840,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[Out to lunch]
diff --git a/langpacks/english/Plugins/AssocMgr.txt b/langpacks/english/Plugins/AssocMgr.txt
index f54f382736..451675cc6d 100644
--- a/langpacks/english/Plugins/AssocMgr.txt
+++ b/langpacks/english/Plugins/AssocMgr.txt
@@ -5,7 +5,7 @@
; Version: 0.1.1.0
; Authors: H. Herkenrath
;============================================================
-[Handles file type associations and URLs like aim, ymsgr, xmpp, wpmsg, gg, tlen.]
+[Handles file type associations and URLs like aim, gg, mirpu, tlen, wpmsg, xmpp, ymsgr.]
;file \plugins\AssocMgr\res\resource.rc
[Registered associations for Miranda NG:]
[Miscellaneous]
diff --git a/langpacks/english/Plugins/BASS_interface.txt b/langpacks/english/Plugins/BASS_interface.txt
index bbc2029082..abed1f5b4c 100644
--- a/langpacks/english/Plugins/BASS_interface.txt
+++ b/langpacks/english/Plugins/BASS_interface.txt
@@ -21,7 +21,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[On the phone]
diff --git a/langpacks/english/Plugins/BuddyPounce.txt b/langpacks/english/Plugins/BuddyPounce.txt
index 9527b81b14..bee48c05ef 100644
--- a/langpacks/english/Plugins/BuddyPounce.txt
+++ b/langpacks/english/Plugins/BuddyPounce.txt
@@ -41,7 +41,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[On the phone]
@@ -52,7 +52,7 @@
[To Away]
[To Not available]
[To Occupied]
-[To DND]
+[To Do not disturb]
[To Free for chat]
[To Invisible]
[To On the phone]
diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index ffeb136f68..db8da90f8a 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -94,7 +94,7 @@
[&Away\tCtrl+2]
[&Not available\tCtrl+3]
[Occ&upied\tCtrl+4]
-[&DND\tCtrl+5]
+[&Do not disturb\tCtrl+5]
[&Free for chat\tCtrl+6]
[&Invisible\tCtrl+7]
[On the &phone\tCtrl+8]
@@ -106,7 +106,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[Out to lunch]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index af176f99e5..4cb6094a8e 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -294,7 +294,7 @@
[&Away\tCtrl+2]
[&Not available\tCtrl+3]
[Occ&upied\tCtrl+4]
-[&DND\tCtrl+5]
+[&Do not disturb\tCtrl+5]
[&Free for chat\tCtrl+6]
[&Invisible\tCtrl+7]
[On the &phone\tCtrl+8]
@@ -352,7 +352,7 @@
[Special colors]
[Standard contacts]
[Away contacts]
-[DND contacts]
+[Do not disturb contacts]
[Not available contacts]
[Occupied contacts]
[Free for chat contacts]
@@ -387,7 +387,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[Out to lunch]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index a4d5d59740..25f526ae00 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -230,7 +230,7 @@
[&Away\tCtrl+2]
[&Not available\tCtrl+3]
[Occ&upied\tCtrl+4]
-[&DND\tCtrl+5]
+[&Do not disturb\tCtrl+5]
[&Free for chat\tCtrl+6]
[&Invisible\tCtrl+7]
[On the &phone\tCtrl+8]
@@ -255,7 +255,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[Out to lunch]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 8bf06774db..261eaee7e1 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Facebook.dll
; Plugin: Facebook RM
-; Version: 0.2.11.7
+; Version: 0.2.11.8
; Authors: Michal Zelinka, Robert Pösel
;============================================================
[Facebook protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/HTTPServer.txt b/langpacks/english/Plugins/HTTPServer.txt
index a6f32f2e55..6538565d1d 100644
--- a/langpacks/english/Plugins/HTTPServer.txt
+++ b/langpacks/english/Plugins/HTTPServer.txt
@@ -22,7 +22,7 @@
[External server name]
[This is the link pasted to the message window]
[Write log file]
-[Enable / Disable HTTP server]
+[Enable HTTP server]
[Main menu items]
[Open log]
[Show popups]
@@ -86,4 +86,3 @@
[Failed to write xml tail to file ]
[Failed to bind to port %s\r\nThis is most likely because another program or service is using this port]
[Disable HTTP server]
-[Enable HTTP server]
diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index a5e9ff83cf..296160acfe 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -158,6 +158,8 @@
[DCC ERROR: Malformed CTCP request from %s [%s]]
[DCC: File transfer resume request from %s denied]
[CTCP %s requested by %s]
+[%u second]
+[%u seconds]
[CTCP PING reply from %s: %u sec(s)]
[CTCP %s reply from %s: %s]
[Downloading list (%u%%) - %u channels]
@@ -261,7 +263,7 @@
[Event: Away]
[Event: Not available]
[Event: Occupied]
-[Event: DND]
+[Event: Do not disturb]
[Event: Free for chat]
[Event: On the phone]
[Event: Out for lunch]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index ee69fec5e2..2268a2c59a 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -321,7 +321,7 @@
[Online]
[Away]
[Not available]
-[DND]
+[Do not disturb]
[Free for chat]
[&Leave chat session]
[&Slap]
@@ -851,7 +851,6 @@
[Choose the status and status message]
[Status]
[Extended away (Not available)]
-[Do not disturb]
[Invisible]
[Offline]
[Priority]
diff --git a/langpacks/english/Plugins/KeyboardNotify.txt b/langpacks/english/Plugins/KeyboardNotify.txt
index 3727882883..5b54d450f9 100644
--- a/langpacks/english/Plugins/KeyboardNotify.txt
+++ b/langpacks/english/Plugins/KeyboardNotify.txt
@@ -34,7 +34,7 @@
[Away]
[Occupied]
[Not available]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[On the phone]
diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index c4f298cbb5..c611faf1cd 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -47,7 +47,7 @@
[&Away]
[&Not available]
[Occ&upied]
-[&DND]
+[&Do not disturb]
[&Free for chat]
[&Invisible]
[On the &phone]
diff --git a/langpacks/english/Plugins/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
index da4d935389..037c15a048 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -22,7 +22,7 @@
[&Away]
[&Not available]
[Occ&upied]
-[&DND]
+[&Do not disturb]
[&Free for chat]
[&Invisible]
[On the &phone]
@@ -114,7 +114,7 @@
[Give it up, I'm not in!]
[Occupied]
[Not right now.]
-[DND]
+[Do not disturb]
[Give a guy some peace, would ya?]
[Free for chat]
[I'm a chatbot!]
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index eb25f896ce..9f45a1d413 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -15,7 +15,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Out to lunch]
[On the phone]
[Always when changing from offline]
diff --git a/langpacks/english/Plugins/Nudge.txt b/langpacks/english/Plugins/Nudge.txt
index 336edf03db..af3ac14961 100644
--- a/langpacks/english/Plugins/Nudge.txt
+++ b/langpacks/english/Plugins/Nudge.txt
@@ -32,7 +32,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[On the phone]
diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
index 16b9930880..151c54346c 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/Popup.txt
@@ -179,7 +179,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Out to lunch]
[On the phone]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 18a4d5c47d..fa856bd959 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -301,7 +301,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[Out to lunch]
diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index 09802f47dd..9d24a6e19e 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -28,7 +28,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[On the phone]
[Out to lunch]
[Free for chat]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 2772ae5542..1b5323ec86 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -49,10 +49,12 @@
[Call information]
[File transfer information]
[URI object]
+[Moji]
+[File]
[Unknown event]
[Incoming call]
;file \protocols\SkypeWeb\src\skype_events.cpp
-[Invalid data!]
+[SkypeWeb error: Invalid data!]
[[b]Original message:[/b]\n%s\n]
[Original message:\n%s\n]
[[b]Edited at %s:[/b]\n%s\n]
diff --git a/langpacks/english/Plugins/SpellChecker.txt b/langpacks/english/Plugins/SpellChecker.txt
index 279d6fece2..dbcfee86b3 100644
--- a/langpacks/english/Plugins/SpellChecker.txt
+++ b/langpacks/english/Plugins/SpellChecker.txt
@@ -2,7 +2,7 @@
;============================================================
; File: SpellChecker.dll
; Plugin: Spell checker
-; Version: 0.2.6.2
+; Version: 0.2.6.3
; Authors: Ricardo Pescuma Domenecci, FREAK_THEMIGHTY
;============================================================
[Spell checker for the message windows. Uses Hunspell to do the checking.]
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index f49acca813..5a2a2da860 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -2,7 +2,7 @@
;============================================================
; File: StartupStatus.dll
; Plugin: StartupStatus
-; Version: 0.8.0.47
+; Version: 0.8.0.48
; Authors: P Boon
;============================================================
[StartupStatus, allows you to define the status Miranda should set on startup, configurable per protocol.]
@@ -154,7 +154,6 @@
[StartupStatus]
[Your default profile will be changed]
;file \plugins\StatusPlugins\StartupStatus\profiles.cpp
-[There is a maximum of 6 menu items]
;file \plugins\StatusPlugins\StartupStatus\toolbars.cpp
[Pressed toolbar icon]
[Released toolbar icon]
diff --git a/langpacks/english/Plugins/StatusChange.txt b/langpacks/english/Plugins/StatusChange.txt
index 3a2f3cc373..9468292400 100644
--- a/langpacks/english/Plugins/StatusChange.txt
+++ b/langpacks/english/Plugins/StatusChange.txt
@@ -12,7 +12,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[On the phone]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 46fda0de62..1a6a5acd8e 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.1.20
+; Version: 0.1.1.22
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
@@ -110,6 +110,7 @@
[Broadcast icon]
[Status icon]
[Wall message icon]
+[Mark messages as read icon]
[Protocols]
[VKontakte]
[Access denied! Data will not be sent or received.]
@@ -227,6 +228,7 @@
[Send message to my wall]
[Load news from VK]
[Wipe contacts missing in friend list]
+[Mark messages as read]
[Send message to user\'s wall]
[Add as friend]
[Delete from friend list]
diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
index 959ae914f9..9e068423fd 100644
--- a/langpacks/english/Plugins/WhatsApp.txt
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -2,7 +2,7 @@
;============================================================
; File: WhatsApp.dll
; Plugin: WhatsApp protocol
-; Version: 0.1.3.2
+; Version: 0.1.3.3
; Authors: Uli Hecht
;============================================================
[WhatsApp protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/WinterSpeak.txt b/langpacks/english/Plugins/WinterSpeak.txt
index 9ff42b83e7..bfaaccda01 100644
--- a/langpacks/english/Plugins/WinterSpeak.txt
+++ b/langpacks/english/Plugins/WinterSpeak.txt
@@ -20,7 +20,7 @@
[Offline]
[Online]
[Away]
-[DND]
+[Do not disturb]
[Not available]
[Occupied]
[Free for chat]
diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index a5652d6b12..1fff7b129b 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -55,7 +55,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[On the phone]
diff --git a/langpacks/english/Plugins/YARelay.txt b/langpacks/english/Plugins/YARelay.txt
index b98f0b292d..28396c1523 100644
--- a/langpacks/english/Plugins/YARelay.txt
+++ b/langpacks/english/Plugins/YARelay.txt
@@ -16,7 +16,7 @@
[Away]
[Not available]
[Occupied]
-[DND]
+[Do not disturb]
[Free for chat]
[Invisible]
[Forward messages to...]