diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
commit | 6e0770908dc151b09a2863b95dc0c132d242acc0 (patch) | |
tree | c72c7070cc0438dc4165ef8d5c6b329fc16448b5 /indra/newview/skins/default/xui/pl/floater_postcard.xml | |
parent | f55af5fcdfdd0b4520e382d315afefd41c534820 (diff) | |
parent | 61657d2e7904ba7274a0ab5d451669d2ee7bb7cc (diff) |
Manual merge from default branch
Resolved conflicts in indra/newview/llchathistory.cpp in favor of trunk version.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/pl/floater_postcard.xml')
-rw-r--r-- | indra/newview/skins/default/xui/pl/floater_postcard.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/pl/floater_postcard.xml b/indra/newview/skins/default/xui/pl/floater_postcard.xml index 362483e2fd..095974aa61 100644 --- a/indra/newview/skins/default/xui/pl/floater_postcard.xml +++ b/indra/newview/skins/default/xui/pl/floater_postcard.xml @@ -20,7 +20,7 @@ Wpisz treść swojej wiadomości tutaj </text_editor> <text name="fine_print"> - Jeżeli odbiorca tej pocztówki dołączy do [SECOND_LIFE], otrzymasz bonusa. + Jeżeli Odbiorca tej pocztówki dołączy do [SECOND_LIFE], otrzymasz bonus. </text> <button label="Anuluj" name="cancel_btn"/> <button label="Wyślij" name="send_btn"/> |