diff --git a/oss/piwik/trunk/plugins/UserSettings/Controller.php b/oss/piwik/trunk/plugins/UserSettings/Controller.php
new file mode 100644
index 00000000..18a38468
--- /dev/null
+++ b/oss/piwik/trunk/plugins/UserSettings/Controller.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ * 
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
+ * @version $Id: Controller.php 1681 2009-12-13 19:19:07Z vipsoft $
+ * 
+ * @category Piwik_Plugins
+ * @package Piwik_UserSettings
+ */
+
+/**
+ *
+ * @package Piwik_UserSettings
+ */
+class Piwik_UserSettings_Controller extends Piwik_Controller 
+{
+	function index()
+	{
+		$view = Piwik_View::factory('index');
+		
+		$view->dataTablePlugin = $this->getPlugin( true );
+		$view->dataTableResolution = $this->getResolution( true );
+		$view->dataTableConfiguration = $this->getConfiguration( true );
+		$view->dataTableOS = $this->getOS( true );
+		$view->dataTableBrowser = $this->getBrowser( true );
+		$view->dataTableBrowserType = $this->getBrowserType ( true );
+		$view->dataTableWideScreen = $this->getWideScreen( true );
+		
+		echo $view->render();
+	}
+
+	function getResolution( $fetch = false)
+	{
+		$view = $this->getStandardDataTableUserSettings(
+										__FUNCTION__, 
+										'UserSettings.getResolution'
+									);		
+		$view->setColumnTranslation('label', Piwik_Translate('UserSettings_ColumnResolution'));
+		return $this->renderView($view, $fetch);
+	}
+	
+	function getConfiguration( $fetch = false)
+	{
+		$view =  $this->getStandardDataTableUserSettings(
+										__FUNCTION__, 
+										'UserSettings.getConfiguration'
+									);
+		$view->setColumnTranslation('label', Piwik_Translate('UserSettings_ColumnConfiguration'));
+		$view->setLimit( 3 );
+		return $this->renderView($view, $fetch);
+	}
+	
+	function getOS( $fetch = false)
+	{
+		$view =  $this->getStandardDataTableUserSettings(
+										__FUNCTION__, 
+										'UserSettings.getOS'
+									);
+		$view->setColumnTranslation('label', Piwik_Translate('UserSettings_ColumnOperatingSystem'));
+		return $this->renderView($view, $fetch);
+	}
+	
+	function getBrowser( $fetch = false)
+	{
+		$view =  $this->getStandardDataTableUserSettings(
+										__FUNCTION__, 
+										'UserSettings.getBrowser'
+									);
+		$view->setColumnTranslation('label', Piwik_Translate('UserSettings_ColumnBrowser'));
+		$view->setGraphLimit(7);
+		return $this->renderView($view, $fetch);
+	}
+	
+	function getBrowserType ( $fetch = false)
+	{
+		$view =  $this->getStandardDataTableUserSettings(
+										__FUNCTION__, 
+										'UserSettings.getBrowserType',
+										'graphPie'
+									);
+		$view->setColumnTranslation('label', Piwik_Translate('UserSettings_ColumnBrowserFamily'));
+		$view->disableOffsetInformation();
+		return $this->renderView($view, $fetch);
+	}
+	
+	function getWideScreen( $fetch = false)
+	{
+		$view =  $this->getStandardDataTableUserSettings(
+										__FUNCTION__, 
+										'UserSettings.getWideScreen'
+									);
+		$view->setColumnTranslation('label', Piwik_Translate('UserSettings_ColumnTypeOfScreen'));
+		$view->disableOffsetInformation();
+		return $this->renderView($view, $fetch);
+	}
+	
+	function getPlugin( $fetch = false)
+	{
+		$view = Piwik_ViewDataTable::factory( 'graphVerticalBar');
+		$view->init( $this->pluginName,  __FUNCTION__, 'UserSettings.getPlugin' );
+		$view->disableSearchBox();
+		$view->disableExcludeLowPopulation();
+		$view->disableSort();
+		$view->disableOffsetInformation();
+		$view->disableShowAllColumns();
+		$view->disallowPercentageInGraphTooltip();
+		$view->setColumnsToDisplay( array('label','nb_visits') );
+		$view->setColumnTranslation('label', Piwik_Translate('UserSettings_ColumnPlugin'));
+		$view->setGraphLimit( 10 );
+		$view->setLimit( 10 );
+		return $this->renderView($view, $fetch);
+	}
+	
+	protected function getStandardDataTableUserSettings( $currentControllerAction, 
+												$APItoCall,
+												$defaultDatatableType = null )
+	{
+		$view = Piwik_ViewDataTable::factory( $defaultDatatableType);
+		$view->init( $this->pluginName,  $currentControllerAction, $APItoCall );
+		$view->disableSearchBox();
+		$view->disableExcludeLowPopulation();
+		$view->setLimit( 5 );
+		$view->setGraphLimit(5);
+		
+		$this->setPeriodVariablesView($view);
+		$column = 'nb_visits';
+		if($view->period == 'day')
+		{
+			$column = 'nb_uniq_visitors';
+		}
+		$view->setSortedColumn( $column );
+		$view->setColumnsToDisplay( array('label', $column) );
+		return $view;
+	}
+}
diff --git a/oss/piwik/trunk/plugins/UserSettings/UserSettings.php b/oss/piwik/trunk/plugins/UserSettings/UserSettings.php
new file mode 100644
index 00000000..174e9c43
--- /dev/null
+++ b/oss/piwik/trunk/plugins/UserSettings/UserSettings.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ * 
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
+ * @version $Id: UserSettings.php 2305 2010-06-15 10:04:53Z matt $
+ * 
+ * @category Piwik_Plugins
+ * @package Piwik_UserSettings
+ */
+
+/**
+ *
+ * @package Piwik_UserSettings
+ */
+class Piwik_UserSettings extends Piwik_Plugin
+{	
+	public function getInformation()
+	{
+		$info = array(
+			'description' => Piwik_Translate('UserSettings_PluginDescription'),
+			'author' => 'Piwik',
+			'author_homepage' => 'http://piwik.org/',
+			'version' => Piwik_Version::VERSION,
+		);
+		
+		return $info;
+	}
+
+	static public $browserType_display = array(
+		'ie'     => 'Trident (IE)',
+		'gecko'  => 'Gecko (Firefox)',
+		'khtml'  => 'KHTML (Konqueror)',
+		'webkit' => 'WebKit (Safari)',
+		'opera'  => 'Presto (Opera)',
+	);
+
+	function getListHooksRegistered()
+	{
+		$hooks = array(
+			'ArchiveProcessing_Day.compute' => 'archiveDay',
+			'ArchiveProcessing_Period.compute' => 'archivePeriod',
+			'WidgetsList.add' => 'addWidgets',
+			'Menu.add' => 'addMenu',
+		);
+		return $hooks;
+	}
+	
+	function addWidgets()
+	{
+		Piwik_AddWidget( 'UserSettings_VisitorSettings', 'UserSettings_WidgetResolutions', 'UserSettings', 'getResolution');
+		Piwik_AddWidget( 'UserSettings_VisitorSettings', 'UserSettings_WidgetBrowsers', 'UserSettings', 'getBrowser');
+		Piwik_AddWidget( 'UserSettings_VisitorSettings', 'UserSettings_WidgetPlugins', 'UserSettings', 'getPlugin');
+		Piwik_AddWidget( 'UserSettings_VisitorSettings', 'UserSettings_WidgetWidescreen', 'UserSettings', 'getWideScreen');
+		Piwik_AddWidget( 'UserSettings_VisitorSettings', 'UserSettings_WidgetBrowserFamilies', 'UserSettings', 'getBrowserType');
+		Piwik_AddWidget( 'UserSettings_VisitorSettings', 'UserSettings_WidgetOperatingSystems', 'UserSettings', 'getOS');
+		Piwik_AddWidget( 'UserSettings_VisitorSettings', 'UserSettings_WidgetGlobalVisitors', 'UserSettings', 'getConfiguration');
+	}
+	
+	function addMenu()
+	{
+		Piwik_AddMenu('General_Visitors', 'UserSettings_SubmenuSettings', array('module' => 'UserSettings', 'action' => 'index'));
+	}
+	
+	function archiveDay( $notification )
+	{
+		require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
+		$maximumRowsInDataTable = Zend_Registry::get('config')->General->datatable_archiving_maximum_rows_standard;
+		$columnToSortByBeforeTruncation = Piwik_Archive::INDEX_NB_VISITS;
+		
+		$archiveProcessing = $notification->getNotificationObject();
+		$this->archiveProcessing = $archiveProcessing;
+			
+		$recordName = 'UserSettings_configuration';
+		$labelSQL = "CONCAT(config_os, ';', config_browser_name, ';', config_resolution)";
+		$interestByConfiguration = $archiveProcessing->getArrayInterestForLabel($labelSQL);
+		$tableConfiguration = $archiveProcessing->getDataTableFromArray($interestByConfiguration);
+		$archiveProcessing->insertBlobRecord($recordName, $tableConfiguration->getSerialized($maximumRowsInDataTable, null, $columnToSortByBeforeTruncation));
+		destroy($tableConfiguration);
+		
+		$recordName = 'UserSettings_os';
+		$labelSQL = "config_os";
+		$interestByOs = $archiveProcessing->getArrayInterestForLabel($labelSQL);
+		$tableOs = $archiveProcessing->getDataTableFromArray($interestByOs);
+		$archiveProcessing->insertBlobRecord($recordName, $tableOs->getSerialized($maximumRowsInDataTable, null, $columnToSortByBeforeTruncation));
+		destroy($tableOs);
+		
+		$recordName = 'UserSettings_browser';
+		$labelSQL = "CONCAT(config_browser_name, ';', config_browser_version)";
+		$interestByBrowser = $archiveProcessing->getArrayInterestForLabel($labelSQL);
+		$tableBrowser = $archiveProcessing->getDataTableFromArray($interestByBrowser);
+		$archiveProcessing->insertBlobRecord($recordName, $tableBrowser->getSerialized($maximumRowsInDataTable, null, $columnToSortByBeforeTruncation));
+		
+		$recordName = 'UserSettings_browserType';
+		$tableBrowserType = $this->getTableBrowserByType($tableBrowser);
+		$archiveProcessing->insertBlobRecord($recordName, $tableBrowserType->getSerialized());
+		destroy($tableBrowser);
+		destroy($tableBrowserType);
+		
+		$recordName = 'UserSettings_resolution';
+		$labelSQL = "config_resolution";
+		$interestByResolution = $archiveProcessing->getArrayInterestForLabel($labelSQL);
+		$tableResolution = $archiveProcessing->getDataTableFromArray($interestByResolution);
+		$tableResolution->filter('ColumnCallbackDeleteRow', array('label', 'Piwik_UserSettings_keepStrlenGreater'));
+		$archiveProcessing->insertBlobRecord($recordName, $tableResolution->getSerialized($maximumRowsInDataTable, null, $columnToSortByBeforeTruncation));
+		
+		$recordName = 'UserSettings_wideScreen';
+		$tableWideScreen = $this->getTableWideScreen($tableResolution);
+		$archiveProcessing->insertBlobRecord($recordName, $tableWideScreen->getSerialized());
+		destroy($tableResolution);
+		destroy($tableWideScreen);
+		
+		$recordName = 'UserSettings_plugin';
+		$tablePlugin = $this->getDataTablePlugin();
+		$archiveProcessing->insertBlobRecord($recordName, $tablePlugin->getSerialized());
+		destroy($tablePlugin);
+	}
+	
+	function archivePeriod( $notification )
+	{
+		$archiveProcessing = $notification->getNotificationObject();
+		$maximumRowsInDataTable = Zend_Registry::get('config')->General->datatable_archiving_maximum_rows_standard;
+		
+		$dataTableToSum = array( 
+				'UserSettings_configuration',
+				'UserSettings_os',
+				'UserSettings_browser',
+				'UserSettings_browserType',
+				'UserSettings_resolution',
+				'UserSettings_wideScreen',
+				'UserSettings_plugin',
+		);
+		
+		$archiveProcessing->archiveDataTable($dataTableToSum, null, $maximumRowsInDataTable);
+	}
+	
+	protected function getTableWideScreen($tableResolution)
+	{
+		$nameToRow = array();
+		foreach($tableResolution->getRows() as $row)
+		{
+			$resolution = $row->getColumn('label');
+			$name = Piwik_getScreenTypeFromResolution($resolution);
+			if(!isset($nameToRow[$name]))
+			{
+				$nameToRow[$name] = new Piwik_DataTable_Row();
+				$nameToRow[$name]->addColumn('label', $name);
+			}
+			
+			$nameToRow[$name]->sumRow( $row );
+		}
+		$tableWideScreen = new Piwik_DataTable();
+		$tableWideScreen->addRowsFromArray($nameToRow);
+		
+		return $tableWideScreen;
+	}
+	
+	protected function getTableBrowserByType($tableBrowser)
+	{		
+		$nameToRow = array();
+		foreach($tableBrowser->getRows() as $row)
+		{
+			$browserLabel = $row->getColumn('label');
+			$familyNameToUse = Piwik_getBrowserFamily($browserLabel);
+			if(!isset($nameToRow[$familyNameToUse]))
+			{
+				$nameToRow[$familyNameToUse] = new Piwik_DataTable_Row();
+				$nameToRow[$familyNameToUse]->addColumn('label',$familyNameToUse);
+			}
+			$nameToRow[$familyNameToUse]->sumRow( $row );
+		}
+		
+		$tableBrowserType = new Piwik_DataTable();
+		$tableBrowserType->addRowsFromArray($nameToRow);
+		return $tableBrowserType;
+	}
+	
+	protected function getDataTablePlugin()
+	{
+		$toSelect = "sum(case config_pdf when 1 then 1 else 0 end) as pdf, 
+							sum(case config_flash when 1 then 1 else 0 end) as flash, 
+							sum(case config_java when 1 then 1 else 0 end) as java, 
+							sum(case config_director when 1 then 1 else 0 end) as director,
+							sum(case config_quicktime when 1 then 1 else 0 end) as quicktime,
+							sum(case config_realplayer when 1 then 1 else 0 end) as realplayer,
+							sum(case config_windowsmedia when 1 then 1 else 0 end) as windowsmedia,
+							sum(case config_gears when 1 then 1 else 0 end) as gears,
+							sum(case config_silverlight when 1 then 1 else 0 end) as silverlight,
+							sum(case config_cookie when 1 then 1 else 0 end) as cookie	";
+		return $this->archiveProcessing->getSimpleDataTableFromSelect($toSelect, Piwik_Archive::INDEX_NB_VISITS);
+	}
+}
diff --git a/oss/piwik/trunk/plugins/UserSettings/functions.php b/oss/piwik/trunk/plugins/UserSettings/functions.php
new file mode 100644
index 00000000..b35915da
--- /dev/null
+++ b/oss/piwik/trunk/plugins/UserSettings/functions.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ * 
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
+ * @version $Id: functions.php 2305 2010-06-15 10:04:53Z matt $
+ * 
+ * @category Piwik_Plugins
+ * @package Piwik_UserSettings
+ */
+
+/**
+ * @see libs/UserAgentParser/UserAgentParser.php
+ */
+require_once PIWIK_INCLUDE_PATH . '/libs/UserAgentParser/UserAgentParser.php';
+		
+function Piwik_getPluginsLogo( $oldLabel )
+{
+	return  'plugins/UserSettings/images/plugins/'. $oldLabel . '.gif';
+}
+
+function Piwik_getOSLabel($osId)
+{
+	$osName = UserAgentParser::getOperatingSystemNameFromId($osId);
+	if($osName !== false)
+	{
+		return $osName;
+	}
+	if( $osId == 'UNK')
+	{
+		return html_entity_decode(Piwik_Translate('General_Unknown'), ENT_COMPAT, 'UTF-8');
+	}
+	return $osId;
+}
+
+function Piwik_getOSShortLabel($osId)
+{
+	$osShortName = UserAgentParser::getOperatingSystemShortNameFromId($osId);
+	if($osShortName !== false)
+	{
+		return $osShortName;
+	}
+	if( $osId == 'UNK')
+	{
+		return html_entity_decode(Piwik_Translate('General_Unknown'), ENT_COMPAT, 'UTF-8');
+	}
+	return $osId;
+}
+
+function Piwik_getBrowserTypeLabel($oldLabel)
+{
+	if(isset(Piwik_UserSettings::$browserType_display[$oldLabel]))
+	{
+		return Piwik_UserSettings::$browserType_display[$oldLabel];
+	}
+	if($oldLabel == 'unknown')
+	{
+		return html_entity_decode(Piwik_Translate('General_Unknown'), ENT_COMPAT, 'UTF-8');
+	}
+	return $oldLabel;
+}
+
+
+function Piwik_getConfigurationLabel($str)
+{
+	if(strpos($str, ';') === false)
+	{
+		return $str;
+	}
+	$values = explode(";", $str);
+	
+	$os = Piwik_getOSLabel($values[0]);
+	$name = $values[1];
+	$browser = UserAgentParser::getBrowserNameFromId($name);
+	if($browser === false)
+	{
+		$browser = html_entity_decode(Piwik_Translate('General_Unknown'), ENT_COMPAT, 'UTF-8');
+	}
+	$resolution = $values[2];
+	return $os . " / " . $browser . " / " . $resolution;
+}
+
+function Piwik_getBrowserLabel($oldLabel)
+{
+	$browserId = Piwik_getBrowserId($oldLabel);
+	$version = Piwik_getBrowserVersion($oldLabel);
+	$browserName = UserAgentParser::getBrowserNameFromId($browserId);
+	if( $browserName !== false)
+	{
+		return $browserName . " ". $version;
+	}
+	if( $browserId == 'UNK')
+	{
+		return html_entity_decode(Piwik_Translate('General_Unknown'), ENT_COMPAT, 'UTF-8');
+	}
+	return $oldLabel;
+}
+
+function Piwik_getBrowserShortLabel($oldLabel)
+{
+	$browserId = Piwik_getBrowserId($oldLabel);
+	$version = Piwik_getBrowserVersion($oldLabel);
+	$browserName = UserAgentParser::getBrowserShortNameFromId($browserId);
+	if( $browserName !== false)
+	{
+		return $browserName . " ". $version;
+	}
+	if( $browserId == 'UNK')
+	{
+		return html_entity_decode(Piwik_Translate('General_Unknown'), ENT_COMPAT, 'UTF-8');
+	}
+	return $oldLabel;
+}
+
+function Piwik_getBrowserId($str)
+{
+	return substr($str, 0, strpos($str, ';'));
+}
+
+function Piwik_getBrowserVersion($str)
+{
+	return substr($str, strpos($str, ';') + 1);
+}
+
+function Piwik_getBrowsersLogo($label)
+{
+	$id = Piwik_getBrowserId($label);
+	// For aggregated row 'Others'
+	if(empty($id)) {
+		$id = 'UNK';
+	}
+	return  'plugins/UserSettings/images/browsers/'. $id . '.gif';
+}
+
+function Piwik_getOSLogo($label)
+{
+	// For aggregated row 'Others'
+	if(empty($label)) {
+		$label = 'UNK';
+	}
+	$path = 'plugins/UserSettings/images/os/'. $label . '.gif';
+	return $path;
+}
+
+function Piwik_getScreensLogo($label)
+{
+	return 'plugins/UserSettings/images/screens/' . $label . '.gif';
+}
+
+function Piwik_UserSettings_keepStrlenGreater($value)
+{
+	return strlen($value) > 5;
+}
+
+function Piwik_getScreenTypeFromResolution($resolution)
+{
+	$width = intval(substr($resolution, 0, strpos($resolution, 'x')));
+	$height= intval(substr($resolution, strpos($resolution, 'x') + 1));
+	$ratio = Piwik::secureDiv($width, $height);
+	
+	if($ratio < 1.4)
+	{
+		$name = 'normal';
+	}
+	else if($ratio < 2)
+	{
+		$name = 'wide';
+	}
+	else
+	{
+		$name = 'dual';
+	}
+	return $name;
+}
+
+function Piwik_getBrowserFamily($browserLabel)
+{
+	$familyNameToUse = UserAgentParser::getBrowserFamilyFromId(substr($browserLabel, 0, 2));
+	return $familyNameToUse;	
+}
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/AB.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AB.gif
new file mode 100644
index 00000000..cd651565
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AB.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/AM.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AM.gif
new file mode 100644
index 00000000..45a4fef3
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AM.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/AN.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AN.gif
new file mode 100644
index 00000000..9c69167f
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AN.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/AR.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AR.gif
new file mode 100644
index 00000000..d80fa3a8
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AR.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/AV.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AV.gif
new file mode 100644
index 00000000..fe6651e9
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AV.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/AW.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AW.gif
new file mode 100644
index 00000000..41781425
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/AW.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/BB.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/BB.gif
new file mode 100644
index 00000000..3cc5f1ae
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/BB.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/BE.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/BE.gif
new file mode 100644
index 00000000..2e952f5c
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/BE.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/BX.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/BX.gif
new file mode 100644
index 00000000..a34ba484
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/BX.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/CA.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/CA.gif
new file mode 100644
index 00000000..3018ff38
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/CA.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/CH.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/CH.gif
new file mode 100644
index 00000000..a1ac4a2e
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/CH.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/CO.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/CO.gif
new file mode 100644
index 00000000..462c7f6e
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/CO.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/CS.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/CS.gif
new file mode 100644
index 00000000..90789365
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/CS.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/DI.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/DI.gif
new file mode 100644
index 00000000..0ae8bbcd
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/DI.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/EL.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/EL.gif
new file mode 100644
index 00000000..92de33e4
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/EL.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/EP.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/EP.gif
new file mode 100644
index 00000000..647095ec
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/EP.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/FB.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/FB.gif
new file mode 100644
index 00000000..9336ff24
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/FB.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/FD.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/FD.gif
new file mode 100644
index 00000000..e39e41ca
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/FD.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/FE.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/FE.gif
new file mode 100644
index 00000000..d9c6c9ed
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/FE.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/FF.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/FF.gif
new file mode 100644
index 00000000..5cf2ba0d
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/FF.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/FL.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/FL.gif
new file mode 100644
index 00000000..c52999e4
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/FL.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/GA.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/GA.gif
new file mode 100644
index 00000000..83bb10fc
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/GA.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/GE.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/GE.gif
new file mode 100644
index 00000000..3401b729
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/GE.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/HA.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/HA.gif
new file mode 100644
index 00000000..7c87ca4f
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/HA.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/HJ.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/HJ.gif
new file mode 100644
index 00000000..69120da2
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/HJ.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/IB.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/IB.gif
new file mode 100644
index 00000000..7d8a05d7
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/IB.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/IC.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/IC.gif
new file mode 100644
index 00000000..c350a301
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/IC.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/IE.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/IE.gif
new file mode 100644
index 00000000..8fa9eb1f
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/IE.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/IR.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/IR.gif
new file mode 100644
index 00000000..efc4345b
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/IR.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/KM.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/KM.gif
new file mode 100644
index 00000000..dc38b147
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/KM.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/KO.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/KO.gif
new file mode 100644
index 00000000..e0b1f2b1
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/KO.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/KP.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/KP.gif
new file mode 100644
index 00000000..58258f12
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/KP.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/KZ.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/KZ.gif
new file mode 100644
index 00000000..3042cc80
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/KZ.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/LI.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/LI.gif
new file mode 100644
index 00000000..880b19df
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/LI.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/LX.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/LX.gif
new file mode 100644
index 00000000..880b19df
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/LX.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/MC.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/MC.gif
new file mode 100644
index 00000000..fefa4312
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/MC.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/MI.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/MI.gif
new file mode 100644
index 00000000..0688fffc
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/MI.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/MO.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/MO.gif
new file mode 100644
index 00000000..866864c8
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/MO.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/NS.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/NS.gif
new file mode 100644
index 00000000..75ffa594
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/NS.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/OP.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/OP.gif
new file mode 100644
index 00000000..e48ae88f
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/OP.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/OW.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/OW.gif
new file mode 100644
index 00000000..f2cbcbfc
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/OW.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/PX.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/PX.gif
new file mode 100644
index 00000000..c4671091
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/PX.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/SF.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/SF.gif
new file mode 100644
index 00000000..c3511e97
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/SF.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/SM.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/SM.gif
new file mode 100644
index 00000000..1e768177
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/SM.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/UNK.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/UNK.gif
new file mode 100644
index 00000000..ede75be6
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/UNK.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/WO.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/WO.gif
new file mode 100644
index 00000000..fd0debbd
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/WO.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/browsers/WP.gif b/oss/piwik/trunk/plugins/UserSettings/images/browsers/WP.gif
new file mode 100644
index 00000000..22cd2a5a
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/browsers/WP.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/AIX.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/AIX.gif
new file mode 100644
index 00000000..9a663f2b
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/AIX.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/AMI.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/AMI.gif
new file mode 100644
index 00000000..2b28a93a
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/AMI.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/AND.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/AND.gif
new file mode 100644
index 00000000..2d8eadba
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/AND.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/BEO.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/BEO.gif
new file mode 100644
index 00000000..f38d8b90
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/BEO.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/BLB.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/BLB.gif
new file mode 100644
index 00000000..3cc5f1ae
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/BLB.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/BSD.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/BSD.gif
new file mode 100644
index 00000000..326d33d8
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/BSD.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/DFB.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/DFB.gif
new file mode 100644
index 00000000..6935e91a
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/DFB.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/DSI.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/DSI.gif
new file mode 100644
index 00000000..6fb563df
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/DSI.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/HPX.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/HPX.gif
new file mode 100644
index 00000000..062ec181
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/HPX.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/IPA.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/IPA.gif
new file mode 100644
index 00000000..4e9113fa
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/IPA.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/IPD.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/IPD.gif
new file mode 100644
index 00000000..829c0a59
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/IPD.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/IPH.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/IPH.gif
new file mode 100644
index 00000000..82e58355
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/IPH.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/IRI.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/IRI.gif
new file mode 100644
index 00000000..65dd44a9
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/IRI.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/LIN.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/LIN.gif
new file mode 100644
index 00000000..12e38881
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/LIN.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/MAC.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/MAC.gif
new file mode 100644
index 00000000..73b2d9ca
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/MAC.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/NBS.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/NBS.gif
new file mode 100644
index 00000000..33e6749c
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/NBS.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/NDS.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/NDS.gif
new file mode 100644
index 00000000..fe731351
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/NDS.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/OBS.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/OBS.gif
new file mode 100644
index 00000000..01c1b07a
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/OBS.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/OS2.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/OS2.gif
new file mode 100644
index 00000000..4ec088d1
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/OS2.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/POS.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/POS.gif
new file mode 100644
index 00000000..49e089ef
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/POS.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/PS3.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/PS3.gif
new file mode 100644
index 00000000..e68f629b
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/PS3.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/PSP.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/PSP.gif
new file mode 100644
index 00000000..91178ebe
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/PSP.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/SOS.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/SOS.gif
new file mode 100644
index 00000000..9d17c202
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/SOS.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/SYL.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/SYL.gif
new file mode 100644
index 00000000..c6e1f256
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/SYL.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/T64.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/T64.gif
new file mode 100644
index 00000000..3255046d
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/T64.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/UNK.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/UNK.gif
new file mode 100644
index 00000000..ec7aa05e
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/UNK.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/W2K.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/W2K.gif
new file mode 100644
index 00000000..404eeabc
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/W2K.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/W95.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/W95.gif
new file mode 100644
index 00000000..404eeabc
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/W95.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/W98.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/W98.gif
new file mode 100644
index 00000000..404eeabc
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/W98.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/WI7.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/WI7.gif
new file mode 100644
index 00000000..d782a6d4
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/WI7.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/WII.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/WII.gif
new file mode 100644
index 00000000..f2644a8a
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/WII.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/WME.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/WME.gif
new file mode 100644
index 00000000..404eeabc
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/WME.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/WNT.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/WNT.gif
new file mode 100644
index 00000000..404eeabc
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/WNT.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/WOS.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/WOS.gif
new file mode 100644
index 00000000..60dcc17d
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/WOS.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/WS3.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/WS3.gif
new file mode 100644
index 00000000..d782a6d4
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/WS3.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/WVI.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/WVI.gif
new file mode 100644
index 00000000..d782a6d4
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/WVI.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/os/WXP.gif b/oss/piwik/trunk/plugins/UserSettings/images/os/WXP.gif
new file mode 100644
index 00000000..d782a6d4
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/os/WXP.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/plugins/cookie.gif b/oss/piwik/trunk/plugins/UserSettings/images/plugins/cookie.gif
new file mode 100644
index 00000000..7e5f5615
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/plugins/cookie.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/plugins/director.gif b/oss/piwik/trunk/plugins/UserSettings/images/plugins/director.gif
new file mode 100644
index 00000000..d40a7520
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/plugins/director.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/plugins/flash.gif b/oss/piwik/trunk/plugins/UserSettings/images/plugins/flash.gif
new file mode 100644
index 00000000..d144c55b
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/plugins/flash.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/plugins/gears.gif b/oss/piwik/trunk/plugins/UserSettings/images/plugins/gears.gif
new file mode 100644
index 00000000..ea5f0dd3
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/plugins/gears.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/plugins/java.gif b/oss/piwik/trunk/plugins/UserSettings/images/plugins/java.gif
new file mode 100644
index 00000000..0aae25f9
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/plugins/java.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/plugins/pdf.gif b/oss/piwik/trunk/plugins/UserSettings/images/plugins/pdf.gif
new file mode 100644
index 00000000..ac908f40
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/plugins/pdf.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/plugins/quicktime.gif b/oss/piwik/trunk/plugins/UserSettings/images/plugins/quicktime.gif
new file mode 100644
index 00000000..48221612
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/plugins/quicktime.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/plugins/realplayer.gif b/oss/piwik/trunk/plugins/UserSettings/images/plugins/realplayer.gif
new file mode 100644
index 00000000..6078f1a4
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/plugins/realplayer.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/plugins/silverlight.gif b/oss/piwik/trunk/plugins/UserSettings/images/plugins/silverlight.gif
new file mode 100644
index 00000000..227f1322
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/plugins/silverlight.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/plugins/windowsmedia.gif b/oss/piwik/trunk/plugins/UserSettings/images/plugins/windowsmedia.gif
new file mode 100644
index 00000000..04f81625
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/plugins/windowsmedia.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/screens/dual.gif b/oss/piwik/trunk/plugins/UserSettings/images/screens/dual.gif
new file mode 100644
index 00000000..5cdbbae2
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/screens/dual.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/screens/normal.gif b/oss/piwik/trunk/plugins/UserSettings/images/screens/normal.gif
new file mode 100644
index 00000000..1c5c3997
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/screens/normal.gif differ
diff --git a/oss/piwik/trunk/plugins/UserSettings/images/screens/wide.gif b/oss/piwik/trunk/plugins/UserSettings/images/screens/wide.gif
new file mode 100644
index 00000000..6b726d55
Binary files /dev/null and b/oss/piwik/trunk/plugins/UserSettings/images/screens/wide.gif differ