diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
commit | 14e82732f4f74ec59933bb9e6c67cf1ce7800a7f (patch) | |
tree | c2b5ff471400ced9342f7f3c1e4bc6b32d8df79f /indra/newview/skins/default/xui/de/panel_region_debug.xml | |
parent | a897e69ffc36b8159e89031c38846395b6551d0b (diff) | |
parent | 890965faf5baa5f6f832e086991d59bb8d33b7bc (diff) |
merging in latest changes, resolved llimview.cpp conflict
Diffstat (limited to 'indra/newview/skins/default/xui/de/panel_region_debug.xml')
-rw-r--r-- | indra/newview/skins/default/xui/de/panel_region_debug.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/de/panel_region_debug.xml b/indra/newview/skins/default/xui/de/panel_region_debug.xml index 4a85bd85fd..a03a0b8b7b 100644 --- a/indra/newview/skins/default/xui/de/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/de/panel_region_debug.xml @@ -36,5 +36,5 @@ <button label="?" name="top_scripts_help"/> <button label="Region neu starten" name="restart_btn" tool_tip="2-Minuten-Countdown und Region neu starten"/> <button label="?" name="restart_help"/> - <button label="Neustart abbrechen" name="cancel_restart_btn" tool_tip="Regionsneustart um eine Stunde verschieben"/> + <button label="Neustart abbrechen" name="cancel_restart_btn" tool_tip="Regionsneustart abbrechen"/> </panel> |