diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-23 22:40:17 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-23 22:40:17 +0300 |
| commit | 3d73a10da3e051b232b4ddc89c1463a8b097ca7f (patch) | |
| tree | 8b32d955d0628ca1138301177e1413cc419229fd /indra/newview/skins/default/xui/da/floater_voice_controls.xml | |
| parent | 4b5b048cb6280cbd9fd303acd96fce73461d1fb4 (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge branch main (DRTVWR-582) into DRTVWR-567
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
Diffstat (limited to 'indra/newview/skins/default/xui/da/floater_voice_controls.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/da/floater_voice_controls.xml | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml deleted file mode 100644 index 69de696bf5..0000000000 --- a/indra/newview/skins/default/xui/da/floater_voice_controls.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_voice_controls" title="Stemme opsætning"> - <string name="title_nearby"> - STEMMER NÆR - </string> - <string name="title_group"> - Gruppe opkald med [GROUP] - </string> - <string name="title_adhoc"> - Konference kald - </string> - <string name="title_peer_2_peer"> - Opkald med [NAME] - </string> - <string name="no_one_near"> - Ingen i nærheden har aktiveret stemmer - </string> - <layout_stack name="my_call_stack"> - <layout_panel name="my_panel"> - <text name="user_text" value="Min avatar:"/> - </layout_panel> - <layout_panel name="leave_call_panel"> - <layout_stack name="voice_effect_and_leave_call_stack"> - <layout_panel name="leave_call_btn_panel"> - <button label="Forlad samtale" name="leave_call_btn"/> - </layout_panel> - </layout_stack> - </layout_panel> - </layout_stack> -</floater> |