diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-24 18:04:26 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-24 18:04:26 +0200 |
commit | d3a606f8323a32c660c71675257e3abd95cb097e (patch) | |
tree | 11e272b194cb42bd9b11b861395f44793d3fa9f6 /indra/newview/skins/default/xui/pl/floater_preview_notecard.xml | |
parent | 5f46430a1aa16212838dd7a9493a42fcb5e92ec3 (diff) | |
parent | 7857f59f9e7c673f1ddbf32d6a66e85f78004445 (diff) |
Manual merge from default branch.
Resolved conflicts in llpanellandmarks.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/pl/floater_preview_notecard.xml')
-rw-r--r-- | indra/newview/skins/default/xui/pl/floater_preview_notecard.xml | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml index b9f80490ab..eb8b5c1a46 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml @@ -1,16 +1,22 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview notecard" title="NOTA:"> - <button label="Zapisz" label_selected="Zapisz" name="Save" /> + <floater.string name="no_object"> + Nie można znaleść obiektu zawierającego tą notkę. + </floater.string> + <floater.string name="not_allowed"> + Nie masz pozwolenia na zobaczenie tej notki. + </floater.string> + <floater.string name="Title"> + Notka: [NAME] + </floater.string> + <floater.string label="Zapisz" label_selected="Zapisz" name="Save"> + Zapisz + </floater.string> <text name="desc txt"> Opis: </text> <text_editor name="Notecard Editor"> Ładowanie... </text_editor> - <string name="no_object"> - Nie można znaleść obiektu zawierającego tą notkę. - </string> - <string name="not_allowed"> - Nie masz pozwolenia na zobaczenie tej notki. - </string> + <button label="Zapisz" label_selected="Zapisz" name="Save"/> </floater> |