Merge branch 'master' of https://github.com/miranda-ng/miranda-ng

6 files changed, 16 insertions, 9 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 4e0dec6e75..bf68fabea5 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -986,9 +986,9 @@
 [Please authorize my request and add me to your contact list.]

 ;file \src\mir_app\src\auth.cpp

 [<Unknown>]

-[%s requested authorization\n%u (%s) on %s]

-[%s requested authorization\n%u on %s]

-[%s requested authorization\n%s on %s]

+[ requested authorization\n%u (%s) on %s]

+[ requested authorization\n%u on %s]

+[ requested authorization\n%s on %s]

 [(Unknown)]

 [Feature is not supported by protocol]

 [%s added you to the contact list\n%u (%s) on %s]

@@ -1351,7 +1351,6 @@
 [Do you want to restart it now?]

 [Plugins]

 ;file \src\mir_app\src\popupOption.cpp

-[Enabled items]

 ;file \src\mir_app\src\profilemanager.cpp

 [<In use>]

 [<Unknown format>]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 9e6e46c9f4..9c42909fb5 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: ICQ.dll

 ;  Plugin: ICQ-WIM protocol

-;  Version: 0.96.1.7

+;  Version: 0.96.1.9

 ;  Authors: George Hazan

 ;============================================================

 [ICQ protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 931981f945..6b975004c7 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -92,6 +92,7 @@
 [Cellular]

 [Video]

 [Modem]

+[(*) marks the current session]

 [Load]

 [Save]

 [Delete]

@@ -736,6 +737,7 @@
 [Embrace picture URLs with [img]]

 [Ignore server roster (groups and nick names)]

 [Security]

+[Allow local time & timezone requests (XEP-0202)]

 [Allow servers to request version (XEP-0092)]

 [Show information about operating system in version replies]

 [Accept only in band incoming filetransfers (don't disclose own IP)]

@@ -943,6 +945,12 @@
 [Unknown format]

 [<Photo not available while offline>]

 [<No photo>]

+[Device ID]

+[Fingerprint]

+[Own device]

+[Trusted]

+[UNTRUSTED]

+[Unknown]

 [Photo]

 ;file \protocols\JabberG\src\jabber_util.cpp

 [Redirect]

@@ -975,6 +983,7 @@
 [Jabber vCard: Edit Phone Number]

 [Contacts]

 [Note]

+[OMEMO]

 ;file \protocols\JabberG\src\jabber_xstatus.cpp

 [<advanced status slot>]

 [Afraid]

diff --git a/langpacks/english/Plugins/NewEventNotify.txt b/langpacks/english/Plugins/NewEventNotify.txt
index 44788e32ac..f8fed019c8 100644
--- a/langpacks/english/Plugins/NewEventNotify.txt
+++ b/langpacks/english/Plugins/NewEventNotify.txt
@@ -35,7 +35,7 @@
 [General options]

 [Show preview of event in popup]

 [Enable event notifications for instant messages]

-[Disable event notifications for group chats]

+[Enable event notifications for group chats]

 [Notify me of...]

 [Error]

 [Left click actions]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 9d69c6fe97..eee76bcbf2 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: PluginUpdater.dll

 ;  Plugin: Plugin updater

-;  Version: 0.2.0.12

+;  Version: 0.2.1.2

 ;  Authors: Mataes, George Hazan

 ;============================================================

 [Installs and updates plugins and other Miranda NG components.]

@@ -29,7 +29,6 @@
 [Development version with debug symbols]

 [Custom version]

 [Change platform to 32-bit]

-[Use HTTPS]

 [Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.]

 [Notifications]

 [Restart]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 8c81410e9f..71f4dd0ef9 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -157,7 +157,7 @@
 [Show typing notification when message dialog is open]

 [Show typing notification when no message dialog is open]

 [Show balloon tooltip in the system tray]

-[        Show popups when a user is typing]

+[Show popups when a user is typing]

 [More about typing notifications]

 [Tab options]

 [Miscellaneous options]