summaryrefslogtreecommitdiff
path: root/langpacks/english/Plugins
diff options
context:
space:
mode:
Diffstat (limited to 'langpacks/english/Plugins')
-rw-r--r--langpacks/english/Plugins/Import.txt8
-rw-r--r--langpacks/english/Plugins/Jabber.txt4
-rw-r--r--langpacks/english/Plugins/MirOTR.txt24
-rw-r--r--langpacks/english/Plugins/NewXstatusNotify.txt2
-rw-r--r--langpacks/english/Plugins/VKontakte.txt2
5 files changed, 27 insertions, 13 deletions
diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index 7abda7081e..50f19f2fc3 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -26,13 +26,13 @@
[Cancel]
[< &Back]
[Import all settings, contacts and all messages]
-[Makes precise copy of the original profile]
[Import all contacts and all messages]
-[Select this if you want to import as much data as possible. This is the recommended option.]
[Only import contacts]
-[Select this if you want to import contacts but don't want to import any message history.]
[Custom import]
-[Select this if you want to customize what to import.]
+[Makes precise copy of the original profile, including all settings, contacts and history]
+[Imports only contacts and history, and a few settings. Ideal for synchronizing.]
+[Imports contacts only, doesn't import any message history.]
+[Custom schema: you can choose what to import.]
[New contacts && groups]
[System history]
[Select items to import:]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 0a006d0400..03e8602cf0 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -402,6 +402,8 @@
[Supported features]
[Info request error]
[Items request error]
+;file \protocols\JabberG\src\jabber_filterlist.cpp
+[Set filter...]
;file \protocols\JabberG\src\jabber_form2.cpp
[One or more addresses for communication related to abusive traffic]
[One or more addresses for customer feedback]
@@ -1284,5 +1286,3 @@
[Listening To]
[Moods]
[Activities]
-;file \protocols\JabberG\src\ui_utils.cpp
-[Set filter...]
diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index 9e9f0802e9..8db76a7138 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -17,6 +17,7 @@
[End sessions on window close]
[End sessions when contacts go offline]
[Prefix encrypted IMs:]
+[don't rely on the prefix, always check the OTR status icon]
[Don't add encrypted messages to the history]
[Also remove OTR system messages]
[Show OTR system messages inline]
@@ -67,11 +68,6 @@
[OTR could not encrypt when sending message]
[OTR Information]
[[OTR INFO] ]
-[Authentication from %s]
-[Authenticate %s]
-[Unknown]
-[OTR: %s (%s)]
-[OTR %s (%s)]
[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]
@@ -126,8 +122,26 @@
[OTR: SecureIM installed]
[You are using SecureIM. MirOTR will only work for contacts with SecureIM disabled]
;file \plugins\MirOTR\src\mirotrmenu.cpp
+[ [v%i]]
[MirOTR menu]
[OTR Status]
;file \plugins\MirOTR\src\options.cpp
[Private Data]
[Services]
+;file \plugins\MirOTR\src\otr.cpp
+[\nusing older protocol version %i]
+[Attempting to start a private conversation...]
+[An error occurred when encrypting your message.\nThe message was not sent]
+['%s' has already closed his/her private connection to you; you should do the same]
+[Error setting up private conversation: %s]
+[Malformed message received]
+[We are receiving our own OTR messages.\nYou are either trying to talk to yourself, or someone is reflecting your messages back at you]
+[The last message to '%s' was resent]
+[The encrypted message received from '%s' is unreadable, as you are not currently communicating privately]
+[We received an unreadable encrypted message from '%s']
+[We received a malformed data message from '%s']
+[The following message received from '%s' was NOT encrypted: [%s]]
+['%s' has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message.]
+[unknown OTR message received, please report that to Miranda NG]
+;file \plugins\MirOTR\src\utils.cpp
+['(Unknown contact)']
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index b5fdeb45fa..781ad44b0a 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -2,7 +2,7 @@
;============================================================
; File: NewXstatusNotify.dll
; Plugin: xStatus notify
-; Version: 1.4.0.10
+; Version: 1.4.0.11
; Authors: Luca Santarelli, Vasilich, yaho
;============================================================
[Notifies you when a contact changes his/her (X)status or status message.]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index f2fb3cccff..669f00cf59 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.0.51
+; Version: 0.1.0.52
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]