automated merge

1 files changed, 13 insertions, 76 deletions

diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
index 6140055d74..7f7fb8ddf0 100644
--- a/indra/newview/skins/default/xui/da/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml
@@ -1,79 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="FOTO FORHÅNDSVINSNING">
-	<text name="type_label">
-		Hvor skal foto hen?
-	</text>
-	<radio_group label="Snapshot type" name="snapshot_type_radio">
-		<radio_item label="Email" name="postcard"/>
-		<radio_item label="Min beholdning (L$[AMOUNT])" name="texture"/>
-		<radio_item label="Gem på min computer" name="local"/>
-	</radio_group>
-	<text name="file_size_label">
-		[SIZE] KB
-	</text>
-	<button label="Tag nyt foto" name="new_snapshot_btn"/>
-	<button label="Send" name="send_btn"/>
-	<button label="Gem (L$[AMOUNT])" name="upload_btn"/>
-	<flyout_button label="Gem" name="save_btn" tool_tip="Gem billede i på din computer">
-		<flyout_button_item label="Gem" name="save_item"/>
-		<flyout_button_item label="Gem som..." name="saveas_item"/>
-	</flyout_button>
-	<button label="Annullér" name="discard_btn"/>
-	<button label="Mere" name="more_btn" tool_tip="Avancerede muligheder"/>
-	<button label="Mindre" name="less_btn" tool_tip="Avancerede muligheder"/>
-	<text name="type_label2">
-		Størrelse
-	</text>
-	<text name="format_label">
-		Format
-	</text>
-	<combo_box label="Opløsning" name="postcard_size_combo">
-		<combo_box.item label="Aktuelle vindue" name="CurrentWindow"/>
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="Manuel" name="Custom"/>
-	</combo_box>
-	<combo_box label="Opløsning" name="texture_size_combo">
-		<combo_box.item label="Aktuelle vindue" name="CurrentWindow"/>
-		<combo_box.item label="Lille (128x128)" name="Small(128x128)"/>
-		<combo_box.item label="Medium (256x256)" name="Medium(256x256)"/>
-		<combo_box.item label="Stor (512x512)" name="Large(512x512)"/>
-		<combo_box.item label="Manuel" name="Custom"/>
-	</combo_box>
-	<combo_box label="Opløsning" name="local_size_combo">
-		<combo_box.item label="Aktuelle vindue" name="CurrentWindow"/>
-		<combo_box.item label="320x240" name="320x240"/>
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="1280x1024" name="1280x1024"/>
-		<combo_box.item label="1600x1200" name="1600x1200"/>
-		<combo_box.item label="Manuelt" name="Custom"/>
-	</combo_box>
-	<combo_box label="Fil-format" name="local_format_combo" width="76">
-		<combo_box.item label="PNG" name="PNG"/>
-		<combo_box.item label="JPEG" name="JPEG"/>
-		<combo_box.item label="BMP" name="BMP"/>
-	</combo_box>
-	<spinner label="Bredde" label_width="41" name="snapshot_width" width="101"/>
-	<spinner label="Højde" label_width="32" left="117" name="snapshot_height" width="92"/>
-	<check_box label="Fasthold proportioner" name="keep_aspect_check"/>
-	<slider label="Billedkvalitet" name="image_quality_slider"/>
-	<text name="layer_type_label">
-		Benyt:
-	</text>
-	<combo_box label="Billedlag" name="layer_types">
-		<combo_box.item label="Farver" name="Colors"/>
-		<combo_box.item label="Dybde" name="Depth"/>
-		<combo_box.item label="Materinger" name="ObjectMattes"/>
-	</combo_box>
-	<check_box label="Snitflade" name="ui_check"/>
-	<check_box label="HUDs" name="hud_check"/>
-	<check_box label="Luk ikke vindue ved gemning" name="keep_open_check"/>
-	<check_box label="Fastfrys (fuldt billede)" name="freeze_frame_check"/>
-	<check_box label="Auto-opdater" name="auto_snapshot_check"/>
-	<string name="unknown">
+<floater name="Snapshot" title="Foto">
+	<floater.string name="unknown">
 		ukendt
-	</string>
+	</floater.string>
+	<button label="Tag nyt foto" name="new_snapshot_btn"/>
+	<line_editor label="Beskrivelse" name="description"/>
+	<button label="Del foto" name="share"/>
+	<button label="Del på internettet" name="share_to_web"/>
+	<button label="Gem til beholdning" name="save_to_inventory"/>
+	<button label="Gem foto" name="save"/>
+	<button label="Email foto" name="share_to_email"/>
+	<button label="Gem på computer" name="save_to_computer"/>
+	<button label="Sæt som profil billede" name="set_profile_pic"/>
+	<button label="Tilbage" name="cancel"/>
 </floater>