merge with master till:

fixes #1358 (StdMsg: "Send on Ctrl+Enter" setting is lost after upgrade)

9 files changed, 36 insertions, 45 deletions

diff --git a/langpacks/croatian/=CORE=.txt b/langpacks/croatian/=CORE=.txt
index 9a020f4ede..babbd6da60 100644
--- a/langpacks/croatian/=CORE=.txt
+++ b/langpacks/croatian/=CORE=.txt
@@ -1,7 +1,7 @@
 ;============================================================

 ;  File: miranda32/64.exe

 ;  Module: Miranda Core

-;  Version: 0.95.8

+;  Version: 0.95.9

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

 ;file \src\core\stdaway\res\resource.rc

 [%s message for %s]

@@ -406,37 +406,37 @@ p&ovijest
 

 [In background]

 

+[Maximum number of flashes]

+

 [Close the message window on send]

 

 [Minimize the message window on send]

 

-[Use the contact's status icon as the window icon]

-

 [Save the window size and location individually for each contact]

 

 [Cascade new windows]

 

-[Show 'Send' button]

+[Support CTRL+Up/Down in message area to show previously sent messages]

 

-[Show toolbar buttons on top row]

+[Delete temporary contacts when closing message window]

 

-[Send message on double 'Enter']

+[Enable avatar support in the message window]

 

-[Send message on 'Enter']

+[Limit avatar height to]

 

-[Show character count]

+[Show 'Send' button]

 

-[Show warning when message has not been received after]

+[Show character count]

 

-[Support CTRL+Up/Down in message area to show previously sent messages]

+[Show toolbar buttons on top row]

 

-[Delete temporary contacts when closing message window]

+[Send message on double 'Enter']

 

-[Enable avatar support in the message window]

+[Send message on 'Enter']

 

-[Limit avatar height to]

+[Send message on 'Ctrl+Enter']

 

-[Maximum number of flashes]

+[Show warning when message has not been received after]

 

 [Send error]

 

@@ -548,7 +548,7 @@ koristi isti stil kao i u dnevnicima poruka
 koristi zadane boje

 [Use custom colors]

 koristi prilagođene boje

-[Popups for the Chat plugin]

+[Popups for the StdMsg plugin]

 skočni prozori za dodatak čavrljanja

 [Timeout (s)]

 vrijeme nestanka (s)

@@ -1390,6 +1390,8 @@ sve datoteke
 [Idle]

 

 ;file \src\core\stdmsg\src\chat_manager.cpp

+[Message sessions]

+

 [Chat module]

 

 [Group chat log background]

@@ -1403,10 +1405,6 @@ sve datoteke
 [Nick list background (selected)]

 

 ;file \src\core\stdmsg\src\chat_options.cpp

-[Send message by pressing the 'Enter' key]

-

-[Send message by pressing the 'Enter' key twice]

-

 [Flash window when someone speaks]

 

 [Flash window when a word is highlighted]

@@ -1627,8 +1625,6 @@ sve datoteke
 

 [Popups to display]

 

-[Message sessions]

-

 [General]

 

 [Chat log]

diff --git a/langpacks/croatian/Plugins/Scriver.txt b/langpacks/croatian/Plugins/Scriver.txt
index fa9ee21c85..42219111d9 100644
--- a/langpacks/croatian/Plugins/Scriver.txt
+++ b/langpacks/croatian/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.]

@@ -68,8 +68,6 @@ prikaži naslovnu traku
 

 [Show avatars]

 

-[Use the contact's status icon as the window icon]

-

 [Show progress indicator]

 

 [Enable transparency]

diff --git a/langpacks/croatian/Plugins/SmileyAdd.txt b/langpacks/croatian/Plugins/SmileyAdd.txt
index 470dd82ffe..9a658f03d5 100644
--- a/langpacks/croatian/Plugins/SmileyAdd.txt
+++ b/langpacks/croatian/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.]

@@ -98,10 +98,10 @@ sve datoteke
 ;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]

diff --git a/langpacks/croatian/Plugins/StatusManager.txt b/langpacks/croatian/Plugins/StatusManager.txt
index 9b62a55361..fd52d073de 100644
--- a/langpacks/croatian/Plugins/StatusManager.txt
+++ b/langpacks/croatian/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/croatian/Plugins/TabSRMM.txt b/langpacks/croatian/Plugins/TabSRMM.txt
index f20828f805..2730729c5f 100644
--- a/langpacks/croatian/Plugins/TabSRMM.txt
+++ b/langpacks/croatian/Plugins/TabSRMM.txt
@@ -835,7 +835,7 @@ prikaži traku izbornika
 [%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]

