diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-04 19:07:54 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-04 19:07:54 -0400 |
commit | 1aee76cf57de2a206bfa464257b1af44acc3fc9c (patch) | |
tree | 0acbc4fbd38f5dc0d9411dabab5fdf460a1008af /indra/newview/skins/default/xui/da | |
parent | 0103d327cda091ac6fe19eeec7218351504708d9 (diff) | |
parent | af6a5b1f40ff0f0a8f0d10f609fa27da7e40959d (diff) |
merge changes for storm-1223, storm-1218, storm-1216
Diffstat (limited to 'indra/newview/skins/default/xui/da')
-rw-r--r-- | indra/newview/skins/default/xui/da/floater_tos.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/da/notifications.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml index 760f60c996..af9ee0bd06 100644 --- a/indra/newview/skins/default/xui/da/floater_tos.xml +++ b/indra/newview/skins/default/xui/da/floater_tos.xml @@ -4,7 +4,7 @@ http://secondlife.com/app/tos/ </floater.string> <floater.string name="loading_url"> - data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E + data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Henter %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E </floater.string> <button label="Fortsæt" label_selected="Fortsæt" name="Continue"/> <button label="Annullér" label_selected="Annullér" name="Cancel"/> diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index a3c4897ee1..30b54d3eb2 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -748,6 +748,7 @@ Prøv venligst igen senere. [OLD_NAME] ([SLID]) er nu kendt som [NEW_NAME]. </notification> <notification name="OfferTeleport"> + Tilbyd en teleport til din position med følgende besked? <form name="form"> <input name="message"> Mød mig i [REGION] |