summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2014-04-22 11:03:53 +0000
committerKirill Volinsky <mataes2007@gmail.com>2014-04-22 11:03:53 +0000
commitdb27bfc7a5266e11cf4b5ad586bbf4e4efa64331 (patch)
tree2e90e3161626edf2138eb80445fd7a17ecc810ce /langpacks/english
parentb1e8dd28bbe9bf6acfa6a11c4ffe6b626bb6fed6 (diff)
english langpack update
git-svn-id: http://svn.miranda-ng.org/main/trunk@9041 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/=CORE=.txt1
-rw-r--r--langpacks/english/Plugins/NewAwaySys.txt2
-rw-r--r--langpacks/english/Plugins/Ping.txt3
-rw-r--r--langpacks/english/Plugins/ShlExt.txt1
4 files changed, 2 insertions, 5 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 387ac37473..4d5d79d137 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -546,7 +546,6 @@
;file \src\core\stdidle\resource.rc
[Become idle if the following is left unattended:]
[Windows]
-[Miranda]
[Become idle if the screen saver is active]
[Become idle if the computer is locked]
[Become idle if a terminal session is disconnected]
diff --git a/langpacks/english/Plugins/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
index c9b4d914b0..c54edb10c7 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -106,8 +106,6 @@
[Open Variables help dialog]
[Your most recent status messages are placed in this category. It's not recommended to put your messages manually here, as they'll be replaced by your recent messages.]
[You can put your frequently used and favorite messages in this category.]
-[Windows]
-[Miranda]
[When this checkbox is ticked, NewAwaySys counts "send times" starting from the last status message change, even if status mode didn't change.\nWhen the checkbox isn't ticked, "send times" are counted from last status mode change (i.e., disabled state is more restrictive).]
[Message]
[URL]
diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index dfd253322b..bcd57855ad 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -55,8 +55,9 @@
;file \plugins\Ping\src\menu.cpp
[Ping]
;file \plugins\Ping\src\options.cpp
+[Text Files (*.txt)]
+[All Files]
[Open log file]
-[All\0*.*\0Text\0*.TXT\0]
[<none>]
[<all>]
[Settings]
diff --git a/langpacks/english/Plugins/ShlExt.txt b/langpacks/english/Plugins/ShlExt.txt
index 8b6a433546..253285d55f 100644
--- a/langpacks/english/Plugins/ShlExt.txt
+++ b/langpacks/english/Plugins/ShlExt.txt
@@ -26,6 +26,5 @@
[Are you sure? This will remove all the settings stored in your database and all registry entries created for shlext to work with Explorer]
[Disable/Remove shlext]
;file \plugins\ShellExt\src\shlcom.cpp
-[Miranda]
[Recently]
[Clear entries]