diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
| commit | a65188d85f75e848d224bd335a00ed8aa51f945e (patch) | |
| tree | f43b390cba45d047fc0fa31659f6969f62b925d1 /indra/newview/skins/default/xui/de/floater_media_settings.xml | |
| parent | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (diff) | |
| parent | 5ca943cd0279d35ffdf584fa0de3b795645f276c (diff) | |
Merge from viewer2. Minor conflict resolved.
Diffstat (limited to 'indra/newview/skins/default/xui/de/floater_media_settings.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/de/floater_media_settings.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/de/floater_media_settings.xml b/indra/newview/skins/default/xui/de/floater_media_settings.xml index 009a46d558..1b98ed7973 100644 --- a/indra/newview/skins/default/xui/de/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_media_settings.xml @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="media_settings" title="MEDIEN-EINSTELLUNGEN">
- <button label="OK" label_selected="OK" name="OK"/>
- <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
- <button label="Übernehmen" label_selected="Übernehmen" name="Apply"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="media_settings" title="MEDIEN-EINSTELLUNGEN"> + <button label="OK" label_selected="OK" name="OK"/> + <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/> + <button label="Übernehmen" label_selected="Übernehmen" name="Apply"/> +</floater> |