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_env_settings.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_env_settings.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/pl/floater_env_settings.xml | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/pl/floater_env_settings.xml b/indra/newview/skins/default/xui/pl/floater_env_settings.xml index e197d94b27..fb4c505ff3 100644 --- a/indra/newview/skins/default/xui/pl/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/pl/floater_env_settings.xml @@ -1,26 +1,28 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Environment Editor Floater" title="EDYTOR ŚRODOWISKA"> + <floater.string name="timeStr"> + [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] + </floater.string> <text name="EnvTimeText"> Czas </text> <text name="EnvTimeText2"> 12:00 PM </text> - <slider label="" name="EnvTimeSlider" /> + <slider label="" name="EnvTimeSlider"/> <text name="EnvCloudText"> Chmury: </text> - <slider label="" name="EnvCloudSlider" /> + <slider label="" name="EnvCloudSlider"/> <text name="EnvWaterColorText"> Kolor Wody </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Kliknij by wybrać kolor" /> + <color_swatch label="" name="EnvWaterColor" tool_tip="Kliknij aby wybrać kolor"/> <text name="EnvWaterFogText"> Zamglenie: </text> - <slider label="" name="EnvWaterFogSlider" /> - <button label="Używaj Czasu Regionu" name="EnvUseEstateTimeButton" /> - <button label="Zaawansowane Niebo" name="EnvAdvancedSkyButton" /> - <button label="Zaawansowana Woda" name="EnvAdvancedWaterButton" /> - <button label="?" name="EnvSettingsHelpButton" /> + <slider label="" name="EnvWaterFogSlider"/> + <button label="Używaj Czasu Regionu" name="EnvUseEstateTimeButton"/> + <button label="Zaawansowane Niebo" name="EnvAdvancedSkyButton"/> + <button label="Zaawansowana Woda" name="EnvAdvancedWaterButton"/> </floater> |