From 6dd3d5ed1fc83c7118fa924d8932c6f742951d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Masarczyk?= Date: Sun, 9 Mar 2014 03:19:56 +0000 Subject: Langpack Polish: update git-svn-id: http://svn.miranda-ng.org/main/trunk@8485 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/polish/Plugins/NewAwaySys.txt | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'langpacks/polish/Plugins/NewAwaySys.txt') diff --git a/langpacks/polish/Plugins/NewAwaySys.txt b/langpacks/polish/Plugins/NewAwaySys.txt index 13e6878c5b..c702d505f8 100644 --- a/langpacks/polish/Plugins/NewAwaySys.txt +++ b/langpacks/polish/Plugins/NewAwaySys.txt @@ -280,7 +280,11 @@ Wiszę na telefonie od %nas_awaysince_time%, daj mi sekundkę! [Out to lunch] Na obiedzie [Been having ?ifgreater(?ctime(H),2,?ifgreater(?ctime(H),10,?ifgreater(?ctime(H),16,supper,dinner),breakfast),supper) since %nas_awaysince_time%.] +<<<<<<< .mine + +======= Jem ?ifgreater(?ctime(H),2,?ifgreater(?ctime(H),10,?ifgreater(?ctime(H),16,kolację,obiad),śniadanie),kolację) od %nas_awaysince_time%. +>>>>>>> .r8468 ;file \plugins\NewAwaySysMod\src\AwaySys.cpp [Toggle On] Włącz przełączanie @@ -351,7 +355,11 @@ Użyj ustawień domyślnych [NewAwaySys: Incoming status message request] NewAwaySys: przychodząca prośba o opis [`[`!cdate()-!ctime()`]` ?cinfo(%subject%,display) (?cinfo(%subject%,id)) read your %nas_statdesc% message:\r\n%extratext%\r\n\r\n] +<<<<<<< .mine + +======= `[`!cdate()-!ctime()`]` ?cinfo(%subject%,display) (?cinfo(%subject%,id)) przeczytaj swój %nas_statdesc% opis:\r\n%extratext%\r\n\r\n +>>>>>>> .r8468 ;file \plugins\NewAwaySysMod\src\Common.h [Miranda NG autoreply >\r\n%extratext%] Autoodpowiedź >\r\n%extratext% -- cgit v1.2.3