summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2014-01-10 15:05:12 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2014-01-10 15:05:12 +0000
commitc6610f3c2e22e9fcd62f5099d9ca280ea0db854e (patch)
treebacc5de7026227b3a9b62e2ce63d1f920dff1a34 /langpacks/english
parent73efaa00c6044d77a6c098bec38057b231ef8243 (diff)
- langpacks/english: update;
- langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@7578 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/Plugins/Jabber.txt26
-rw-r--r--langpacks/english/Plugins/StartupSilence.txt2
-rw-r--r--langpacks/english/Plugins/VKontakte.txt5
3 files changed, 11 insertions, 22 deletions
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 7fd057c342..11cd4c1ca7 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -53,19 +53,6 @@
[Hint:]
[Try to uncheck all checkmarks above if you're experiencing troubles with sending files. But it can cause problems with transfer of large files.]
[Jabber Account Registration]
-[Jabber Agents]
-[Register/Search Jabber Agents]
-[Jabber server:]
-[Browse]
-[Register...]
-[Browse/Join chat room...]
-[Search...]
-[Registered Jabber Transports]
-[Log on]
-[Log off]
-[Register with a new service...]
-[Close]
-[Command]
[Jabber Form]
[Instruction:]
[Submit]
@@ -75,7 +62,6 @@
[Jabber Password]
[Remember password for this session]
[Save password permanently]
-[Data form test]
[Address1:]
[Address2:]
[City:]
@@ -123,19 +109,15 @@
[Current Password:]
[New Password:]
[Confirm New Password:]
-[Jabber Multi-User Conference]
-[Conference server:]
[Create or Join group chat]
[Jabber Multi-User Conference\nCreate or join existing conference room.]
+[Conference server:]
[Room:]
[Recently visited chatrooms:]
[Bookmarks]
[JID List]
[Apply Filter]
[Reset Filter]
-[Jabber Agent Registration]
-[JID:]
-[Register]
[Invite Users]
[<room jid>\nSend group chat invitation.]
[Other JID:]
@@ -151,6 +133,7 @@
[Server side bookmarks\nStore conference rooms and web links on server.]
[Remove]
[Edit]
+[Close]
[Bookmark Details]
[Bookmark Type]
[Conference]
@@ -189,9 +172,8 @@
[View as list]
[Favorites]
[Refresh]
+[JID:]
[Node:]
-[Change %s Message]
-[Closing in %d]
[Account type:]
[Login server:]
[Register account now]
@@ -246,6 +228,8 @@
[Sending Ad-Hoc command to %s]
;file \protocols\JabberG\src\jabber_agent.cpp
[No message]
+[Jabber Agent Registration]
+[Register]
[Please wait...]
;file \protocols\JabberG\src\jabber_bookmarks.cpp
[Bookmark Name]
diff --git a/langpacks/english/Plugins/StartupSilence.txt b/langpacks/english/Plugins/StartupSilence.txt
index 7cc3196deb..9139a96825 100644
--- a/langpacks/english/Plugins/StartupSilence.txt
+++ b/langpacks/english/Plugins/StartupSilence.txt
@@ -5,7 +5,7 @@
; Version: 0.2.0.0
; Authors: Vladimir Lyubimov
;============================================================
-[Disables ALL popups and sounds for 10-300 sec at Miranda startup and enables them always for Miranda NG (Automatically per computer settings).]
+[Suppresses popups and mutes sounds for 10-300 sec at Miranda NG startup, then sets them back to predefined state (Automatically per computer settings).]
;file \plugins\StartupSilence\res\StartupSilence.rc
[Silence at Startup]
[Settings for the next Computer Name:]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 7cf4c9a7e3..7ce9067375 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -25,12 +25,17 @@
[VKontakte]
;file \protocols\VKontakte\src\vk_captcha.cpp
[Enter the text you see]
+;file \protocols\VKontakte\src\vk_chats.cpp
+[Participants]
+[Owners]
+[Unknown]
;file \protocols\VKontakte\src\vk_options.cpp
[Network]
[Account]
;file \protocols\VKontakte\src\vk_proto.cpp
[%s server connection]
;file \protocols\VKontakte\src\vk_thread.cpp
+[me]
[Attachments:]
[Photo]
[Audio]