summaryrefslogtreecommitdiff
path: root/langpacks/polish/Plugins
diff options
context:
space:
mode:
authorDart Raiden <wowemuh@gmail.com>2015-10-24 23:26:22 +0000
committerDart Raiden <wowemuh@gmail.com>2015-10-24 23:26:22 +0000
commit0ace710d01dc20a6befcc9eefaa26ebf7ccc2a75 (patch)
treeaf4eb156136862f0d69534b603c7207559432495 /langpacks/polish/Plugins
parent5262fce019621330587fbae32feb5adf1c62c5ea (diff)
langpacks: update
git-svn-id: http://svn.miranda-ng.org/main/trunk@15611 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/polish/Plugins')
-rw-r--r--langpacks/polish/Plugins/MirLua.txt4
-rw-r--r--langpacks/polish/Plugins/Omegle.txt2
2 files changed, 1 insertions, 5 deletions
diff --git a/langpacks/polish/Plugins/MirLua.txt b/langpacks/polish/Plugins/MirLua.txt
index 7c299f29c3..261b77aa04 100644
--- a/langpacks/polish/Plugins/MirLua.txt
+++ b/langpacks/polish/Plugins/MirLua.txt
@@ -2,11 +2,7 @@
;============================================================
; File: MirLua.dll
; Plugin: MirLua
-<<<<<<< .mine
-; Version: 0.11.5.0
-=======
; Version: 0.11.5.1
->>>>>>> .r15608
; Authors: Miranda NG team
;============================================================
[Extends Miranda NG functionality with Lua scripts.]
diff --git a/langpacks/polish/Plugins/Omegle.txt b/langpacks/polish/Plugins/Omegle.txt
index b1535ebd7a..e3f8e3aeca 100644
--- a/langpacks/polish/Plugins/Omegle.txt
+++ b/langpacks/polish/Plugins/Omegle.txt
@@ -75,7 +75,7 @@ Obcy 2
[Stranger]
Obcy
[You and the Stranger both like: ]
-Ty i obcy lubicie:
+Ty i obcy lubicie:\s
[%s is typing.]
%s pisze.
[%s stopped typing.]