diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
| commit | 6e0770908dc151b09a2863b95dc0c132d242acc0 (patch) | |
| tree | c72c7070cc0438dc4165ef8d5c6b329fc16448b5 /indra/newview/skins/default/xui/de | |
| parent | f55af5fcdfdd0b4520e382d315afefd41c534820 (diff) | |
| parent | 61657d2e7904ba7274a0ab5d451669d2ee7bb7cc (diff) | |
Manual merge from default branch
Resolved conflicts in indra/newview/llchathistory.cpp in favor of trunk version.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/de')
| -rw-r--r-- | indra/newview/skins/default/xui/de/floater_build_options.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/de/panel_nearby_media.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/de/floater_build_options.xml b/indra/newview/skins/default/xui/de/floater_build_options.xml index b70c859490..e90eb2c00b 100644 --- a/indra/newview/skins/default/xui/de/floater_build_options.xml +++ b/indra/newview/skins/default/xui/de/floater_build_options.xml @@ -2,7 +2,7 @@ <floater name="build options floater" title="RASTER-OPTIONEN"> <spinner label="Raster-Einheiten (Meter)" name="GridResolution"/> <spinner label="Rastergröße (Meter)" name="GridDrawSize"/> - <check_box label="Einrasten von Untereinheiten aktivieren" name="GridSubUnit"/> + <check_box label="An Untereinheiten ausrichten" name="GridSubUnit"/> <check_box label="Überschneidungen anzeigen" name="GridCrossSection"/> <text name="grid_opacity_label" tool_tip="Raster-Deckkraft"> Deckkraft: diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml index ad26f71245..32750f14d4 100644 --- a/indra/newview/skins/default/xui/de/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_media.xml @@ -13,8 +13,8 @@ (wird abgespielt) </string> <panel name="minimized_controls"> - <button label="Alle stoppen" name="all_nearby_media_disable_btn" tool_tip="Alle Medien in der Nähe ausschalten"/> - <button label="Alle starten" name="all_nearby_media_enable_btn" tool_tip="Alle Medien in der Nähe einschalten"/> + <button label="Stoppen" name="all_nearby_media_disable_btn" tool_tip="Alle Medien in der Nähe ausschalten"/> + <button label="Starten" name="all_nearby_media_enable_btn" tool_tip="Alle Medien in der Nähe einschalten"/> <button name="open_prefs_btn" tool_tip="Medien-Einstellungen öffnen"/> <button label="Mehr >>" label_selected="Weniger <<" name="more_less_btn" tool_tip="Erweiterte Steuerung"/> </panel> |