diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-09 10:22:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-09 10:22:04 -0400 |
| commit | 608403a8466a44a5aa46c6cae4a7a65ac4bf0084 (patch) | |
| tree | ad91ddf5d1bf66c0f6552b961851540e615a9a65 | |
| parent | fc0166380bad07768f3c7ac4a5166892a27a493e (diff) | |
| parent | 8cc315a1997d98456b33c310ff8010973af3ee93 (diff) | |
merge changes for vwr-26458
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/de/floater_delete_env_preset.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index b7be56e6c3..f94997b8b5 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -220,6 +220,7 @@ Boroondas Gupte VWR-23455 VWR-24487 VWR-26066 + VWR-26458 WEB-262 Bulli Schumann CT-218 diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml index c924716523..cc14ce640d 100644 --- a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml @@ -4,7 +4,7 @@ Wasser-Voreinstellung löschen </string> <string name="title_sky"> - Hilmmel-Voreinstellung löschen + Himmel-Voreinstellung löschen </string> <string name="title_day_cycle"> Tageszyklus löschen |