@@ -1054,6 +1054,8 @@ kartice
 

 [Information (10x10)]

 

+[Message Sessions]

+

 [Group chat windows]

 

 [Group chat log]

@@ -1598,8 +1600,6 @@ drugo
 

 [Close or hide window, depends on the close button setting above]

 

-[Message sessions]

-

 [General]

 

 [Tabs and layout]

diff --git a/langpacks/croatian/Untranslated/=CORE=.txt b/langpacks/croatian/Untranslated/=CORE=.txt
index 162e69b30f..60ac90000f 100644
--- a/langpacks/croatian/Untranslated/=CORE=.txt
+++ b/langpacks/croatian/Untranslated/=CORE=.txt
@@ -129,22 +129,22 @@
 [Disable sounds on idle]

 [Automatically popup window when:]

 [In background]

+[Maximum number of flashes]

 [Close the message window on send]

 [Minimize the message window on send]

-[Use the contact's status icon as the window icon]

 [Save the window size and location individually for each contact]

 [Cascade new windows]

+[Support CTRL+Up/Down in message area to show previously sent messages]

+[Delete temporary contacts when closing message window]

+[Enable avatar support in the message window]

+[Limit avatar height to]

 [Show 'Send' button]

+[Show character count]

 [Show toolbar buttons on top row]

 [Send message on double 'Enter']

 [Send message on 'Enter']

-[Show character count]

+[Send message on 'Ctrl+Enter']

 [Show warning when message has not been received after]

-[Support CTRL+Up/Down in message area to show previously sent messages]

-[Delete temporary contacts when closing message window]

-[Enable avatar support in the message window]

-[Limit avatar height to]

-[Maximum number of flashes]

 [Send error]

 [An error has occurred. The protocol reported the following error:]

 [while sending the following message:]

@@ -547,14 +547,13 @@
 [Transfer and virus scan complete]

 [Outgoing]

 [Idle]

+[Message sessions]

 [Chat module]

 [Group chat log background]

 [Message background]

 [Nick list background]

 [Nick list lines]

 [Nick list background (selected)]

-[Send message by pressing the 'Enter' key]

-[Send message by pressing the 'Enter' key twice]

 [Flash window when someone speaks]

 [Flash window when a word is highlighted]

 [Show list of users in the chat room]

@@ -665,7 +664,6 @@
 [Icons to display in the message log]

 [Icons to display in the tray]

 [Popups to display]

-[Message sessions]

 [General]

 [Chat log]

 [Chat]

diff --git a/langpacks/croatian/Untranslated/Scriver.txt b/langpacks/croatian/Untranslated/Scriver.txt
index 9293074311..77efb62dae 100644
--- a/langpacks/croatian/Untranslated/Scriver.txt
+++ b/langpacks/croatian/Untranslated/Scriver.txt
@@ -26,7 +26,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/croatian/Untranslated/SmileyAdd.txt b/langpacks/croatian/Untranslated/SmileyAdd.txt
index e3f0ef0723..d17556cb56 100644
--- a/langpacks/croatian/Untranslated/SmileyAdd.txt
+++ b/langpacks/croatian/Untranslated/SmileyAdd.txt
@@ -39,8 +39,8 @@
 [Customize]

 [Protocol specific]

 [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/croatian/Untranslated/TabSRMM.txt b/langpacks/croatian/Untranslated/TabSRMM.txt
index 9ab529f8ed..6359cfe449 100644
--- a/langpacks/croatian/Untranslated/TabSRMM.txt
+++ b/langpacks/croatian/Untranslated/TabSRMM.txt
@@ -375,7 +375,7 @@
 [ (set by %s)]

 [%s enables '%s' status for %s]

 [%s disables '%s' status for %s]

-[Message Sessions]

+[Message sessions]

 [Input area background]

 [Log background]

 [Single Messaging]

@@ -483,6 +483,7 @@
 [Topic (10x10)]

 [Highlight (10x10)]

 [Information (10x10)]

+[Message Sessions]

 [Group chat windows]

 [Group chat log]

 [Appearance and functionality of chat room windows]

@@ -744,7 +745,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]