summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/=CORE=.txt22
-rw-r--r--langpacks/english/Plugins/Scriver.txt3
-rw-r--r--langpacks/english/Plugins/SmileyAdd.txt4
-rw-r--r--langpacks/english/Plugins/StatusManager.txt2
-rw-r--r--langpacks/english/Plugins/TabSRMM.txt4
5 files changed, 16 insertions, 19 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 1f8cff331a..3db4b52ca8 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=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]
@@ -207,22 +207,22 @@
;file \src\core\stdmsg\res\resource.rc
[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:]
@@ -278,7 +278,7 @@
[Use same style as in the message log]
[Use default colors]
[Use custom colors]
-[Popups for the Chat plugin]
+[Popups for the StdMsg plugin]
[Timeout (s)]
[Text]
[Background]
@@ -709,6 +709,7 @@
;file \src\core\stdidle\src\options.cpp
[Idle]
;file \src\core\stdmsg\src\chat_manager.cpp
+[Message sessions]
[Chat module]
[Group chat log background]
[Message background]
@@ -716,8 +717,6 @@
[Nick list lines]
[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]
[Show list of users in the chat room]
@@ -828,7 +827,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/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]