summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2015-06-23 19:46:05 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2015-06-23 19:46:05 +0000
commitccef0b4c21f28c71a715af4c68d81fd5d82b46bc (patch)
treeaf07c623d6686039b305d43897ef48d2e284125e /langpacks/english
parentdef03bef859796b00a5486343e95d3deea1d61db (diff)
- langpacks/english: update;
- langpacks/russian: update; translation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@14354 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/Plugins/ClientChangeNotify.txt2
-rw-r--r--langpacks/english/Plugins/CmdLine.txt2
-rw-r--r--langpacks/english/Plugins/HwHotKeys.txt1
-rw-r--r--langpacks/english/Plugins/New_GPG.txt2
-rw-r--r--langpacks/english/Plugins/Tox.txt2
-rw-r--r--langpacks/english/Plugins/VKontakte.txt2
-rw-r--r--langpacks/english/Plugins/Variables.txt1
7 files changed, 7 insertions, 5 deletions
diff --git a/langpacks/english/Plugins/ClientChangeNotify.txt b/langpacks/english/Plugins/ClientChangeNotify.txt
index 45bbc74284..38516426af 100644
--- a/langpacks/english/Plugins/ClientChangeNotify.txt
+++ b/langpacks/english/Plugins/ClientChangeNotify.txt
@@ -36,8 +36,8 @@
[%s (was %s)]
[Disable c&lient change notification]
[Enable c&lient change notification]
-[Popups]
[ClientChangeNotify: Client changed]
+[Popups]
;file \plugins\ClientChangeNotify\src\Misc.h
[Error #%d]
[Can't open log file ]
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index 5cbce59aae..2d515d41c1 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -2,7 +2,7 @@
;============================================================
; File: CmdLine.dll
; Plugin: Command line
-; Version: 0.0.4.4
+; Version: 0.0.4.5
; Authors: Cristian Libotean
;============================================================
[This plugin lets you control Miranda from the command line.]
diff --git a/langpacks/english/Plugins/HwHotKeys.txt b/langpacks/english/Plugins/HwHotKeys.txt
index af487a8266..5d4a3c971c 100644
--- a/langpacks/english/Plugins/HwHotKeys.txt
+++ b/langpacks/english/Plugins/HwHotKeys.txt
@@ -18,3 +18,4 @@
[Combination of keys for assignment]
;file \plugins\HwHotKeys\src\HwHotKeys_DllMain.cpp
[Customize]
+[Hardware HotKeys]
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index a31a59fae3..13682a1650 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -191,6 +191,8 @@
[There is no public or private key.]
;file \plugins\New_GPG\src\utilities.cpp
[Do you want to toggle encryption for all subcontacts?]
+[Turn off GPG encryption]
+[Turn on GPG encryption]
[Target file exists, do you want to replace it?]
[Capability to decrypt file not found on other side.\nRecipient may be unable to decrypt file(s).\nDo you want to encrypt file(s) anyway?]
[File transfer warning]
diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 001c87626c..9d2f27c401 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Tox.dll
; Plugin: Tox protocol
-; Version: 0.11.1.8
+; Version: 0.11.1.9
; Authors: Miranda NG Team
;============================================================
[Tox protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 891423e9a4..f320e40ff8 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.7
+; Version: 0.1.1.8
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index d7a16b747f..2745524ae3 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -187,7 +187,6 @@
[formats timestamp x (seconds since 1/1/1970) in time format y]
[y > 0: line number y from file x, y = 0: the whole file, y < 0: line y counted from the end, y = r: random line]
[uptime in seconds]
-[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]
[expand environment variable x]
[user name]
[text from clipboard]