summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/english/=CORE=.txt3
-rw-r--r--langpacks/english/Plugins/Actman.txt2
-rw-r--r--langpacks/english/Plugins/Jabber.txt1
-rw-r--r--langpacks/english/Plugins/TabSRMM.txt3
4 files changed, 4 insertions, 5 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 53b95aca79..80c5eb6130 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -586,10 +586,10 @@
['Hide offline' means to hide:]
[Default settings for known event types]
[Show when filter is active]
-[Log to file]
[Popup]
[Tray]
[Sound]
+[Log to file]
[Show icons in tray only when the chat room is not active]
[Highlight event]
[Show popups only when the chat room is not active]
@@ -1399,7 +1399,6 @@
[On]
[Off]
[Password]
-[Unused]
[Frames]
[Add group]
[Warning]
diff --git a/langpacks/english/Plugins/Actman.txt b/langpacks/english/Plugins/Actman.txt
index 2bbcd18f1f..7d761ad9bf 100644
--- a/langpacks/english/Plugins/Actman.txt
+++ b/langpacks/english/Plugins/Actman.txt
@@ -348,7 +348,7 @@
[Enables or disables popup windows (maybe deprecated)]
[result of protocol service call]
[Send a general request through the protocol chain for a contact]
-[str, account name]
+[account name (string)]
[Return account name associated to contact (no need to free it)]
[displays the Account Manager]
[Show the dialog to select the contact]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index cc58ba9f99..204c5263e3 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -731,6 +731,7 @@
[Fix incorrect timestamps in incoming messages]
[Disable frame]
[Enable XMPP link processing (requires AssocMgr)]
+[Embrace picture URLs with [img]]
[Ignore server roster (groups and nick names)]
[Security]
[Allow servers to request version (XEP-0092)]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 33320b9971..743b5a7a45 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -68,7 +68,6 @@
[seconds]
[Input history size]
[entries]
-[Options marked with an asterisk (*) will only take effect after Miranda has been restarted.]
[More about advanced tweaks]
[Revert to (safe) defaults]
[Event notify options]
@@ -843,7 +842,7 @@
[Display metacontact icons]
[Error feedback]
[Close current tab on send]
-[Enable unattended send (experimental feature, required for multisend and send later) (*)]
+[Enable unattended send (experimental feature, required for multisend and send later)]
[Show client description in info panel]
[On tab control]
[On the button bar]