diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
| commit | cc92525b0df952659102d2e5adcc4140fea7f371 (patch) | |
| tree | ee1a9b63decb3667fb740a8c9b70bcfdbf9a054b /indra/newview/skins/default/xui/da/panel_friends.xml | |
| parent | 4bcbf3342284b19ff5fbda5a16a43a8cafb3baad (diff) | |
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
Diffstat (limited to 'indra/newview/skins/default/xui/da/panel_friends.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/da/panel_friends.xml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/da/panel_friends.xml b/indra/newview/skins/default/xui/da/panel_friends.xml new file mode 100644 index 0000000000..48fa38731e --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_friends.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="friends">
+ <string name="Multiple">
+ Flere venner...
+ </string>
+ <scroll_list name="friend_list"
+ tool_tip="Hold Shift eller Ctrl nede imens du klikker for at vælge flere venner">
+ <column name="icon_online_status" tool_tip="Online status" />
+ <column label="Name" name="friend_name" tool_tip="Navn" />
+ <column name="icon_visible_online" tool_tip="Venner kan se at du er online" />
+ <column name="icon_visible_map" tool_tip="Venner kan finde dig på kortet" />
+ <column name="icon_edit_mine"
+ tool_tip="Venner kan rette i, slette eller tage dine objekter" />
+ <column name="icon_edit_theirs" tool_tip="Du kan rette i denne vens objekter" />
+ </scroll_list>
+ <button label="IM" name="im_btn" tool_tip="Skriv en personlig besked (IM)" />
+ <button label="Profil" name="profile_btn"
+ tool_tip="Vis billede, grupper og anden information" />
+ <button label="Teleport..." name="offer_teleport_btn"
+ tool_tip="Tilbyd denne ven at blive teleporteret til din nuværende position" />
+ <button label="Betal..." name="pay_btn"
+ tool_tip="Giv Linden dollars (L$) til denne ven" />
+ <button label="Fjern..." name="remove_btn"
+ tool_tip="Fjern denne beboer fra din venneliste" />
+ <button label="Tilføj..." name="add_btn" tool_tip="Tilbyd venskab til denne beboer" />
+</panel>
|