Merge branch 'next' of git://github.com/imprudence/imprudence into next

Removed the new "Set your own Imprudence tag colour feature".  Should check though, might be bits left that where not obvious.

Conflicts:
	.gitignore
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/panel_login.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerinfo.cpp

The usual branding conflicts.

1 files changed, 36 insertions, 0 deletions

diff --git a/linden/indra/newview/skins/default/xui/nl/floater_postcard.xml b/linden/indra/newview/skins/default/xui/nl/floater_postcard.xml
new file mode 100644
index 0000000..f31b479
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/nl/floater_postcard.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="Email foto">
+        <text name="to_label">
+                Ontvanger e-mail:
+        </text>
+        <text name="from_label">
+                Uw e-mail:
+        </text>
+        <text name="name_label">
+                Uw naam:
+        </text>
+        <text name="subject_label">
+                Onderwerp:
+        </text>
+        <line_editor label="Type hier uw onderwerp." name="subject_form"/>
+        <text name="msg_label">
+                Bericht:
+        </text>
+        <text_editor name="msg_form">
+                Type hier uw bericht.
+        </text_editor>
+        <text name="fine_print">
+                Indien uw ontvanger deelneemt aan SL, zult u een verwijzingsbonus ontvangen.
+        </text>
+        <button label="Annuleren" name="cancel_btn"/>
+        <button label="Verzenden" name="send_btn"/>
+        <string name="default_subject">
+                Ansichtkaart uit Second Life
+        </string>
+        <string name="default_message">
+                Kom dit zien!
+        </string>
+        <string name="upload_message">
+                &quot;Verzenden…&quot;
+        </string>
+</floater>