From 40086f4fc370ca92218c805fe5cee10c09f57f2c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 14 May 2018 18:29:31 +0300 Subject: merge with master till: fixes #1358 (StdMsg: "Send on Ctrl+Enter" setting is lost after upgrade) --- langpacks/english/Plugins/Scriver.txt | 3 +-- langpacks/english/Plugins/SmileyAdd.txt | 4 ++-- langpacks/english/Plugins/StatusManager.txt | 2 +- langpacks/english/Plugins/TabSRMM.txt | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) (limited to 'langpacks/english/Plugins') diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index a7d67a16e2..f638f96664 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Scriver.dll ; Plugin: Scriver -; Version: 3.0.1.7 +; Version: 3.0.1.8 ; Authors: Miranda NG team ;============================================================ [Scriver - send and receive instant messages.] @@ -37,7 +37,6 @@ [Show toolbar] [Show info bar] [Show avatars] -[Use the contact's status icon as the window icon] [Show progress indicator] [Enable transparency] [active] diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt index 352ce29bf6..c0c60a4938 100644 --- a/langpacks/english/Plugins/SmileyAdd.txt +++ b/langpacks/english/Plugins/SmileyAdd.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: SmileyAdd.dll ; Plugin: SmileyAdd -; Version: 0.3.0.1 +; Version: 0.3.0.2 ; Authors: Peacow, nightwish, bid, borkra ;============================================================ [Smiley support for Miranda NG.] @@ -55,8 +55,8 @@ [Protocol specific] ;file \plugins\SmileyAdd\src\smileys.cpp [Smiley pack %s for category "%s" not found.\nSelect correct smiley pack in the Options -> Customize -> Smileys.] -[Smiley #%u in file %s for smiley pack %s not found.] [There were problems loading smiley pack (it should be corrected).\nSee network log for details.] +[Smiley #%u in file %s for smiley pack %s not found.] [%s global smiley pack] [Standard] [Regular expression "%s" in smiley pack "%s" malformed.] diff --git a/langpacks/english/Plugins/StatusManager.txt b/langpacks/english/Plugins/StatusManager.txt index dc5f2969dc..0df4c26eec 100644 --- a/langpacks/english/Plugins/StatusManager.txt +++ b/langpacks/english/Plugins/StatusManager.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: StatusManager.dll ; Plugin: Status manager -; Version: 1.1.0.4 +; Version: 1.2.0.1 ; 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.] diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index 5ec60fafe9..dd4fa35fc5 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -423,7 +423,7 @@ [%s enables '%s' status for %s] [%s disables '%s' status for %s] ;file \plugins\TabSRMM\src\chat_main.cpp -[Message Sessions] +[Message sessions] ;file \plugins\TabSRMM\src\chat_options.cpp [Input area background] [Log background] @@ -533,6 +533,7 @@ [Topic (10x10)] [Highlight (10x10)] [Information (10x10)] +[Message Sessions] [Group chat windows] [Group chat log] [Appearance and functionality of chat room windows] @@ -813,7 +814,6 @@ [Normal - close tab, if last tab is closed also close the window] [Minimize the window to the task bar] [Close or hide window, depends on the close button setting above] -[Message sessions] [General] [Tabs and layout] [Containers] -- cgit v1.2.3