summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
authorDart Raiden <wowemuh@gmail.com>2016-06-25 10:54:52 +0000
committerDart Raiden <wowemuh@gmail.com>2016-06-25 10:54:52 +0000
commit1b92eaa3ce7aaa3e75b9380b20a684fac11c3933 (patch)
tree10bbc440fa46e2a2f570f4ff7b715b8041316d1e /langpacks/english
parent1a07ef2d64e2133fede68be72ba1af98faa06c5b (diff)
langpacks/english: update
git-svn-id: http://svn.miranda-ng.org/main/trunk@17035 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/=CORE=.txt1
-rw-r--r--langpacks/english/Plugins/Dummy.txt2
-rw-r--r--langpacks/english/Plugins/Jabber.txt1
-rw-r--r--langpacks/english/Plugins/ListeningTo.txt3
-rw-r--r--langpacks/english/Plugins/MirOTR.txt1
-rw-r--r--langpacks/english/Plugins/Sametime.txt1
-rw-r--r--langpacks/english/Plugins/VKontakte.txt4
-rw-r--r--langpacks/english/Plugins/Weather.txt1
-rw-r--r--langpacks/english/Plugins/Yahoo.txt1
9 files changed, 1 insertions, 14 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index c08ee2c177..1915642d3b 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1245,7 +1245,6 @@
[Assignment to the metacontact failed.]
[Assignment failure]
;file \src\mir_app\src\meta_edit.cpp
-[ID]
[Protocol]
[Send offline]
[Send &online]
diff --git a/langpacks/english/Plugins/Dummy.txt b/langpacks/english/Plugins/Dummy.txt
index a7c529d2cc..4d1e5aaa13 100644
--- a/langpacks/english/Plugins/Dummy.txt
+++ b/langpacks/english/Plugins/Dummy.txt
@@ -23,11 +23,9 @@
[User ID]
[ICQ number]
[Nickname]
-[JID]
[Visible name]
[E-mail address]
[Live ID]
-[ID]
[Skype name]
[Steam ID]
[Tlen login]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 6a12a78e47..04adcbb3d9 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -752,7 +752,6 @@
[Role changes]
[Status changes]
[Don't notify history messages]
-[JID]
[Group]
[Subscription]
[Uploading...]
diff --git a/langpacks/english/Plugins/ListeningTo.txt b/langpacks/english/Plugins/ListeningTo.txt
index 4d128b03a4..882984c7e8 100644
--- a/langpacks/english/Plugins/ListeningTo.txt
+++ b/langpacks/english/Plugins/ListeningTo.txt
@@ -24,15 +24,12 @@
[Apply template for info from contacts (overrides contacts template)]
[Get info from WATrack plugin]
[Get info from these players:]
-[Winamp (*)]
[Windows Media Player]
-[iTunes]
[foobar2000 (need to install the plugin manually)]
[Other players]
[Ask for new info every]
[seconds]
[Allow auto-loading plugins into players (affect players with *)]
-[mRadio]
[Listening to]
[Template:]
[Variables:]
diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index 9f37aff784..7b7160602e 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -73,7 +73,6 @@
[OTR finished]
[OTR private]
[OTR not secure]
-[OTR]
[Refresh]
[Generating new private key for protocol '%s'.\nPlease Wait...]
[General]
diff --git a/langpacks/english/Plugins/Sametime.txt b/langpacks/english/Plugins/Sametime.txt
index d4850e254f..72e85c1667 100644
--- a/langpacks/english/Plugins/Sametime.txt
+++ b/langpacks/english/Plugins/Sametime.txt
@@ -57,7 +57,6 @@
[Error]
;file \protocols\Sametime\src\sametime_proto.cpp
[%s connection]
-[ID]
;file \protocols\Sametime\src\sametime_session.cpp
[Sametime administrator message]
[Session announcement - from '%s']
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 0530485777..5c4ed560ae 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.2.0
+; Version: 0.1.1.28
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
@@ -151,8 +151,6 @@
[Document]
[Wall post]
[Link]
-[Product]
-[Price]
[Gift]
[Unsupported or unknown attachment type: %s]
[(Unknown contact)]
diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index 0b85bc4020..8bfea68814 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -53,7 +53,6 @@
[Edit Weather Station]
[Weather Station]
[City name]
-[ID]
[Log Information]
[Use internal history]
[Use external file]
diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index c8bc55d945..e079ec2509 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -88,7 +88,6 @@
;file \protocols\Yahoo\src\proto.cpp
[New E-mail available in Inbox]
[%s plugin connections]
-[ID]
[Please enter your Yahoo ID in Options -> Network -> Yahoo]
[Please enter your Yahoo password in Options -> Network -> Yahoo]
[Yahoo Login Error]