summaryrefslogtreecommitdiff
path: root/langpacks/english/Plugins/SmileyAdd.txt
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-05-14 18:29:31 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-05-14 18:29:31 +0300
commit40086f4fc370ca92218c805fe5cee10c09f57f2c (patch)
treeeca73024f9ad1d5434821061a8b8a4ca899eb748 /langpacks/english/Plugins/SmileyAdd.txt
parent3f1628f127d35aa14da97e50c2a94cfd61ad52dd (diff)
merge with master till:
fixes #1358 (StdMsg: "Send on Ctrl+Enter" setting is lost after upgrade)
Diffstat (limited to 'langpacks/english/Plugins/SmileyAdd.txt')
-rw-r--r--langpacks/english/Plugins/SmileyAdd.txt4
1 files changed, 2 insertions, 2 deletions
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.]