diff options
| author | bunnyhoney <bunnyhoney@o2.pl> | 2014-03-09 05:52:55 +0000 |
|---|---|---|
| committer | bunnyhoney <bunnyhoney@o2.pl> | 2014-03-09 05:52:55 +0000 |
| commit | 685bdd6028b2d01d10168b06150983e7bd8e126a (patch) | |
| tree | 7ed701d65b431d79e14539204e1818f5b650849a /langpacks/polish/Plugins/NewAwaySys.txt | |
| parent | 1e2a5c427d6973fa3a5d7fd337fe8b50ed93c3f0 (diff) | |
Langpack Polish: update
git-svn-id: http://svn.miranda-ng.org/main/trunk@8487 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/polish/Plugins/NewAwaySys.txt')
| -rw-r--r-- | langpacks/polish/Plugins/NewAwaySys.txt | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/langpacks/polish/Plugins/NewAwaySys.txt b/langpacks/polish/Plugins/NewAwaySys.txt index c702d505f8..9c0fa4fed9 100644 --- a/langpacks/polish/Plugins/NewAwaySys.txt +++ b/langpacks/polish/Plugins/NewAwaySys.txt @@ -280,11 +280,7 @@ 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
@@ -355,11 +351,7 @@ 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
+`[`!cdate()-!ctime()`]` ?cinfo(%subject%,display) (?cinfo(%subject%,id)) %nas_statdesc% przeczytaj opis:\r\n%extratext%\r\n\r\n
;file \plugins\NewAwaySysMod\src\Common.h
[Miranda NG autoreply >\r\n%extratext%]
Autoodpowiedź >\r\n%extratext%
|