diff options
author | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
---|---|---|
committer | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
commit | fbd241da54ad6017825b59c5b0c71086d8b8957a (patch) | |
tree | 34051dba97afece2416f25954080011d922d910e /indra/newview/skins/default/xui/de/panel_profile_view.xml | |
parent | 834d0f1ed612c8644e642103096daf7f0b0f44c9 (diff) | |
parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) |
STORM-1019 Resolve merge conflicts
Diffstat (limited to 'indra/newview/skins/default/xui/de/panel_profile_view.xml')
-rw-r--r-- | indra/newview/skins/default/xui/de/panel_profile_view.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/de/panel_profile_view.xml b/indra/newview/skins/default/xui/de/panel_profile_view.xml index b44c128000..7e93bd1ede 100644 --- a/indra/newview/skins/default/xui/de/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/de/panel_profile_view.xml @@ -10,10 +10,8 @@ <text name="solo_username_label" value="Benutzername:"/> <text name="status" value="Online"/> <text name="user_name_small" value="Dieser Name ist ein ganz außerordentlich langer Name"/> - <text name="user_name" value="Jack Linden"/> <button name="copy_to_clipboard" tool_tip="In Zwischenablage kopieren"/> <text name="user_label" value="Benutzername:"/> - <text name="user_slid" value="jack.linden"/> <tab_container name="tabs" tab_min_width="60"> <panel label="PROFIL" name="panel_profile"/> <panel label="AUSWAHL" name="panel_picks"/> |