summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/da
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-07-28 12:15:32 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-07-28 12:15:32 -0700
commit0b9327df241e1a5a4693c690810ce8c330e196ad (patch)
tree1bdff29f5e3de1764410a7bf706763d4a35ebe8b /indra/newview/skins/default/xui/da
parent75452dd7a8f9f51bf3fbcb871976168f80e0cae0 (diff)
parentb8d5c8993d46dc5b24bc07f721115a174ff918c8 (diff)
Merge
Diffstat (limited to 'indra/newview/skins/default/xui/da')
-rw-r--r--indra/newview/skins/default/xui/da/panel_edit_pick.xml2
-rw-r--r--indra/newview/skins/default/xui/da/strings.xml7
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