summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2015-09-01 21:22:14 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2015-09-01 21:22:14 +0000
commitd21411e62a54693f387bbd5b1c5976dd019e98b1 (patch)
tree440180bfeb2e3e23e830ad91f1539fa33e60294c /langpacks/english
parentf2b5b0dd953573cbce3fe8df62daa2ada646c626 (diff)
langpacks update
git-svn-id: http://svn.miranda-ng.org/main/trunk@15144 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/Plugins/Dropbox.txt2
-rw-r--r--langpacks/english/Plugins/Facebook.txt1
-rw-r--r--langpacks/english/Plugins/HTTPServer.txt2
-rw-r--r--langpacks/english/Plugins/Jabber.txt2
-rw-r--r--langpacks/english/Plugins/PluginUpdater.txt2
-rw-r--r--langpacks/english/Plugins/SkypeWeb.txt2
-rw-r--r--langpacks/english/Plugins/TabSRMM.txt7
7 files changed, 13 insertions, 5 deletions
diff --git a/langpacks/english/Plugins/Dropbox.txt b/langpacks/english/Plugins/Dropbox.txt
index 6d9ff048f2..3fb044ed2c 100644
--- a/langpacks/english/Plugins/Dropbox.txt
+++ b/langpacks/english/Plugins/Dropbox.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Dropbox.dll
; Plugin: Dropbox
-; Version: 0.12.0.6
+; Version: 0.12.0.7
; Authors: Miranda NG Team
;============================================================
[Allows you to transfer files via Dropbox.]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index a4ea38063a..7bc27f6e10 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -25,6 +25,7 @@
[Default group:]
[Automatically set 'Ignore status change' flag]
[Use bigger avatars]
+[Prefer real names instead of nicknames]
[Event notifications]
[Notifications]
[News feeds (WARNING: Causes excessive network traffic!)]
diff --git a/langpacks/english/Plugins/HTTPServer.txt b/langpacks/english/Plugins/HTTPServer.txt
index 4402f744f8..76ddf3804c 100644
--- a/langpacks/english/Plugins/HTTPServer.txt
+++ b/langpacks/english/Plugins/HTTPServer.txt
@@ -2,7 +2,7 @@
;============================================================
; File: HTTPServer.dll
; Plugin: HTTPServer
-; Version: 0.1.2.2
+; Version: 0.1.2.3
; Authors: Kennet Nielsen, modified by Vampik, Houdini
;============================================================
[HTTP Web Server plugin for Miranda.]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 09b6e023bd..e39c6ef826 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -732,7 +732,7 @@
[Automatically accept authorization requests]
[Fix incorrect timestamps in incoming messages]
[Disable frame]
-[Enable XMPP link processing (requires Association Manager)]
+[Enable XMPP link processing (requires AssocMgr)]
[Keep contacts assigned to local groups (ignore roster group)]
[Security]
[Allow servers to request version (XEP-0092)]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 942f6a7d5c..9d64255ccb 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -88,7 +88,7 @@
[Close popup]
[Do nothing]
;file \plugins\PluginUpdater\src\Options.cpp
-[Backup profile before update]
+[Backup database before update]
[Stable version (incompatible with current development version)]
[hours]
[days]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 2d3a02078a..2772ae5542 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -103,5 +103,5 @@
[Incoming call sound]
[Incoming call canceled sound]
;file \protocols\SkypeWeb\src\skype_trouter.cpp
-[Failed establish a TRouter connection.]
+[Failed to establish a TRouter connection.]
[Incoming call from %s]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index eed99e5dcc..95c5265ff8 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -797,6 +797,13 @@
[Server window]
[%s on %s%s]
;file \plugins\TabSRMM\src\templates.cpp
+[Message In]
+[Message Out]
+[Group In (Start)]
+[Group Out (Start)]
+[Group In (Inner)]
+[Group Out (Inner)]
+[Error message]
[Template set editor]
[This will reset the template set to the default built-in templates. Are you sure you want to do this?]
[Template set was successfully reset, please close and reopen all message windows. This template editor window will now close.]