svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/

merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
index cc408de572..a1150d173b 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
@@ -53,10 +53,12 @@
 		L$ [AMT]

 	</text>

 	<text name="purchase_warning_repurchase">

-		Der er sket en fejl, og k&#248;bet er afbrudt. Fors&#248;g venligst igen.

+		Der er sket en fejl, og k&#248;bet er afbrudt.

+Fors&#248;g venligst igen.

 	</text>

 	<text name="purchase_warning_notenough">

-		Du k&#248;ber ikke nok valuta, tast et st&#248;rre bel&#248;b og pr&#248;v igen.

+		Du k&#248;ber ikke nok valuta, tast et st&#248;rre bel&#248;b

+og pr&#248;v igen.

 	</text>

 	<button label="Annuller" name="cancel_btn" />

 	<button label="K&#248;b" name="buy_btn" />