english & russian langpack update

8 files changed, 50 insertions, 38 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 57f7f67ba2..96f3cd9314 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -996,6 +996,7 @@
 [Actively searching]

 [In love]

 [It\'s complicated]

+[In a civil union]

 [Summary]

 [Contact]

 [Location]

diff --git a/langpacks/english/Plugins/Alarms.txt b/langpacks/english/Plugins/Alarms.txt
index 168e2fa9b9..0ff576e127 100644
--- a/langpacks/english/Plugins/Alarms.txt
+++ b/langpacks/english/Plugins/Alarms.txt
@@ -45,7 +45,6 @@
 [Weekly]

 [Daily]

 [Weekdays]

-[Monthly]

 [Yearly]

 [i'm hiding]

 [Date and time]

@@ -53,6 +52,14 @@
 [Don't trigger on startup]

 [No reminder]

 [Selected days]

+[Mon]

+[Tue]

+[Wed]

+[Thu]

+[Fri]

+[Sat]

+[Sun]

+[Monthly]

 [Dismiss]

 [Snooze]

 [Static]

diff --git a/langpacks/english/Plugins/Discord.txt b/langpacks/english/Plugins/Discord.txt
index 1676bd1295..6efa5db3fb 100644
--- a/langpacks/english/Plugins/Discord.txt
+++ b/langpacks/english/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.0.0.3
+;  Version: 0.2.0.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -13,9 +13,14 @@
 [Contacts]
 [Default group:]
 [Nick:]
+;file \protocols\Discord\src\dispatch.cpp
+[edited at]
+[User]
 ;file \protocols\Discord\src\options.cpp
 [Network]
 [Account]
 ;file \protocols\Discord\src\proto.cpp
 [%s server connection]
+[%s gateway connection]
 [User ID]
+[Protocol is offline or no JID]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 879556163d..cb207bf842 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.3.0.3

+;  Version: 0.3.1.0

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -26,7 +26,8 @@
 [Automatically set 'Ignore status change' flag]

 [Use bigger avatars]

 [Prefer real names instead of nicknames]

-[At login load also contacts you recently chat with]

+[Load also Messenger contacts at login (not only Facebook friends)]

+[Use invisible status for Facebook Pages (instead of offline)]

 [Popup notifications]

 [Show notifications]

 [Show wall posts (news feed) (WARNING: Causes excessive network traffic!)]

diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index f38d223800..f099dfaf45 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SimpleStatusMsg.dll

 ;  Plugin: Simple status message

-;  Version: 1.9.0.5

+;  Version: 1.9.0.6

 ;  Authors: Bartosz 'Dezeath' Bialek, Harven

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

 [Provides a simple way to set status and away messages.]

@@ -122,6 +122,7 @@
 [Are you sure you want to clear predefined status messages?]

 [Confirm clearing predefined]

 [<last status>]

+[Startup status]

 [Status]

 [General]

 [Advanced]

diff --git a/langpacks/english/Plugins/StatusManager.txt b/langpacks/english/Plugins/StatusManager.txt
index 7888f90a87..ccc10eabde 100644
--- a/langpacks/english/Plugins/StatusManager.txt
+++ b/langpacks/english/Plugins/StatusManager.txt
@@ -2,11 +2,19 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 0.11.0.0
+;  Version: 0.11.2.0
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
 ;file \plugins\StatusManager\res\resource.rc
+[Enable modules]
+[Keep status]
+[A connection checker. Automatically reconnects your accounts after protocol error or internet drop.]
+[Startup status]
+[Allows you to define the status Miranda should set on startup, configurable per account.]
+[Advanced auto away]
+[Improved Auto Away module with some more options than the built in, configurable per account.]
+[Note: Miranda NG will have to be restarted for changes to take effect.]
 [General]
 [Show popups]
 [Account connection]
@@ -133,28 +141,11 @@
 [Entering first auto-away status]
 [Entering second auto-away status]
 [Leaving first auto-away status]
-[Leaving second auto-away status]
-[Becoming active without status change]
 [Pre-conditions]
-[TriggerData]
 [Status: The status the account will change to\r\nAccount: The account changing state]
-;file \plugins\StatusManager\src\aaa_options.cpp
-[minutes of %s mode]
-[Rules]
-[Status messages]
-[Auto away]
-;file \plugins\StatusManager\src\commonstatus.cpp
-[I've been away since %time%.]
-[Give it up, I'm not in!]
-[Not right now.]
-[Give a guy some peace, would ya?]
-[I'm a chatbot!]
-[Yep, I'm here.]
-[Nope, not here.]
-[I'm hiding from the mafia.]
-[That'll be the phone.]
-[Mmm... food.]
-[idleeeeeeee]
+[TriggerData]
+[Becoming active without status change]
+[Leaving second auto-away status]
 ;file \plugins\StatusManager\src\confirmdialog.cpp
 [Set %s message for %s.]
 [<last>]
@@ -162,7 +153,14 @@
 [<n/a>]
 [Protocol]
 [Closing in %d]
-;file \plugins\StatusManager\src\keepstatus.cpp
+;file \plugins\StatusManager\src\options.cpp
+[Status manager]
+;file \plugins\StatusManager\src\AdvancedAutoAway\aaa_options.cpp
+[minutes of %s mode]
+[Rules]
+[Status messages]
+[Auto away]
+;file \plugins\StatusManager\src\KeepStatus\keepstatus.cpp
 [%s connected from another location]
 [%s login error, cancel reconnecting]
 [%s login error (next retry (%d) in %d s)]
@@ -175,13 +173,12 @@
 [No internet connection seems available... (next retry (%d) in %d s)]
 [Status was set ok]
 [Giving up]
-[Keep status]
-;file \plugins\StatusManager\src\ks_options.cpp
+;file \plugins\StatusManager\src\KeepStatus\ks_options.cpp
 [Basic]
 [Advanced]
 [You broke the Internet!]
 [Popups]
-;file \plugins\StatusManager\src\ss_options.cpp
+;file \plugins\StatusManager\src\StartupStatus\ss_options.cpp
 [<unknown>]
 [Right]
 [None]
@@ -194,10 +191,8 @@
 [default]
 [unknown]
 [At least one profile must exist]
-[Status manager]
 [Your default profile will be changed]
-[Startup status]
-;file \plugins\StatusManager\src\ss_profiles.cpp
-;file \plugins\StatusManager\src\ss_toolbars.cpp
+;file \plugins\StatusManager\src\StartupStatus\ss_profiles.cpp
+;file \plugins\StatusManager\src\StartupStatus\ss_toolbars.cpp
 [Pressed toolbar icon]
 [Released toolbar icon]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 6b525fbe77..e6549b16d4 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -552,6 +552,7 @@
 [Actively searching]

 [In love]

 [It\'s complicated]

+[In a civil union]

 [jun.]

 [sen.]

 ;file \plugins\UserInfoEx\src\svc_constants.h

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 8d77086591..7ef75a1206 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.2.9

+;  Version: 0.1.2.12

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

@@ -84,11 +84,12 @@
 [Local settings]

 [Contact list group:]

 [Language for names and titles:]

-[Server-side delivery confirmation]

-[Use local time for received messages]

-[Automatically wipe local contacts missing in your friend list]

 [Mark message as read:]

 [Sync history on protocol online:]

+[Load last messages when message window open and  local history is empty]

+[Use local time for received messages]

+[Load only friends to local contact list]

+[Server-side delivery confirmation]

 [Bots challenge test]

 [Instruction:]

 [Submit]