summaryrefslogtreecommitdiff
path: root/langpacks/polish
diff options
context:
space:
mode:
Diffstat (limited to 'langpacks/polish')
-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.]