diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
commit | a5227864bd7ca930b41041ff80b20c30474f5f8c (patch) | |
tree | 0a7f77c543184209717be29dfc24e1d05d320a00 /indra/newview/skins/default/xui/da/panel_preferences_chat.xml | |
parent | 3f3c9c7e255e090c7f09dafd08ec20f2d8a09c6d (diff) | |
parent | b74e1d942352e81e0cc00e21ef3b351152b32248 (diff) |
Manual merge from default branch
Resolved conflict in indra/newview/llviewerwindow.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/da/panel_preferences_chat.xml')
-rw-r--r-- | indra/newview/skins/default/xui/da/panel_preferences_chat.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml index df71e29cb9..df97193598 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml @@ -45,6 +45,12 @@ </text> <check_box initial_value="true" label="Afspil skrive animation ved chat" name="play_typing_animation"/> <check_box label="Send e-mail til mig når jeg modtager IM og er offline" name="send_im_to_email"/> + <text name="show_ims_in_label"> + Vis IM'er i: + </text> + <text name="requires_restart_label"> + (kræver genstart) + </text> <radio_group name="chat_window" tool_tip="Vise dine personlige beskeder i separate vinduer, eller i ét vindue med flere faner (Kræver genstart)"> <radio_item label="Separate vinduer" name="radio" value="0"/> <radio_item label="Faner" name="radio2" value="1"/> |