QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3

svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql

1 files changed, 230 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/nl/mime_types.xml b/indra/newview/skins/default/xui/nl/mime_types.xml
new file mode 100644
index 0000000000..f6ff9e0be4
--- /dev/null
+++ b/indra/newview/skins/default/xui/nl/mime_types.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<mimetypes name="default">

+	<widgetset name="web">

+		<label name="web_label">

+			Web Inhoud

+		</label>

+		<tooltip name="web_tooltip">

+			Deze locatie bevat Web inhoud

+		</tooltip>

+		<playtip name="web_playtip">

+			Toon Web inhoud

+		</playtip>

+	</widgetset>

+	<widgetset name="movie">

+		<label name="movie_label">

+			Film

+		</label>

+		<tooltip name="movie_tooltip">

+			Hier kan een film afgespeeld worden

+		</tooltip>

+		<playtip name="movie_playtip">

+			Afspelen film

+		</playtip>

+	</widgetset>

+	<widgetset name="none">

+		<label name="none_label">

+			Geen Inhoud

+		</label>

+		<tooltip name="none_tooltip">

+			Geen media hier

+		</tooltip>

+	</widgetset>

+	<widgetset name="image">

+		<label name="image_label">

+			Afbeelding

+		</label>

+		<tooltip name="image_tooltip">

+			Er is een afbeelding op deze locatie

+		</tooltip>

+		<playtip name="image_playtip">

+			Bekijk de afbeelding van deze locatie

+		</playtip>

+	</widgetset>

+	<widgetset name="audio">

+		<label name="audio_label">

+			Audio

+		</label>

+		<tooltip name="audio_tooltip">

+			Er is audio op deze locatie

+		</tooltip>

+		<playtip name="audio_playtip">

+			Speel de audio van deze locatie af

+		</playtip>

+	</widgetset>

+	<scheme name="rtsp">

+		<label name="rtsp_label">

+			Real Time Streaming

+		</label>

+	</scheme>

+	<mimetype name="blank">

+		<label name="blank_label">

+			- Geen -

+		</label>

+	</mimetype>

+	<mimetype name="none/none">

+		<label name="none/none_label">

+			- Geen -

+		</label>

+	</mimetype>

+	<mimetype name="audio/*">

+		<label name="audio2_label">

+			Audio

+		</label>

+	</mimetype>

+	<mimetype name="video/*">

+		<label name="video2_label">

+			Video

+		</label>

+	</mimetype>

+	<mimetype name="image/*">

+		<label name="image2_label">

+			Afbeelding

+		</label>

+	</mimetype>

+	<mimetype name="video/vnd.secondlife.qt.legacy">

+		<label name="vnd.secondlife.qt.legacy_label">

+			Film (QuickTime)

+		</label>

+	</mimetype>

+	<mimetype name="application/javascript">

+		<label name="application/javascript_label">

+			Javascript

+		</label>

+	</mimetype>

+	<mimetype name="application/ogg">

+		<label name="application/ogg_label">

+			Ogg Audio/Video

+		</label>

+	</mimetype>

+	<mimetype name="application/pdf">

+		<label name="application/pdf_label">

+			PDF Document

+		</label>

+	</mimetype>

+	<mimetype name="application/postscript">

+		<label name="application/postscript_label">

+			Postscript Document

+		</label>

+	</mimetype>

+	<mimetype name="application/rtf">

+		<label name="application/rtf_label">

+			Rich Text (RTF)

+		</label>

+	</mimetype>

+	<mimetype name="application/smil">

+		<label name="application/smil_label">

+			Synchronized Multimedia Integration Language (SMIL)

+		</label>

+	</mimetype>

+	<mimetype name="application/xhtml+xml">

+		<label name="application/xhtml+xml_label">

+			Web Pagina (XHTML)

+		</label>

+	</mimetype>

+	<mimetype name="application/x-director">

+		<label name="application/x-director_label">

+			Macromedia Director

+		</label>

+	</mimetype>

+	<mimetype name="application/x-shockwave-flash">

+		<label name="application/x-shockwave-flash_label">

+			Flash

+		</label>

+	</mimetype>

+	<mimetype name="audio/mid">

+		<label name="audio/mid_label">

+			Audio (MIDI)

+		</label>

+	</mimetype>

+	<mimetype name="audio/mpeg">

+		<label name="audio/mpeg_label">

+			Audio (MP3)

+		</label>

+	</mimetype>

+	<mimetype name="audio/x-aiff">

+		<label name="audio/x-aiff_label">

+			Audio (AIFF)

+		</label>

+	</mimetype>

+	<mimetype name="audio/x-wav">

+		<label name="audio/x-wav_label">

+			Audio (WAV)

+		</label>

+	</mimetype>

+	<mimetype name="image/bmp">

+		<label name="image/bmp_label">

+			Afbeelding (BMP)

+		</label>

+	</mimetype>

+	<mimetype name="image/gif">

+		<label name="image/gif_label">

+			Afbeelding (GIF)

+		</label>

+	</mimetype>

+	<mimetype name="image/jpeg">

+		<label name="image/jpeg_label">

+			Afbeelding (JPEG)

+		</label>

+	</mimetype>

+	<mimetype name="image/png">

+		<label name="image/png_label">

+			Afbeelding (PNG)

+		</label>

+	</mimetype>

+	<mimetype name="image/svg+xml">

+		<label name="image/svg+xml_label">

+			Afbeelding (SVG)

+		</label>

+	</mimetype>

+	<mimetype name="image/tiff">

+		<label name="image/tiff_label">

+			Afbeelding (TIFF)

+		</label>

+	</mimetype>

+	<mimetype name="text/html">

+		<label name="text/html_label">

+			Web Pagina

+		</label>

+	</mimetype>

+	<mimetype name="text/plain">

+		<label name="text/plain_label">

+			Tekst

+		</label>

+	</mimetype>

+	<mimetype name="text/xml">

+		<label name="text/xml_label">

+			XML

+		</label>

+	</mimetype>

+	<mimetype name="video/mpeg">

+		<label name="video/mpeg_label">

+			Film (MPEG)

+		</label>

+	</mimetype>

+	<mimetype name="video/mp4">

+		<label name="video/mp4_label">

+			Film (MP4)

+		</label>

+	</mimetype>

+	<mimetype name="video/quicktime">

+		<label name="video/quicktime_label">

+			Film (QuickTime)

+		</label>

+	</mimetype>

+	<mimetype name="video/x-ms-asf">

+		<label name="video/x-ms-asf_label">

+			Film (Windows Media ASF)

+		</label>

+	</mimetype>

+	<mimetype name="video/x-ms-wmv">

+		<label name="video/x-ms-wmv_label">

+			Film (Windows Media WMV)

+		</label>

+	</mimetype>

+	<mimetype name="video/x-msvideo">

+		<label name="video/x-msvideo_label">

+			Film (AVI)

+		</label>

+	</mimetype>

+</mimetypes>