diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
| commit | 4a6bacea0f8dcff959028f285bc533852da608b5 (patch) | |
| tree | 7f49b429051e550f70917ccbcdd1c27bf86f5bdf /indra/newview/skins | |
| parent | ac4766d4354ee1945f1569a94d755e3e7c0cd566 (diff) | |
merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
Diffstat (limited to 'indra/newview/skins')
3 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml index dec1bb386b..6dd4be0ad7 100644 --- a/indra/newview/skins/default/xui/de/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml @@ -43,9 +43,6 @@ <check_box label="Verweigern - keine archivierte Zahlungsinfo" name="deny_anonymous" /> <check_box label="Verweigern - Zahlungsinfo archiviert" name="deny_identified" /> <check_box label="Verweigern - Zahlungsinfo verwendet" name="deny_transacted" /> - <text name="abuse_email_text"> - [Abuse E-mail Beta] - </text> <button label="Übernehmen" name="apply_btn" /> <text name="estate_manager_label"> Grundstücksverwalter: diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml index 42eaec0e3e..d2fd70ee54 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml @@ -46,9 +46,6 @@ <check_box label="支払情報登録がないものを拒否" name="deny_anonymous" /> <check_box label="支払情報登録があるものを拒否" name="deny_identified" /> <check_box label="使用されている支払情報を拒否" name="deny_transacted" /> - <text name="abuse_email_text"> - [Abuse E-mail Beta] - </text> <button label="適用" name="apply_btn" /> <text name="allow_resident_label"> 許可された住人: diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml index 1560505a06..f647abb92c 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml @@ -37,7 +37,7 @@ <check_box label="Informações de pagamento" name="deny_identified" />
<check_box label="Informações de pagtos realizados" name="deny_transacted" />
<text name="abuse_email_text">
- [E-mail do abuso Beta]
+ E-mail do abuso:
</text>
<button label="Aplicar" name="apply_btn" />
<text name="allow_resident_label">
|