diff options
author | Richard Nelson <richard@lindenlab.com> | 2011-07-26 15:38:37 -0700 |
---|---|---|
committer | Richard Nelson <richard@lindenlab.com> | 2011-07-26 15:38:37 -0700 |
commit | 2c2a4c123eb9bfa80785e5509e73c8f7f236228f (patch) | |
tree | 83160657e9c42e9dc78f6be455f254671429bc9c /indra/newview/skins/default/xui/da | |
parent | 74b6f5dce31b5ff69ced8e1e8cd37e4c5ded2943 (diff) | |
parent | 95da8c81f3d5afd8d888589398028883e6647333 (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/da')
-rw-r--r-- | indra/newview/skins/default/xui/da/panel_edit_pick.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/da/strings.xml | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml index fd287b1a0a..3036f30240 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_pick.xml @@ -29,7 +29,7 @@ <layout_panel name="layout_panel1"> <button label="Gem valgte" name="save_changes_btn"/> </layout_panel> - <layout_panel name="layout_panel1"> + <layout_panel name="layout_panel2"> <button label="Annullér" name="cancel_btn"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 68b861fe92..b5d8ac44bc 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -1209,9 +1209,6 @@ Prøv venligst om lidt igen. <string name="InvFolder My Inventory"> Min beholdning </string> - <string name="InvFolder My Favorites"> - Mine favoritter - </string> <string name="InvFolder Library"> Bibliotek </string> @@ -1270,10 +1267,10 @@ Prøv venligst om lidt igen. Bevægelser </string> <string name="InvFolder Favorite"> - Favoritter + Mine favoritter </string> <string name="InvFolder favorite"> - Favoritter + Mine favoritter </string> <string name="InvFolder Current Outfit"> Nuværende sæt |