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, 15 insertions, 0 deletions

diff --git a/linden/indra/newview/skins/default/xui/nl/panel_groups.xml b/linden/indra/newview/skins/default/xui/nl/panel_groups.xml
new file mode 100644
index 0000000..a0c77b8
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/nl/panel_groups.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="groups">
+        <text name="groupdesc">
+                Uw huidige actieve groep wordt vet getoond.
+        </text>
+        <text name="groupcount" width="300">
+                U behoort tot [COUNT] groepen (maximaal [MAX]).
+        </text>
+        <button label="IM/Oproepen" name="IM" tool_tip="Open Instant Message sessie" width="86"/>
+        <button label="Info" name="Info" width="86"/>
+        <button label="Activeren" name="Activate" width="86"/>
+        <button label="Verlaten" name="Leave" width="86"/>
+        <button label="Maak…" name="Create" width="86"/>
+        <button label="Zoeken…" name="Search..." width="86"/>
+</panel>