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

diff --git a/linden/indra/newview/skins/default/xui/nl/floater_joystick.xml b/linden/indra/newview/skins/default/xui/nl/floater_joystick.xml
new file mode 100644
index 0000000..dcdddd0
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/nl/floater_joystick.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Joystick" title="Joystick configuratie">
+        <check_box name="enable_joystick" width="80">
+                Joystick inschakelen:
+        </check_box>
+        <text left="146" name="joystick_type" width="360"/>
+        <spinner label="X-as mapping" name="JoystickAxis1"/>
+        <spinner label="Y-as mapping" name="JoystickAxis2"/>
+        <spinner label="Z-as mapping" name="JoystickAxis0"/>
+        <spinner label="Stampen mapping" name="JoystickAxis4"/>
+        <spinner label="Gieren mapping" name="JoystickAxis5"/>
+        <spinner label="Rollen mapping" name="JoystickAxis3"/>
+        <spinner label="Zoom mapping" name="JoystickAxis6"/>
+        <check_box label="Directe zoom" name="ZoomDirect"/>
+        <check_box label="3D Cursor" name="Cursor3D"/>
+        <check_box label="Automatisch niveau" name="AutoLeveling"/>
+        <text name="Control Modes:">
+                Besturingsmodi:
+        </text>
+        <check_box name="JoystickAvatarEnabled">
+                Avatar
+        </check_box>
+        <check_box name="JoystickBuildEnabled">
+                Bouwen
+        </check_box>
+        <check_box name="JoystickFlycamEnabled">
+                Vliegcamera
+        </check_box>
+        <text name="XScale">
+                X schaal
+        </text>
+        <text name="YScale">
+                Y schaal
+        </text>
+        <text name="ZScale">
+                Z schaal
+        </text>
+        <text name="PitchScale">
+                Stampen schaal
+        </text>
+        <text name="YawScale">
+                Gieren schaal
+        </text>
+        <text name="RollScale">
+                Rollen schaal
+        </text>
+        <text name="XDeadZone">
+                X dode zone
+        </text>
+        <text name="YDeadZone">
+                Y dode zone
+        </text>
+        <text name="ZDeadZone">
+                Z dode zone
+        </text>
+        <text name="PitchDeadZone" left="4" width="110">
+                Stampen dode zone
+        </text>
+        <text name="YawDeadZone">
+                Gieren dode zone
+        </text>
+        <text name="RollDeadZone">
+                Rollen dode zone
+        </text>
+        <text name="Feathering">
+                Feathering
+        </text>
+        <text name="ZoomScale2">
+                Zoomschaal
+        </text>
+        <text name="ZoomDeadZone">
+                Zoom dode zone
+        </text>
+        <button label="SpaceNavigator standaardwaarden" name="SpaceNavigatorDefaults" width="200" font="SansSerifSmall"/>
+        <button label="OK" label_selected="OK" name="ok_btn"/>
+        <button label="Annuleren" label_selected="Annuleren" name="cancel_btn" left_delta="110"/>
+        <string name="JoystickMonitor">
+                Joystick monitor
+        </string>
+        <string name="Axis">
+                As [NUM]
+        </string>
+        <string name="NoDevice">
+                Geen apparaat gedetecteerd
+        </string>
+</floater>