summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2015-03-27 07:28:16 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2015-03-27 07:28:16 +0000
commite3dae8e31b2c0bae3ee7f5d53a59134fcae8dba2 (patch)
tree5b9c4bb8c88817c31eed61aed0048a02ec79fa5e
parent4beb69b6dbfbca860c8d16db8500e47a496ac61b (diff)
- langpacks/english: update;
- langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@12521 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--langpacks/english/Plugins/MirOTR.txt3
-rw-r--r--langpacks/russian/Plugins/MirOTR.txt2
-rw-r--r--langpacks/russian/Untranslated/Import.txt4
-rw-r--r--langpacks/russian/Untranslated/MirOTR.txt1
4 files changed, 4 insertions, 6 deletions
diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index 8db76a7138..7284b0fa54 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -122,7 +122,6 @@
[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
@@ -143,5 +142,3 @@
[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/russian/Plugins/MirOTR.txt b/langpacks/russian/Plugins/MirOTR.txt
index d6c8fe9196..286f27c8d5 100644
--- a/langpacks/russian/Plugins/MirOTR.txt
+++ b/langpacks/russian/Plugins/MirOTR.txt
@@ -237,5 +237,3 @@ OTR: установлен SecureIM
Личные данные
[Services]
Службы
-['(Unknown contact)']
-'(Неизвестный контакт)'
diff --git a/langpacks/russian/Untranslated/Import.txt b/langpacks/russian/Untranslated/Import.txt
new file mode 100644
index 0000000000..a4c877e54d
--- /dev/null
+++ b/langpacks/russian/Untranslated/Import.txt
@@ -0,0 +1,4 @@
+[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.]
diff --git a/langpacks/russian/Untranslated/MirOTR.txt b/langpacks/russian/Untranslated/MirOTR.txt
index a504b8a7b8..6cd4933a54 100644
--- a/langpacks/russian/Untranslated/MirOTR.txt
+++ b/langpacks/russian/Untranslated/MirOTR.txt
@@ -1,6 +1,5 @@
[don't rely on the prefix, always check the OTR status icon]
[[OTR INFO] ]
-[ [v%i]]
[\nusing older protocol version %i]
[Attempting to start a private conversation...]
[An error occurred when encrypting your message.\nThe message was not sent]