diff --git a/install-new/classes/xmlLoader.php b/install-new/classes/xmlLoader.php index af6ef1a3a..f58241af8 100644 --- a/install-new/classes/xmlLoader.php +++ b/install-new/classes/xmlLoader.php @@ -50,6 +50,7 @@ class InstallXmlLoader protected $data_path; protected $lang_path; protected $img_path; + public $path_type; protected $ids = array(); @@ -72,6 +73,7 @@ class InstallXmlLoader public function setDefaultPath() { + $this->path_type = 'common'; $this->data_path = _PS_INSTALL_DATA_PATH_.'xml/'; $this->lang_path = _PS_INSTALL_LANGS_PATH_; $this->img_path = _PS_INSTALL_DATA_PATH_.'img/'; @@ -79,6 +81,7 @@ class InstallXmlLoader public function setFixturesPath() { + $this->path_type = 'fixture'; $this->data_path = _PS_INSTALL_FIXTURES_PATH_.'apple/data/'; $this->lang_path = _PS_INSTALL_FIXTURES_PATH_.'apple/langs/'; $this->img_path = _PS_INSTALL_FIXTURES_PATH_.'apple/img/'; @@ -336,7 +339,7 @@ class InstallXmlLoader if ($iso) $cache_id .= ':'.$iso; - if (!isset($this->cache_xml_entity[$cache_id])) + if (!isset($this->cache_xml_entity[$this->path_type][$cache_id])) { $path = $this->data_path.$entity.'.xml'; if ($iso) @@ -345,11 +348,11 @@ class InstallXmlLoader if (!file_exists($path)) throw new PrestashopInstallerException('XML data file '.$entity.'.xml not found'); - if (!$this->cache_xml_entity[$cache_id] = @simplexml_load_file($path)) + if (!$this->cache_xml_entity[$this->path_type][$cache_id] = @simplexml_load_file($path)) throw new PrestashopInstallerException('XML data file '.$entity.'.xml invalid'); } - return $this->cache_xml_entity[$cache_id]; + return $this->cache_xml_entity[$this->path_type][$cache_id]; } /** @@ -591,7 +594,7 @@ class InstallXmlLoader $columns[$table][$row['Field']] = $this->checkIfTypeIsText($row['Type']); } - $exclude = array_merge(array('id_'.$table, 'date_add', 'date_upd', 'position', 'deleted', 'id_lang', 'id_shop', 'id_group_shop'), $exclude); + $exclude = array_merge(array('id_'.$table, 'date_add', 'date_upd', 'position', 'deleted', 'id_lang'), $exclude); $list = array(); foreach ($columns[$table] as $k => $v) @@ -886,6 +889,7 @@ class InstallXmlLoader $alias_multilang = array(); if ($is_multilang) { + $columns = $this->getColumns($entity); $multilang_columns = $this->getColumns($entity, true); // If some columns from _lang table have same name than original table, rename them (E.g. value in configuration) @@ -1002,7 +1006,7 @@ class InstallXmlLoader if (!$primary) return ''; - if (!$id_format || !$row) + if (!$id_format || !$row || !$row[$id_format]) $ids[$entity][$primary] = $entity.'_'.$primary; else { diff --git a/install-new/data/db_structure.sql b/install-new/data/db_structure.sql index ad94c9953..d74f1c9d7 100644 --- a/install-new/data/db_structure.sql +++ b/install-new/data/db_structure.sql @@ -23,6 +23,7 @@ CREATE TABLE `PREFIX_address` ( `id_customer` int(10) unsigned NOT NULL default '0', `id_manufacturer` int(10) unsigned NOT NULL default '0', `id_supplier` int(10) unsigned NOT NULL default '0', + `id_warehouse` int(10) unsigned NOT NULL default '0', `alias` varchar(32) NOT NULL, `company` varchar(32) default NULL, `lastname` varchar(32) NOT NULL, @@ -45,7 +46,8 @@ CREATE TABLE `PREFIX_address` ( KEY `id_country` (`id_country`), KEY `id_state` (`id_state`), KEY `id_manufacturer` (`id_manufacturer`), - KEY `id_supplier` (`id_supplier`) + KEY `id_supplier` (`id_supplier`), + KEY `id_warehouse` (`id_warehouse`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_alias` ( @@ -139,6 +141,11 @@ CREATE TABLE `PREFIX_carrier` ( `external_module_name` varchar(64) DEFAULT NULL, `shipping_method` int(2) NOT NULL DEFAULT '0', `position` int(10) unsigned NOT NULL default '0', + `max_width` int(10) DEFAULT 0, + `max_height` int(10) DEFAULT 0, + `max_depth` int(10) DEFAULT 0, + `max_weight` int(10) DEFAULT 0, + `grade` int(10) DEFAULT 0, PRIMARY KEY (`id_carrier`), KEY `deleted` (`deleted`,`active`), KEY `id_tax_rules_group` (`id_tax_rules_group`) @@ -148,8 +155,8 @@ CREATE TABLE `PREFIX_carrier_lang` ( `id_carrier` int(10) unsigned NOT NULL, `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_lang` int(10) unsigned NOT NULL, - `delay` varchar(128) default NULL, - UNIQUE KEY `shipper_lang_index` (`id_lang`,`id_shop`, `id_carrier`) + `delay` varchar(128) DEFAULT NULL, + PRIMARY KEY `shipper_lang_index` (`id_lang`,`id_shop`, `id_carrier`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_carrier_zone` ( @@ -163,6 +170,7 @@ CREATE TABLE `PREFIX_cart` ( `id_group_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1', `id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1', `id_carrier` int(10) unsigned NOT NULL, + `delivery_option` varchar(100), `id_lang` int(10) unsigned NOT NULL, `id_address_delivery` int(10) unsigned NOT NULL, `id_address_invoice` int(10) unsigned NOT NULL, @@ -173,6 +181,7 @@ CREATE TABLE `PREFIX_cart` ( `recyclable` tinyint(1) unsigned NOT NULL default '1', `gift` tinyint(1) unsigned NOT NULL default '0', `gift_message` text, + `allow_seperated_package` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_cart`), @@ -207,7 +216,7 @@ CREATE TABLE `PREFIX_cart_rule` ( `cart_rule_restriction` tinyint(1) unsigned NOT NULL default 0, `product_restriction` tinyint(1) unsigned NOT NULL default 0, `free_shipping` tinyint(1) NOT NULL default 0, - `reduction_percent` decimal(4,2) NOT NULL default 0, + `reduction_percent` decimal(5,2) NOT NULL default 0, `reduction_amount` decimal(17,2) NOT NULL default 0, `reduction_tax` tinyint(1) unsigned NOT NULL default 0, `reduction_currency` int(10) unsigned NOT NULL default 0, @@ -274,6 +283,7 @@ CREATE TABLE `PREFIX_cart_cart_rule` ( CREATE TABLE `PREFIX_cart_product` ( `id_cart` int(10) unsigned NOT NULL, `id_product` int(10) unsigned NOT NULL, + `id_address_delivery` int(10) UNSIGNED DEFAULT 0, `id_shop` int(10) unsigned NOT NULL DEFAULT '1', `id_product_attribute` int(10) unsigned default NULL, `quantity` int(10) unsigned NOT NULL default '0', @@ -323,7 +333,7 @@ CREATE TABLE `PREFIX_category_product` ( `id_category` int(10) unsigned NOT NULL, `id_product` int(10) unsigned NOT NULL, `position` int(10) unsigned NOT NULL default '0', - KEY `category_product_index` (`id_category`,`id_product`), + UNIQUE KEY `category_product_index` (`id_category`,`id_product`), INDEX (`id_product`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; @@ -372,14 +382,18 @@ CREATE TABLE `PREFIX_cms_category_lang` ( KEY `category_name` (`name`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE `PREFIX_compare_product` ( - `id_compare_product` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_product` int(10) unsigned NOT NULL, - `id_guest` int(10) unsigned NOT NULL, +CREATE TABLE `PREFIX_compare` ( + `id_compare` int(10) unsigned NOT NULL auto_increment, `id_customer` int(10) unsigned NOT NULL, + PRIMARY KEY (`id_compare`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +CREATE TABLE `PREFIX_compare_product` ( + `id_compare` int(10) unsigned NOT NULL, + `id_product` int(10) unsigned NOT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, - PRIMARY KEY (`id_compare_product`) + PRIMARY KEY (`id_compare`,`id_product`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_configuration` ( @@ -583,13 +597,14 @@ CREATE TABLE `PREFIX_customer_thread` ( CREATE TABLE `PREFIX_customization` ( `id_customization` int(10) unsigned NOT NULL auto_increment, `id_product_attribute` int(10) unsigned NOT NULL default '0', + `id_address_delivery` int(10) UNSIGNED NOT NULL DEFAULT 0, `id_cart` int(10) unsigned NOT NULL, `id_product` int(10) NOT NULL, `quantity` int(10) NOT NULL, `quantity_refunded` INT NOT NULL DEFAULT '0', `quantity_returned` INT NOT NULL DEFAULT '0', `in_cart` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0', - PRIMARY KEY (`id_customization`,`id_cart`,`id_product`), + PRIMARY KEY (`id_customization`,`id_cart`,`id_product`, `id_address_delivery`), KEY `id_product_attribute` (`id_product_attribute`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; @@ -656,7 +671,7 @@ CREATE TABLE `PREFIX_employee` ( `bo_show_screencast` tinyint(1) NOT NULL default '1', `active` tinyint(1) unsigned NOT NULL default '0', `id_last_order` tinyint(1) unsigned NOT NULL default '0', - `id_last_message` tinyint(1) unsigned NOT NULL default '0', + `id_last_customer_message` tinyint(1) unsigned NOT NULL default '0', `id_last_customer` tinyint(1) unsigned NOT NULL default '0', PRIMARY KEY (`id_employee`), KEY `employee_login` (`email`,`passwd`), @@ -725,6 +740,7 @@ CREATE TABLE `PREFIX_group` ( `id_group` int(10) unsigned NOT NULL auto_increment, `reduction` decimal(17,2) NOT NULL default '0.00', `price_display_method` TINYINT NOT NULL DEFAULT 0, + `show_prices` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_group`) @@ -753,6 +769,13 @@ CREATE TABLE `PREFIX_product_group_reduction_cache` ( PRIMARY KEY(`id_product`, `id_group`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; +CREATE TABLE `PREFIX_product_carrier` ( + `id_product` int(10) unsigned NOT NULL, + `id_carrier_reference` int(10) unsigned NOT NULL, + `id_shop` int(10) unsigned NOT NULL, + PRIMARY KEY (`id_product`, `id_carrier_reference`, `id_shop`) +) ENGINE = ENGINE_TYPE DEFAULT CHARSET=utf8; + CREATE TABLE `PREFIX_guest` ( `id_guest` int(10) unsigned NOT NULL auto_increment, `id_operating_system` int(10) unsigned default NULL, @@ -929,6 +952,7 @@ CREATE TABLE `PREFIX_module` ( `id_module` int(10) unsigned NOT NULL auto_increment, `name` varchar(64) NOT NULL, `active` tinyint(1) unsigned NOT NULL default '0', + `version` VARCHAR(8) NOT NULL, PRIMARY KEY (`id_module`), KEY `name` (`name`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; @@ -971,6 +995,7 @@ CREATE TABLE `PREFIX_operating_system` ( CREATE TABLE `PREFIX_orders` ( `id_order` int(10) unsigned NOT NULL auto_increment, + `reference` VARCHAR(9), `id_group_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1', `id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1', `id_carrier` int(10) unsigned NOT NULL, @@ -1025,14 +1050,38 @@ CREATE TABLE `PREFIX_orders` ( INDEX `date_add`(`date_add`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE IF NOT EXISTS `PREFIX_order_detail_tax` ( +CREATE TABLE `PREFIX_order_detail_tax` ( `id_order_detail` int(11) NOT NULL, - `id_tax` int(11) NOT NULL + `id_tax` int(11) NOT NULL, + `unit_amount` DECIMAL( 10,6 ) NOT NULL default '0.00', + `total_amount` DECIMAL( 10, 6 ) NOT NULL default '0.00' +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +CREATE TABLE `PREFIX_order_invoice` ( + `id_order_invoice` int(11) NOT NULL AUTO_INCREMENT, + `id_order` int(11) NOT NULL, + `number` int(11) NOT NULL, + `total_discount_tax_excl` decimal(17,2) NOT NULL DEFAULT '0.00', + `total_discount_tax_incl` decimal(17,2) NOT NULL DEFAULT '0.00', + `total_paid_tax_excl` decimal(17,2) NOT NULL DEFAULT '0.00', + `total_paid_tax_incl` decimal(17,2) NOT NULL DEFAULT '0.00', + `total_products` decimal(17,2) NOT NULL DEFAULT '0.00', + `total_products_wt` decimal(17,2) NOT NULL DEFAULT '0.00', + `total_shipping_tax_excl` decimal(17,2) NOT NULL DEFAULT '0.00', + `total_shipping_tax_incl` decimal(17,2) NOT NULL DEFAULT '0.00', + `total_wrapping_tax_excl` decimal(17,2) NOT NULL DEFAULT '0.00', + `total_wrapping_tax_incl` decimal(17,2) NOT NULL DEFAULT '0.00', + `note` text, + `date_add` datetime NOT NULL, + PRIMARY KEY (`id_order_invoice`), + KEY `id_order` (`id_order`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_order_detail` ( `id_order_detail` int(10) unsigned NOT NULL auto_increment, `id_order` int(10) unsigned NOT NULL, + `id_order_invoice` int(11) default NULL, + `id_warehouse` int(10) unsigned DEFAULT 0, `product_id` int(10) unsigned NOT NULL, `product_attribute_id` int(10) unsigned default NULL, `product_name` varchar(255) NOT NULL, @@ -1044,6 +1093,8 @@ CREATE TABLE `PREFIX_order_detail` ( `product_price` decimal(20,6) NOT NULL default '0.000000', `reduction_percent` DECIMAL(10, 2) NOT NULL default '0.00', `reduction_amount` DECIMAL(20, 6) NOT NULL default '0.000000', + `reduction_amount_tax_incl` FLOAT( 20.6 ) NOT NULL default '0.000000', + `reduction_amount_tax_excl` FLOAT( 20.6 ) NOT NULL default '0.000000', `group_reduction` DECIMAL(10, 2) NOT NULL default '0.000000', `product_quantity_discount` decimal(20,6) NOT NULL default '0.000000', `product_ean13` varchar(13) default NULL, @@ -1051,15 +1102,23 @@ CREATE TABLE `PREFIX_order_detail` ( `product_reference` varchar(32) default NULL, `product_supplier_reference` varchar(32) default NULL, `product_weight` float NOT NULL, + `tax_computation_method` tinyint(1) unsigned NOT NULL default '0', `tax_name` varchar(16) NOT NULL, `tax_rate` DECIMAL(10,3) NOT NULL DEFAULT '0.000', - `tax_computation_method` tinyint(1) unsigned NOT NULL default '0', `ecotax` decimal(21,6) NOT NULL default '0.00', `ecotax_tax_rate` DECIMAL(5,3) NOT NULL DEFAULT '0.000', `discount_quantity_applied` TINYINT(1) NOT NULL DEFAULT 0, `download_hash` varchar(255) default NULL, `download_nb` int(10) unsigned default '0', `download_deadline` datetime default '0000-00-00 00:00:00', + `total_price_tax_incl` DECIMAL(20, 6) NOT NULL default '0.000000', + `total_price_tax_excl` DECIMAL(20, 6) NOT NULL default '0.000000', + `unit_price_tax_incl` DECIMAL(20, 6) NOT NULL default '0.000000', + `unit_price_tax_excl` DECIMAL(20, 6) NOT NULL default '0.000000', + `total_shipping_price_tax_incl` DECIMAL(20, 6) NOT NULL default '0.000000', + `total_shipping_price_tax_excl` DECIMAL(20, 6) NOT NULL default '0.000000', + `purchase_supplier_price` DECIMAL(20, 6) NOT NULL default '0.000000', + `original_product_price` DECIMAL(20, 6) NOT NULL default '0.000000', PRIMARY KEY (`id_order_detail`), KEY `order_detail_order` (`id_order`), KEY `product_id` (`product_id`), @@ -1067,12 +1126,21 @@ CREATE TABLE `PREFIX_order_detail` ( KEY `id_order_id_order_detail` (`id_order`, `id_order_detail`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `PREFIX_order_tax` ( + `id_order` int(11) NOT NULL, + `tax_name` varchar(40) NOT NULL, + `tax_rate` decimal(6,3) NOT NULL, + `amount` decimal(20,6) NOT NULL +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + CREATE TABLE `PREFIX_order_cart_rule` ( `id_order_cart_rule` int(10) unsigned NOT NULL auto_increment, `id_order` int(10) unsigned NOT NULL, `id_cart_rule` int(10) unsigned NOT NULL, + `id_order_invoice` int(10) unsigned DEFAULT 0, `name` varchar(32) NOT NULL, `value` decimal(17,2) NOT NULL default '0.00', + `value_tax_excl` decimal(17,2) NOT NULL default '0.00', PRIMARY KEY (`id_order_cart_rule`), KEY `id_order` (`id_order`), KEY `id_cart_rule` (`id_cart_rule`) @@ -1144,6 +1212,9 @@ CREATE TABLE `PREFIX_order_slip` ( `id_customer` int(10) unsigned NOT NULL, `id_order` int(10) unsigned NOT NULL, `shipping_cost` tinyint(3) unsigned NOT NULL default '0', + `amount` DECIMAL(10,2) NOT NULL, + `shipping_cost_amount` DECIMAL(10,2) NOT NULL, + `partial` TINYINT(1) NOT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_order_slip`), @@ -1155,6 +1226,7 @@ CREATE TABLE `PREFIX_order_slip_detail` ( `id_order_slip` int(10) unsigned NOT NULL, `id_order_detail` int(10) unsigned NOT NULL, `product_quantity` int(10) unsigned NOT NULL default '0', + `amount` DECIMAL(10,2) NOT NULL, PRIMARY KEY (`id_order_slip`,`id_order_detail`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; @@ -1168,6 +1240,7 @@ CREATE TABLE `PREFIX_order_state` ( `logable` tinyint(1) NOT NULL default '0', `delivery` tinyint(1) UNSIGNED NOT NULL default '0', `shipped` tinyint(1) UNSIGNED NOT NULL default '0', + `paid` tinyint(1) UNSIGNED NOT NULL default '0', PRIMARY KEY (`id_order_state`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; @@ -1211,18 +1284,21 @@ CREATE TABLE `PREFIX_page_viewed` ( PRIMARY KEY (`id_page`, `id_date_range`, `id_shop`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE `PREFIX_payment_cc` ( - `id_payment_cc` INT NOT NULL auto_increment, +CREATE TABLE `PREFIX_order_payment` ( + `id_order_payment` INT NOT NULL auto_increment, + `id_order_invoice` INT UNSIGNED NULL, `id_order` INT UNSIGNED NULL, `id_currency` INT UNSIGNED NOT NULL, `amount` DECIMAL(10,2) NOT NULL, + `payment_method` varchar(255) NOT NULL, + `conversion_rate` decimal(13,6) NOT NULL DEFAULT 1, `transaction_id` VARCHAR(254) NULL, `card_number` VARCHAR(254) NULL, `card_brand` VARCHAR(254) NULL, `card_expiration` CHAR(7) NULL, `card_holder` VARCHAR(254) NULL, `date_add` DATETIME NOT NULL, - PRIMARY KEY (`id_payment_cc`), + PRIMARY KEY (`id_order_payment`), KEY `id_order` (`id_order`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; @@ -1268,6 +1344,7 @@ CREATE TABLE `PREFIX_product` ( `cache_default_attribute` int(10) unsigned default NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, + `advanced_stock_management` tinyint(1) default '0' NOT NULL, PRIMARY KEY (`id_product`), KEY `product_supplier` (`id_supplier`), KEY `product_manufacturer` (`id_manufacturer`), @@ -1508,20 +1585,26 @@ CREATE TABLE `PREFIX_search_word` ( CREATE TABLE `PREFIX_specific_price` ( `id_specific_price` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `id_specific_price_rule` INT(11) UNSIGNED NOT NULL, + `id_cart` INT(11) UNSIGNED NOT NULL, `id_product` INT UNSIGNED NOT NULL, `id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1', + `id_group_shop` INT(11) UNSIGNED NOT NULL, `id_currency` INT UNSIGNED NOT NULL, `id_country` INT UNSIGNED NOT NULL, `id_group` INT UNSIGNED NOT NULL, + `id_customer` INT UNSIGNED NOT NULL, `id_product_attribute` INT UNSIGNED NOT NULL, `price` DECIMAL(20, 6) NOT NULL, - `from_quantity` SMALLINT UNSIGNED NOT NULL, + `from_quantity` mediumint(8) UNSIGNED NOT NULL, `reduction` DECIMAL(20, 6) NOT NULL, `reduction_type` ENUM('amount', 'percentage') NOT NULL, `from` DATETIME NOT NULL, `to` DATETIME NOT NULL, PRIMARY KEY(`id_specific_price`), - KEY (`id_product`, `id_shop`, `id_currency`, `id_country`, `id_group`, `from_quantity`, `from`, `to`) + KEY (`id_product`, `id_shop`, `id_currency`, `id_country`, `id_group`, `id_customer`, `from_quantity`, `from`, `to`), + KEY (`id_specific_price_rule`), + KEY (`id_cart`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_state` ( @@ -1545,6 +1628,7 @@ CREATE TABLE `PREFIX_subdomain` ( CREATE TABLE `PREFIX_supplier` ( `id_supplier` int(10) unsigned NOT NULL auto_increment, + `id_address` int(10) unsigned NOT NULL default 0, `name` varchar(64) NOT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, @@ -1594,6 +1678,7 @@ CREATE TABLE `PREFIX_tax` ( `rate` DECIMAL(10, 3) NOT NULL, `active` tinyint(1) unsigned NOT NULL default '1', `deleted` tinyint(1) unsigned NOT NULL default '0', + `account_number` varchar(64) NOT NULL, PRIMARY KEY (`id_tax`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; @@ -1638,8 +1723,8 @@ CREATE TABLE `PREFIX_store` ( `address2` varchar(128) DEFAULT NULL, `city` varchar(64) NOT NULL, `postcode` varchar(12) NOT NULL, - `latitude` decimal(10,8) DEFAULT NULL, - `longitude` decimal(10,8) DEFAULT NULL, + `latitude` decimal(11,8) DEFAULT NULL, + `longitude` decimal(11,8) DEFAULT NULL, `hours` varchar(254) DEFAULT NULL, `phone` varchar(16) DEFAULT NULL, `fax` varchar(16) DEFAULT NULL, @@ -1731,7 +1816,8 @@ CREATE TABLE `PREFIX_specific_price_priority` ( `id_specific_price_priority` INT NOT NULL AUTO_INCREMENT , `id_product` INT NOT NULL , `priority` VARCHAR( 80 ) NOT NULL , - PRIMARY KEY ( `id_specific_price_priority` , `id_product` ) + PRIMARY KEY ( `id_specific_price_priority` , `id_product` ), + UNIQUE KEY `id_product` (`id_product`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_log` ( @@ -1754,12 +1840,6 @@ CREATE TABLE `PREFIX_import_match` ( PRIMARY KEY (`id_import_match`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE `PREFIX_address_format` ( - `id_country` int(10) unsigned NOT NULL, - `format` varchar(255) NOT NULL DEFAULT '', - KEY `country` (`id_country`) -) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; - CREATE TABLE IF NOT EXISTS `PREFIX_group_shop` ( `id_group_shop` int(11) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(64) CHARACTER SET utf8 NOT NULL, @@ -1785,19 +1865,20 @@ CREATE TABLE IF NOT EXISTS `PREFIX_shop` ( KEY `id_theme` (`id_theme`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; - CREATE TABLE IF NOT EXISTS `PREFIX_shop_url` ( - `id_shop_url` int(11) unsigned NOT NULL AUTO_INCREMENT, - `id_shop` int(11) unsigned NOT NULL, - `domain` varchar(255) NOT NULL, - `domain_ssl` varchar(255) NOT NULL, - `physical_uri` varchar(64) NOT NULL, - `virtual_uri` varchar(64) NOT NULL, - `main` TINYINT(1) NOT NULL, - `active` TINYINT(1) NOT NULL, - PRIMARY KEY (`id_shop_url`), - KEY `id_shop` (`id_shop`), - UNIQUE KEY `shop_url` (`domain`, `virtual_uri`) - ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `PREFIX_shop_url` ( + `id_shop_url` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_shop` int(11) unsigned NOT NULL, + `domain` varchar(150) NOT NULL, + `domain_ssl` varchar(150) NOT NULL, + `physical_uri` varchar(64) NOT NULL, + `virtual_uri` varchar(64) NOT NULL, + `main` TINYINT(1) NOT NULL, + `active` TINYINT(1) NOT NULL, + PRIMARY KEY (`id_shop_url`), + KEY `id_shop` (`id_shop`), + UNIQUE KEY `full_shop_url` (`domain`, `physical_uri`, `virtual_uri`), + UNIQUE KEY `full_shop_url_ssl` (`domain_ssl`, `physical_uri`, `virtual_uri`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `PREFIX_theme` ( `id_theme` int(11) NOT NULL AUTO_INCREMENT, @@ -1827,6 +1908,12 @@ PRIMARY KEY (`id_carrier`, `id_shop`), KEY `id_shop` (`id_shop`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; +CREATE TABLE `PREFIX_address_format` ( + `id_country` int(10) unsigned NOT NULL, + `format` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id_country`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + CREATE TABLE `PREFIX_cms_shop` ( `id_cms` INT( 11 ) UNSIGNED NOT NULL, `id_shop` INT( 11 ) UNSIGNED NOT NULL , @@ -1957,9 +2044,11 @@ CREATE TABLE `PREFIX_stock_mvt` ( `id_stock_mvt` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `id_stock` INT(11) UNSIGNED NOT NULL, `id_order` INT(11) UNSIGNED DEFAULT NULL, - `id_supplier_order` INT(11) UNSIGNED DEFAULT NULL, + `id_supply_order` INT(11) UNSIGNED DEFAULT NULL, `id_stock_mvt_reason` INT(11) UNSIGNED NOT NULL, `id_employee` INT(11) UNSIGNED NOT NULL, + `employee_lastname` varchar(32) DEFAULT '', + `employee_firstname` varchar(32) DEFAULT '', `physical_quantity` INT(11) UNSIGNED NOT NULL, `date_add` DATETIME NOT NULL, `sign` tinyint(1) NOT NULL DEFAULT 1, @@ -1977,6 +2066,7 @@ CREATE TABLE `PREFIX_stock_mvt_reason` ( `sign` tinyint(1) NOT NULL DEFAULT 1, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, + `deleted` tinyint(1) unsigned NOT NULL default '0', PRIMARY KEY (`id_stock_mvt_reason`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; @@ -1992,11 +2082,14 @@ CREATE TABLE `PREFIX_stock` ( `id_warehouse` INT(11) UNSIGNED NOT NULL, `id_product` INT(11) UNSIGNED NOT NULL, `id_product_attribute` INT(11) UNSIGNED NOT NULL, +`reference` VARCHAR(32) NOT NULL, +`ean13` VARCHAR(13) DEFAULT NULL, +`upc` VARCHAR(12) DEFAULT NULL, `physical_quantity` INT(11) UNSIGNED NOT NULL, `usable_quantity` INT(11) UNSIGNED NOT NULL, `price_te` DECIMAL(20,6) DEFAULT '0.000000', PRIMARY KEY (`id_stock`), - KEY `id_warehouse` (`id_warehouse`), + KEY `id_warehouse` (`id_warehouse`), KEY `id_product` (`id_product`), KEY `id_product_attribute` (`id_product_attribute`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; @@ -2009,18 +2102,18 @@ CREATE TABLE `PREFIX_warehouse` ( `reference` VARCHAR(32) DEFAULT NULL, `name` VARCHAR(45) NOT NULL, `management_type` ENUM('WA', 'FIFO', 'LIFO') NOT NULL DEFAULT 'WA', +`deleted` tinyint(1) unsigned NOT NULL default '0', PRIMARY KEY (`id_warehouse`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_warehouse_product_location` ( -`id_product` INT(11) UNSIGNED NOT NULL, -`id_product_attribute` INT(11) UNSIGNED NOT NULL, -`id_warehouse` INT(11) UNSIGNED NOT NULL, -`location` VARCHAR(64) DEFAULT NULL, - PRIMARY KEY (`id_product`, `id_product_attribute`, `id_warehouse`), - KEY `id_warehouse` (`id_warehouse`), - KEY `id_product` (`id_product`), - KEY `id_product_attribute` (`id_product_attribute`) + `id_warehouse_product_location` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_product` int(11) unsigned NOT NULL, + `id_product_attribute` int(11) unsigned NOT NULL, + `id_warehouse` int(11) unsigned NOT NULL, + `location` varchar(64) DEFAULT NULL, + PRIMARY KEY (`id_warehouse_product_location`), + UNIQUE KEY `id_product` (`id_product`,`id_product_attribute`,`id_warehouse`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_warehouse_shop` ( @@ -2044,24 +2137,27 @@ CREATE TABLE `PREFIX_stock_available` ( `id_product` INT(11) UNSIGNED NOT NULL, `id_product_attribute` INT(11) UNSIGNED NOT NULL, `id_shop` INT(11) UNSIGNED NOT NULL, +`id_group_shop` INT(11) UNSIGNED NOT NULL, `quantity` INT(10) NOT NULL DEFAULT '0', `depends_on_stock` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0', `out_of_stock` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (`id_stock_available`), KEY `id_shop` (`id_shop`), + KEY `id_group_shop` (`id_group_shop`), KEY `id_product` (`id_product`), KEY `id_product_attribute` (`id_product_attribute`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE `PREFIX_supplier_order` ( -`id_supplier_order` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, +CREATE TABLE `PREFIX_supply_order` ( +`id_supply_order` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, `id_supplier` INT(11) UNSIGNED NOT NULL, -`id_employee` INT(11) UNSIGNED NOT NULL, +`supplier_name` VARCHAR(64) NOT NULL, +`id_lang` INT(11) UNSIGNED NOT NULL, `id_warehouse` INT(11) UNSIGNED NOT NULL, -`id_supplier_order_state` INT(11) UNSIGNED NOT NULL, +`id_supply_order_state` INT(11) UNSIGNED NOT NULL, `id_currency` INT(11) UNSIGNED NOT NULL, `id_ref_currency` INT(11) UNSIGNED NOT NULL, -`reference` VARCHAR(32) DEFAULT NULL, +`reference` VARCHAR(32) NOT NULL, `date_add` DATETIME NOT NULL, `date_upd` DATETIME NOT NULL, `date_delivery_expected` DATETIME DEFAULT NULL, @@ -2071,18 +2167,24 @@ CREATE TABLE `PREFIX_supplier_order` ( `total_ti` DECIMAL(20,6) DEFAULT '0.000000', `discount_rate` DECIMAL(20,6) DEFAULT '0.000000', `discount_value_te` DECIMAL(20,6) DEFAULT '0.000000', - PRIMARY KEY (`id_supplier_order`), +`is_template` tinyint(1) DEFAULT '0', + PRIMARY KEY (`id_supply_order`), KEY `id_supplier` (`id_supplier`), KEY `id_warehouse` (`id_warehouse`), KEY `reference` (`reference`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE `PREFIX_supplier_order_detail` ( -`id_supplier_order_detail` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, -`id_supplier_order` INT(11) UNSIGNED NOT NULL, +CREATE TABLE `PREFIX_supply_order_detail` ( +`id_supply_order_detail` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, +`id_supply_order` INT(11) UNSIGNED NOT NULL, +`id_currency` INT(11) UNSIGNED NOT NULL, `id_product` INT(11) UNSIGNED NOT NULL, `id_product_attribute` INT(11) UNSIGNED NOT NULL, -`id_currency` INT(11) UNSIGNED NOT NULL, +`reference` VARCHAR(32) NOT NULL, +`supplier_reference` VARCHAR(32) NOT NULL, +`name` varchar(128) NOT NULL, +`ean13` VARCHAR(13) DEFAULT NULL, +`upc` VARCHAR(12) DEFAULT NULL, `exchange_rate` DECIMAL(20,6) DEFAULT '0.000000', `unit_price_te` DECIMAL(20,6) DEFAULT '0.000000', `quantity_expected` INT(11) UNSIGNED NOT NULL, @@ -2096,64 +2198,78 @@ CREATE TABLE `PREFIX_supplier_order_detail` ( `price_ti` DECIMAL(20,6) DEFAULT '0.000000', `tax_value_with_order_discount` DECIMAL(20,6) DEFAULT '0.000000', `price_with_order_discount_te` DECIMAL(20,6) DEFAULT '0.000000', - PRIMARY KEY (`id_supplier_order_detail`), - KEY `id_supplier_order` (`id_supplier_order`), + PRIMARY KEY (`id_supply_order_detail`), + KEY `id_supply_order` (`id_supply_order`), KEY `id_product` (`id_product`), KEY `id_product_attribute` (`id_product_attribute`), KEY `id_product_product_attribute` (`id_product`, `id_product_attribute`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE `PREFIX_supplier_order_history` ( -`id_supplier_order_history` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, -`id_supplier_order` INT(11) UNSIGNED NOT NULL, +CREATE TABLE `PREFIX_supply_order_history` ( +`id_supply_order_history` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, +`id_supply_order` INT(11) UNSIGNED NOT NULL, `id_employee` INT(11) UNSIGNED NOT NULL, +`employee_lastname` varchar(32) DEFAULT '', +`employee_firstname` varchar(32) DEFAULT '', `id_state` INT(11) UNSIGNED NOT NULL, `date_add` DATETIME NOT NULL, - PRIMARY KEY (`id_supplier_order_history`), - KEY `id_supplier_order` (`id_supplier_order`), + PRIMARY KEY (`id_supply_order_history`), + KEY `id_supply_order` (`id_supply_order`), KEY `id_employee` (`id_employee`), KEY `id_state` (`id_state`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE `PREFIX_supplier_order_state` ( -`id_supplier_order_state` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, +CREATE TABLE `PREFIX_supply_order_state` ( +`id_supply_order_state` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, `delivery_note` tinyint(1) NOT NULL DEFAULT 0, `editable` tinyint(1) NOT NULL DEFAULT 0, `receipt_state` tinyint(1) NOT NULL DEFAULT 0, `pending_receipt` tinyint(1) NOT NULL DEFAULT 0, `enclosed` tinyint(1) NOT NULL DEFAULT 0, `color` VARCHAR(32) DEFAULT NULL, - PRIMARY KEY (`id_supplier_order_state`) + PRIMARY KEY (`id_supply_order_state`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE `PREFIX_supplier_order_state_lang` ( -`id_supplier_order_state` INT(11) UNSIGNED NOT NULL, +CREATE TABLE `PREFIX_supply_order_state_lang` ( +`id_supply_order_state` INT(11) UNSIGNED NOT NULL, `id_lang` INT(11) UNSIGNED NOT NULL, `name` VARCHAR(128) DEFAULT NULL, - PRIMARY KEY (`id_supplier_order_state`, `id_lang`) + PRIMARY KEY (`id_supply_order_state`, `id_lang`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE `PREFIX_supplier_order_receipt_history` ( -`id_supplier_order_receipt_history` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, -`id_supplier_order_detail` INT(11) UNSIGNED NOT NULL, +CREATE TABLE `PREFIX_supply_order_receipt_history` ( +`id_supply_order_receipt_history` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, +`id_supply_order_detail` INT(11) UNSIGNED NOT NULL, `id_employee` INT(11) UNSIGNED NOT NULL, -`id_supplier_order_state` INT(11) UNSIGNED NOT NULL, +`employee_lastname` varchar(32) DEFAULT '', +`employee_firstname` varchar(32) DEFAULT '', +`id_supply_order_state` INT(11) UNSIGNED NOT NULL, `quantity` INT(11) UNSIGNED NOT NULL, `date_add` DATETIME NOT NULL, - PRIMARY KEY (`id_supplier_order_receipt_history`), - KEY `id_supplier_order_detail` (`id_supplier_order_detail`), - KEY `id_supplier_order_state` (`id_supplier_order_state`) + PRIMARY KEY (`id_supply_order_receipt_history`), + KEY `id_supply_order_detail` (`id_supply_order_detail`), + KEY `id_supply_order_state` (`id_supply_order_state`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +CREATE TABLE `PREFIX_product_supplier` ( + `id_product_supplier` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, + `id_product` int(11) UNSIGNED NOT NULL, + `id_product_attribute` int(11) UNSIGNED NOT NULL DEFAULT '0', + `id_supplier` int(11) UNSIGNED NOT NULL, + `product_supplier_reference` varchar(32) DEFAULT NULL, + `product_supplier_price_te` decimal(20,6) NOT NULL DEFAULT '0.000000', + `id_currency` int(11) unsigned NOT NULL, + PRIMARY KEY (`id_product_supplier`), + UNIQUE KEY `id_product` (`id_product`,`id_product_attribute`,`id_supplier`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_supplier_rates` ( -`id_product` INT(11) UNSIGNED NOT NULL, -`id_product_attribute` INT(11) UNSIGNED NOT NULL, -`id_supplier` INT(11) UNSIGNED NOT NULL, +`id_product_supplier` INT(11) UNSIGNED NOT NULL, `id_currency` INT(11) UNSIGNED NOT NULL, `quantity_min` INT(11) UNSIGNED NOT NULL, `quantity_max` INT(11) UNSIGNED NOT NULL, `price_te` DECIMAL(20,6) DEFAULT '0.000000', - PRIMARY KEY (`id_product`, `id_product_attribute`, `id_supplier`, `quantity_min`, `quantity_max`) + PRIMARY KEY (`id_product_supplier`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_accounting_zone_shop` ( @@ -2164,3 +2280,61 @@ CREATE TABLE `PREFIX_accounting_zone_shop` ( PRIMARY KEY (`id_accounting_zone_shop`), UNIQUE KEY `id_zone` (`id_zone`,`id_shop`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +CREATE TABLE `PREFIX_accounting_product_zone_shop` ( + `id_accounting_product_zone_shop` int(11) NOT NULL AUTO_INCREMENT, + `id_product` int(11) NOT NULL, + `id_shop` int(11) NOT NULL, + `id_zone` int(11) NOT NULL, + `account_number` varchar(64) NOT NULL, + PRIMARY KEY (`id_accounting_product_zone_shop`), + UNIQUE KEY `id_product` (`id_product`,`id_shop`,`id_zone`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +CREATE TABLE `PREFIX_order_carrier` ( + `id_order_carrier` int(11) NOT NULL AUTO_INCREMENT, + `id_order` int(11) unsigned NOT NULL, + `id_carrier` int(11) unsigned NOT NULL, + `id_order_invoice` int(11) unsigned DEFAULT NULL, + `weight` float DEFAULT NULL, + `shipping_cost_tax_excl` decimal(20,6) DEFAULT NULL, + `shipping_cost_tax_incl` decimal(20,6) DEFAULT NULL, + `tracking_number` varchar(64) DEFAULT NULL, + `date_add` datetime NOT NULL, + PRIMARY KEY (`id_order_carrier`), + KEY `id_order` (`id_order`), + KEY `id_carrier` (`id_carrier`), + KEY `id_order_invoice` (`id_order_invoice`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `PREFIX_specific_price_rule` ( + `id_specific_price_rule` int(10) unsigned NOT NULL AUTO_INCREMENT, + `name` VARCHAR(255) NOT NULL, + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', + `id_currency` int(10) unsigned NOT NULL, + `id_country` int(10) unsigned NOT NULL, + `id_group` int(10) unsigned NOT NULL, + `from_quantity` mediumint(8) unsigned NOT NULL, + `price` DECIMAL(20,6), + `reduction` decimal(20,6) NOT NULL, + `reduction_type` enum('amount','percentage') NOT NULL, + `from` datetime NOT NULL, + `to` datetime NOT NULL, + PRIMARY KEY (`id_specific_price_rule`), + KEY `id_product` (`id_shop`,`id_currency`,`id_country`,`id_group`,`from_quantity`,`from`,`to`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +CREATE TABLE `PREFIX_specific_price_rule_condition_group` ( + `id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL, + `id_specific_price_rule` INT(11) UNSIGNED NOT NULL, + PRIMARY KEY ( `id_specific_price_rule_condition_group`, `id_specific_price_rule` ) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +CREATE TABLE `PREFIX_specific_price_rule_condition` ( + `id_specific_price_rule_condition` INT(11) UNSIGNED NOT NULL, + `id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL, + `type` VARCHAR(255) NOT NULL, + `value` VARCHAR(255) NOT NULL, +PRIMARY KEY (`id_specific_price_rule_condition`), +INDEX (`id_specific_price_rule_condition_group`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; diff --git a/install-new/data/img/genders/gender_1.jpg b/install-new/data/img/genders/gender_1.jpg new file mode 100644 index 000000000..14107c32b Binary files /dev/null and b/install-new/data/img/genders/gender_1.jpg differ diff --git a/install-new/data/img/genders/gender_2.jpg b/install-new/data/img/genders/gender_2.jpg new file mode 100644 index 000000000..a2f7ee3f1 Binary files /dev/null and b/install-new/data/img/genders/gender_2.jpg differ diff --git a/install-new/data/img/genders/gender_3.jpg b/install-new/data/img/genders/gender_3.jpg new file mode 100644 index 000000000..a2f7ee3f1 Binary files /dev/null and b/install-new/data/img/genders/gender_3.jpg differ diff --git a/install-new/data/img/os/order_state_1.gif b/install-new/data/img/os/order_state_1.gif new file mode 100644 index 000000000..e7c5f3153 Binary files /dev/null and b/install-new/data/img/os/order_state_1.gif differ diff --git a/install-new/data/img/os/order_state_10.gif b/install-new/data/img/os/order_state_10.gif new file mode 100644 index 000000000..2780d81e7 Binary files /dev/null and b/install-new/data/img/os/order_state_10.gif differ diff --git a/install-new/data/img/os/order_state_11.gif b/install-new/data/img/os/order_state_11.gif new file mode 100644 index 000000000..57abc204b Binary files /dev/null and b/install-new/data/img/os/order_state_11.gif differ diff --git a/install-new/data/img/os/order_state_12.gif b/install-new/data/img/os/order_state_12.gif new file mode 100644 index 000000000..2e5f3d24c Binary files /dev/null and b/install-new/data/img/os/order_state_12.gif differ diff --git a/install-new/data/img/os/order_state_2.gif b/install-new/data/img/os/order_state_2.gif new file mode 100644 index 000000000..192829587 Binary files /dev/null and b/install-new/data/img/os/order_state_2.gif differ diff --git a/install-new/data/img/os/order_state_3.gif b/install-new/data/img/os/order_state_3.gif new file mode 100644 index 000000000..56d6cefc5 Binary files /dev/null and b/install-new/data/img/os/order_state_3.gif differ diff --git a/install-new/data/img/os/order_state_4.gif b/install-new/data/img/os/order_state_4.gif new file mode 100644 index 000000000..54a3e55c7 Binary files /dev/null and b/install-new/data/img/os/order_state_4.gif differ diff --git a/install-new/data/img/os/order_state_5.gif b/install-new/data/img/os/order_state_5.gif new file mode 100644 index 000000000..cbce89abe Binary files /dev/null and b/install-new/data/img/os/order_state_5.gif differ diff --git a/install-new/data/img/os/order_state_6.gif b/install-new/data/img/os/order_state_6.gif new file mode 100644 index 000000000..8d4e46519 Binary files /dev/null and b/install-new/data/img/os/order_state_6.gif differ diff --git a/install-new/data/img/os/order_state_7.gif b/install-new/data/img/os/order_state_7.gif new file mode 100644 index 000000000..c3a61298f Binary files /dev/null and b/install-new/data/img/os/order_state_7.gif differ diff --git a/install-new/data/img/os/order_state_8.gif b/install-new/data/img/os/order_state_8.gif new file mode 100644 index 000000000..b16b55530 Binary files /dev/null and b/install-new/data/img/os/order_state_8.gif differ diff --git a/install-new/data/img/os/order_state_9.gif b/install-new/data/img/os/order_state_9.gif new file mode 100644 index 000000000..f4d413d42 Binary files /dev/null and b/install-new/data/img/os/order_state_9.gif differ diff --git a/install-new/data/img/t/AdminCms.gif b/install-new/data/img/t/AdminCms.gif new file mode 100644 index 000000000..176c99a23 Binary files /dev/null and b/install-new/data/img/t/AdminCms.gif differ diff --git a/install-new/data/xml/.xml b/install-new/data/xml/.xml deleted file mode 100644 index a87c70177..000000000 --- a/install-new/data/xml/.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/install-new/data/xml/access.xml b/install-new/data/xml/access.xml index d4cfe77b3..573317c38 100644 --- a/install-new/data/xml/access.xml +++ b/install-new/data/xml/access.xml @@ -1,109 +1,112 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/data/xml/address_format.xml b/install-new/data/xml/address_format.xml index 54c70aa7c..466bb5720 100644 --- a/install-new/data/xml/address_format.xml +++ b/install-new/data/xml/address_format.xml @@ -1,102 +1,101 @@ - - - - - - - - + + + + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company address1 address2 city State:name postcode Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 @@ -104,2345 +103,2345 @@ address2 postcode city State:name Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company address1 address2 city, State:name postcode Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - + + + firstname lastname company vat_number address1 address2 postcode city Country:name -phone]]> - - - \ No newline at end of file +phone + + + diff --git a/install-new/data/xml/carrier.xml b/install-new/data/xml/carrier.xml index bd85830fb..d4aed93b1 100644 --- a/install-new/data/xml/carrier.xml +++ b/install-new/data/xml/carrier.xml @@ -1,23 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + 0 + + + + diff --git a/install-new/data/xml/carrier_group.xml b/install-new/data/xml/carrier_group.xml index 7061a1139..63ee20d09 100644 --- a/install-new/data/xml/carrier_group.xml +++ b/install-new/data/xml/carrier_group.xml @@ -1,11 +1,8 @@ - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/install-new/data/xml/carrier_zone.xml b/install-new/data/xml/carrier_zone.xml index 852a7ace2..eba14abc4 100644 --- a/install-new/data/xml/carrier_zone.xml +++ b/install-new/data/xml/carrier_zone.xml @@ -1,11 +1,10 @@ - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/install-new/data/xml/category.xml b/install-new/data/xml/category.xml index 10969f5cf..5fdd43b44 100644 --- a/install-new/data/xml/category.xml +++ b/install-new/data/xml/category.xml @@ -1,11 +1,10 @@ - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/install-new/data/xml/cms.xml b/install-new/data/xml/cms.xml index f0c67704a..b8ca83e16 100644 --- a/install-new/data/xml/cms.xml +++ b/install-new/data/xml/cms.xml @@ -1,15 +1,14 @@ - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff --git a/install-new/data/xml/cms_category.xml b/install-new/data/xml/cms_category.xml index d6f61d4b4..33d4e3d2d 100644 --- a/install-new/data/xml/cms_category.xml +++ b/install-new/data/xml/cms_category.xml @@ -1,11 +1,10 @@ - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/install-new/data/xml/configuration.xml b/install-new/data/xml/configuration.xml index 0b7761c16..f759323e2 100644 --- a/install-new/data/xml/configuration.xml +++ b/install-new/data/xml/configuration.xml @@ -1,628 +1,855 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + 2 + + + 1 + + + 8 + + + 0 + + + 0 + + + 3 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 0 + + + 1 + + + > + + + 10 + + + 0 + + + 0 + + + 4 + + + 1 + + + 2 + + + 0 + + + 0 + + + 1 + + + 1 + + + 1 + + + 20 + + + 0 + + + kg + + + 1 + + + 0 + + + 7 + + + 3 + + + 131072 + + + 64 + + + 64 + + + IN + + + 1 + + + DE + + + 1 + + + 1 + + + 360 + + + 360 + + + 1 + + + 1 + + + 3 + + + + + + 6 + + + 10 + + + 1 + + + 1 + + + 3 + + + 3 + + + 4 + + + 2 + + + 2 + + + 1 + + + Europe/Paris + + + 0 + + + 1 + + + 0 + + + 0 + + + 0 + + + 2011-12-21 19:11:28 + + + 2 + + + 2011-12-21 19:11:28 + + + 3 + + + 0 + + + 0 + + + 0 + + + cl + + + 1 + + + 1 + + + 1 + + + + + + 0 + + + 0 + + + 0 + + + 3 + + + 3 + + + 1 + + + id_shop;id_currency;id_country;id_group + + + 0 + + + 1 + + + km + + + 1 + + + 1 + + + 0 + + + 224 + + + 73 + + + 530 + + + 228 + + + 0 + + + 0 + + + 0 + + + 0 + + + AF;ZA;AX;AL;DZ;DE;AD;AO;AI;AQ;AG;AN;SA;AR;AM;AW;AU;AT;AZ;BS;BH;BD;BB;BY;BE;BZ;BJ;BM;BT;BO;BA;BW;BV;BR;BN;BG;BF;MM;BI;KY;KH;CM;CA;CV;CF;CL;CN;CX;CY;CC;CO;KM;CG;CD;CK;KR;KP;CR;CI;HR;CU;DK;DJ;DM;EG;IE;SV;AE;EC;ER;ES;EE;ET;FK;FO;FJ;FI;FR;GA;GM;GE;GS;GH;GI;GR;GD;GL;GP;GU;GT;GG;GN;GQ;GW;GY;GF;HT;HM;HN;HK;HU;IM;MU;VG;VI;IN;ID;IR;IQ;IS;IL;IT;JM;JP;JE;JO;KZ;KE;KG;KI;KW;LA;LS;LV;LB;LR;LY;LI;LT;LU;MO;MK;MG;MY;MW;MV;ML;MT;MP;MA;MH;MQ;MR;YT;MX;FM;MD;MC;MN;ME;MS;MZ;NA;NR;NP;NI;NE;NG;NU;NF;NO;NC;NZ;IO;OM;UG;UZ;PK;PW;PS;PA;PG;PY;NL;PE;PH;PN;PL;PF;PR;PT;QA;DO;CZ;RE;RO;GB;RU;RW;EH;BL;KN;SM;MF;PM;VA;VC;LC;SB;WS;AS;ST;SN;RS;SC;SL;SG;SK;SI;SO;SD;LK;SE;CH;SR;SJ;SZ;SY;TJ;TW;TZ;TD;TF;TH;TL;TG;TK;TO;TT;TN;TM;TC;TR;TV;UA;UY;US;VU;VE;VN;WF;YE;ZM;ZW + + + 0 + + + fr + + + FR + + + 2 + + + 1 + + + cm + + + 1 + + + 1 + + + 0 + + + 209.185.108;209.185.253;209.85.238;209.85.238.11;209.85.238.4;216.239.33.96;216.239.33.97;216.239.33.98;216.239.33.99;216.239.37.98;216.239.37.99;216.239.39.98;216.239.39.99;216.239.41.96;216.239.41.97;216.239.41.98;216.239.41.99;216.239.45.4;216.239.46;216.239.51.96;216.239.51.97;216.239.51.98;216.239.51.99;216.239.53.98;216.239.53.99;216.239.57.96;216.239.57.97;216.239.57.98;216.239.57.99;216.239.59.98;216.239.59.99;216.33.229.163;64.233.173.193;64.233.173.194;64.233.173.195;64.233.173.196;64.233.173.197;64.233.173.198;64.233.173.199;64.233.173.200;64.233.173.201;64.233.173.202;64.233.173.203;64.233.173.204;64.233.173.205;64.233.173.206;64.233.173.207;64.233.173.208;64.233.173.209;64.233.173.210;64.233.173.211;64.233.173.212;64.233.173.213;64.233.173.214;64.233.173.215;64.233.173.216;64.233.173.217;64.233.173.218;64.233.173.219;64.233.173.220;64.233.173.221;64.233.173.222;64.233.173.223;64.233.173.224;64.233.173.225;64.233.173.226;64.233.173.227;64.233.173.228;64.233.173.229;64.233.173.230;64.233.173.231;64.233.173.232;64.233.173.233;64.233.173.234;64.233.173.235;64.233.173.236;64.233.173.237;64.233.173.238;64.233.173.239;64.233.173.240;64.233.173.241;64.233.173.242;64.233.173.243;64.233.173.244;64.233.173.245;64.233.173.246;64.233.173.247;64.233.173.248;64.233.173.249;64.233.173.250;64.233.173.251;64.233.173.252;64.233.173.253;64.233.173.254;64.233.173.255;64.68.80;64.68.81;64.68.82;64.68.83;64.68.84;64.68.85;64.68.86;64.68.87;64.68.88;64.68.89;64.68.90.1;64.68.90.10;64.68.90.11;64.68.90.12;64.68.90.129;64.68.90.13;64.68.90.130;64.68.90.131;64.68.90.132;64.68.90.133;64.68.90.134;64.68.90.135;64.68.90.136;64.68.90.137;64.68.90.138;64.68.90.139;64.68.90.14;64.68.90.140;64.68.90.141;64.68.90.142;64.68.90.143;64.68.90.144;64.68.90.145;64.68.90.146;64.68.90.147;64.68.90.148;64.68.90.149;64.68.90.15;64.68.90.150;64.68.90.151;64.68.90.152;64.68.90.153;64.68.90.154;64.68.90.155;64.68.90.156;64.68.90.157;64.68.90.158;64.68.90.159;64.68.90.16;64.68.90.160;64.68.90.161;64.68.90.162;64.68.90.163;64.68.90.164;64.68.90.165;64.68.90.166;64.68.90.167;64.68.90.168;64.68.90.169;64.68.90.17;64.68.90.170;64.68.90.171;64.68.90.172;64.68.90.173;64.68.90.174;64.68.90.175;64.68.90.176;64.68.90.177;64.68.90.178;64.68.90.179;64.68.90.18;64.68.90.180;64.68.90.181;64.68.90.182;64.68.90.183;64.68.90.184;64.68.90.185;64.68.90.186;64.68.90.187;64.68.90.188;64.68.90.189;64.68.90.19;64.68.90.190;64.68.90.191;64.68.90.192;64.68.90.193;64.68.90.194;64.68.90.195;64.68.90.196;64.68.90.197;64.68.90.198;64.68.90.199;64.68.90.2;64.68.90.20;64.68.90.200;64.68.90.201;64.68.90.202;64.68.90.203;64.68.90.204;64.68.90.205;64.68.90.206;64.68.90.207;64.68.90.208;64.68.90.21;64.68.90.22;64.68.90.23;64.68.90.24;64.68.90.25;64.68.90.26;64.68.90.27;64.68.90.28;64.68.90.29;64.68.90.3;64.68.90.30;64.68.90.31;64.68.90.32;64.68.90.33;64.68.90.34;64.68.90.35;64.68.90.36;64.68.90.37;64.68.90.38;64.68.90.39;64.68.90.4;64.68.90.40;64.68.90.41;64.68.90.42;64.68.90.43;64.68.90.44;64.68.90.45;64.68.90.46;64.68.90.47;64.68.90.48;64.68.90.49;64.68.90.5;64.68.90.50;64.68.90.51;64.68.90.52;64.68.90.53;64.68.90.54;64.68.90.55;64.68.90.56;64.68.90.57;64.68.90.58;64.68.90.59;64.68.90.6;64.68.90.60;64.68.90.61;64.68.90.62;64.68.90.63;64.68.90.64;64.68.90.65;64.68.90.66;64.68.90.67;64.68.90.68;64.68.90.69;64.68.90.7;64.68.90.70;64.68.90.71;64.68.90.72;64.68.90.73;64.68.90.74;64.68.90.75;64.68.90.76;64.68.90.77;64.68.90.78;64.68.90.79;64.68.90.8;64.68.90.80;64.68.90.9;64.68.91;64.68.92;66.249.64;66.249.65;66.249.66;66.249.67;66.249.68;66.249.69;66.249.70;66.249.71;66.249.72;66.249.73;66.249.78;66.249.79;72.14.199;8.6.48 + + + 5 + + + 1 + + + 25.948969 + + + -80.226439 + + + 0 + + + 1 + + + 1324491088 + + + 1 + + + 1 + + + 2 + + + 3 + + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 9 + + + 10 + + + 11 + + + 12 + + + 1 + + + jpg + + + 7 + + + 90 + + + 480 + + + 480 + + + 0 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 0 + + + 0 + + + 0 + + + 1 + + + 0 + + + 1 + + + 2 + + + id_address_delivery + + + 1 + + + 0 + + + 1 + + + 2 + + + 0 + + + 1 + + + 7 + + + 6 + + + 0 + + + 8 + + + 3 + + + 1 + + + 2 + + + 3 + + + 0 + + + + + + + + + 1 + + + + 1 + + + 0 + + + 0 + + + 0 + + + http://www.yoursite.com + + + 2 + + + 5 + + + 2,1 + + + 2,1 + + + 2 + + + 1 + + + 3 + + + 1 + + + 1 + + + 5 + + + 5 + + + 1 + + + graphxmlswfcharts + + + never + + + gridhtml + + + 10 + + + 100 + + + 400 + + + 1 + + + 2 + + + 1 + + + 2 + + + 1 + + + 3 + + + 0_3|0_4 + + + 0_3|0_4 + + + 1 + + + 0 + + + store.jpg + + + 1 + + + 10 + + + 0 + + + 4 + + + 1 + + + 20 + + + 1 + + + 131072 + + + 64 + + + 64 + + + 3 + + + 6 + + + 10 + + + 1 + + + 1 + + + 3 + + + 3 + + + 4 + + + 2 + + + 2 + + + 1 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 1 + + + 1 + + + 224 + + + 73 + + + 1 + + + 1 + + + jpg + + + 7 + + + 90 + + + 2 + + + 1 + + + 3 + + + 1 + + + 1 + + + 5 + + + 5 + + + 10 + + + 0_3|0_4 + + + 0_3|0_4 + + + 1 + + + 0 + + + store.jpg + + + jpg + + + CAT2,CAT3,CAT4 + + + + + + http://www.facebook.com/prestashop + + + http://www.twitter.com/prestashop + + + RSS + + + Prestashop + + + 41, boulevard des capucines, 75002 Paris, France + + + +33 (0)1.40.18.30.04 + + + pub@prestashop.com + + + +33 (0)1.40.18.30.04 + + + pub@prestashop.com + + + 1 + + + 5 + + + 1 + + + 1 + + + + + + + + + 5 + + + 535 + + + 300 + + + 1300 + + + 7700 + + + 1.5.0.2 + + + L + + + m + + + localhost + + + localhost + + + 1.5.0.2 + + + PrestaShop + + + raphael.malie@gmail.com + + + 1 + + + 10 + + + diff --git a/install-new/data/xml/contact.xml b/install-new/data/xml/contact.xml index 56d1e19d7..9f8034390 100644 --- a/install-new/data/xml/contact.xml +++ b/install-new/data/xml/contact.xml @@ -1,16 +1,10 @@ - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/install-new/data/xml/country.xml b/install-new/data/xml/country.xml index 954b2ebab..2bb63d79d 100644 --- a/install-new/data/xml/country.xml +++ b/install-new/data/xml/country.xml @@ -1,261 +1,260 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/data/xml/gender.xml b/install-new/data/xml/gender.xml index 08e62efee..fd324a60d 100644 --- a/install-new/data/xml/gender.xml +++ b/install-new/data/xml/gender.xml @@ -1,12 +1,11 @@ - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/install-new/data/xml/group.xml b/install-new/data/xml/group.xml index 96c02e177..acef37033 100644 --- a/install-new/data/xml/group.xml +++ b/install-new/data/xml/group.xml @@ -1,11 +1,13 @@ - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/install-new/data/xml/hook.xml b/install-new/data/xml/hook.xml index c87bdae66..e6011da2d 100644 --- a/install-new/data/xml/hook.xml +++ b/install-new/data/xml/hook.xml @@ -1,13 +1,11 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/install-new/data/xml/hook_alias.xml b/install-new/data/xml/hook_alias.xml index 03f125cf3..78faaa98f 100644 --- a/install-new/data/xml/hook_alias.xml +++ b/install-new/data/xml/hook_alias.xml @@ -1,350 +1,349 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + payment + displayPayment + + + newOrder + actionValidateOrder + + + paymentConfirm + actionPaymentConfirmation + + + paymentReturn + displayPaymentReturn + + + updateQuantity + actionUpdateQuantity + + + rightColumn + displayRightColumn + + + leftColumn + displayLeftColumn + + + home + displayHome + + + header + displayHeader + + + cart + actionCartSave + + + authentication + actionAuthentication + + + addproduct + actionProductAdd + + + updateproduct + actionProductUpdate + + + top + displayTop + + + extraRight + displayRightColumnProduct + + + deleteproduct + actionProductDelete + + + productfooter + displayFooterProduct + + + invoice + displayInvoice + + + updateOrderStatus + actionOrderStatusUpdate + + + adminOrder + displayAdminOrder + + + footer + displayFooter + + + PDFInvoice + displayPDFInvoice + + + adminCustomers + displayAdminCustomers + + + orderConfirmation + displayOrderConfirmation + + + createAccount + actionCustomerAccountAdd + + + customerAccount + displayCustomerAccount + + + orderSlip + actionOrderSlipAdd + + + productTab + displayProductTab + + + productTabContent + displayProductTabContent + + + shoppingCart + displayShoppingCartFooter + + + createAccountForm + displayCustomerAccountForm + + + AdminStatsModules + displayAdminStatsModules + + + GraphEngine + displayAdminStatsGraphEngine + + + orderReturn + actionOrderReturn + + + productActions + displayProductButtons + + + backOfficeHome + displayBackOfficeHome + + + GridEngine + displayAdminStatsGridEngine + + + watermark + actionWatermark + + + cancelProduct + actionProductCancel + + + extraLeft + displayLeftColumnProduct + + + productOutOfStock + actionProductOutOfStock + + + updateProductAttribute + actionProductAttributeUpdate + + + extraCarrier + displayCarrierList + + + shoppingCartExtra + displayShoppingCart + + + search + actionSearch + + + backBeforePayment + displayBeforePayment + + + updateCarrier + actionCarrierUpdate + + + postUpdateOrderStatus + actionOrderStatusPostUpdate + + + createAccountTop + displayCustomerAccountFormTop + + + backOfficeHeader + displayBackOfficeHeader + + + backOfficeTop + displayBackOfficeTop + + + backOfficeFooter + displayBackOfficeFooter + + + deleteProductAttribute + actionProductAttributeDelete + + + processCarrier + actionCarrierProcess + + + orderDetail + actionOrderDetail + + + beforeCarrier + displayBeforeCarrier + + + orderDetailDisplayed + displayOrderDetail + + + paymentCCAdded + actionPaymentCCAdd + + + extraProductComparison + displayProductComparison + + + categoryAddition + actionCategoryAdd + + + categoryUpdate + actionCategoryUpdate + + + categoryDeletion + actionCategoryDelete + + + beforeAuthentication + actionBeforeAuthentication + + + paymentTop + displayPaymentTop + + + afterCreateHtaccess + actionHtaccessCreate + + + afterSaveAdminMeta + actionAdminMetaSave + + + attributeGroupForm + displayAttributeGroupForm + + + afterSaveAttributeGroup + actionAttributeGroupSave + + + afterDeleteAttributeGroup + actionAttributeGroupDelete + + + featureForm + displayFeatureForm + + + afterSaveFeature + actionFeatureSave + + + afterDeleteFeature + actionFeatureDelete + + + afterSaveProduct + actionProductSave + + + productListAssign + actionProductListOverride + + + postProcessAttributeGroup + displayAttributeGroupPostProcess + + + postProcessFeature + displayFeaturePostProcess + + + featureValueForm + displayFeatureValueForm + + + postProcessFeatureValue + displayFeatureValuePostProcess + + + afterDeleteFeatureValue + actionFeatureValueDelete + + + afterSaveFeatureValue + actionFeatureValueSave + + + attributeForm + displayAttributeForm + + + postProcessAttribute + actionAttributePostProcess + + + afterDeleteAttribute + actionAttributeDelete + + + afterSaveAttribute + actionAttributeSave + + + taxManager + actionTaxManager + + + diff --git a/install-new/data/xml/image_type.xml b/install-new/data/xml/image_type.xml index 2a31dad33..7bd466a78 100644 --- a/install-new/data/xml/image_type.xml +++ b/install-new/data/xml/image_type.xml @@ -1,25 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/data/xml/meta.xml b/install-new/data/xml/meta.xml index 063a07a02..1afd028dc 100644 --- a/install-new/data/xml/meta.xml +++ b/install-new/data/xml/meta.xml @@ -1,84 +1,83 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + 404 + + + best-sales + + + contact-form + + + index + + + manufacturer + + + new-products + + + password + + + prices-drop + + + sitemap + + + supply + + + address + + + addresses + + + authentication + + + cart + + + discount + + + history + + + identity + + + my-account + + + order-follow + + + order-slip + + + order + + + search + + + stores + + + order-opc + + + guest-tracking + + + diff --git a/install-new/data/xml/operating_system.xml b/install-new/data/xml/operating_system.xml index c602076e9..d77191e76 100644 --- a/install-new/data/xml/operating_system.xml +++ b/install-new/data/xml/operating_system.xml @@ -1,21 +1,20 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + Windows XP + + + Windows Vista + + + MacOsX + + + Linux + + + diff --git a/install-new/data/xml/order_return_state.xml b/install-new/data/xml/order_return_state.xml index 83b4b3f3c..620a03dbf 100644 --- a/install-new/data/xml/order_return_state.xml +++ b/install-new/data/xml/order_return_state.xml @@ -1,14 +1,13 @@ - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/install-new/data/xml/order_state.xml b/install-new/data/xml/order_state.xml index 09002917a..77b2eaefd 100644 --- a/install-new/data/xml/order_state.xml +++ b/install-new/data/xml/order_state.xml @@ -1,28 +1,28 @@ - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/install-new/data/xml/profile.xml b/install-new/data/xml/profile.xml index 12c8a9456..557a09f5c 100644 --- a/install-new/data/xml/profile.xml +++ b/install-new/data/xml/profile.xml @@ -1,9 +1,7 @@ - - - - - - - \ No newline at end of file + + + + + diff --git a/install-new/data/xml/quick_access.xml b/install-new/data/xml/quick_access.xml index 2455df73b..2097553e1 100644 --- a/install-new/data/xml/quick_access.xml +++ b/install-new/data/xml/quick_access.xml @@ -1,25 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + index.php + + + ../ + + + index.php?controller=AdminCategories&addcategory + + + index.php?controller=AdminProducts&addproduct + + + index.php?controller=AdminCartRules&addcart_rule + + + diff --git a/install-new/data/xml/search_engine.xml b/install-new/data/xml/search_engine.xml index 6ebe2b5d8..411a27ff8 100644 --- a/install-new/data/xml/search_engine.xml +++ b/install-new/data/xml/search_engine.xml @@ -1,124 +1,123 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + google + + + aol + + + yandex + + + ask.com + + + nhl.com + + + yahoo + + + baidu + + + lycos + + + exalead + + + search.live + + + voila + + + altavista + + + bing + + + daum + + + eniro + + + naver + + + msn + + + netscape + + + cnn + + + about + + + mamma + + + alltheweb + + + virgilio + + + alice + + + najdi + + + mama + + + seznam + + + onet + + + szukacz + + + yam + + + pchome + + + kvasir + + + sesam + + + ozu + + + terra + + + mynet + + + ekolay + + + rambler + + + diff --git a/install-new/data/xml/state.xml b/install-new/data/xml/state.xml index a82003960..5f48d0706 100644 --- a/install-new/data/xml/state.xml +++ b/install-new/data/xml/state.xml @@ -1,950 +1,949 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + Alabama + + + Alaska + + + Arizona + + + Arkansas + + + California + + + Colorado + + + Connecticut + + + Delaware + + + Florida + + + Georgia + + + Hawaii + + + Idaho + + + Illinois + + + Indiana + + + Iowa + + + Kansas + + + Kentucky + + + Louisiana + + + Maine + + + Maryland + + + Massachusetts + + + Michigan + + + Minnesota + + + Mississippi + + + Missouri + + + Montana + + + Nebraska + + + Nevada + + + New Hampshire + + + New Jersey + + + New Mexico + + + New York + + + North Carolina + + + North Dakota + + + Ohio + + + Oklahoma + + + Oregon + + + Pennsylvania + + + Rhode Island + + + South Carolina + + + South Dakota + + + Tennessee + + + Texas + + + Utah + + + Vermont + + + Virginia + + + Washington + + + West Virginia + + + Wisconsin + + + Wyoming + + + Puerto Rico + + + US Virgin Islands + + + District of Columbia + + + Aguascalientes + + + Baja California + + + Baja California Sur + + + Campeche + + + Chiapas + + + Chihuahua + + + Coahuila + + + Colima + + + Distrito Federal + + + Durango + + + Guanajuato + + + Guerrero + + + Hidalgo + + + Jalisco + + + Estado de México + + + Michoacán + + + Morelos + + + Nayarit + + + Nuevo León + + + Oaxaca + + + Puebla + + + Querétaro + + + Quintana Roo + + + San Luis Potosí + + + Sinaloa + + + Sonora + + + Tabasco + + + Tamaulipas + + + Tlaxcala + + + Veracruz + + + Yucatán + + + Zacatecas + + + Ontario + + + Quebec + + + British Columbia + + + Alberta + + + Manitoba + + + Saskatchewan + + + Nova Scotia + + + New Brunswick + + + Newfoundland and Labrador + + + Prince Edward Island + + + Northwest Territories + + + Yukon + + + Nunavut + + + Buenos Aires + + + Catamarca + + + Chaco + + + Chubut + + + Ciudad de Buenos Aires + + + Córdoba + + + Corrientes + + + Entre Ríos + + + Formosa + + + Jujuy + + + La Pampa + + + La Rioja + + + Mendoza + + + Misiones + + + Neuquén + + + Río Negro + + + Salta + + + San Juan + + + San Luis + + + Santa Cruz + + + Santa Fe + + + Santiago del Estero + + + Tierra del Fuego + + + Tucumán + + + Agrigento + + + Alessandria + + + Ancona + + + Aosta + + + Arezzo + + + Ascoli Piceno + + + Asti + + + Avellino + + + Bari + + + Barletta-Andria-Trani + + + Belluno + + + Benevento + + + Bergamo + + + Biella + + + Bologna + + + Bolzano + + + Brescia + + + Brindisi + + + Cagliari + + + Caltanissetta + + + Campobasso + + + Carbonia-Iglesias + + + Caserta + + + Catania + + + Catanzaro + + + Chieti + + + Como + + + Cosenza + + + Cremona + + + Crotone + + + Cuneo + + + Enna + + + Fermo + + + Ferrara + + + Firenze + + + Foggia + + + Forlì-Cesena + + + Frosinone + + + Genova + + + Gorizia + + + Grosseto + + + Imperia + + + Isernia + + + L'Aquila + + + La Spezia + + + Latina + + + Lecce + + + Lecco + + + Livorno + + + Lodi + + + Lucca + + + Macerata + + + Mantova + + + Massa + + + Matera + + + Medio Campidano + + + Messina + + + Milano + + + Modena + + + Monza e della Brianza + + + Napoli + + + Novara + + + Nuoro + + + Ogliastra + + + Olbia-Tempio + + + Oristano + + + Padova + + + Palermo + + + Parma + + + Pavia + + + Perugia + + + Pesaro-Urbino + + + Pescara + + + Piacenza + + + Pisa + + + Pistoia + + + Pordenone + + + Potenza + + + Prato + + + Ragusa + + + Ravenna + + + Reggio Calabria + + + Reggio Emilia + + + Rieti + + + Rimini + + + Roma + + + Rovigo + + + Salerno + + + Sassari + + + Savona + + + Siena + + + Siracusa + + + Sondrio + + + Taranto + + + Teramo + + + Terni + + + Torino + + + Trapani + + + Trento + + + Treviso + + + Trieste + + + Udine + + + Varese + + + Venezia + + + Verbano-Cusio-Ossola + + + Vercelli + + + Verona + + + Vibo Valentia + + + Vicenza + + + Viterbo + + + Aceh + + + Bali + + + Bangka + + + Banten + + + Bengkulu + + + Central Java + + + Central Kalimantan + + + Central Sulawesi + + + Coat of arms of East Java + + + East kalimantan + + + East Nusa Tenggara + + + Lambang propinsi + + + Jakarta + + + Jambi + + + Lampung + + + Maluku + + + North Maluku + + + North Sulawesi + + + North Sumatra + + + Papua + + + Riau + + + Lambang Riau + + + Southeast Sulawesi + + + South Kalimantan + + + South Sulawesi + + + South Sumatra + + + West Java + + + West Kalimantan + + + West Nusa Tenggara + + + Lambang Provinsi Papua Barat + + + West Sulawesi + + + West Sumatra + + + Yogyakarta + + + Aichi + + + Akita + + + Aomori + + + Chiba + + + Ehime + + + Fukui + + + Fukuoka + + + Fukushima + + + Gifu + + + Gunma + + + Hiroshima + + + Hokkaido + + + Hyogo + + + Ibaraki + + + Ishikawa + + + Iwate + + + Kagawa + + + Kagoshima + + + Kanagawa + + + Kochi + + + Kumamoto + + + Kyoto + + + Mie + + + Miyagi + + + Miyazaki + + + Nagano + + + Nagasaki + + + Nara + + + Niigata + + + Oita + + + Okayama + + + Okinawa + + + Osaka + + + Saga + + + Saitama + + + Shiga + + + Shimane + + + Shizuoka + + + Tochigi + + + Tokushima + + + Tokyo + + + Tottori + + + Toyama + + + Wakayama + + + Yamagata + + + Yamaguchi + + + Yamanashi + + + diff --git a/install-new/data/xml/stock_mvt_reason.xml b/install-new/data/xml/stock_mvt_reason.xml index 60eb4b1f7..93ce8d919 100644 --- a/install-new/data/xml/stock_mvt_reason.xml +++ b/install-new/data/xml/stock_mvt_reason.xml @@ -1,17 +1,16 @@ - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/install-new/data/xml/subdomain.xml b/install-new/data/xml/subdomain.xml index 7e2004623..07156939b 100644 --- a/install-new/data/xml/subdomain.xml +++ b/install-new/data/xml/subdomain.xml @@ -1,10 +1,9 @@ - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/install-new/data/xml/supplier_order_state.xml b/install-new/data/xml/supplier_order_state.xml deleted file mode 100644 index 8538b3343..000000000 --- a/install-new/data/xml/supplier_order_state.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/install-new/data/xml/supply_order_state.xml b/install-new/data/xml/supply_order_state.xml new file mode 100644 index 000000000..f7a0299d3 --- /dev/null +++ b/install-new/data/xml/supply_order_state.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/install-new/data/xml/tab.xml b/install-new/data/xml/tab.xml index c9b5e0b44..1c2cd7acd 100644 --- a/install-new/data/xml/tab.xml +++ b/install-new/data/xml/tab.xml @@ -1,295 +1,306 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + AdminCatalog + + + AdminCustomers + + + AdminOrders + + + AdminPayment + + + AdminShipping + + + AdminStats + + + AdminModules + + + AdminPreferences + + + AdminTools + + + AdminManufacturers + + + AdminAttributesGroups + + + AdminAddresses + + + AdminStatuses + + + AdminCartRules + + + AdminCurrencies + + + AdminTaxes + + + AdminCarriers + + + AdminCountries + + + AdminZones + + + AdminRangePrice + + + AdminRangeWeight + + + AdminModulesPositions + + + AdminDb + + + AdminEmails + + + AdminImages + + + AdminPPreferences + + + AdminContacts + + + AdminEmployees + + + AdminProfiles + + + AdminAccess + + + AdminLanguages + + + AdminTranslations + + + AdminSuppliers + + + AdminTabs + + + AdminFeatures + + + AdminQuickAccesses + + + AdminThemes + + + AdminContact + + + AdminAliases + + + AdminImport + + + AdminInvoices + + + AdminSearch + + + AdminLocalization + + + AdminStates + + + AdminReturn + + + AdminPdf + + + AdminSlip + + + AdminSubDomains + + + AdminBackup + + + AdminOrderMessage + + + AdminDeliverySlip + + + AdminMeta + + + AdminCmsContent + + + AdminScenes + + + AdminMessages + + + AdminTracking + + + AdminSearchEngines + + + AdminReferrers + + + AdminGroups + + + AdminGenerator + + + AdminCarts + + + AdminTags + + + AdminSearchConf + + + AdminAttachments + + + AdminInformation + + + AdminPerformance + + + AdminCustomerThreads + + + AdminWebservice + + + AdminStockMvt + + + AdminAddonsCatalog + + + AdminAddonsMyAccount + + + AdminStores + + + AdminThemes + + + AdminGeolocation + + + AdminTaxRulesGroup + + + AdminLogs + + + AdminHome + + + AdminShop + + + AdminGroupShop + + + AdminShopUrl + + + AdminGenders + + + AdminRequestSql + + + AdminProducts + + + AdminCategories + + + AdminStock + + + AdminWarehouses + + + AdminStockManagement + + + AdminStockInstantState + + + AdminStockCover + + + AdminSupplyOrders + + + AdminAttributeGenerator + + + AdminAccounting + + + AdminAccountingManagement + + + AdminAccountingExport + + + AdminCmsCategories + + + AdminCms + + + AdminLogin + + + AdminStockConfiguration + + + AdminSpecificPriceRule + + + diff --git a/install-new/data/xml/theme.xml b/install-new/data/xml/theme.xml index 049f231a1..881be4e2b 100644 --- a/install-new/data/xml/theme.xml +++ b/install-new/data/xml/theme.xml @@ -1,12 +1,11 @@ - - - - - - - - - - \ No newline at end of file + + + + + + default + + + diff --git a/install-new/data/xml/timezone.xml b/install-new/data/xml/timezone.xml index 5a41e90a1..ca6ac4138 100644 --- a/install-new/data/xml/timezone.xml +++ b/install-new/data/xml/timezone.xml @@ -1,569 +1,568 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/data/xml/warehouse.xml b/install-new/data/xml/warehouse.xml index 62308e738..f9b165670 100644 --- a/install-new/data/xml/warehouse.xml +++ b/install-new/data/xml/warehouse.xml @@ -1,15 +1,12 @@ - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/install-new/data/xml/web_browser.xml b/install-new/data/xml/web_browser.xml index 9d56484bb..4d31db30f 100644 --- a/install-new/data/xml/web_browser.xml +++ b/install-new/data/xml/web_browser.xml @@ -1,33 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + Safari + + + Firefox 2.x + + + Firefox 3.x + + + Opera + + + IE 6.x + + + IE 7.x + + + IE 8.x + + + Google Chrome + + + diff --git a/install-new/data/xml/zone.xml b/install-new/data/xml/zone.xml index 48a23cd62..1213ee9e7 100644 --- a/install-new/data/xml/zone.xml +++ b/install-new/data/xml/zone.xml @@ -1,34 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + Europe + + + North America + + + Asia + + + Africa + + + Oceania + + + South America + + + Europe (out E.U) + + + Centrale America/Antilla + + + diff --git a/install-new/fixtures/apple/data/access.xml b/install-new/fixtures/apple/data/access.xml index ea5f18d79..ac1461a6b 100644 --- a/install-new/fixtures/apple/data/access.xml +++ b/install-new/fixtures/apple/data/access.xml @@ -1,373 +1,405 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/address.xml b/install-new/fixtures/apple/data/address.xml index ad65dad51..f602105c9 100644 --- a/install-new/fixtures/apple/data/address.xml +++ b/install-new/fixtures/apple/data/address.xml @@ -1,39 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
-
- - - - -
- - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + +
+ 1 Infinite Loop + + Cupertino + +
+
+ 16, Main street + 2nd floor + Paris + +
+ + diff --git a/install-new/fixtures/apple/data/alias.xml b/install-new/fixtures/apple/data/alias.xml index 7bc6b2275..c734f41c0 100644 --- a/install-new/fixtures/apple/data/alias.xml +++ b/install-new/fixtures/apple/data/alias.xml @@ -1,19 +1,18 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + ipdo + ipod + + + piod + ipod + + + diff --git a/install-new/fixtures/apple/data/attribute.xml b/install-new/fixtures/apple/data/attribute.xml index 90f478211..57f1343ba 100644 --- a/install-new/fixtures/apple/data/attribute.xml +++ b/install-new/fixtures/apple/data/attribute.xml @@ -1,30 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/attribute_group.xml b/install-new/fixtures/apple/data/attribute_group.xml index eae1001e2..04c30c826 100644 --- a/install-new/fixtures/apple/data/attribute_group.xml +++ b/install-new/fixtures/apple/data/attribute_group.xml @@ -1,13 +1,12 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/carrier.xml b/install-new/fixtures/apple/data/carrier.xml index 74ec8285d..52b6b3b6f 100644 --- a/install-new/fixtures/apple/data/carrier.xml +++ b/install-new/fixtures/apple/data/carrier.xml @@ -1,26 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + My carrier + + + + diff --git a/install-new/fixtures/apple/data/carrier_group.xml b/install-new/fixtures/apple/data/carrier_group.xml index 648e97b66..f663f440f 100644 --- a/install-new/fixtures/apple/data/carrier_group.xml +++ b/install-new/fixtures/apple/data/carrier_group.xml @@ -1,11 +1,12 @@ - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/carrier_zone.xml b/install-new/fixtures/apple/data/carrier_zone.xml index 3ae37078b..59390cfd6 100644 --- a/install-new/fixtures/apple/data/carrier_zone.xml +++ b/install-new/fixtures/apple/data/carrier_zone.xml @@ -1,12 +1,11 @@ - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/install-new/fixtures/apple/data/cart.xml b/install-new/fixtures/apple/data/cart.xml index d20054356..6d299fa5a 100644 --- a/install-new/fixtures/apple/data/cart.xml +++ b/install-new/fixtures/apple/data/cart.xml @@ -1,21 +1,23 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/cart_product.xml b/install-new/fixtures/apple/data/cart_product.xml index c71d9c6d0..2dc8e62e5 100644 --- a/install-new/fixtures/apple/data/cart_product.xml +++ b/install-new/fixtures/apple/data/cart_product.xml @@ -1,14 +1,14 @@ - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/category.xml b/install-new/fixtures/apple/data/category.xml index 6e7e09e07..72dc24621 100644 --- a/install-new/fixtures/apple/data/category.xml +++ b/install-new/fixtures/apple/data/category.xml @@ -1,13 +1,12 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/category_product.xml b/install-new/fixtures/apple/data/category_product.xml index e6a2118c6..61fa8c812 100644 --- a/install-new/fixtures/apple/data/category_product.xml +++ b/install-new/fixtures/apple/data/category_product.xml @@ -1,21 +1,20 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/connections.xml b/install-new/fixtures/apple/data/connections.xml index 7c71eb8f8..2395fcce7 100644 --- a/install-new/fixtures/apple/data/connections.xml +++ b/install-new/fixtures/apple/data/connections.xml @@ -1,15 +1,14 @@ - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + http://www.prestashop.com + + + diff --git a/install-new/fixtures/apple/data/customer.xml b/install-new/fixtures/apple/data/customer.xml index 0d0b3084a..0282a60fd 100644 --- a/install-new/fixtures/apple/data/customer.xml +++ b/install-new/fixtures/apple/data/customer.xml @@ -1,28 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + pub@prestashop.com + + + + diff --git a/install-new/fixtures/apple/data/delivery.xml b/install-new/fixtures/apple/data/delivery.xml index d6cc8ef93..e73aa7afa 100644 --- a/install-new/fixtures/apple/data/delivery.xml +++ b/install-new/fixtures/apple/data/delivery.xml @@ -1,17 +1,16 @@ - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/feature.xml b/install-new/fixtures/apple/data/feature.xml index 2571ee61c..863bdfd89 100644 --- a/install-new/fixtures/apple/data/feature.xml +++ b/install-new/fixtures/apple/data/feature.xml @@ -1,13 +1,11 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/install-new/fixtures/apple/data/feature_value.xml b/install-new/fixtures/apple/data/feature_value.xml index ee5a0d291..55b50f4f5 100644 --- a/install-new/fixtures/apple/data/feature_value.xml +++ b/install-new/fixtures/apple/data/feature_value.xml @@ -1,24 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/guest.xml b/install-new/fixtures/apple/data/guest.xml index 199e95179..8477fcd55 100644 --- a/install-new/fixtures/apple/data/guest.xml +++ b/install-new/fixtures/apple/data/guest.xml @@ -1,23 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/image.xml b/install-new/fixtures/apple/data/image.xml index 7812691ef..f96ae20ae 100644 --- a/install-new/fixtures/apple/data/image.xml +++ b/install-new/fixtures/apple/data/image.xml @@ -1,36 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/manufacturer.xml b/install-new/fixtures/apple/data/manufacturer.xml index 00af1ef39..984429e56 100644 --- a/install-new/fixtures/apple/data/manufacturer.xml +++ b/install-new/fixtures/apple/data/manufacturer.xml @@ -1,16 +1,15 @@ - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + Apple Computer, Inc + + + Shure Incorporated + + + diff --git a/install-new/fixtures/apple/data/order_detail.xml b/install-new/fixtures/apple/data/order_detail.xml index 33b3b3c71..8cf5d6100 100644 --- a/install-new/fixtures/apple/data/order_detail.xml +++ b/install-new/fixtures/apple/data/order_detail.xml @@ -1,44 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + iPod touch - Capacité: 32Go + + + + Écouteurs à isolation sonore Shure SE210 + + + + diff --git a/install-new/fixtures/apple/data/order_history.xml b/install-new/fixtures/apple/data/order_history.xml index 92dcb493b..22d8c6ca8 100644 --- a/install-new/fixtures/apple/data/order_history.xml +++ b/install-new/fixtures/apple/data/order_history.xml @@ -1,12 +1,11 @@ - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/install-new/fixtures/apple/data/order_message.xml b/install-new/fixtures/apple/data/order_message.xml index 562e4ad61..1c9a0e3e2 100644 --- a/install-new/fixtures/apple/data/order_message.xml +++ b/install-new/fixtures/apple/data/order_message.xml @@ -1,9 +1,7 @@ - - - - - - - \ No newline at end of file + + + + + diff --git a/install-new/fixtures/apple/data/orders.xml b/install-new/fixtures/apple/data/orders.xml index 4b230c0c3..8334205d1 100644 --- a/install-new/fixtures/apple/data/orders.xml +++ b/install-new/fixtures/apple/data/orders.xml @@ -1,40 +1,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Chèque + cheque + + + + diff --git a/install-new/fixtures/apple/data/product.xml b/install-new/fixtures/apple/data/product.xml index 3c0fc911f..34537f6cf 100644 --- a/install-new/fixtures/apple/data/product.xml +++ b/install-new/fixtures/apple/data/product.xml @@ -1,74 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/product_attribute.xml b/install-new/fixtures/apple/data/product_attribute.xml index 317f4e2c7..4d6c14415 100644 --- a/install-new/fixtures/apple/data/product_attribute.xml +++ b/install-new/fixtures/apple/data/product_attribute.xml @@ -1,104 +1,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/product_attribute_combination.xml b/install-new/fixtures/apple/data/product_attribute_combination.xml index fe2bf8833..0c461960d 100644 --- a/install-new/fixtures/apple/data/product_attribute_combination.xml +++ b/install-new/fixtures/apple/data/product_attribute_combination.xml @@ -1,61 +1,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/product_supplier.xml b/install-new/fixtures/apple/data/product_supplier.xml new file mode 100644 index 000000000..59c4ce5ab --- /dev/null +++ b/install-new/fixtures/apple/data/product_supplier.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/profile.xml b/install-new/fixtures/apple/data/profile.xml index de42ff03b..e936c897e 100644 --- a/install-new/fixtures/apple/data/profile.xml +++ b/install-new/fixtures/apple/data/profile.xml @@ -1,12 +1,10 @@ - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/install-new/fixtures/apple/data/range_price.xml b/install-new/fixtures/apple/data/range_price.xml index 7979b5ffc..ce420575e 100644 --- a/install-new/fixtures/apple/data/range_price.xml +++ b/install-new/fixtures/apple/data/range_price.xml @@ -1,12 +1,11 @@ - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/install-new/fixtures/apple/data/range_weight.xml b/install-new/fixtures/apple/data/range_weight.xml index f110657fb..ce95fa9f5 100644 --- a/install-new/fixtures/apple/data/range_weight.xml +++ b/install-new/fixtures/apple/data/range_weight.xml @@ -1,12 +1,11 @@ - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/install-new/fixtures/apple/data/scene.xml b/install-new/fixtures/apple/data/scene.xml index 7ea3f0cc5..c519b20a7 100644 --- a/install-new/fixtures/apple/data/scene.xml +++ b/install-new/fixtures/apple/data/scene.xml @@ -1,12 +1,11 @@ - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/install-new/fixtures/apple/data/specific_price.xml b/install-new/fixtures/apple/data/specific_price.xml new file mode 100644 index 000000000..3d0699022 --- /dev/null +++ b/install-new/fixtures/apple/data/specific_price.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/stock_available.xml b/install-new/fixtures/apple/data/stock_available.xml index d578aba50..4aa959cdb 100644 --- a/install-new/fixtures/apple/data/stock_available.xml +++ b/install-new/fixtures/apple/data/stock_available.xml @@ -1,43 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/data/store.xml b/install-new/fixtures/apple/data/store.xml index c7373f47a..f4ec91959 100644 --- a/install-new/fixtures/apple/data/store.xml +++ b/install-new/fixtures/apple/data/store.xml @@ -1,68 +1,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + Dade County + 3030 SW 8th St Miami + + Miami + a:7:{i:0;s:13:"09:00 - 19:00";i:1;s:13:"09:00 - 19:00";i:2;s:13:"09:00 - 19:00";i:3;s:13:"09:00 - 19:00";i:4;s:13:"09:00 - 19:00";i:5;s:13:"10:00 - 16:00";i:6;s:13:"10:00 - 16:00";} + + + + + E Fort Lauderdale + 1000 Northeast 4th Ave Fort Lauderdale + + Miami + a:7:{i:0;s:13:"09:00 - 19:00";i:1;s:13:"09:00 - 19:00";i:2;s:13:"09:00 - 19:00";i:3;s:13:"09:00 - 19:00";i:4;s:13:"09:00 - 19:00";i:5;s:13:"10:00 - 16:00";i:6;s:13:"10:00 - 16:00";} + + + + + Pembroke Pines + 11001 Pines Blvd Pembroke Pines + + Miami + a:7:{i:0;s:13:"09:00 - 19:00";i:1;s:13:"09:00 - 19:00";i:2;s:13:"09:00 - 19:00";i:3;s:13:"09:00 - 19:00";i:4;s:13:"09:00 - 19:00";i:5;s:13:"10:00 - 16:00";i:6;s:13:"10:00 - 16:00";} + + + + + Coconut Grove + 2999 SW 32nd Avenue + + Miami + a:7:{i:0;s:13:"09:00 - 19:00";i:1;s:13:"09:00 - 19:00";i:2;s:13:"09:00 - 19:00";i:3;s:13:"09:00 - 19:00";i:4;s:13:"09:00 - 19:00";i:5;s:13:"10:00 - 16:00";i:6;s:13:"10:00 - 16:00";} + + + + + N Miami/Biscayne + 12055 Biscayne Blvd + + Miami + a:7:{i:0;s:13:"09:00 - 19:00";i:1;s:13:"09:00 - 19:00";i:2;s:13:"09:00 - 19:00";i:3;s:13:"09:00 - 19:00";i:4;s:13:"09:00 - 19:00";i:5;s:13:"10:00 - 16:00";i:6;s:13:"10:00 - 16:00";} + + + + + diff --git a/install-new/fixtures/apple/data/supplier.xml b/install-new/fixtures/apple/data/supplier.xml index 79f689e53..8344eda96 100644 --- a/install-new/fixtures/apple/data/supplier.xml +++ b/install-new/fixtures/apple/data/supplier.xml @@ -1,16 +1,15 @@ - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + AppleStore + + + Shure Online Store + + + diff --git a/install-new/fixtures/apple/data/tag.xml b/install-new/fixtures/apple/data/tag.xml index 1a9073a88..2c4d15d51 100644 --- a/install-new/fixtures/apple/data/tag.xml +++ b/install-new/fixtures/apple/data/tag.xml @@ -1,9 +1,7 @@ - - - - - - - \ No newline at end of file + + + + + diff --git a/install-new/fixtures/apple/img/st/Coconut_Grove-medium.jpg b/install-new/fixtures/apple/img/st/Coconut_Grove-medium.jpg index ad01d54a3..cbdb7a7d8 100644 Binary files a/install-new/fixtures/apple/img/st/Coconut_Grove-medium.jpg and b/install-new/fixtures/apple/img/st/Coconut_Grove-medium.jpg differ diff --git a/install-new/fixtures/apple/img/st/Dade_County-medium.jpg b/install-new/fixtures/apple/img/st/Dade_County-medium.jpg index ad01d54a3..cbdb7a7d8 100644 Binary files a/install-new/fixtures/apple/img/st/Dade_County-medium.jpg and b/install-new/fixtures/apple/img/st/Dade_County-medium.jpg differ diff --git a/install-new/fixtures/apple/img/st/E_Fort_Lauderdale-medium.jpg b/install-new/fixtures/apple/img/st/E_Fort_Lauderdale-medium.jpg index ad01d54a3..cbdb7a7d8 100644 Binary files a/install-new/fixtures/apple/img/st/E_Fort_Lauderdale-medium.jpg and b/install-new/fixtures/apple/img/st/E_Fort_Lauderdale-medium.jpg differ diff --git a/install-new/fixtures/apple/img/st/N_Miami_Biscayne-medium.jpg b/install-new/fixtures/apple/img/st/N_Miami_Biscayne-medium.jpg index ad01d54a3..cbdb7a7d8 100644 Binary files a/install-new/fixtures/apple/img/st/N_Miami_Biscayne-medium.jpg and b/install-new/fixtures/apple/img/st/N_Miami_Biscayne-medium.jpg differ diff --git a/install-new/fixtures/apple/img/st/Pembroke_Pines-medium.jpg b/install-new/fixtures/apple/img/st/Pembroke_Pines-medium.jpg index ad01d54a3..cbdb7a7d8 100644 Binary files a/install-new/fixtures/apple/img/st/Pembroke_Pines-medium.jpg and b/install-new/fixtures/apple/img/st/Pembroke_Pines-medium.jpg differ diff --git a/install-new/fixtures/apple/langs/de/data/attribute.xml b/install-new/fixtures/apple/langs/de/data/attribute.xml index 7f0b7e6d6..154e185bc 100644 --- a/install-new/fixtures/apple/langs/de/data/attribute.xml +++ b/install-new/fixtures/apple/langs/de/data/attribute.xml @@ -1,63 +1,63 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + 2GB + + + 4GB + + + Metallic + + + Blau + + + Pink + + + Grün + + + Orange + + + Optionale 64 GB Solid-State-Drive + + + Parallele ATA 80GB Drive @ 4200 rpm + + + 1.60GHz Intel Core 2 Duo + + + 1.80GHz Intel Core 2 Duo + + + 80GB: 20.000 Songs + + + 160GB: 40.000 Songs + + + Schwarz + + + 8Go + + + 16Go + + + 32Go + + + Violett + + + Gelb + + + Rot + + diff --git a/install-new/fixtures/apple/langs/de/data/attribute_group.xml b/install-new/fixtures/apple/langs/de/data/attribute_group.xml index 2719d0ad4..40b29843e 100644 --- a/install-new/fixtures/apple/langs/de/data/attribute_group.xml +++ b/install-new/fixtures/apple/langs/de/data/attribute_group.xml @@ -1,15 +1,15 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + Speicherplatz + Disk space + + + Farbe + Color + + + ICU + Processor + + diff --git a/install-new/fixtures/apple/langs/de/data/carrier.xml b/install-new/fixtures/apple/langs/de/data/carrier.xml index f2f26ca73..35bd6421a 100644 --- a/install-new/fixtures/apple/langs/de/data/carrier.xml +++ b/install-new/fixtures/apple/langs/de/data/carrier.xml @@ -1,6 +1,6 @@ - + - - - - \ No newline at end of file + + Zustellung am nächsten Tag! + + diff --git a/install-new/fixtures/apple/langs/de/data/category.xml b/install-new/fixtures/apple/langs/de/data/category.xml index 3ffd0f05c..cfa6ffc26 100644 --- a/install-new/fixtures/apple/langs/de/data/category.xml +++ b/install-new/fixtures/apple/langs/de/data/category.xml @@ -1,27 +1,27 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + iPods + Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater. + musik-iPods + + + + + + Zubehör + Wonderful accessories for your iPod + zubehor-ipod + + + + + + Laptops + The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part. + laptops + Apple laptops + Apple MacBook Air-Laptops + Powerful and chic Apple laptops + + diff --git a/install-new/fixtures/apple/langs/de/data/feature.xml b/install-new/fixtures/apple/langs/de/data/feature.xml index 8dd5408a0..bbbd27650 100644 --- a/install-new/fixtures/apple/langs/de/data/feature.xml +++ b/install-new/fixtures/apple/langs/de/data/feature.xml @@ -1,18 +1,18 @@ - + - - - - - - - - - - - - - - - - \ No newline at end of file + + Höhe + + + Breite + + + Tiefe + + + Gewicht + + + Kopfhörer + + diff --git a/install-new/fixtures/apple/langs/de/data/feature_value.xml b/install-new/fixtures/apple/langs/de/data/feature_value.xml index 68e1c4975..a00cdf87b 100644 --- a/install-new/fixtures/apple/langs/de/data/feature_value.xml +++ b/install-new/fixtures/apple/langs/de/data/feature_value.xml @@ -1,45 +1,45 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + Jack stereo + + + Mini-jack stéréo + + + 69.8 mm + + + 52.3 mm + + + 49.2 g + + + 6,5 mm + + + 27.3 mm + + + 41.2 mm + + + 15.5 g + + + 10,5 mm + + + 4.33 in + + + 70 mm + + + 120g + + + 8 mm + + diff --git a/install-new/fixtures/apple/langs/de/data/image.xml b/install-new/fixtures/apple/langs/de/data/image.xml index 414d8f564..0673d0bc2 100644 --- a/install-new/fixtures/apple/langs/de/data/image.xml +++ b/install-new/fixtures/apple/langs/de/data/image.xml @@ -1,81 +1,81 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + macbook-air-1 + + + macbook-air-2 + + + macbook-air-3 + + + macbook-air-4 + + + macbook-air-5 + + + superdrive-pour-macbook-air-1 + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + housse-portefeuille-en-cuir + + + Shure SE210 Sound-Isolating Earphones for iPod and iPhone + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + diff --git a/install-new/fixtures/apple/langs/de/data/manufacturer.xml b/install-new/fixtures/apple/langs/de/data/manufacturer.xml index 621ff2471..07df270a1 100644 --- a/install-new/fixtures/apple/langs/de/data/manufacturer.xml +++ b/install-new/fixtures/apple/langs/de/data/manufacturer.xml @@ -1,10 +1,10 @@ - + - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/install-new/fixtures/apple/langs/de/data/order_message.xml b/install-new/fixtures/apple/langs/de/data/order_message.xml index f89d5e3bd..afd05d916 100644 --- a/install-new/fixtures/apple/langs/de/data/order_message.xml +++ b/install-new/fixtures/apple/langs/de/data/order_message.xml @@ -1,11 +1,11 @@ - + - - - + Frist + Hi, -Leider ist einer der Artikel aus Ihrer Bestellung momentan nicht auf Lager. Dies kann zu einer leichten Lieferverzögerung führen. Wir entschuldigen uns hierfür und bemühen uns schnellstens um Abhilfe. +Leider ist einer der Artikel aus Ihrer Bestellung momentan nicht auf Lager. Dies kann zu einer leichten Lieferverzögerung führen. Wir entschuldigen uns hierfür und bemühen uns schnellstens um Abhilfe. -Mit freundlichen Grüßen,]]> - - \ No newline at end of file +Mit freundlichen Grüßen, + + diff --git a/install-new/fixtures/apple/langs/de/data/product.xml b/install-new/fixtures/apple/langs/de/data/product.xml index 2b071ec62..24a44708e 100644 --- a/install-new/fixtures/apple/langs/de/data/product.xml +++ b/install-new/fixtures/apple/langs/de/data/product.xml @@ -1,135 +1,135 @@ - + - - Immer eine Kurve voraus.

-

Für all die, die gleich losrocken wollen, gibt es jetzt neun tolle Farben zur Auswahl. Aber das ist nur ein Teil der Geschichte. Mit seinem runden Design, das komplett aus Aluminium und Glas besteht, werden Sie den iPod nano nicht mehr weglegen wollen.

-

Tolles Design. Und viel Köpfchen.

-

Die neue Genius-Funktion verwandelt den iPod nano in Ihren hoch intelligenten, persönlichen DJ. Es erstellt Abspiellisten aus den Songs in Ihrer Sammlung, die gut zusammenpassen.

-

Passt sich Ihren Bewegungen an.

-

Der iPod nano jetzt mit Beschleunigungsmesser. Einmal schütteln, und Ihre Musik wird neu sortiert. Kippen Sie es zur Seite für die Cover Flow-Ansicht. Und spielen Sie mit den Bewegungen, an die Sie denken.

]]> - New design. New features. Now in 8GB and 16GB. iPod nano rocks like never before.

]]> - - - - - - - - - - style="font-size: small;">Gleich festmachen.

-

Tragen Sie bis zu 500 Songs am Ärmel. Oder an Ihrem Gürtel. Oder an Ihrer Sporthose. iPod shuffle ist ein Erkennungszeichen echter Musikfans. Jetzt in neuen, noch leuchtenderen Farben.

-

style="font-size: small;">Füttern Sie Ihren iPod shuffle.

-

iTunes ist Ihr Super-Store für Unterhaltung. Es ist Ihre optimal organisierte Musik-Sammlung und Jukebox. Und Sie können Ihren iPod shuffle mit einem Klick laden.

-

style="font-size: small;">Die Schöne und der Beat.

-

Das farbintensive eloxierte Aluminium ergänzt das schlichte Design des iPod shuffle. Jetzt in Blau, Grün, Rosa, Rot und klassischem Silber.

]]> - iPod shuffle, the world’s most wearable music player, now clips on in more vibrant blue, green, pink, and red.

]]> - - - - - - - - - - MacBook Air ist kaum dicker als Ihr Zeigefinger. Nahezu jedes Detail wurde abgeflacht. Und dabei hat es immer noch einen 13,3-Zoll-Widescreen-LED-Display, eine Tastatur in voller Größe und einen großen Multi-Touch-Trackpad. Es besitzt eine unvergleichliche Tragbarkeit, ohne die üblichen Kompromisse für ultraportable Bildschirme und Tastaturen.

Der unglaublich dünne MacBook Air ist das Ergebnis zahlreicher Innovationen zur Größen- und Gewichtsoptimierung. Die flachere Festplatte, die strategisch versteckten I/O-Ports und eine noch flachere Batterie: Alles wurde immer wieder überdacht, immer mit dem Ziel, es noch dünner zu gestalten.

Das Design und Konzept von MacBook Air ist voll auf die Vorteile der Kabelfreiheit ausgerichtet. Eine Welt, in der 802.11n WLAN heutzutage so schnell und so leicht verfügbar ist, dass die Menschen heute grenzenlos Filme online kaufen oder mieten, Software downloaden und Dateien über das Internet teilen oder speichern können.

]]> - - - - - - - - - - -
Die 2,4 GHz MacBook-Modelle haben nun 2 GB Standard-Arbeitsspeicher - ideal zum reibungslosen Abspielen Ihrer Lieblings-Anwendungen.]]> - - - - - - - - - - - Fünf neue Hands-on-Anwendungen -

Rich-HTML-E-Mails mit Fotos anzeigen sowie PDF-, Word-und Excel-Anhänge. Holen Sie sich Karten, Wegbeschreibungen und Echtzeit-Verkehrsinformationen. Sie können sich Notizen machen und Börsen- und Wetterberichte lesen.

-

Berühren Sie Ihre Musik, Filme und vieles mehr

-

Mit der revolutionären, in den wunderschönen 3,5-Zoll-Display integrierten Multi-Touch-Technologie können Sie zuziehen, zoomen, scrollen und streichen.

-

Internet in Ihrer Tasche

-

Mit dem Safari-Webbrowser sehen Sie Webseiten so, wie sie gesehen werden sollten und vergrößern und verkleinern sie mit einer Berührung.2Fügen Sie Web-Clips zu Ihrer Startseite hinzu für den Schnellzugriff auf Ihre bevorzugten Webseiten.

-

Zum Set gehören/h3> -
    -
  • der iPod touch
    • -
  • Ohrhörer
    • -
  • USB 2.0-Kabel
    • -
  • Anschluss-Adapter
    • -
  • Poliertuch
    • -
  • Basis
    • -
  • Quick Start Guide
    • -
]]> - -
  • Revolutionary Multi-Touch interface
    • -
  • 3.5-inch widescreen color display
    • -
  • Wi-Fi (802.11b/g)
    • -
  • 8 mm thin
    • -
  • Safari, YouTube, Mail, Stocks, Weather, Notes, iTunes Wi-Fi Music Store, Maps
    • -]]>     - - - - - - - - - - Lorem ipsum

    ]]>     - Lorem ipsum

    ]]>     - - - - - - - -     - - Mit ihren hochauflösenden Micro-Lautsprechern, die vollen Klang liefern und ihrem ergonomischen, leichten Design sind die SE210 Ohrhörer ideal zum mobilen Extraklasse-Musik hören auf Ihrem iPod oder iPhone. Sie bieten die genaueste Tonwiedergabe, sowohl aus tragbaren als auch aus Home-Stereo-Audio-Quellen - für ultimative präzisen Höhen und kraftvolle Bässe. Darüber hinaus ermöglicht das flexible Design optimalen Tragekomfort durch eine Vielzahl von Tragemöglichkeiten.

    Funktionen
    -
      -
    • Klangisolierendes Design
      • -
    • Hochauflösende Micro-Lautsprecher mit Single Balanced Armature-Treiber
      • -
    • Abnehmbare modulare Kabel, die Sie je nach Aktivität länger oder kürzer einstellen können
      • -
    • Kompatibler Stecker mit Kopfhörer-Anschlüssen für iPod und iPhone
      • -
    -Daten
    -
      -
    • Lautsprecher-Typ: Hochauflösende Micro-Lautsprecher
      • -
    • Frequenzbereich: 25Hz-18.5kHz
      • -
    • Impedanz (1kHz): 26 Ohm
      • -
    • Empfindlichkeit (1mW): 114 dB SPL/mW
      • -
    • Kabellänge (mit Erweiterung): 18,0 Zoll/45,0 cm (54,0 Zoll/137,1 cm)
      • -
    -Im Set enthalten
    -
      -
    • Shure SE210 Ohrhörer
      • -
    • Verlängerungskabel (36,0 Zoll/91,4 cm)
      • -
    • Drei Paar Schaumstoff-Hörmuschelhüllen (klein, mittel, groß)
      • -
    • Drei Paar weiche Flex-Hörmuschelhüllen (klein, mittel, groß)
      • -
    • Ein Paar Triple-Flange-Hörmuschelhüllen
      • -
    • Trage-Etui
      • -
    -Garantie
    Zwei Jahre
    (Einzelheiten hierzu finden Sie auf
    www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm).

    Mfr. Teilenummer: SE210-A-EFS

    Hinweis: Für Produkte auf dieser Website, die nicht den Markennamen Apple tragen, werden Service und Support ausschließlich von den Herstellern gemäß der den Produkten beiliegenden Nutzungsbedingungen übernommen. Die von Apple angebotene Garantiezeit gilt nicht für Produkte, die kein Apple-Markenzeichen tragen, selbst wenn diese zusammen mit Apple-Produkten verpackt oder verkauft wurden. Bitte wenden Sie sich direkt an den Hersteller für den technischen Support und Kundendienst.]]>     - Evolved from personal monitor technology road-tested by pro musicians and perfected by Shure engineers, the lightweight and stylish SE210 delivers full-range audio that's free from outside noise.

    ]]>     - - - - - - - -     - \ No newline at end of file + + <p><span style="font-size: small;">Immer eine Kurve voraus.</span></strong></p> +<p>Für all die, die gleich losrocken wollen, gibt es jetzt neun tolle Farben zur Auswahl. Aber das ist nur ein Teil der Geschichte. Mit seinem runden Design, das komplett aus Aluminium und Glas besteht, werden Sie den iPod nano nicht mehr weglegen wollen.</p> +<p><span style="font-size: small;">Tolles Design. Und viel Köpfchen.</Span></strong></p> +<p>Die neue Genius-Funktion verwandelt den iPod nano in Ihren hoch intelligenten, persönlichen DJ. Es erstellt Abspiellisten aus den Songs in Ihrer Sammlung, die gut zusammenpassen.</P> +<p><span style="font-size: small;">Passt sich Ihren Bewegungen an.</span></strong></p> +<p>Der iPod nano jetzt mit Beschleunigungsmesser. Einmal schütteln, und Ihre Musik wird neu sortiert. Kippen Sie es zur Seite für die Cover Flow-Ansicht. Und spielen Sie mit den Bewegungen, an die Sie denken.</P> + <p>New design. New features. Now in 8GB and 16GB. iPod nano rocks like never before.</p> + ipod-nano + + + + iPod Nano + In stock + + + + <p>style="font-size: small;"><strong>Gleich festmachen.</strong></span></p> +<p>Tragen Sie bis zu 500 Songs am Ärmel. Oder an Ihrem Gürtel. Oder an Ihrer Sporthose. iPod shuffle ist ein Erkennungszeichen echter Musikfans. Jetzt in neuen, noch leuchtenderen Farben.</P> +<p>style="font-size: small;"><strong>Füttern Sie Ihren iPod shuffle.</Strong></span></p> +<p>iTunes ist Ihr Super-Store für Unterhaltung. Es ist Ihre optimal organisierte Musik-Sammlung und Jukebox. Und Sie können Ihren iPod shuffle mit einem Klick laden.</P> +<p>style="font-size: small;"><strong>Die Schöne und der Beat.</strong></span></p> +<p>Das farbintensive eloxierte Aluminium ergänzt das schlichte Design des iPod shuffle. Jetzt in Blau, Grün, Rosa, Rot und klassischem Silber.</P> + <p>iPod shuffle, the world’s most wearable music player, now clips on in more vibrant blue, green, pink, and red.</p> + ipod-shuffle + + + + iPod shuffle + In stock + + + + <p>MacBook Air ist kaum dicker als Ihr Zeigefinger. Nahezu jedes Detail wurde abgeflacht. Und dabei hat es immer noch einen 13,3-Zoll-Widescreen-LED-Display, eine Tastatur in voller Größe und einen großen Multi-Touch-Trackpad. Es besitzt eine unvergleichliche Tragbarkeit, ohne die üblichen Kompromisse für ultraportable Bildschirme und Tastaturen.</P>Der unglaublich dünne MacBook Air ist das Ergebnis zahlreicher Innovationen zur Größen- und Gewichtsoptimierung. Die flachere Festplatte, die strategisch versteckten I/O-Ports und eine noch flachere Batterie: Alles wurde immer wieder überdacht, immer mit dem Ziel, es noch dünner zu gestalten.</P>Das Design und Konzept von MacBook Air ist voll auf die Vorteile der Kabelfreiheit ausgerichtet. Eine Welt, in der 802.11n WLAN heutzutage so schnell und so leicht verfügbar ist, dass die Menschen heute grenzenlos Filme online kaufen oder mieten, Software downloaden und Dateien über das Internet teilen oder speichern können. </P> + MacBook Air is ultrathin, ultraportable, and ultra unlike anything else. But you don’t lose inches and pounds overnight. It’s the result of rethinking conventions. Of multiple wireless innovations. And of breakthrough design. With MacBook Air, mobile computing suddenly has a new standard. + macbook-Air + + + + MacBook Air + + + + + Jedes MacBook verfügt über eine größere Festplatte, bis zu 250GB, zum Speichern immer größer werdender Mediensammlungen und wertvoller Daten.<br/><br/>Die 2,4 GHz MacBook-Modelle haben nun 2 GB Standard-Arbeitsspeicher - ideal zum reibungslosen Abspielen Ihrer Lieblings-Anwendungen. + MacBook makes it easy to hit the road thanks to its tough polycarbonate case, built-in wireless technologies, and innovative MagSafe Power Adapter that releases automatically if someone accidentally trips on the cord. + macbook + + + + MacBook + + + + + <h3>Fünf neue Hands-on-Anwendungen</h3> +<p>Rich-HTML-E-Mails mit Fotos anzeigen sowie PDF-, Word-und Excel-Anhänge. Holen Sie sich Karten, Wegbeschreibungen und Echtzeit-Verkehrsinformationen. Sie können sich Notizen machen und Börsen- und Wetterberichte lesen.</P> +<h3>Berühren Sie Ihre Musik, Filme und vieles mehr</h3> +<p>Mit der revolutionären, in den wunderschönen 3,5-Zoll-Display integrierten Multi-Touch-Technologie können Sie zuziehen, zoomen, scrollen und streichen.</p> +<h3>Internet in Ihrer Tasche</h3> +<p>Mit dem Safari-Webbrowser sehen Sie Webseiten so, wie sie gesehen werden sollten und vergrößern und verkleinern sie mit einer Berührung.<sup>2</sup>Fügen Sie Web-Clips zu Ihrer Startseite hinzu für den Schnellzugriff auf Ihre bevorzugten Webseiten.</p> +<h3>Zum Set gehören/h3> +<ul> +<li><span></span>der iPod touch</li> +<li><span></span>Ohrhörer</li> +<li><span></span>USB 2.0-Kabel</li> +<li><span></span>Anschluss-Adapter</li> +<li><span></span>Poliertuch</li> +<li><span></span>Basis</li> +<li><span></span>Quick Start Guide</li> +</ul> + <ul> +<li>Revolutionary Multi-Touch interface</li> +<li>3.5-inch widescreen color display</li> +<li>Wi-Fi (802.11b/g)</li> +<li>8 mm thin</li> +<li>Safari, YouTube, Mail, Stocks, Weather, Notes, iTunes Wi-Fi Music Store, Maps</li> +</ul> + iPod-Touch + + + + iPod touch + + + + + <p>Lorem ipsum</p> + <p>Lorem ipsum</p> + lederhulle-belkin-fur-ipod-nano-schwarz-schokolade + + + + Lederhülle Belkin für ipod nano - Schwarz/Schokolade + + + + + <div class="product-overview-full">Mit ihren hochauflösenden Micro-Lautsprechern, die vollen Klang liefern und ihrem ergonomischen, leichten Design sind die SE210 Ohrhörer ideal zum mobilen Extraklasse-Musik hören auf Ihrem iPod oder iPhone. Sie bieten die genaueste Tonwiedergabe, sowohl aus tragbaren als auch aus Home-Stereo-Audio-Quellen - für ultimative präzisen Höhen und kraftvolle Bässe. Darüber hinaus ermöglicht das flexible Design optimalen Tragekomfort durch eine Vielzahl von Tragemöglichkeiten. <br/><br/>Funktionen</strong><br/> +<ul> +<li>Klangisolierendes Design</li> +<li>Hochauflösende Micro-Lautsprecher mit Single Balanced Armature-Treiber</li> +<li>Abnehmbare modulare Kabel, die Sie je nach Aktivität länger oder kürzer einstellen können</li> +<li>Kompatibler Stecker mit Kopfhörer-Anschlüssen für iPod und iPhone</li> +</ul> +<strong>Daten</strong><br/> +<ul> +<li>Lautsprecher-Typ: Hochauflösende Micro-Lautsprecher</li> +<li> Frequenzbereich: 25Hz-18.5kHz </li> +<li>Impedanz (1kHz): 26 Ohm </li> +<li>Empfindlichkeit (1mW): 114 dB SPL/mW</li> +<li> Kabellänge (mit Erweiterung): 18,0 Zoll/45,0 cm (54,0 Zoll/137,1 cm) </li> +</ul> +<strong>Im Set enthalten</strong><br/> +<ul> +<li>Shure SE210 Ohrhörer </li> +<li> Verlängerungskabel (36,0 Zoll/91,4 cm) </li> +<li> Drei Paar Schaumstoff-Hörmuschelhüllen (klein, mittel, groß) </li> +<li> Drei Paar weiche Flex-Hörmuschelhüllen (klein, mittel, groß) </li> +<li> Ein Paar Triple-Flange-Hörmuschelhüllen </li> +<li> Trage-Etui </li> +</ul> +Garantie<br /> Zwei Jahre <br />(Einzelheiten hierzu finden Sie auf <br />www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm). <br /><br /> Mfr. Teilenummer: SE210-A-EFS <br /><br />Hinweis: Für Produkte auf dieser Website, die nicht den Markennamen Apple tragen, werden Service und Support ausschließlich von den Herstellern gemäß der den Produkten beiliegenden Nutzungsbedingungen übernommen. Die von Apple angebotene Garantiezeit gilt nicht für Produkte, die kein Apple-Markenzeichen tragen, selbst wenn diese zusammen mit Apple-Produkten verpackt oder verkauft wurden. Bitte wenden Sie sich direkt an den Hersteller für den technischen Support und Kundendienst.</div> + <p>Evolved from personal monitor technology road-tested by pro musicians and perfected by Shure engineers, the lightweight and stylish SE210 delivers full-range audio that's free from outside noise.</p> + klangisolierte-ohrhorer-shure-se210-weib + + + + Shure SE210 Klangisolierte Ohrhörer für iPod und iPhone + + + + diff --git a/install-new/fixtures/apple/langs/de/data/profile.xml b/install-new/fixtures/apple/langs/de/data/profile.xml index f2c3054d4..37cd3994a 100644 --- a/install-new/fixtures/apple/langs/de/data/profile.xml +++ b/install-new/fixtures/apple/langs/de/data/profile.xml @@ -1,15 +1,15 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + Administrator + + + Logistiker + + + Übersetzer + + + Verkäufer + + diff --git a/install-new/fixtures/apple/langs/de/data/scene.xml b/install-new/fixtures/apple/langs/de/data/scene.xml index ae8a1db98..72ee0ead7 100644 --- a/install-new/fixtures/apple/langs/de/data/scene.xml +++ b/install-new/fixtures/apple/langs/de/data/scene.xml @@ -1,12 +1,12 @@ - + - - - - - - - - - - \ No newline at end of file + + Die iPods Nano + + + Die iPods + + + Die MacBooks + + diff --git a/install-new/fixtures/apple/langs/de/data/supplier.xml b/install-new/fixtures/apple/langs/de/data/supplier.xml index 07f36aeb6..1c7900ea5 100644 --- a/install-new/fixtures/apple/langs/de/data/supplier.xml +++ b/install-new/fixtures/apple/langs/de/data/supplier.xml @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/install-new/fixtures/apple/langs/en/data/attribute.xml b/install-new/fixtures/apple/langs/en/data/attribute.xml index 350a52948..6c19c4704 100644 --- a/install-new/fixtures/apple/langs/en/data/attribute.xml +++ b/install-new/fixtures/apple/langs/en/data/attribute.xml @@ -1,63 +1,63 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + 2GB + + + 4GB + + + Metal + + + Blue + + + Pink + + + Green + + + Orange + + + Optional 64GB solid-state drive + + + 80GB Parallel ATA Drive @ 4200 rpm + + + 1.60GHz Intel Core 2 Duo + + + 1.80GHz Intel Core 2 Duo + + + 80GB: 20,000 Songs + + + 160GB: 40,000 Songs + + + Black + + + 8Go + + + 16Go + + + 32Go + + + Purple + + + Yellow + + + Red + + diff --git a/install-new/fixtures/apple/langs/en/data/attribute_group.xml b/install-new/fixtures/apple/langs/en/data/attribute_group.xml index dc2c4a94c..221a81bc7 100644 --- a/install-new/fixtures/apple/langs/en/data/attribute_group.xml +++ b/install-new/fixtures/apple/langs/en/data/attribute_group.xml @@ -1,15 +1,15 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + Disk space + Disk space + + + Color + Color + + + ICU + Processor + + diff --git a/install-new/fixtures/apple/langs/en/data/carrier.xml b/install-new/fixtures/apple/langs/en/data/carrier.xml index 07d723522..c59766e73 100644 --- a/install-new/fixtures/apple/langs/en/data/carrier.xml +++ b/install-new/fixtures/apple/langs/en/data/carrier.xml @@ -1,6 +1,6 @@ - + - - - - \ No newline at end of file + + Delivery next day! + + diff --git a/install-new/fixtures/apple/langs/en/data/category.xml b/install-new/fixtures/apple/langs/en/data/category.xml index 0b0f6c90b..eeae63831 100644 --- a/install-new/fixtures/apple/langs/en/data/category.xml +++ b/install-new/fixtures/apple/langs/en/data/category.xml @@ -1,27 +1,27 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + iPods + Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater. + music-ipods + + + + + + Accessories + Wonderful accessories for your iPod + accessories-ipod + + + + + + Laptops + The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part. + laptops + Apple laptops + Apple laptops MacBook Air + Powerful and chic Apple laptops + + diff --git a/install-new/fixtures/apple/langs/en/data/feature.xml b/install-new/fixtures/apple/langs/en/data/feature.xml index c6de30b39..7682c6495 100644 --- a/install-new/fixtures/apple/langs/en/data/feature.xml +++ b/install-new/fixtures/apple/langs/en/data/feature.xml @@ -1,18 +1,18 @@ - + - - - - - - - - - - - - - - - - \ No newline at end of file + + Height + + + Width + + + Depth + + + Weight + + + Headphone + + diff --git a/install-new/fixtures/apple/langs/en/data/feature_value.xml b/install-new/fixtures/apple/langs/en/data/feature_value.xml index 574f41d70..d3a824d22 100644 --- a/install-new/fixtures/apple/langs/en/data/feature_value.xml +++ b/install-new/fixtures/apple/langs/en/data/feature_value.xml @@ -1,45 +1,45 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + Jack stereo + + + Mini-jack stereo + + + 2.75 in + + + 2.06 in + + + 49.2 g + + + 0.26 in + + + 1.07 in + + + 1.62 in + + + 15.5 g + + + 0.41 in (clip included) + + + 4.33 in + + + 2.76 in + + + 120g + + + 0.31 in + + diff --git a/install-new/fixtures/apple/langs/en/data/image.xml b/install-new/fixtures/apple/langs/en/data/image.xml index cce2d987a..49a836dc3 100644 --- a/install-new/fixtures/apple/langs/en/data/image.xml +++ b/install-new/fixtures/apple/langs/en/data/image.xml @@ -1,81 +1,81 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + MacBook Air + + + MacBook Air + + + MacBook Air + + + MacBook Air + + + MacBook Air + + + MacBook Air SuperDrive + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + housse-portefeuille-en-cuir + + + Shure SE210 Sound-Isolating Earphones for iPod and iPhone + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + diff --git a/install-new/fixtures/apple/langs/en/data/manufacturer.xml b/install-new/fixtures/apple/langs/en/data/manufacturer.xml index 621ff2471..07df270a1 100644 --- a/install-new/fixtures/apple/langs/en/data/manufacturer.xml +++ b/install-new/fixtures/apple/langs/en/data/manufacturer.xml @@ -1,10 +1,10 @@ - + - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/install-new/fixtures/apple/langs/en/data/order_message.xml b/install-new/fixtures/apple/langs/en/data/order_message.xml index f61aca05a..93ad3b501 100644 --- a/install-new/fixtures/apple/langs/en/data/order_message.xml +++ b/install-new/fixtures/apple/langs/en/data/order_message.xml @@ -1,12 +1,12 @@ - + - - - + Delay + Hi, Unfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery. Please accept our apologies and rest assured that we are working hard to rectify this. -Best regards,]]> - - \ No newline at end of file +Best regards, + + diff --git a/install-new/fixtures/apple/langs/en/data/product.xml b/install-new/fixtures/apple/langs/en/data/product.xml index 85d13c691..0c405b001 100644 --- a/install-new/fixtures/apple/langs/en/data/product.xml +++ b/install-new/fixtures/apple/langs/en/data/product.xml @@ -1,135 +1,135 @@ - + - - Curved ahead of the curve.

    -

    For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass design and you won't want to put iPod nano down.

    -

    Great looks. And brains, too.

    -

    The new Genius feature turns iPod nano into your own highly intelligent, personal DJ. It creates playlists by finding songs in your library that go great together.

    -

    Made to move with your moves.

    -

    The accelerometer comes to iPod nano. Give it a shake to shuffle your music. Turn it sideways to view Cover Flow. And play games designed with your moves in mind.

    ]]>     - New design. New features. Now in 8GB and 16GB. iPod nano rocks like never before.

    ]]>     - - - - - - - -     - - Instant attachment.

    -

    Wear up to 500 songs on your sleeve. Or your belt. Or your gym shorts. iPod shuffle is a badge of musical devotion. Now in new, more brilliant colors.

    -

    Feed your iPod shuffle.

    -

    iTunes is your entertainment superstore. It’s your ultra-organized music collection and jukebox. And it’s how you load up your iPod shuffle in one click.

    -

    Beauty and the beat.

    -

    Intensely colorful anodized aluminum complements the simple design of iPod shuffle. Now in blue, green, pink, red, and original silver.

    ]]>     - iPod shuffle, the world’s most wearable music player, now clips on in more vibrant blue, green, pink, and red.

    ]]>     - - - - - - - -     - - MacBook Air is nearly as thin as your index finger. Practically every detail that could be streamlined has been. Yet it still has a 13.3-inch widescreen LED display, full-size keyboard, and large multi-touch trackpad. It’s incomparably portable without the usual ultraportable screen and keyboard compromises.

    The incredible thinness of MacBook Air is the result of numerous size- and weight-shaving innovations. From a slimmer hard drive to strategically hidden I/O ports to a lower-profile battery, everything has been considered and reconsidered with thinness in mind.

    MacBook Air is designed and engineered to take full advantage of the wireless world. A world in which 802.11n Wi-Fi is now so fast and so available, people are truly living untethered — buying and renting movies online, downloading software, and sharing and storing files on the web.

    ]]>     - - - - - - - - -     - -
    The 2.4GHz MacBook models now include 2GB of memory standard — perfect for running more of your favorite applications smoothly.]]>     - - - - - - - - -     - - Five new hands-on applications

    -

    View rich HTML email with photos as well as PDF, Word, and Excel attachments. Get maps, directions, and real-time traffic information. Take notes and read stock and weather reports.

    -

    Touch your music, movies, and more

    -

    The revolutionary Multi-Touch technology built into the gorgeous 3.5-inch display lets you pinch, zoom, scroll, and flick with your fingers.

    -

    Internet in your pocket

    -

    With the Safari web browser, see websites the way they were designed to be seen and zoom in and out with a tap.2 And add Web Clips to your Home screen for quick access to favorite sites.

    -

    What's in the box

    -
      -
    • iPod touch
      • -
    • Earphones
      • -
    • USB 2.0 cable
      • -
    • Dock adapter
      • -
    • Polishing cloth
      • -
    • Stand
      • -
    • Quick Start guide
      • -
    ]]>     - -
  • Revolutionary Multi-Touch interface
    • -
  • 3.5-inch widescreen color display
    • -
  • Wi-Fi (802.11b/g)
    • -
  • 8 mm thin
    • -
  • Safari, YouTube, Mail, Stocks, Weather, Notes, iTunes Wi-Fi Music Store, Maps
    • -]]>     - - - - - - - -     - - Lorem ipsum

    ]]>     - Lorem ipsum

    ]]>     - - - - - - - -     - - Using Hi-Definition MicroSpeakers to deliver full-range audio, the ergonomic and lightweight design of the SE210 earphones is ideal for premium on-the-go listening on your iPod or iPhone. They offer the most accurate audio reproduction from both portable and home stereo audio sources--for the ultimate in precision highs and rich low end. In addition, the flexible design allows you to choose the most comfortable fit from a variety of wearing positions.

    Features
    -
      -
    • Sound-isolating design
      • -
    • Hi-Definition MicroSpeaker with a single balanced armature driver
      • -
    • Detachable, modular cable so you can make the cable longer or shorter depending on your activity
      • -
    • Connector compatible with earphone ports on both iPod and iPhone
      • -
    -Specifications
    -
      -
    • Speaker type: Hi-Definition MicroSpeaker
      • -
    • Frequency range: 25Hz-18.5kHz
      • -
    • Impedance (1kHz): 26 Ohms
      • -
    • Sensitivity (1mW): 114 dB SPL/mW
      • -
    • Cable length (with extension): 18.0 in./45.0 cm (54.0 in./137.1 cm)
      • -
    -In the box
    -
      -
    • Shure SE210 earphones
      • -
    • Extension cable (36.0 in./91.4 cm)
      • -
    • Three pairs foam earpiece sleeves (small, medium, large)
      • -
    • Three pairs soft flex earpiece sleeves (small, medium, large)
      • -
    • One pair triple-flange earpiece sleeves
      • -
    • Carrying case
      • -
    -Warranty
    Two-year limited
    (For details, please visit
    www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm.)

    Mfr. Part No.: SE210-A-EFS

    Note: Products sold through this website that do not bear the Apple Brand name are serviced and supported exclusively by their manufacturers in accordance with terms and conditions packaged with the products. Apple's Limited Warranty does not apply to products that are not Apple-branded, even if packaged or sold with Apple products. Please contact the manufacturer directly for technical support and customer service.]]>     - Evolved from personal monitor technology road-tested by pro musicians and perfected by Shure engineers, the lightweight and stylish SE210 delivers full-range audio that's free from outside noise.

    ]]>     - - - - - - - -     -     \ No newline at end of file + + <p><strong><span style="font-size: small;">Curved ahead of the curve.</span></strong></p> +<p>For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass design and you won't want to put iPod nano down.</p> +<p><strong><span style="font-size: small;">Great looks. And brains, too.</span></strong></p> +<p>The new Genius feature turns iPod nano into your own highly intelligent, personal DJ. It creates playlists by finding songs in your library that go great together.</p> +<p><strong><span style="font-size: small;">Made to move with your moves.</span></strong></p> +<p>The accelerometer comes to iPod nano. Give it a shake to shuffle your music. Turn it sideways to view Cover Flow. And play games designed with your moves in mind.</p> + <p>New design. New features. Now in 8GB and 16GB. iPod nano rocks like never before.</p> + ipod-nano + + + + iPod Nano + In stock + + + + <p><span style="font-size: small;"><strong>Instant attachment.</strong></span></p> +<p>Wear up to 500 songs on your sleeve. Or your belt. Or your gym shorts. iPod shuffle is a badge of musical devotion. Now in new, more brilliant colors.</p> +<p><span style="font-size: small;"><strong>Feed your iPod shuffle.</strong></span></p> +<p>iTunes is your entertainment superstore. It’s your ultra-organized music collection and jukebox. And it’s how you load up your iPod shuffle in one click.</p> +<p><span style="font-size: small;"><strong>Beauty and the beat.</strong></span></p> +<p>Intensely colorful anodized aluminum complements the simple design of iPod shuffle. Now in blue, green, pink, red, and original silver.</p> + <p>iPod shuffle, the world’s most wearable music player, now clips on in more vibrant blue, green, pink, and red.</p> + ipod-shuffle + + + + iPod shuffle + In stock + + + + <p>MacBook Air is nearly as thin as your index finger. Practically every detail that could be streamlined has been. Yet it still has a 13.3-inch widescreen LED display, full-size keyboard, and large multi-touch trackpad. It’s incomparably portable without the usual ultraportable screen and keyboard compromises.</p><p>The incredible thinness of MacBook Air is the result of numerous size- and weight-shaving innovations. From a slimmer hard drive to strategically hidden I/O ports to a lower-profile battery, everything has been considered and reconsidered with thinness in mind.</p><p>MacBook Air is designed and engineered to take full advantage of the wireless world. A world in which 802.11n Wi-Fi is now so fast and so available, people are truly living untethered — buying and renting movies online, downloading software, and sharing and storing files on the web. </p> + MacBook Air is ultrathin, ultraportable, and ultra unlike anything else. But you don’t lose inches and pounds overnight. It’s the result of rethinking conventions. Of multiple wireless innovations. And of breakthrough design. With MacBook Air, mobile computing suddenly has a new standard. + macbook-air + + + + MacBook Air + + + + + Every MacBook has a larger hard drive, up to 250GB, to store growing media collections and valuable data.<br /><br />The 2.4GHz MacBook models now include 2GB of memory standard — perfect for running more of your favorite applications smoothly. + MacBook makes it easy to hit the road thanks to its tough polycarbonate case, built-in wireless technologies, and innovative MagSafe Power Adapter that releases automatically if someone accidentally trips on the cord. + macbook + + + + MacBook + + + + + <h3>Five new hands-on applications</h3> +<p>View rich HTML email with photos as well as PDF, Word, and Excel attachments. Get maps, directions, and real-time traffic information. Take notes and read stock and weather reports.</p> +<h3>Touch your music, movies, and more</h3> +<p>The revolutionary Multi-Touch technology built into the gorgeous 3.5-inch display lets you pinch, zoom, scroll, and flick with your fingers.</p> +<h3>Internet in your pocket</h3> +<p>With the Safari web browser, see websites the way they were designed to be seen and zoom in and out with a tap.<sup>2</sup> And add Web Clips to your Home screen for quick access to favorite sites.</p> +<h3>What's in the box</h3> +<ul> +<li><span></span>iPod touch</li> +<li><span></span>Earphones</li> +<li><span></span>USB 2.0 cable</li> +<li><span></span>Dock adapter</li> +<li><span></span>Polishing cloth</li> +<li><span></span>Stand</li> +<li><span></span>Quick Start guide</li> +</ul> + <ul> +<li>Revolutionary Multi-Touch interface</li> +<li>3.5-inch widescreen color display</li> +<li>Wi-Fi (802.11b/g)</li> +<li>8 mm thin</li> +<li>Safari, YouTube, Mail, Stocks, Weather, Notes, iTunes Wi-Fi Music Store, Maps</li> +</ul> + ipod-touch + + + + iPod touch + + + + + <p>Lorem ipsum</p> + <p>Lorem ipsum</p> + belkin-leather-folio-for-ipod-nano-black-chocolate + + + + Belkin Leather Folio for iPod nano - Black / Chocolate + + + + + <div class="product-overview-full">Using Hi-Definition MicroSpeakers to deliver full-range audio, the ergonomic and lightweight design of the SE210 earphones is ideal for premium on-the-go listening on your iPod or iPhone. They offer the most accurate audio reproduction from both portable and home stereo audio sources--for the ultimate in precision highs and rich low end. In addition, the flexible design allows you to choose the most comfortable fit from a variety of wearing positions. <br /> <br /> <strong>Features </strong> <br /> +<ul> +<li>Sound-isolating design </li> +<li> Hi-Definition MicroSpeaker with a single balanced armature driver </li> +<li> Detachable, modular cable so you can make the cable longer or shorter depending on your activity </li> +<li> Connector compatible with earphone ports on both iPod and iPhone </li> +</ul> +<strong>Specifications </strong><br /> +<ul> +<li>Speaker type: Hi-Definition MicroSpeaker </li> +<li> Frequency range: 25Hz-18.5kHz </li> +<li> Impedance (1kHz): 26 Ohms </li> +<li> Sensitivity (1mW): 114 dB SPL/mW </li> +<li> Cable length (with extension): 18.0 in./45.0 cm (54.0 in./137.1 cm) </li> +</ul> +<strong>In the box</strong><br /> +<ul> +<li>Shure SE210 earphones </li> +<li> Extension cable (36.0 in./91.4 cm) </li> +<li> Three pairs foam earpiece sleeves (small, medium, large) </li> +<li> Three pairs soft flex earpiece sleeves (small, medium, large) </li> +<li> One pair triple-flange earpiece sleeves </li> +<li> Carrying case </li> +</ul> +Warranty<br /> Two-year limited <br />(For details, please visit <br />www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm.) <br /><br /> Mfr. Part No.: SE210-A-EFS <br /><br />Note: Products sold through this website that do not bear the Apple Brand name are serviced and supported exclusively by their manufacturers in accordance with terms and conditions packaged with the products. Apple's Limited Warranty does not apply to products that are not Apple-branded, even if packaged or sold with Apple products. Please contact the manufacturer directly for technical support and customer service.</div> + <p>Evolved from personal monitor technology road-tested by pro musicians and perfected by Shure engineers, the lightweight and stylish SE210 delivers full-range audio that's free from outside noise.</p> + ecouteurs-a-isolation-sonore-shure-se210-blanc + + + + Shure SE210 Sound-Isolating Earphones for iPod and iPhone + + + + diff --git a/install-new/fixtures/apple/langs/en/data/profile.xml b/install-new/fixtures/apple/langs/en/data/profile.xml index 017ff63fe..02aa4d76c 100644 --- a/install-new/fixtures/apple/langs/en/data/profile.xml +++ b/install-new/fixtures/apple/langs/en/data/profile.xml @@ -1,15 +1,15 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + Administrator + + + Logistician + + + Translator + + + Salesman + + diff --git a/install-new/fixtures/apple/langs/en/data/scene.xml b/install-new/fixtures/apple/langs/en/data/scene.xml index a42697b43..f7270d3ff 100644 --- a/install-new/fixtures/apple/langs/en/data/scene.xml +++ b/install-new/fixtures/apple/langs/en/data/scene.xml @@ -1,12 +1,12 @@ - + - - - - - - - - - - \ No newline at end of file + + The iPods Nano + + + The iPods + + + The MacBooks + + diff --git a/install-new/fixtures/apple/langs/en/data/supplier.xml b/install-new/fixtures/apple/langs/en/data/supplier.xml index 07f36aeb6..1c7900ea5 100644 --- a/install-new/fixtures/apple/langs/en/data/supplier.xml +++ b/install-new/fixtures/apple/langs/en/data/supplier.xml @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/install-new/fixtures/apple/langs/en/data/tag.xml b/install-new/fixtures/apple/langs/en/data/tag.xml index 38f6904b1..b781c0ed2 100644 --- a/install-new/fixtures/apple/langs/en/data/tag.xml +++ b/install-new/fixtures/apple/langs/en/data/tag.xml @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/install-new/fixtures/apple/langs/es/data/attribute.xml b/install-new/fixtures/apple/langs/es/data/attribute.xml index 8c2d16be6..a29b2935d 100644 --- a/install-new/fixtures/apple/langs/es/data/attribute.xml +++ b/install-new/fixtures/apple/langs/es/data/attribute.xml @@ -1,63 +1,63 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + 2Go + + + 4Go + + + Metal + + + Azul + + + Rosa + + + Verde + + + Naranja + + + SSD (solid-state drive) 64 Go + + + Disco duro PATA 80 Go 4 200 tr/min + + + Intel Core 2 Duo para 1,6 GHz + + + Intel Core 2 Duo para 1,8 GHz + + + 80 Go : 20 000 canciones + + + 160 Go : 40 000 canciones + + + Negro + + + 8Go + + + 16Go + + + 32Go + + + Violeta + + + Amarillo + + + Rojo + + diff --git a/install-new/fixtures/apple/langs/es/data/attribute_group.xml b/install-new/fixtures/apple/langs/es/data/attribute_group.xml index ef264772a..00a56f715 100644 --- a/install-new/fixtures/apple/langs/es/data/attribute_group.xml +++ b/install-new/fixtures/apple/langs/es/data/attribute_group.xml @@ -1,15 +1,15 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + Capacidad + Capacidad + + + Color + Color + + + ICU + Procesador + + diff --git a/install-new/fixtures/apple/langs/es/data/carrier.xml b/install-new/fixtures/apple/langs/es/data/carrier.xml index 6b914666c..53b97c5f1 100644 --- a/install-new/fixtures/apple/langs/es/data/carrier.xml +++ b/install-new/fixtures/apple/langs/es/data/carrier.xml @@ -1,6 +1,6 @@ - + - - - - \ No newline at end of file + + ¡Entrega día siguiente! + + diff --git a/install-new/fixtures/apple/langs/es/data/category.xml b/install-new/fixtures/apple/langs/es/data/category.xml index ab963d66a..36eda5e7d 100644 --- a/install-new/fixtures/apple/langs/es/data/category.xml +++ b/install-new/fixtures/apple/langs/es/data/category.xml @@ -1,27 +1,27 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + iPods + Es hora de que el mejor jugador de la música, al escenario para hacer un bis. Con el nuevo iPod, el mundo es tu escenario. + musica-ipods + + + + + + Accesorios + Todos los accesorios de moda para tu iPod + ipod-accesorios + + + + + + Portátiles + El último procesador Intel, un disco duro más grande, con profusión de memoria y otras novedades. Todo en sólo 2,59 cm libres de cualquier obstrucción. Las nuevas portátiles Mac cumplir rendimiento, potencia y conectividad de una computadora de escritorio. Sin la parte del escritorio. + portatiles-apple + Portátiles Apple + portátiles apple macbook air + portátiles apple poderoso y el diseño + + diff --git a/install-new/fixtures/apple/langs/es/data/feature.xml b/install-new/fixtures/apple/langs/es/data/feature.xml index 4f185108b..875e0e2ae 100644 --- a/install-new/fixtures/apple/langs/es/data/feature.xml +++ b/install-new/fixtures/apple/langs/es/data/feature.xml @@ -1,18 +1,18 @@ - + - - - - - - - - - - - - - - - - \ No newline at end of file + + Alto + + + Ancho + + + Profundo + + + Peso + + + Toma auriculares + + diff --git a/install-new/fixtures/apple/langs/es/data/feature_value.xml b/install-new/fixtures/apple/langs/es/data/feature_value.xml index ad4fff239..3eea91eee 100644 --- a/install-new/fixtures/apple/langs/es/data/feature_value.xml +++ b/install-new/fixtures/apple/langs/es/data/feature_value.xml @@ -1,45 +1,45 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + Jack stereo + + + Mini-jack stéréo + + + 69.8 mm + + + 52.3 mm + + + 49,2 g + + + 6,5 mm + + + 27.3 mm + + + 41.2 mm + + + 15.5 g + + + 10,5 mm (clip incluyendo) + + + 110 mm + + + 70 mm + + + 120g + + + 8 mm + + diff --git a/install-new/fixtures/apple/langs/es/data/image.xml b/install-new/fixtures/apple/langs/es/data/image.xml index 5a3a17132..cc54c253f 100644 --- a/install-new/fixtures/apple/langs/es/data/image.xml +++ b/install-new/fixtures/apple/langs/es/data/image.xml @@ -1,81 +1,81 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + macbook-air-1 + + + macbook-air-2 + + + macbook-air-3 + + + macbook-air-4 + + + macbook-air-5 + + + superdrive-pour-macbook-air-1 + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + housse-portefeuille-en-cuir + + + Auriculares aislantes del sonido Shure SE210 + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + diff --git a/install-new/fixtures/apple/langs/es/data/manufacturer.xml b/install-new/fixtures/apple/langs/es/data/manufacturer.xml index 621ff2471..07df270a1 100644 --- a/install-new/fixtures/apple/langs/es/data/manufacturer.xml +++ b/install-new/fixtures/apple/langs/es/data/manufacturer.xml @@ -1,10 +1,10 @@ - + - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/install-new/fixtures/apple/langs/es/data/order_message.xml b/install-new/fixtures/apple/langs/es/data/order_message.xml index a1a558c24..10e142fcf 100644 --- a/install-new/fixtures/apple/langs/es/data/order_message.xml +++ b/install-new/fixtures/apple/langs/es/data/order_message.xml @@ -1,13 +1,13 @@ - + - - - + Plazo + Hola, -Uno de los elementos de su solicitud se encuentra actualmente la reposición, el cual poco puede retrasar el envío. +Uno de los elementos de su solicitud se encuentra actualmente la reposición, el cual poco puede retrasar el envío. -Gracias por su comprensión. +Gracias por su comprensión. -Saludos cordiales,]]> - - \ No newline at end of file +Saludos cordiales, + + diff --git a/install-new/fixtures/apple/langs/es/data/product.xml b/install-new/fixtures/apple/langs/es/data/product.xml index ba7b98bcf..4c5b4c049 100644 --- a/install-new/fixtures/apple/langs/es/data/product.xml +++ b/install-new/fixtures/apple/langs/es/data/product.xml @@ -1,111 +1,111 @@ - + - - Curvas aerodinámicas.

    -

    Para los aficionados a las sensaciones fuertes, os presentamos nueve nuevos colores. ¡ Y eso no es todo ! Experimenta el diseño elíptico de aluminio y vidrio. ¡ No querrás separarte de él nunca más !

    -


    Estético e inteligente.

    -

    La nueva aplicación Genius hace de iPod nano tu discjockey personal. Genuis crea listas de lectura buscando en tu biblioteca las canciones que combinan entre si.

    -


    Hecho para moverse contigo.
    iPod nano está equipado de un acelerómetro. Muévelo para mezclar tu música. Voltéalo para mostrar Cover Flow. Y descubre juegos adaptados a tus movimientos.

    ]]>     - Nuevo diseño. Nuevas aplicaciones. Ahora disponible en 8 y 16 Go. iPod nano, más rock que nunca.

    ]]>     - - - - - - - -     - - Un enlace inmediato.

    Lleva hasta 500 canciones colgadas de tu manga, de tu cinturón o de tu pantalón. Presume con tu iPod shuffle como signo exterior de tu pasión por la música. Ahora ya existen cuatro nuevos colores más llamativos.

    Llena tu iPod shuffle.

    iTunes es una enorme tienda dedicada a la diversión, una colección de música organizada perfectamente y un jukebox. Con tan solo un clic puedes llenar tu iPod shuffle con canciones.

    La música en tecnicolor.

    iPod shuffle presenta nuevos colores vivos que realzan su diseño estilizado en aluminio anodizado. Elige entre azul, verde, rosa, rojo y el plateado de origen.

    ]]>     - iPod shuffle, el walkman más portátil del mundo, ahora en azul, verde, rosa y rojo.

    ]]>     - - - - - - - -     - - MacBook Air es casi tan fino como tu dedo. Se ha simplificado al máximo y a pesar de ello dispone de una pantalla panorámica de 13,3 pulgadas, de un teclado completo y de un amplio trackpad multi-touch. Portátil al 100%, te evitará tener que hacer un compromiso en lo que concierne a la pantalla y al teclado.

    La increíble sutileza de MacBook Air es el resultado de un gran número de innovaciones en materia de reducción de tamaño y peso. Desde un disco duro más fino hasta puertos E/S disimulados hábilmente pasando por una batería más plana, cada detalle se consideró para que el resultado fuera lo más fino posible.

    MacBook Air fue creado y elaborado para disfrutar plenamente del mundo inalámbrico. Un mundo en el que la norma Wi-Fi 802.11n es tan rápida y accesible que permite liberarse completamente de cualquier atadura para comprar videos en línea, descargar programas, almacenar y compartir archivos en la Red.

    ]]>     - MacBook Air es ultra fino, ultra portátil y ultra diferente de todo el resto. Pero no se pierden kilos y centímetros en tan solo una noche. Todo esto es el resultado de un nuevo invento de normas. De un sinfín de novedades sin cable. Y de una revolución en el diseño. Con MacBook Air, la informática móvil adquiere una nueva dimensión.

    ]]>     - - - - - - - -     - - Cada MacBook está equipado de un disco duro más espacioso, de una capacidad de hasta 250 Go, para almacenar tus colecciones multimedia en expansión y tus datos más preciados.
    El modelo MacBook de 2,4 GHz integra 2 Go de memoria en estándar. Lo ideal para realizar sin dificultad tus aplicaciones preferidas.

    ]]>     - MacBook te ofrece una gran libertad de movimientos gracias a su exterior resistente en policarbonato, a su tecnología sin cable y a su adaptador cargador sector innovador que se desconecta automáticamente si alguien se engancha en el cable.

    ]]>     - - - - - - - -     - - Cinco nuevas aplicaciones a mano

    -


    Consulta tu correo en formato HTML enriquecido, con fotos y ficheros adjuntos en formato PDF, Word y Excel. Consigue mapas, itinerarios e información sobre el estado de la carreteras en tiempo real. Escribe notas y consulta la bolsa y el tiempo.
    Alcanza con un dedo tu música y tus videos, entre otras cosas.
    La tecnología multi-touch revolucionaria integrada a la magnífica pantalla de 3,5 pulgadas te permitirá efectuar zoom hacia adelante y hacia atrás, y pasar y ojear las páginas solo con la ayuda de tus dedos.

    -

    Internet en tu bolsillo

    -

    Con el navegador Safari, podrás consultar sitios web en su compaginación de origen y efectuar un zoom hacia adelante y hacia atrás con la simple presión de un dedo en la pantalla.

    -

    Contenido del estuche
    * iPod touch
    * Auriculares
    * Cable USB 2.0
    * Adaptador Dock
    * Paño de limpieza
    * Base
    * Guía de inicio rápido
    Título
    Párrafo

    ]]>     - Interfaz multi-touch revolucionaria
    Pantalla panorámica color de 3,5 pulgadas
    Wi-Fi (802.11b/g)
    8 mm de espesor
    Safari, YouTube, iTunes Wi-Fi Music Store, Correo, Mapas, Bolsa, El tiempo, Notas

    ]]>     - - - - - - - -     - - Características

    -
      -
    • Cuero suave resistente
      • -
    • Acceso a la tecla Hold
      • -
    • Cierre magnético
      • -
    • Acceso al Dock Conector
      • -
    • Salva pantallas
      • -
    ]]>     - Este estuche de cuero de última moda garantiza una completa protección contra los arañazos y los pequeños contratiempos de la vida diaria. Su diseño elegante y compacto te permite meter tu Ipod directamente en tu bolsillo o en tu bolso.

    ]]>     - - - - - - - -     - - Los auriculares SE210, ligeros y elegantes, están basados en la tecnología de los monitores personales que los músicos profesionales utilizan en carretera y que los ingenieros de Shure han perfeccionado. También están provistos de una salida audio de gama extendida exenta de todo ruido exterior.

    Creado para un aislamiento sonoro

    -

    Las almohadillas provistas de un aislamiento sonoro bloquean más del 90% del ruido ambiente. Combinadas con un diseño ergonómico atractivo y un cable modular, minimizan las intrusiones del mundo exterior y te permiten concentrarte en tu música. Creados para los apasionados por la música que quieren que su aparato audio móvil evolucione, los auriculares SE210 te permitirán llevar la tecnología allí donde tú vayas.

    Micro-transductor alta definición
    Desarrollados para poder tener una audición de calidad durante los desplazamientos, los auriculares SE210 utilizan un único transductor con un armazón equilibrado para poder disfrutar de una gama audio extendida. ¿El resultado ? Un confort audio increíble que restituye cada detalle de un espectáculo en directo.

    El kit universal Deluxe incluye los siguientes elementos :
    - Almohadillas para aislamiento sonoro
    Las almohadillas para el aislamiento sonoro tienen una doble función : bloquear el ruido ambiente y garantizar una estabilidad y un confort personalizados. Como cada oreja es diferente el kit universal Deluxe incluye tres tallas (S, M, L) de almohadillas de espuma y flexibles. Elige la talla y el estilo de almohadilla que mejor te convenga : un buen aislamiento es un factor clave tanto para optimizar el aislamiento sonoro y la respuesta de los bajos como para aumentar el confort durante una audición prolongada.

    - Cable modular

    -

    Basándose en los comentarios de los numerosos usuarios, los ingenieros de Shure han creado una solución de cable separable para permitir un grado de personalización sin precedentes. El cable de 1 metro te permite adaptar el confort en función de la actividad del momento y de la aplicación.

    - Estuche para el transporte

    -

    Además de las almohadillas de aislamiento sonoro y del cable modular, los auriculares SE210 están provistos de un estuche de transporte compacto y resistente para guardar los auriculares de manera práctica y sin dificultad.
    - Garantía límite de dos años
    Cada solución SE210 tiene una garantía piezas y mano de obra de dos años.

    -


    Características técnicas

    -
      -
    • Tipo de transductor : micro-transductor alta definición
      • -
    • Sensibilidad (1 mW) : presión acústica de 114 dB/mW
      • -
    • Impedancia : (à 1 kHz) : 26 W
      • -
    • Gama de frecuencias : 25 Hz ˆ 18,5 kHz
      • -
    • Longitud del cable / con alargador : 45 cm / 136 cm
      • -
    -


    Contenido de la caja

    -
      -
    • Altavoces Shure SE210
      • -
    • Kit universal Deluxe (almohadillas de aislamiento sonoro, cable modular, estuche de transporte)
      • -
    ]]>     - Los auriculares con aislamiento ergonómicos y ligeros ofrecen la reproducción más fiel proveniente de fuentes audio estéreo móviles o de salón.

    ]]>     - - - - - - - -     -     \ No newline at end of file + + <p><strong>Curvas aerodinámicas.</strong></p> +<p>Para los aficionados a las sensaciones fuertes, os presentamos nueve nuevos colores. ¡ Y eso no es todo ! Experimenta el diseño elíptico de aluminio y vidrio. ¡ No querrás separarte de él nunca más !</p> +<p><strong><br /> Estético e inteligente.</strong></p> +<p>La nueva aplicación Genius hace de iPod nano tu discjockey personal. Genuis crea listas de lectura buscando en tu biblioteca las canciones que combinan entre si.</p> +<p><strong><br /> Hecho para moverse contigo.</strong><br /> iPod nano está equipado de un acelerómetro. Muévelo para mezclar tu música. Voltéalo para mostrar Cover Flow. Y descubre juegos adaptados a tus movimientos.</p> + <p>Nuevo diseño. Nuevas aplicaciones. Ahora disponible en 8 y 16 Go. iPod nano, más rock que nunca.</p> + ipod-nano + + + + iPod Nano + Disponible + + + + <p><strong>Un enlace inmediato.</strong><br /> <br /> Lleva hasta 500 canciones colgadas de tu manga, de tu cinturón o de tu pantalón. Presume con tu iPod shuffle como signo exterior de tu pasión por la música. Ahora ya existen cuatro nuevos colores más llamativos. <br /> <br /> <strong>Llena tu iPod shuffle.</strong><br /> <br /> iTunes es una enorme tienda dedicada a la diversión, una colección de música organizada perfectamente y un jukebox. Con tan solo un clic puedes llenar tu iPod shuffle con canciones. <br /> <br /> <strong>La música en tecnicolor. </strong><br /> <br /> iPod shuffle presenta nuevos colores vivos que realzan su diseño estilizado en aluminio anodizado. Elige entre azul, verde, rosa, rojo y el plateado de origen.</p> + <p>iPod shuffle, el walkman más portátil del mundo, ahora en azul, verde, rosa y rojo.</p> + ipod-shuffle + + + + iPod shuffle + Disponible + + + + <p>MacBook Air es casi tan fino como tu dedo. Se ha simplificado al máximo y a pesar de ello dispone de una pantalla panorámica de 13,3 pulgadas, de un teclado completo y de un amplio trackpad multi-touch. Portátil al 100%, te evitará tener que hacer un compromiso en lo que concierne a la pantalla y al teclado. <br /> <br /> La increíble sutileza de MacBook Air es el resultado de un gran número de innovaciones en materia de reducción de tamaño y peso. Desde un disco duro más fino hasta puertos E/S disimulados hábilmente pasando por una batería más plana, cada detalle se consideró para que el resultado fuera lo más fino posible.<br /> <br /> MacBook Air fue creado y elaborado para disfrutar plenamente del mundo inalámbrico. Un mundo en el que la norma Wi-Fi 802.11n es tan rápida y accesible que permite liberarse completamente de cualquier atadura para comprar videos en línea, descargar programas, almacenar y compartir archivos en la Red.</p> + <p>MacBook Air es ultra fino, ultra portátil y ultra diferente de todo el resto. Pero no se pierden kilos y centímetros en tan solo una noche. Todo esto es el resultado de un nuevo invento de normas. De un sinfín de novedades sin cable. Y de una revolución en el diseño. Con MacBook Air, la informática móvil adquiere una nueva dimensión.</p> + macbook-air + + + + MacBook Air + Disponible + + + + <p>Cada MacBook está equipado de un disco duro más espacioso, de una capacidad de hasta 250 Go, para almacenar tus colecciones multimedia en expansión y tus datos más preciados. <br /> El modelo MacBook de 2,4 GHz integra 2 Go de memoria en estándar. Lo ideal para realizar sin dificultad tus aplicaciones preferidas.</p> + <p>MacBook te ofrece una gran libertad de movimientos gracias a su exterior resistente en policarbonato, a su tecnología sin cable y a su adaptador cargador sector innovador que se desconecta automáticamente si alguien se engancha en el cable.</p> + macbook + + + + MacBook + Disponible + + + + <p>Cinco nuevas aplicaciones a mano</p> +<p><br /> Consulta tu correo en formato HTML enriquecido, con fotos y ficheros adjuntos en formato PDF, Word y Excel. Consigue mapas, itinerarios e información sobre el estado de la carreteras en tiempo real. Escribe notas y consulta la bolsa y el tiempo. <br /> Alcanza con un dedo tu música y tus videos, entre otras cosas. <br /> La tecnología multi-touch revolucionaria integrada a la magnífica pantalla de 3,5 pulgadas te permitirá efectuar zoom hacia adelante y hacia atrás, y pasar y ojear las páginas solo con la ayuda de tus dedos.</p> +<p>Internet en tu bolsillo</p> +<p>Con el navegador Safari, podrás consultar sitios web en su compaginación de origen y efectuar un zoom hacia adelante y hacia atrás con la simple presión de un dedo en la pantalla.</p> +<p>Contenido del estuche<br /> * iPod touch<br /> * Auriculares<br /> * Cable USB 2.0<br /> * Adaptador Dock<br /> * Paño de limpieza<br /> * Base<br /> * Guía de inicio rápido<br /> Título<br /> Párrafo</p> + <p>Interfaz multi-touch revolucionaria<br /> Pantalla panorámica color de 3,5 pulgadas<br /> Wi-Fi (802.11b/g)<br /> 8 mm de espesor<br /> Safari, YouTube, iTunes Wi-Fi Music Store, Correo, Mapas, Bolsa, El tiempo, Notas</p> + ipod-touch + + + + iPod touch + Disponible + + + + <p><strong>Características</strong></p> +<ul> +<li> Cuero suave resistente</li> +<li>Acceso a la tecla Hold</li> +<li>Cierre magnético</li> +<li>Acceso al Dock Conector</li> +<li>Salva pantallas</li> +</ul> + <p>Este estuche de cuero de última moda garantiza una completa protección contra los arañazos y los pequeños contratiempos de la vida diaria. Su diseño elegante y compacto te permite meter tu Ipod directamente en tu bolsillo o en tu bolso.</p> + funda-cuero-ipod-nano-negro-chocolate + + + + Leather Case (iPod nano) - Negro / Chocolate + Disponible + + + + <p>Los auriculares SE210, ligeros y elegantes, están basados en la tecnología de los monitores personales que los músicos profesionales utilizan en carretera y que los ingenieros de Shure han perfeccionado. También están provistos de una salida audio de gama extendida exenta de todo ruido exterior. <br /> <br /> <strong>Creado para un aislamiento sonoro</strong></p> +<p>Las almohadillas provistas de un aislamiento sonoro bloquean más del 90% del ruido ambiente. Combinadas con un diseño ergonómico atractivo y un cable modular, minimizan las intrusiones del mundo exterior y te permiten concentrarte en tu música. Creados para los apasionados por la música que quieren que su aparato audio móvil evolucione, los auriculares SE210 te permitirán llevar la tecnología allí donde tú vayas. <br /> <br /> <strong>Micro-transductor alta definición </strong><br /> Desarrollados para poder tener una audición de calidad durante los desplazamientos, los auriculares SE210 utilizan un único transductor con un armazón equilibrado para poder disfrutar de una gama audio extendida. ¿El resultado ? Un confort audio increíble que restituye cada detalle de un espectáculo en directo. <br /> <br /> <strong>El kit universal Deluxe incluye los siguientes elementos :</strong><br /> - Almohadillas para aislamiento sonoro<br /> Las almohadillas para el aislamiento sonoro tienen una doble función : bloquear el ruido ambiente y garantizar una estabilidad y un confort personalizados. Como cada oreja es diferente el kit universal Deluxe incluye tres tallas (S, M, L) de almohadillas de espuma y flexibles. Elige la talla y el estilo de almohadilla que mejor te convenga : un buen aislamiento es un factor clave tanto para optimizar el aislamiento sonoro y la respuesta de los bajos como para aumentar el confort durante una audición prolongada. <br /> <br /> - Cable modular</p> +<p>Basándose en los comentarios de los numerosos usuarios, los ingenieros de Shure han creado una solución de cable separable para permitir un grado de personalización sin precedentes. El cable de 1 metro te permite adaptar el confort en función de la actividad del momento y de la aplicación. <br /> <br /> - Estuche para el transporte</p> +<p>Además de las almohadillas de aislamiento sonoro y del cable modular, los auriculares SE210 están provistos de un estuche de transporte compacto y resistente para guardar los auriculares de manera práctica y sin dificultad. <br /> - Garantía límite de dos años <br /> Cada solución SE210 tiene una garantía piezas y mano de obra de dos años.</p> +<p><br /> <em><strong>Características técnicas</strong></em></p> +<ul> +<li>Tipo de transductor : micro-transductor alta definición</li> +<li>Sensibilidad (1 mW) : presión acústica de 114 dB/mW</li> +<li>Impedancia : (à 1 kHz) : 26 W</li> +<li>Gama de frecuencias : 25 Hz ˆ 18,5 kHz</li> +<li>Longitud del cable / con alargador : 45 cm / 136 cm</li> +</ul> +<p><br /> <strong><em>Contenido de la caja</em></strong></p> +<ul> +<li>Altavoces Shure SE210</li> +<li>Kit universal Deluxe (almohadillas de aislamiento sonoro, cable modular, estuche de transporte)</li> +</ul> + <p>Los auriculares con aislamiento ergonómicos y ligeros ofrecen la reproducción más fiel proveniente de fuentes audio estéreo móviles o de salón.</p> + auriculares-aislantes-del-sonido-shure-se210 + + + + Auriculares aislantes del sonido Shure SE210 + Disponible + + + diff --git a/install-new/fixtures/apple/langs/es/data/profile.xml b/install-new/fixtures/apple/langs/es/data/profile.xml index 2c2a082e7..9ebcbf405 100644 --- a/install-new/fixtures/apple/langs/es/data/profile.xml +++ b/install-new/fixtures/apple/langs/es/data/profile.xml @@ -1,15 +1,15 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + Administrador + + + Logistician + + + Translator + + + Salesman + + diff --git a/install-new/fixtures/apple/langs/es/data/scene.xml b/install-new/fixtures/apple/langs/es/data/scene.xml index e392878f7..cd7a5fc92 100644 --- a/install-new/fixtures/apple/langs/es/data/scene.xml +++ b/install-new/fixtures/apple/langs/es/data/scene.xml @@ -1,12 +1,12 @@ - + - - - - - - - - - - \ No newline at end of file + + El iPod Nano + + + El iPod + + + El MacBook + + diff --git a/install-new/fixtures/apple/langs/es/data/supplier.xml b/install-new/fixtures/apple/langs/es/data/supplier.xml index 07f36aeb6..1c7900ea5 100644 --- a/install-new/fixtures/apple/langs/es/data/supplier.xml +++ b/install-new/fixtures/apple/langs/es/data/supplier.xml @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/install-new/fixtures/apple/langs/es/data/tag.xml b/install-new/fixtures/apple/langs/es/data/tag.xml index 9d6294e02..a77f6541a 100644 --- a/install-new/fixtures/apple/langs/es/data/tag.xml +++ b/install-new/fixtures/apple/langs/es/data/tag.xml @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/install-new/fixtures/apple/langs/fr/data/attribute.xml b/install-new/fixtures/apple/langs/fr/data/attribute.xml index 9a3dd9060..028533c94 100644 --- a/install-new/fixtures/apple/langs/fr/data/attribute.xml +++ b/install-new/fixtures/apple/langs/fr/data/attribute.xml @@ -1,63 +1,63 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + 2Go + + + 4Go + + + Metal + + + Bleu + + + Rose + + + Vert + + + Orange + + + Disque dur SSD (solid-state drive) de 64 Go + + + Disque dur PATA de 80 Go à 4 200 tr/min + + + Intel Core 2 Duo à 1,6 GHz + + + Intel Core 2 Duo à 1,8 GHz + + + 80 Go : 20 000 chansons + + + 160 Go : 40 000 chansons + + + Noir + + + 8Go + + + 16Go + + + 32Go + + + Violet + + + Jaune + + + Rouge + + diff --git a/install-new/fixtures/apple/langs/fr/data/attribute_group.xml b/install-new/fixtures/apple/langs/fr/data/attribute_group.xml index eda19821a..05b3bf254 100644 --- a/install-new/fixtures/apple/langs/fr/data/attribute_group.xml +++ b/install-new/fixtures/apple/langs/fr/data/attribute_group.xml @@ -1,15 +1,15 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + Capacité + Capacité + + + Couleur + Couleur + + + ICU + Processeur + + diff --git a/install-new/fixtures/apple/langs/fr/data/carrier.xml b/install-new/fixtures/apple/langs/fr/data/carrier.xml index b8612d40a..80c980459 100644 --- a/install-new/fixtures/apple/langs/fr/data/carrier.xml +++ b/install-new/fixtures/apple/langs/fr/data/carrier.xml @@ -1,6 +1,6 @@ - + - - - - \ No newline at end of file + + Livraison le lendemain ! + + diff --git a/install-new/fixtures/apple/langs/fr/data/category.xml b/install-new/fixtures/apple/langs/fr/data/category.xml index 5198da1b2..3dc131c24 100644 --- a/install-new/fixtures/apple/langs/fr/data/category.xml +++ b/install-new/fixtures/apple/langs/fr/data/category.xml @@ -1,27 +1,27 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + iPods + Il est temps, pour le meilleur lecteur de musique, de remonter sur scène pour un rappel. Avec le nouvel iPod, le monde est votre scène. + musique-ipods + + + + + + Accessoires + Tous les accessoires à la mode pour votre iPod + accessoires-ipod + + + + + + Portables + Le tout dernier processeur Intel, un disque dur plus spacieux, de la mémoire à profusion et d'autres nouveautés. Le tout, dans à peine 2,59 cm qui vous libèrent de toute entrave. Les nouveaux portables Mac réunissent les performances, la puissance et la connectivité d'un ordinateur de bureau. Sans la partie bureau. + portables-apple + Portables Apple + portables apple macbook air + portables apple puissants et design + + diff --git a/install-new/fixtures/apple/langs/fr/data/feature.xml b/install-new/fixtures/apple/langs/fr/data/feature.xml index d3f81071e..f35f778f4 100644 --- a/install-new/fixtures/apple/langs/fr/data/feature.xml +++ b/install-new/fixtures/apple/langs/fr/data/feature.xml @@ -1,18 +1,18 @@ - + - - - - - - - - - - - - - - - - \ No newline at end of file + + Hauteur + + + Largeur + + + Profondeur + + + Poids + + + Prise casque + + diff --git a/install-new/fixtures/apple/langs/fr/data/feature_value.xml b/install-new/fixtures/apple/langs/fr/data/feature_value.xml index 2f7043dad..05f8d3017 100644 --- a/install-new/fixtures/apple/langs/fr/data/feature_value.xml +++ b/install-new/fixtures/apple/langs/fr/data/feature_value.xml @@ -1,45 +1,45 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + Jack stéréo + + + Mini-jack stéréo + + + 69,8 mm + + + 52,3 mm + + + 49,2 g + + + 6,5 mm + + + 27,3 mm + + + 41,2 mm + + + 15,5 g + + + 10,5 mm (clip compris) + + + 110 mm + + + 70 mm + + + 120g + + + 8 mm + + diff --git a/install-new/fixtures/apple/langs/fr/data/image.xml b/install-new/fixtures/apple/langs/fr/data/image.xml index 24d096650..56837c5c8 100644 --- a/install-new/fixtures/apple/langs/fr/data/image.xml +++ b/install-new/fixtures/apple/langs/fr/data/image.xml @@ -1,81 +1,81 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + macbook-air-1 + + + macbook-air-2 + + + macbook-air-3 + + + macbook-air-4 + + + macbook-air-5 + + + superdrive-pour-macbook-air-1 + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + housse-portefeuille-en-cuir-ipod-nano + + + Écouteurs à isolation sonore Shure SE210 + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + diff --git a/install-new/fixtures/apple/langs/fr/data/manufacturer.xml b/install-new/fixtures/apple/langs/fr/data/manufacturer.xml index 621ff2471..07df270a1 100644 --- a/install-new/fixtures/apple/langs/fr/data/manufacturer.xml +++ b/install-new/fixtures/apple/langs/fr/data/manufacturer.xml @@ -1,10 +1,10 @@ - + - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/install-new/fixtures/apple/langs/fr/data/order_message.xml b/install-new/fixtures/apple/langs/fr/data/order_message.xml index 1e620210f..c66b94a16 100644 --- a/install-new/fixtures/apple/langs/fr/data/order_message.xml +++ b/install-new/fixtures/apple/langs/fr/data/order_message.xml @@ -1,13 +1,13 @@ - + - - - + Délai + Bonjour, -Un des éléments de votre commande est actuellement en réapprovisionnement, ce qui peut légèrement retarder son envoi. +Un des éléments de votre commande est actuellement en réapprovisionnement, ce qui peut légèrement retarder son envoi. -Merci de votre compréhension. +Merci de votre compréhension. -Cordialement,]]> - - \ No newline at end of file +Cordialement, + + diff --git a/install-new/fixtures/apple/langs/fr/data/product.xml b/install-new/fixtures/apple/langs/fr/data/product.xml index 478c581cd..95dc6ee38 100644 --- a/install-new/fixtures/apple/langs/fr/data/product.xml +++ b/install-new/fixtures/apple/langs/fr/data/product.xml @@ -1,164 +1,164 @@ - + - - Des courbes avantageuses.

    -

    Pour les amateurs de sensations, voici neuf nouveaux coloris. Et ce n'est pas tout ! Faites l'expérience du design elliptique en aluminum et verre. Vous ne voudrez plus le lâcher.

    -

    Beau et intelligent.

    -

    La nouvelle fonctionnalité Genius fait d'iPod nano votre DJ personnel. Genius crée des listes de lecture en recherchant dans votre bibliothèque les chansons qui vont bien ensemble.

    -

    Fait pour bouger avec vous.

    -

    iPod nano est équipé de l'accéléromètre. Secouez-le pour mélanger votre musique. Basculez-le pour afficher Cover Flow. Et découvrez des jeux adaptés à vos mouvements.

    ]]>     - Nouveau design. Nouvelles fonctionnalités. Désormais en 8 et 16 Go. iPod nano, plus rock que jamais.

    ]]>     - - - - - - - -     - - Un lien immédiat.

    -

    Portez jusqu'à 500 chansons accrochées à votre manche, à votre ceinture ou à votre short. Arborez votre iPod shuffle comme signe extérieur de votre passion pour la musique. Existe désormais en quatre nouveaux coloris encore plus éclatants.

    -

    Emplissez votre iPod shuffle.

    -

    iTunes est un immense magasin dédié au divertissement, une collection musicale parfaitement organisée et un jukebox. Vous pouvez en un seul clic remplir votre iPod shuffle de chansons.

    -

    La musique en technicolor.

    -

    iPod shuffle s'affiche désormais dans de nouveaux coloris intenses qui rehaussent le design épuré du boîtier en aluminium anodisé. Choisissez parmi le bleu, le vert, le rose, le rouge et l'argenté d'origine.

    ]]>     - iPod shuffle, le baladeur le plus portable du monde, se clippe maintenant en bleu, vert, rose et rouge.

    ]]>     - - - - - - - -     - - MacBook Air est presque aussi fin que votre index. Pratiquement tout ce qui pouvait être simplifié l'a été. Il n'en dispose pas moins d'un écran panoramique de 13,3 pouces, d'un clavier complet et d'un vaste trackpad multi-touch. Incomparablement portable il vous évite les compromis habituels en matière d'écran et de clavier ultra-portables.

    L'incroyable finesse de MacBook Air est le résultat d'un grand nombre d'innovations en termes de réduction de la taille et du poids. D'un disque dur plus fin à des ports d'E/S habilement dissimulés en passant par une batterie plus plate, chaque détail a été considéré et reconsidéré avec la finesse à l'esprit.

    MacBook Air a été conçu et élaboré pour profiter pleinement du monde sans fil. Un monde dans lequel la norme Wi-Fi 802.11n est désormais si rapide et si accessible qu'elle permet véritablement de se libérer de toute attache pour acheter des vidéos en ligne, télécharger des logicééééiels, stocker et partager des fichiers sur le Web.

    ]]>     - - - - - - - - -     - -
    Le modèle MacBook à 2,4 GHz intègre désormais 2 Go de mémoire en standard. L'idéal pour exécuter en souplesse vos applications préférées.]]>     - - - - - - - - -     - - Titre 1 -

    Titre 2

    -

    Titre 3

    -

    Titre 4

    -
    Titre 5
    -
    Titre 6
    -
      -
    • UL
      • -
    • UL
      • -
    • UL
      • -
    • UL
      • -
    -
      -
    1. OL
      2. -
    2. OL
      3. -
    3. OL
      4. -
    4. OL
      5. -
    -

    paragraphe...

    -

    paragraphe...

    -

    paragraphe...

    - - - - - - - - - - - - - - - - - - -
    th th th
    tdtdtd
    tdtdtd
    -

    Cinq nouvelles applications sous la main

    -

    Consultez vos e-mails au format HTML enrichi, avec photos et pieces jointes au format PDF, Word et Excel. Obtenez des cartes, des itinéraires et des informations sur l'état de la circulation en temps réel. Rédigez des notes et consultez les cours de la Bourse et les bulletins météo.

    -

    Touchez du doigt votre musique et vos vidéos. Entre autres.

    -

    La technologie multi-touch révolutionnaire intégrée au superbe écran de 3,5 pouces vous permet d'effectuer des zooms avant et arrière, de faire défiler et de feuilleter des pages à l'aide de vos seuls doigts.

    -

    Internet dans votre poche

    -

    Avec le navigateur Safari, vous pouvez consulter des sites web dans leur mise en page d'origine et effectuer un zoom avant et arrière d'une simple pression sur l'écran.

    -

    Contenu du coffret

    -
      -
    • iPod touch
      • -
    • Écouteurs
      • -
    • Câble USB 2.0
      • -
    • Adaptateur Dock
      • -
    • Chiffon de nettoyage
      • -
    • Support
      • -
    • Guide de démarrage rapide
      • -
    -

     

    ]]>     - Interface multi-touch révolutionnaire
    Écran panoramique couleur de 3,5 pouces
    Wi-Fi (802.11b/g)
    8 mm d'épaisseur
    Safari, YouTube, iTunes Wi-Fi Music Store, Courrier, Cartes, Bourse, Météo, Notes

    ]]>     - - - - - - - -     - - Caractéristiques

    -
  • Cuir doux résistant
    • -
  • Accès au bouton Hold
    • -
  • Fermeture magnétique
    • -
  • Accès au Dock Connector
    • -
  • Protège-écran
    • ]]>     - Cet étui en cuir tendance assure une protection complète contre les éraflures et les petits aléas de la vie quotidienne. Sa conception élégante et compacte vous permet de glisser votre iPod directement dans votre poche ou votre sac à main.

    ]]>     - - - - - - - -     - - Basés sur la technologie des moniteurs personnels testée sur la route par des musiciens professionnels et perfectionnée par les ingénieurs Shure, les écouteurs SE210, légers et élégants, fournissent une sortie audio à gamme étendue exempte de tout bruit externe.


    Conception à isolation sonore
    Les embouts à isolation sonore fournis bloquent plus de 90 % du bruit ambiant. Combinés à un design ergonomique séduisant et un câble modulaire, ils minimisent les intrusions du monde extérieur, vous permettant de vous concentrer sur votre musique. Conçus pour les amoureux de la musique qui souhaitent faire évoluer leur appareil audio portable, les écouteurs SE210 vous permettent d'emmener la performance avec vous.

    Micro-transducteur haute définition
    Développés pour une écoute de qualité supérieure en déplacement, les écouteurs SE210 utilisent un seul transducteur à armature équilibrée pour bénéficier d'une gamme audio étendue. Le résultat ? Un confort d'écoute époustouflant qui restitue tous les détails d'un spectacle live.

    -

    Le kit universel Deluxe comprend les éléments suivants :
    - Embouts à isolation sonore
    Les embouts à isolation sonore inclus ont un double rôle : bloquer les bruits ambiants et garantir un maintien et un confort personnalisés. Comme chaque oreille est différente, le kit universel Deluxe comprend trois tailles (S, M, L) d'embouts mousse et flexibles. Choisissez la taille et le style d'embout qui vous conviennent le mieux : une bonne étanchéité est un facteur clé pour optimiser l'isolation sonore et la réponse des basses, ainsi que pour accroître le confort en écoute prolongée.

    - Câble modulaire
    En se basant sur les commentaires de nombreux utilisateurs, les ingénieurs de Shure ont développé une solution de câble détachable pour permettre un degré de personnalisation sans précédent. Le câble de 1 mètre fourni vous permet d'adapter votre confort en fonction de l'activité et de l'application.

    - Étui de transport
    Outre les embouts à isolation sonore et le câble modulaire, un étui de transport compact et résistant est fourni avec les écouteurs SE210 pour vous permettre de ranger vos écouteurs de manière pratique et sans encombres.

    - Garantie limitée de deux ans
    Chaque solution SE210 achetée est couverte par une garantie pièces et main-d'œuvre de deux ans.

    Caractéristiques techniques

    -
      -
    • Type de transducteur : micro-transducteur haute définition
      • -
    • Sensibilité (1 mW) : pression acoustique de 114 dB/mW
      • -
    • Impédance (à 1 kHz) : 26 W
      • -
    • Gamme de fréquences : 25 Hz – 18,5 kHz
      • -
    • Longueur de câble / avec rallonge : 45 cm / 136 cm
      • -
    -

    Contenu du coffret

    -
      -
    • Écouteurs Shure SE210
      • -
    • Kit universel Deluxe (embouts à isolation sonore, câble modulaire, étui de transport)
      • -
    ]]>     - Les écouteurs à isolation sonore ergonomiques et légers offrent la reproduction audio la plus fidèle en provenance de sources audio stéréo portables ou de salon.

    ]]>     - - - - - - - -     -     \ No newline at end of file + + <p><span style="font-size: small;"><strong>Des courbes avantageuses.</strong></span></p> +<p>Pour les amateurs de sensations, voici neuf nouveaux coloris. Et ce n'est pas tout ! Faites l'expérience du design elliptique en aluminum et verre. Vous ne voudrez plus le lâcher.</p> +<p><strong><span style="font-size: small;">Beau et intelligent.</span></strong></p> +<p>La nouvelle fonctionnalité Genius fait d'iPod nano votre DJ personnel. Genius crée des listes de lecture en recherchant dans votre bibliothèque les chansons qui vont bien ensemble.</p> +<p><strong><span style="font-size: small;">Fait pour bouger avec vous.</span></strong></p> +<p>iPod nano est équipé de l'accéléromètre. Secouez-le pour mélanger votre musique. Basculez-le pour afficher Cover Flow. Et découvrez des jeux adaptés à vos mouvements.</p> + <p>Nouveau design. Nouvelles fonctionnalités. Désormais en 8 et 16 Go. iPod nano, plus rock que jamais.</p> + ipod-nano + + + + iPod Nano + En stock + + + + <p><span style="font-size: small;"><strong>Un lien immédiat.</strong></span></p> +<p>Portez jusqu'à 500 chansons accrochées à votre manche, à votre ceinture ou à votre short. Arborez votre iPod shuffle comme signe extérieur de votre passion pour la musique. Existe désormais en quatre nouveaux coloris encore plus éclatants.</p> +<p><span style="font-size: small;"><strong>Emplissez votre iPod shuffle.</strong></span></p> +<p>iTunes est un immense magasin dédié au divertissement, une collection musicale parfaitement organisée et un jukebox. Vous pouvez en un seul clic remplir votre iPod shuffle de chansons.</p> +<p><strong><span style="font-size: small;">La musique en technicolor.</span></strong></p> +<p>iPod shuffle s'affiche désormais dans de nouveaux coloris intenses qui rehaussent le design épuré du boîtier en aluminium anodisé. Choisissez parmi le bleu, le vert, le rose, le rouge et l'argenté d'origine.</p> + <p>iPod shuffle, le baladeur le plus portable du monde, se clippe maintenant en bleu, vert, rose et rouge.</p> + ipod-shuffle + + + + iPod shuffle + En stock + + + + <p>MacBook Air est presque aussi fin que votre index. Pratiquement tout ce qui pouvait être simplifié l'a été. Il n'en dispose pas moins d'un écran panoramique de 13,3 pouces, d'un clavier complet et d'un vaste trackpad multi-touch. Incomparablement portable il vous évite les compromis habituels en matière d'écran et de clavier ultra-portables.</p><p>L'incroyable finesse de MacBook Air est le résultat d'un grand nombre d'innovations en termes de réduction de la taille et du poids. D'un disque dur plus fin à des ports d'E/S habilement dissimulés en passant par une batterie plus plate, chaque détail a été considéré et reconsidéré avec la finesse à l'esprit.</p><p>MacBook Air a été conçu et élaboré pour profiter pleinement du monde sans fil. Un monde dans lequel la norme Wi-Fi 802.11n est désormais si rapide et si accessible qu'elle permet véritablement de se libérer de toute attache pour acheter des vidéos en ligne, télécharger des logicééééiels, stocker et partager des fichiers sur le Web. </p> + MacBook Air est ultra fin, ultra portable et ultra différent de tout le reste. Mais on ne perd pas des kilos et des centimètres en une nuit. C'est le résultat d'une réinvention des normes. D'une multitude d'innovations sans fil. Et d'une révolution dans le design. Avec MacBook Air, l'informatique mobile prend soudain une nouvelle dimension. + macbook-air + + + + MacBook Air + + + + + Chaque MacBook est équipé d'un disque dur plus spacieux, d'une capacité atteignant 250 Go, pour stocker vos collections multimédia en expansion et vos données précieuses.<br /><br />Le modèle MacBook à 2,4 GHz intègre désormais 2 Go de mémoire en standard. L'idéal pour exécuter en souplesse vos applications préférées. + MacBook vous offre la liberté de mouvement grâce à son boîtier résistant en polycarbonate, à ses technologies sans fil intégrées et à son adaptateur secteur MagSafe novateur qui se déconnecte automatiquement si quelqu'un se prend les pieds dans le fil. + macbook + + + + MacBook + + + + + <h1>Titre 1</h1> +<h2>Titre 2</h2> +<h3>Titre 3</h3> +<h4>Titre 4</h4> +<h5>Titre 5</h5> +<h6>Titre 6</h6> +<ul> +<li>UL</li> +<li>UL</li> +<li>UL</li> +<li>UL</li> +</ul> +<ol> +<li>OL</li> +<li>OL</li> +<li>OL</li> +<li>OL</li> +</ol> +<p>paragraphe...</p> +<p>paragraphe...</p> +<p>paragraphe...</p> +<table border="0"> +<thead> +<tr> +<th>th</th> <th>th</th> <th>th</th> +</tr> +</thead> +<tbody> +<tr> +<td>td</td> +<td>td</td> +<td>td</td> +</tr> +<tr> +<td>td</td> +<td>td</td> +<td>td</td> +</tr> +</tbody> +</table> +<h3>Cinq nouvelles applications sous la main</h3> +<p>Consultez vos e-mails au format HTML enrichi, avec photos et pieces jointes au format PDF, Word et Excel. Obtenez des cartes, des itinéraires et des informations sur l'état de la circulation en temps réel. Rédigez des notes et consultez les cours de la Bourse et les bulletins météo.</p> +<h3>Touchez du doigt votre musique et vos vidéos. Entre autres.</h3> +<p>La technologie multi-touch révolutionnaire intégrée au superbe écran de 3,5 pouces vous permet d'effectuer des zooms avant et arrière, de faire défiler et de feuilleter des pages à l'aide de vos seuls doigts.</p> +<h3>Internet dans votre poche</h3> +<p>Avec le navigateur Safari, vous pouvez consulter des sites web dans leur mise en page d'origine et effectuer un zoom avant et arrière d'une simple pression sur l'écran.</p> +<h3>Contenu du coffret</h3> +<ul> +<li><span></span>iPod touch</li> +<li><span></span>Écouteurs</li> +<li><span></span>Câble USB 2.0</li> +<li><span></span>Adaptateur Dock</li> +<li><span></span>Chiffon de nettoyage</li> +<li><span></span>Support</li> +<li><span></span>Guide de démarrage rapide</li> +</ul> +<p> </p> + <p>Interface multi-touch révolutionnaire<br />Écran panoramique couleur de 3,5 pouces<br />Wi-Fi (802.11b/g)<br />8 mm d'épaisseur<br />Safari, YouTube, iTunes Wi-Fi Music Store, Courrier, Cartes, Bourse, Météo, Notes</p> + ipod-touch + + + + iPod touch + En stock + + + + <p><strong>Caractéristiques</strong></p> +<li>Cuir doux résistant<br /> </li> +<li>Accès au bouton Hold<br /> </li> +<li>Fermeture magnétique<br /> </li> +<li>Accès au Dock Connector<br /> </li> +<li>Protège-écran</li> + <p>Cet étui en cuir tendance assure une protection complète contre les éraflures et les petits aléas de la vie quotidienne. Sa conception élégante et compacte vous permet de glisser votre iPod directement dans votre poche ou votre sac à main.</p> + housse-portefeuille-en-cuir-ipod-nano-noir-chocolat + + + + Housse portefeuille en cuir (iPod nano) - Noir/Chocolat + + + + + <p>Basés sur la technologie des moniteurs personnels testée sur la route par des musiciens professionnels et perfectionnée par les ingénieurs Shure, les écouteurs SE210, légers et élégants, fournissent une sortie audio à gamme étendue exempte de tout bruit externe.</p><br /><p><strong>Conception à isolation sonore <br /></strong>Les embouts à isolation sonore fournis bloquent plus de 90 % du bruit ambiant. Combinés à un design ergonomique séduisant et un câble modulaire, ils minimisent les intrusions du monde extérieur, vous permettant de vous concentrer sur votre musique. Conçus pour les amoureux de la musique qui souhaitent faire évoluer leur appareil audio portable, les écouteurs SE210 vous permettent d'emmener la performance avec vous. <br /> <br /><strong>Micro-transducteur haute définition <br /></strong>Développés pour une écoute de qualité supérieure en déplacement, les écouteurs SE210 utilisent un seul transducteur à armature équilibrée pour bénéficier d'une gamme audio étendue. Le résultat ? Un confort d'écoute époustouflant qui restitue tous les détails d'un spectacle live.</p> +<p><strong>Le kit universel Deluxe comprend les éléments suivants : <br /></strong>- <strong><em>Embouts à isolation sonore</em></strong> <br />Les embouts à isolation sonore inclus ont un double rôle : bloquer les bruits ambiants et garantir un maintien et un confort personnalisés. Comme chaque oreille est différente, le kit universel Deluxe comprend trois tailles (S, M, L) d'embouts mousse et flexibles. Choisissez la taille et le style d'embout qui vous conviennent le mieux : une bonne étanchéité est un facteur clé pour optimiser l'isolation sonore et la réponse des basses, ainsi que pour accroître le confort en écoute prolongée.<br /><br />- <em><strong>Câble modulaire</strong></em> <br />En se basant sur les commentaires de nombreux utilisateurs, les ingénieurs de Shure ont développé une solution de câble détachable pour permettre un degré de personnalisation sans précédent. Le câble de 1 mètre fourni vous permet d'adapter votre confort en fonction de l'activité et de l'application.<br /> <br />- <em><strong>Étui de transport</strong></em> <br />Outre les embouts à isolation sonore et le câble modulaire, un étui de transport compact et résistant est fourni avec les écouteurs SE210 pour vous permettre de ranger vos écouteurs de manière pratique et sans encombres.<br /> <br />- <strong><em>Garantie limitée de deux ans <br /></em></strong>Chaque solution SE210 achetée est couverte par une garantie pièces et main-d'œuvre de deux ans.<br /><br /><strong>Caractéristiques techniques</strong></p> +<ul> +<li> Type de transducteur : micro-transducteur haute définition<br /></li> +<li> Sensibilité (1 mW) : pression acoustique de 114 dB/mW<br /></li> +<li> Impédance (à 1 kHz) : 26 W<br /></li> +<li> Gamme de fréquences : 25 Hz – 18,5 kHz<br /></li> +<li> Longueur de câble / avec rallonge : 45 cm / 136 cm<br /></li> +</ul> +<p><strong>Contenu du coffret<br /></strong></p> +<ul> +<li> Écouteurs Shure SE210<br /></li> +<li> Kit universel Deluxe (embouts à isolation sonore, câble modulaire, étui de transport)</li> +</ul> + <p>Les écouteurs à isolation sonore ergonomiques et légers offrent la reproduction audio la plus fidèle en provenance de sources audio stéréo portables ou de salon.</p> + ecouteurs-a-isolation-sonore-shure-se210 + + + + Écouteurs à isolation sonore Shure SE210 + + + + diff --git a/install-new/fixtures/apple/langs/fr/data/profile.xml b/install-new/fixtures/apple/langs/fr/data/profile.xml index 73ef67b1a..b67308e5e 100644 --- a/install-new/fixtures/apple/langs/fr/data/profile.xml +++ b/install-new/fixtures/apple/langs/fr/data/profile.xml @@ -1,15 +1,15 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + Administrateur + + + Logisticien + + + Traducteur + + + Commercial + + diff --git a/install-new/fixtures/apple/langs/fr/data/scene.xml b/install-new/fixtures/apple/langs/fr/data/scene.xml index 931f79e2d..4983d5999 100644 --- a/install-new/fixtures/apple/langs/fr/data/scene.xml +++ b/install-new/fixtures/apple/langs/fr/data/scene.xml @@ -1,12 +1,12 @@ - + - - - - - - - - - - \ No newline at end of file + + Les iPods Nano + + + Les iPods + + + Les MacBooks + + diff --git a/install-new/fixtures/apple/langs/fr/data/supplier.xml b/install-new/fixtures/apple/langs/fr/data/supplier.xml index 07f36aeb6..1c7900ea5 100644 --- a/install-new/fixtures/apple/langs/fr/data/supplier.xml +++ b/install-new/fixtures/apple/langs/fr/data/supplier.xml @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/install-new/fixtures/apple/langs/fr/data/tag.xml b/install-new/fixtures/apple/langs/fr/data/tag.xml index e8583cab2..cc467ca12 100644 --- a/install-new/fixtures/apple/langs/fr/data/tag.xml +++ b/install-new/fixtures/apple/langs/fr/data/tag.xml @@ -1,15 +1,15 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + diff --git a/install-new/fixtures/apple/langs/it/data/attribute.xml b/install-new/fixtures/apple/langs/it/data/attribute.xml index 99e257c0e..61d19a2d6 100644 --- a/install-new/fixtures/apple/langs/it/data/attribute.xml +++ b/install-new/fixtures/apple/langs/it/data/attribute.xml @@ -1,63 +1,63 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + 2GB + + + 4GB + + + Metallico + + + Blu + + + Rosa + + + Verde + + + Arancio + + + Opzionale solid-state drive 64GB + + + 80GB Parallel ATA Drive @ 4200 rpm + + + 1.60GHz Intel Core 2 Duo + + + 1.80GHz Intel Core 2 Duo + + + 80GB: 20.000 canzoni + + + 160GB: 40,000 canzoni + + + Nero + + + 8Go + + + 16Go + + + 32Go + + + Viola + + + Giallo + + + Rosso + + diff --git a/install-new/fixtures/apple/langs/it/data/attribute_group.xml b/install-new/fixtures/apple/langs/it/data/attribute_group.xml index 99984fbb6..3160aad06 100644 --- a/install-new/fixtures/apple/langs/it/data/attribute_group.xml +++ b/install-new/fixtures/apple/langs/it/data/attribute_group.xml @@ -1,15 +1,15 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + Spazio disco + Spazio disco + + + Colore + Colore + + + ICU + Processore + + diff --git a/install-new/fixtures/apple/langs/it/data/carrier.xml b/install-new/fixtures/apple/langs/it/data/carrier.xml index 0304df8e2..013c72c81 100644 --- a/install-new/fixtures/apple/langs/it/data/carrier.xml +++ b/install-new/fixtures/apple/langs/it/data/carrier.xml @@ -1,6 +1,6 @@ - + - - - - \ No newline at end of file + + Consegna il giorno dopo! + + diff --git a/install-new/fixtures/apple/langs/it/data/category.xml b/install-new/fixtures/apple/langs/it/data/category.xml index 8ee9be136..7135a3e53 100644 --- a/install-new/fixtures/apple/langs/it/data/category.xml +++ b/install-new/fixtures/apple/langs/it/data/category.xml @@ -1,27 +1,27 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + iPods + Adesso che puoi acquistare film dall'iTunes Store e inserirli nel tuo iPod, il tuo mondo è un palcoscenico. + musica-ipods + + + + + + Accessori + Fantastici accessori per il tuo iPod + accessori-ipod + + + + + + Laptop + L'ultimissimo processore Intel, hard drive più ampio, moltissima memoria, e ancora più funzioni tutte inserite in 2,54 centimetri. I nuovi laptop Mac offrono le prestazioni, la potenza e la connettività di un computer da tavolo. Senza bisogno del tavolo. + laptop + laptop Apple + laptot Apple MacBook Air + Laptop Apple potenti ed eleganti + + diff --git a/install-new/fixtures/apple/langs/it/data/feature.xml b/install-new/fixtures/apple/langs/it/data/feature.xml index 65c44265a..6759f11d1 100644 --- a/install-new/fixtures/apple/langs/it/data/feature.xml +++ b/install-new/fixtures/apple/langs/it/data/feature.xml @@ -1,18 +1,18 @@ - + - - - - - - - - - - - - - - - - \ No newline at end of file + + Altezza + + + Larghezza + + + Profondità + + + Peso + + + Auricolare + + diff --git a/install-new/fixtures/apple/langs/it/data/feature_value.xml b/install-new/fixtures/apple/langs/it/data/feature_value.xml index bcd12e1f1..d712c83b5 100644 --- a/install-new/fixtures/apple/langs/it/data/feature_value.xml +++ b/install-new/fixtures/apple/langs/it/data/feature_value.xml @@ -1,45 +1,45 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + Jack stereo + + + Mini-jack stéréo + + + 69.8 mm + + + 52.3 mm + + + 49.2 g + + + 6,5 mm + + + 27.3 mm + + + 41.2 mm + + + 15.5 g + + + 10,5 mm) + + + 4.33 in + + + 70 mm + + + 120g + + + 8 mm + + diff --git a/install-new/fixtures/apple/langs/it/data/image.xml b/install-new/fixtures/apple/langs/it/data/image.xml index 414d8f564..0673d0bc2 100644 --- a/install-new/fixtures/apple/langs/it/data/image.xml +++ b/install-new/fixtures/apple/langs/it/data/image.xml @@ -1,81 +1,81 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + macbook-air-1 + + + macbook-air-2 + + + macbook-air-3 + + + macbook-air-4 + + + macbook-air-5 + + + superdrive-pour-macbook-air-1 + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + housse-portefeuille-en-cuir + + + Shure SE210 Sound-Isolating Earphones for iPod and iPhone + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + diff --git a/install-new/fixtures/apple/langs/it/data/manufacturer.xml b/install-new/fixtures/apple/langs/it/data/manufacturer.xml index 621ff2471..07df270a1 100644 --- a/install-new/fixtures/apple/langs/it/data/manufacturer.xml +++ b/install-new/fixtures/apple/langs/it/data/manufacturer.xml @@ -1,10 +1,10 @@ - + - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/install-new/fixtures/apple/langs/it/data/order_message.xml b/install-new/fixtures/apple/langs/it/data/order_message.xml index 8cef0bcff..bfb0d2d80 100644 --- a/install-new/fixtures/apple/langs/it/data/order_message.xml +++ b/install-new/fixtures/apple/langs/it/data/order_message.xml @@ -1,12 +1,12 @@ - + - - - + Ritardo + Salve, -purtroppo un articolo che hai ordinato non è al momento in magazzino. Questo potrebbe provocare un leggero ritardo nella consegna. +purtroppo un articolo che hai ordinato non è al momento in magazzino. Questo potrebbe provocare un leggero ritardo nella consegna. Ti preghiamo di scusarci; ci stiamo organizzando per ovviare a questo inconveniente. -Cordialmente,]]> - - \ No newline at end of file +Cordialmente, + + diff --git a/install-new/fixtures/apple/langs/it/data/product.xml b/install-new/fixtures/apple/langs/it/data/product.xml index ba83eac96..316cb596c 100644 --- a/install-new/fixtures/apple/langs/it/data/product.xml +++ b/install-new/fixtures/apple/langs/it/data/product.xml @@ -1,135 +1,135 @@ - + - - Curve mozzafiato.

    -

    Per te che ami le sensazioni forti, ecco nove fantastici colori. Ma non è finito qui. Accarezza il design sinuoso fatto di vetro e alluminio dell'iPod nano, e non lo lascerai più.

    -

    Bello e intelligente.

    -

    La nuova funzione Genius trasforma l'iPod nano nel tuo DJ personale. Sa creare delle playlist andando a cercare nella libreria musicale le canzoni che stanno bene insieme.

    -

    Fatto per muoversi con te.

    -

    L'accelerometro è integrato all'iPod nano. Scuotilo per dare uno shuffle alla tua musica. Ruotalo di lato per vedere il Cover Flow. E divertiti con i giochi adattati alle tue movenze.

    ]]>     - Nuovo design. Nuove funzioni. Adesso in 8GB e 16GB. iPod nano, forte come non mai.

    ]]>     - - - - - - - -     - - Sempre attaccato.

    -

    Metti 500 canzoni in tasca. O nella cintura. O nei pantaloncini. iPod shuffle ti fa avere le canzoni sempre addosso. Adesso in colori più nuovi e brillanti.

    -

    Ricarica il tuo iPod shuffle.

    -

    iTunes è il tuo superstore del divertimento. La tua raccolta musicale super organizzata, il tuo juke-box. E puoi ricaricare il tuo iPod shuffle con un click.

    -

    Musica coloratissima.

    -

    Complementi dai colori intensi in alluminio anodizzato: questo è il design semplice di iPod shuffle. Adesso in blu, verde rosa, rosso, e argento originale.

    ]]>     - iPod shuffle, il lettore musicale più indossabile del mondo, adesso anche nelle tonalità più vibranti di blu, verde, rosa e rosso.

    ]]>     - - - - - - - -     - - MacBook Air è sottile quasi come il tuo indice. Praticamente ogni dettaglio è stato semplificato al massimo. Eppure riesce ad avere uno schermo LED di 13,3 pollici, tastiera completa, e un ampio track-pad multi-touch. Incredibilmente portatile, non soffre dei compromessi tra schermo e tastiera.

    La sottigliezza incredibile di MacBook Air è il risultato di moltissime innovazioni nel campo della riduzione di dimensioni e peso. Un hard drive più sottile, porte I/O strategicamente nascoste, batteria più piatta: tutto è stato ben calibrato pensando sempre alla sottigliezza.

    MacBook Air è stato progettato e realizzato per godere a pieno dell'universo del wireless. In un mondo in cui la norma 802.11n Wi-Fi è ormai rapida e disponibile, le persone vivono connesse - acquistano e noleggiano film online, scaricano programmi, condividono e conservano file nel web.

    ]]>     - - - - - - - - -     - -
    I modelli MacBook a 2,4GHz ora includono 2GB di memoria standard — ideale per le tue applicazioni preferite.]]>     - - - - - - - - -     - - Cinque nuove applicazioni sotto mano -

    Consulta le tue e-mail in formato rich HTML con foto e allegati PDF, Word, e Excel. Ottieni mappe, indicazioni stradali e sul traffico in tempo reale. Prendi appunti e consulta la Borsa e le previsioni meteo.

    -

    Tocca la musica, i film e altro ancora

    -

    La rivoluzionaria tecnologia Multi-Touch integrata al bellissimo schermo da 3,5 pollici ti permette di zoomare avanti e indietro, sfogliare e far scorrere le pagine con le dita.

    -

    Internet in tasca

    -

    Con il web browser Safari, consulta i siti web nella loro impaginazione originale e usa lo zoom avanti e indietro con la sola pressione delle dita.2 Aggiungi Web Clips al tuo schermo per accedere subito ai siti preferiti.

    -

    Nella confezione

    -
      -
    • iPod touch
      • -
    • Auricolari
      • -
    • Cavo USB 2.0
      • -
    • Adattatore Dock
      • -
    • Panno per la pulizia
      • -
    • Supporto
      • -
    • Guida installazione rapida
      • -
    ]]>     - -
  • Interfaccia Multi-Touch rivoluzionaria
    • -
  • Schermo widescreen a colori da 3,5 pollici
    • -
  • Wi-Fi (802.11b/g)
    • -
  • 8 mm di spessore
    • -
  • Safari, YouTube, Mail, Borsa, Meteo, Appunti, iTunes Wi-Fi Music Store, Mappe
    • -]]>     - - - - - - - -     - - Lorem ipsum

    ]]>     - Lorem ipsum

    ]]>     - - - - - - - -     - - L'ascolto con la tecnologia dei Micro-Auricolari ad Alta Definizione permette l'ascolto ideale del tuo iPod o iPhone. E' quanto ti offre il design leggero, ergonomico ed elegante degli auricolari SE210. Ti garantiscono un rendimento audio ad alto livello di stereo portatili e fissi, per un livello di precisione mai raggiunto prima. Inoltre, la forma flessibile ti peremtte di scegliere la posizione migliore per indossarli.

    Caratteristiche
    -
      -
    • Design di isolamento del suono
      • -
    • Micro-speaker ad alta definizione con driver singolo ad armatura bilanciata
      • -
    • Cavo staccabile e regolabile in modo da poterlo allungare o accorciare in base alle tue attività
      • -
    • Connettore compatibile con porte auricolari sia su iPod che iPhone
      • -
    -Specifiche tecniche
    -
      -
    • Tipo speaker: MicroSpeaker ad alta definizione
      • -
    • Gamma di frequenza: 25Hz-18.5kHz
      • -
    • Impedenza (1kHz): 26 Ohms
      • -
    • Sensibilità (1mW): 114 dB SPL/mW
      • -
    • Lunghezza cavo (con prolunga): 18.0 in./45,0 cm (54.0 in./137,1 cm)
      • -
    -Nella confezione
    -
      -
    • Auricolari Shure SE210
      • -
    • Cavo prolunga (36.0 in./91,4 cm)
      • -
    • Tre paia di imbuti in spugna (small, medium, large)
      • -
    • Tre paia di imbuti morbidi (small, medium, large)
      • -
    • Un paio di imbuti a tripla aletta
      • -
    • Custodia da viaggio
      • -
    -Garanzia
    Due anni limitata
    (Per informazioni, visitare
    www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm.)

    Mfr. Parte N.: SE210-A-EFS

    Nota: I prodotti venduti tramite questo sito web e che non hanno il marchio Apple ricevono assistenza esclusivamente dai loro produttori con i termini e le condizioni contenute nella confezione del prodotto. La Garanzia Limitata di Apple non si applica ai prodotti che non appartengono al marchio Apple, anche se imballati o venduti con i prodotti Apple . Contatta direttamente il produttore per supporto tecnico e servizio clienti.]]>     - Basati sulla tecnologia all'avanguardia, testati da musicisti professionisti, e messi a punto da ingegneri Shure, i leggeri ed eleganti SE210 offrono un suono nitido e privo di rumori di fondo.

    ]]>     - - - - - - - -     -     \ No newline at end of file + + <p><strong><span style="font-size: small;">Curve mozzafiato.</span></strong></p> +<p>Per te che ami le sensazioni forti, ecco nove fantastici colori. Ma non è finito qui. Accarezza il design sinuoso fatto di vetro e alluminio dell'iPod nano, e non lo lascerai più.</p> +<p><strong><span style="font-size: small;">Bello e intelligente.</span></strong></p> +<p>La nuova funzione Genius trasforma l'iPod nano nel tuo DJ personale. Sa creare delle playlist andando a cercare nella libreria musicale le canzoni che stanno bene insieme.</p> +<p><strong><span style="font-size: small;">Fatto per muoversi con te.</span></strong></p> +<p>L'accelerometro è integrato all'iPod nano. Scuotilo per dare uno shuffle alla tua musica. Ruotalo di lato per vedere il Cover Flow. E divertiti con i giochi adattati alle tue movenze.</p> + <p>Nuovo design. Nuove funzioni. Adesso in 8GB e 16GB. iPod nano, forte come non mai.</p> + ipod-nano + + + + iPod Nano + In magazzino + + + + <p><span style="font-size: small;"><strong>Sempre attaccato.</strong></span></p> +<p>Metti 500 canzoni in tasca. O nella cintura. O nei pantaloncini. iPod shuffle ti fa avere le canzoni sempre addosso. Adesso in colori più nuovi e brillanti.</p> +<p><span style="font-size: small;"><strong>Ricarica il tuo iPod shuffle.</strong></span></p> +<p>iTunes è il tuo superstore del divertimento. La tua raccolta musicale super organizzata, il tuo juke-box. E puoi ricaricare il tuo iPod shuffle con un click.</p> +<p><span style="font-size: small;"><strong>Musica coloratissima.</strong></span></p> +<p>Complementi dai colori intensi in alluminio anodizzato: questo è il design semplice di iPod shuffle. Adesso in blu, verde rosa, rosso, e argento originale.</p> + <p>iPod shuffle, il lettore musicale più indossabile del mondo, adesso anche nelle tonalità più vibranti di blu, verde, rosa e rosso.</p> + ipod-shuffle + + + + iPod shuffle + In magazzino + + + + <p>MacBook Air è sottile quasi come il tuo indice. Praticamente ogni dettaglio è stato semplificato al massimo. Eppure riesce ad avere uno schermo LED di 13,3 pollici, tastiera completa, e un ampio track-pad multi-touch. Incredibilmente portatile, non soffre dei compromessi tra schermo e tastiera.</p><p>La sottigliezza incredibile di MacBook Air è il risultato di moltissime innovazioni nel campo della riduzione di dimensioni e peso. Un hard drive più sottile, porte I/O strategicamente nascoste, batteria più piatta: tutto è stato ben calibrato pensando sempre alla sottigliezza.</p><p>MacBook Air è stato progettato e realizzato per godere a pieno dell'universo del wireless. In un mondo in cui la norma 802.11n Wi-Fi è ormai rapida e disponibile, le persone vivono connesse - acquistano e noleggiano film online, scaricano programmi, condividono e conservano file nel web. </p> + MacBook Air è ultra-piatto, ultra-portatile, e ultra come nient'altro al mondo. Ma non si perdono chili e centimetri in una notte. E' il risultato di una rielaborazione degli standard. Di moltissime innovazioni sul wireless. E di un design rivoluzionario. Con MacBook Air, l'informatica mobile acquista una nuova dimensione. + macbook-air + + + + MacBook Air + + + + + Tutti i MacBook hanno un hard drive più ampio, fino a 250GB, per conservare le tue raccolte multimediali e i dati importanti.<br /><br />I modelli MacBook a 2,4GHz ora includono 2GB di memoria standard — ideale per le tue applicazioni preferite. + MacBook ti offre il massimo della libertà di movimento grazie alla sua struttura resistente in policarbonato, alle tecnologie integrate wireless, e all'innovativo MagSafe Power Adapter che si stacca automaticamente se qualcuno accidentalmente inciampa nel cavo. + macbook + + + + MacBook + + + + + <h3>Cinque nuove applicazioni sotto mano</h3> +<p>Consulta le tue e-mail in formato rich HTML con foto e allegati PDF, Word, e Excel. Ottieni mappe, indicazioni stradali e sul traffico in tempo reale. Prendi appunti e consulta la Borsa e le previsioni meteo.</p> +<h3>Tocca la musica, i film e altro ancora</h3> +<p>La rivoluzionaria tecnologia Multi-Touch integrata al bellissimo schermo da 3,5 pollici ti permette di zoomare avanti e indietro, sfogliare e far scorrere le pagine con le dita.</p> +<h3>Internet in tasca</h3> +<p>Con il web browser Safari, consulta i siti web nella loro impaginazione originale e usa lo zoom avanti e indietro con la sola pressione delle dita.<sup>2</sup> Aggiungi Web Clips al tuo schermo per accedere subito ai siti preferiti.</p> +<h3>Nella confezione</h3> +<ul> +<li><span></span>iPod touch</li> +<li><span></span>Auricolari</li> +<li><span></span>Cavo USB 2.0</li> +<li><span></span>Adattatore Dock</li> +<li><span></span>Panno per la pulizia</li> +<li><span></span>Supporto</li> +<li><span></span>Guida installazione rapida</li> +</ul> + <ul> +<li>Interfaccia Multi-Touch rivoluzionaria</li> +<li>Schermo widescreen a colori da 3,5 pollici</li> +<li>Wi-Fi (802.11b/g)</li> +<li>8 mm di spessore</li> +<li>Safari, YouTube, Mail, Borsa, Meteo, Appunti, iTunes Wi-Fi Music Store, Mappe</li> +</ul> + ipod-touch + + + + iPod touch + + + + + <p>Lorem ipsum</p> + <p>Lorem ipsum</p> + custodia-portafoglio-in-pelle-belkin-per-ipod-nano-nero-cioccolato + + + + Custodia portafoglio in pelle Belkin per iPod nano - Nero/Cioccolato + + + + + <div class="product-overview-full">L'ascolto con la tecnologia dei Micro-Auricolari ad Alta Definizione permette l'ascolto ideale del tuo iPod o iPhone. E' quanto ti offre il design leggero, ergonomico ed elegante degli auricolari SE210. Ti garantiscono un rendimento audio ad alto livello di stereo portatili e fissi, per un livello di precisione mai raggiunto prima. Inoltre, la forma flessibile ti peremtte di scegliere la posizione migliore per indossarli. <br /> <br /> <strong>Caratteristiche</strong> <br /> +<ul> +<li>Design di isolamento del suono </li> +<li> Micro-speaker ad alta definizione con driver singolo ad armatura bilanciata </li> +<li> Cavo staccabile e regolabile in modo da poterlo allungare o accorciare in base alle tue attività </li> +<li> Connettore compatibile con porte auricolari sia su iPod che iPhone </li> +</ul> +<strong>Specifiche tecniche </strong><br /> +<ul> +<li>Tipo speaker: MicroSpeaker ad alta definizione</li> +<li> Gamma di frequenza: 25Hz-18.5kHz </li> +<li> Impedenza (1kHz): 26 Ohms </li> +<li> Sensibilità (1mW): 114 dB SPL/mW </li> +<li> Lunghezza cavo (con prolunga): 18.0 in./45,0 cm (54.0 in./137,1 cm) </li> +</ul> +<strong>Nella confezione</strong><br /> +<ul> +<li>Auricolari Shure SE210 </li> +<li> Cavo prolunga (36.0 in./91,4 cm) </li> +<li> Tre paia di imbuti in spugna (small, medium, large) </li> +<li> Tre paia di imbuti morbidi (small, medium, large) </li> +<li> Un paio di imbuti a tripla aletta </li> +<li> Custodia da viaggio </li> +</ul> +Garanzia<br /> Due anni limitata <br />(Per informazioni, visitare <br />www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm.) <br /><br /> Mfr. Parte N.: SE210-A-EFS <br /><br />Nota: I prodotti venduti tramite questo sito web e che non hanno il marchio Apple ricevono assistenza esclusivamente dai loro produttori con i termini e le condizioni contenute nella confezione del prodotto. La Garanzia Limitata di Apple non si applica ai prodotti che non appartengono al marchio Apple, anche se imballati o venduti con i prodotti Apple . Contatta direttamente il produttore per supporto tecnico e servizio clienti.</div> + <p>Basati sulla tecnologia all'avanguardia, testati da musicisti professionisti, e messi a punto da ingegneri Shure, i leggeri ed eleganti SE210 offrono un suono nitido e privo di rumori di fondo.</p> + ecouteurs-a-isolation-sonore-shure-se210-blanc + + + + auricolari-sound-isolating-shure-se210-per-ipod-e-iphone + + + + diff --git a/install-new/fixtures/apple/langs/it/data/profile.xml b/install-new/fixtures/apple/langs/it/data/profile.xml index 19e069803..c620bd11f 100644 --- a/install-new/fixtures/apple/langs/it/data/profile.xml +++ b/install-new/fixtures/apple/langs/it/data/profile.xml @@ -1,15 +1,15 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + Administrator + + + Logista + + + Traduttore + + + Venditore + + diff --git a/install-new/fixtures/apple/langs/it/data/scene.xml b/install-new/fixtures/apple/langs/it/data/scene.xml index cb0b6bd42..c90102858 100644 --- a/install-new/fixtures/apple/langs/it/data/scene.xml +++ b/install-new/fixtures/apple/langs/it/data/scene.xml @@ -1,12 +1,12 @@ - + - - - - - - - - - - \ No newline at end of file + + Gli iPod Nano + + + Gli iPod + + + I MacBook + + diff --git a/install-new/fixtures/apple/langs/it/data/supplier.xml b/install-new/fixtures/apple/langs/it/data/supplier.xml index 07f36aeb6..1c7900ea5 100644 --- a/install-new/fixtures/apple/langs/it/data/supplier.xml +++ b/install-new/fixtures/apple/langs/it/data/supplier.xml @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/install-new/init.php b/install-new/init.php index 53f0382ff..58ee71ed0 100644 --- a/install-new/init.php +++ b/install-new/init.php @@ -50,3 +50,47 @@ require_once _PS_INSTALL_PATH_.'classes/model.php'; require_once _PS_INSTALL_PATH_.'classes/session.php'; require_once _PS_INSTALL_PATH_.'classes/sqlLoader.php'; require_once _PS_INSTALL_PATH_.'classes/xmlLoader.php'; + +class InstallLog +{ + /** + * @return InstallLog + */ + public function getInstance() + { + static $instance = null; + + if (!$instance) + $instance = new InstallLog(); + return $instance; + } + + protected $fd; + protected $start_time = array(); + protected $last_time; + + public function __construct() + { + $this->fd = fopen(_PS_INSTALL_PATH_.'log.txt', 'w'); + $this->last_time = microtime(true); + } + + public function write($id) + { + $str = "[$id]"; + $str .= ' - [Time: '.round(microtime(true) - $this->last_time, 4).']'; + if (isset($this->start_time[$id])) + $str .= ' - [Length: '.round(microtime(true) - $this->start_time[$id], 4).']'; + fwrite($this->fd, "$str\n"); + } + + public function start($id) + { + $this->start_time[$id] = microtime(true); + } + + public function __destruct() + { + fclose($this->fd); + } +} \ No newline at end of file diff --git a/install-new/langs/de/data/carrier.xml b/install-new/langs/de/data/carrier.xml index 874b3763f..0afce7889 100644 --- a/install-new/langs/de/data/carrier.xml +++ b/install-new/langs/de/data/carrier.xml @@ -1,6 +1,6 @@ - + - - - - \ No newline at end of file + + Abholung im Geschäft + + diff --git a/install-new/langs/de/data/category.xml b/install-new/langs/de/data/category.xml index 0e14379d6..21fbec134 100644 --- a/install-new/langs/de/data/category.xml +++ b/install-new/langs/de/data/category.xml @@ -1,11 +1,11 @@ - + - - - - - - - - - \ No newline at end of file + + Start + + home + + + + + diff --git a/install-new/langs/de/data/cms.xml b/install-new/langs/de/data/cms.xml index 5b37800e3..04c519e3f 100644 --- a/install-new/langs/de/data/cms.xml +++ b/install-new/langs/de/data/cms.xml @@ -1,45 +1,45 @@ - + - - - - - Versand und Rücknahme

    Ihre Versandverpackung

    Pakete werden normalerweise 2 Tage nach Zahlungseingang mit UPS mit Bestellverfolgemöglichkeit und Ablieferung ohne Unterschrift geliefert. Wenn Sie lieber eine UPS-Sendung per Einschreiben erhalten möchten, entstehen zusätzliche Kosten. Bitte kontaktieren Sie uns, bevor Sie dieses Liefermethode wählen. Wir senden Ihnen einen Link für die Bestellverfolgung unabhängig davon, welche Liefermethode Sie wählen.

    Die Versandkosten beinhalten Lade- und Verpackungsgebühren sowie die Portokosten. Die Verladegebühren stehen fest, wobei Transportkosten schwanken, je nach Gesamtgewicht des Pakets. Wir raten Ihnen, mehrere Artikel in einer Bestellung zusammenzufassen. Wir können zwei verschiedene Bestellungen nicht zusammenlegen, und die Versandkosten werden separat für jede Bestellung gerechnet. Ihr Paket wird auf Ihr Risiko versandt, aber zerbrechliche Ware wird besonders sorgsam behandelt.

    Die Versandschachteln sind weit geschnitten und ihre Ware wird gut geschützt verpackt.

    ]]>     - -     - - - - - Legal

    Credits

    Konzept und Gestaltung:

    Diese Webseite wurde hergestellt unter Verwendung von PrestaShop™ open-source software.

    ]]>     - -     - - - - - Your terms and conditions of use

    Rule 1

    Here is the rule 1 content

    -

    Rule 2

    Here is the rule 2 content

    -

    Rule 3

    Here is the rule 3 content

    ]]>     - -     - - - - - About us -

    Our company

    Our company

    -

    Our team

    Our team

    -

    Informations

    Informations

    ]]>     - -     - - - - - Secure payment -

    Our secure payment

    With SSL

    -

    Using Visa/Mastercard/Paypal

    About this services

    ]]>     - -     -     \ No newline at end of file + + Lieferung + Unsere Lieferbedingungen + Bedingungen, Lieferung, Frist, Versand, Verpackung + <h2>Versand und Rücknahme</h2><h3>Ihre Versandverpackung</h3><p>Pakete werden normalerweise 2 Tage nach Zahlungseingang mit UPS mit Bestellverfolgemöglichkeit und Ablieferung ohne Unterschrift geliefert. Wenn Sie lieber eine UPS-Sendung per Einschreiben erhalten möchten, entstehen zusätzliche Kosten. Bitte kontaktieren Sie uns, bevor Sie dieses Liefermethode wählen. Wir senden Ihnen einen Link für die Bestellverfolgung unabhängig davon, welche Liefermethode Sie wählen.</p><p>Die Versandkosten beinhalten Lade- und Verpackungsgebühren sowie die Portokosten. Die Verladegebühren stehen fest, wobei Transportkosten schwanken, je nach Gesamtgewicht des Pakets. Wir raten Ihnen, mehrere Artikel in einer Bestellung zusammenzufassen. Wir können zwei verschiedene Bestellungen nicht zusammenlegen, und die Versandkosten werden separat für jede Bestellung gerechnet. Ihr Paket wird auf Ihr Risiko versandt, aber zerbrechliche Ware wird besonders sorgsam behandelt.<br /><br />Die Versandschachteln sind weit geschnitten und ihre Ware wird gut geschützt verpackt.</p> + Lieferung + + + Rechtliche Hinweise + Rechtliche Hinweise + Hinweise, rechtlich, Gutscheine + <h2>Legal</h2><h3>Credits</h3><p>Konzept und Gestaltung:</p><p>Diese Webseite wurde hergestellt unter Verwendung von <a href="http://www.prestashop.com">PrestaShop</a>&trade; open-source software.</p> + rechtliche-hinweise + + + Allgemeine Nutzungsbedingungen + Unsere allgemeinen Nutzungsbedingungen + Voraussetzungen, Bedingungen, nutzen, verkaufen + <h2>Your terms and conditions of use</h2><h3>Rule 1</h3><p>Here is the rule 1 content</p> +<h3>Rule 2</h3><p>Here is the rule 2 content</p> +<h3>Rule 3</h3><p>Here is the rule 3 content</p> + allgemeine-nutzungsbedingungen + + + Über uns + Learn more about us + über uns, Informationen + <h2>About us</h2> +<h3>Our company</h3><p>Our company</p> +<h3>Our team</h3><p>Our team</p> +<h3>Informations</h3><p>Informations</p> + uber-uns + + + Sichere Zahlung + Unsere Sicherheits-Zahlungsmethoden + Sichere Zahlung, SSL, Visa, MasterCard, PayPal + <h2>Secure payment</h2> +<h3>Our secure payment</h3><p>With SSL</p> +<h3>Using Visa/Mastercard/Paypal</h3><p>About this services</p> + sichere-zahlung + + diff --git a/install-new/langs/de/data/cms_category.xml b/install-new/langs/de/data/cms_category.xml index 8900bb4cb..bc0b4edf8 100644 --- a/install-new/langs/de/data/cms_category.xml +++ b/install-new/langs/de/data/cms_category.xml @@ -1,11 +1,11 @@ - + - - - - - - - - - \ No newline at end of file + + Start + + Start + + + + + diff --git a/install-new/langs/de/data/configuration.xml b/install-new/langs/de/data/configuration.xml index c9cdfd5fd..ceb8f3f40 100644 --- a/install-new/langs/de/data/configuration.xml +++ b/install-new/langs/de/data/configuration.xml @@ -1,21 +1,21 @@ - + - - - - - - - - - - - - - - - - \ No newline at end of file + + FA + + + LI + + + + + + 0 + + + Lieber Kunde, + +Mit freundlichen Grüßen, +Ihr Kundenservice + + diff --git a/install-new/langs/de/data/contact.xml b/install-new/langs/de/data/contact.xml index 12a9fcc54..34b1ce00a 100644 --- a/install-new/langs/de/data/contact.xml +++ b/install-new/langs/de/data/contact.xml @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + Falls ein technisches Problem auf der Webseite auftritt + + + Bei Fragen oder Reklamationen zu einer Bestellung + + diff --git a/install-new/langs/de/data/country.xml b/install-new/langs/de/data/country.xml index dd283ed95..d57ea1e36 100644 --- a/install-new/langs/de/data/country.xml +++ b/install-new/langs/de/data/country.xml @@ -1,735 +1,735 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + Germany + + + Austria + + + Belgium + + + Canada + + + China + + + Spain + + + Finland + + + France + + + Greece + + + Italy + + + Japan + + + Luxemburg + + + Netherlands + + + Poland + + + Portugal + + + Czech Republic + + + United Kingdom + + + Sweden + + + Switzerland + + + Denmark + + + United States + + + HongKong + + + Norway + + + Australia + + + Singapore + + + Ireland + + + New Zealand + + + South Korea + + + Israel + + + South Africa + + + Nigeria + + + Ivory Coast + + + Togo + + + Bolivia + + + Mauritius + + + Romania + + + Slovakia + + + Algeria + + + American Samoa + + + + Angola + + + Anguilla + + + Antigua and Barbuda + + + Argentina + + + Armenia + + + Aruba + + + Azerbaijan + + + Bahamas + + + Bahrain + + + Bangladesh + + + Barbados + + + Belarus + + + Belize + + + Benin + + + Bermuda + + + Bhutan + + + Botswana + + + Brazil + + + Brunei + + + Burkina Faso + + + Burma (Myanmar) + + + Burundi + + + Cambodia + + + Cameroon + + + Cape Verde + + + Central African Republic + + + Chad + + + Chile + + + Colombia + + + Comoros + + + Congo, Dem. Republic + + + Congo, Republic + + + Costa Rica + + + Croatia + + + Cuba + + + Cyprus + + + Djibouti + + + Dominica + + + Dominican Republic + + + East Timor + + + Ecuador + + + Egypt + + + El Salvador + + + Equatorial Guinea + + + Eritrea + + + Estonia + + + Ethiopia + + + Falkland Islands + + + Faroe Islands + + + Fiji + + + Gabon + + + Gambia + + + Georgia + + + Ghana + + + Grenada + + + Greenland + + + Gibraltar + + + Guadeloupe + + + Guam + + + Guatemala + + + Guernsey + + + Guinea + + + Guinea-Bissau + + + Guyana + + + Haiti + + + Heard Island and McDonald Islands + + + Vatican City State + + + Honduras + + + Iceland + + + India + + + Indonesia + + + Iran + + + Iraq + + + Man Island + + + Jamaica + + + Jersey + + + Jordan + + + Kazakhstan + + + Kenya + + + Kiribati + + + Korea, Dem. Republic of + + + Kuwait + + + Kyrgyzstan + + + Laos + + + Latvia + + + Lebanon + + + Lesotho + + + Liberia + + + Libya + + + Liechtenstein + + + Lithuania + + + Macau + + + Macedonia + + + Madagascar + + + Malawi + + + Malaysia + + + Maldives + + + Mali + + + Malta + + + Marshall Islands + + + Martinique + + + Mauritania + + + Hungary + + + Mayotte + + + Mexico + + + Micronesia + + + Moldova + + + Monaco + + + Mongolia + + + Montenegro + + + Montserrat + + + Morocco + + + Mozambique + + + Namibia + + + Nauru + + + Nepal + + + Netherlands Antilles + + + New Caledonia + + + Nicaragua + + + Niger + + + Niue + + + Norfolk Island + + + Northern Mariana Islands + + + Oman + + + Pakistan + + + Palau + + + Palestinian Territories + + + Panama + + + Papua New Guinea + + + Paraguay + + + Peru + + + Philippines + + + Pitcairn + + + Puerto Rico + + + Qatar + + + Reunion Island + + + Russian Federation + + + Rwanda + + + Saint Barthelemy + + + Saint Kitts and Nevis + + + Saint Lucia + + + Saint Martin + + + Saint Pierre and Miquelon + + + Saint Vincent and the Grenadines + + + Samoa + + + San Marino + + + São Tomé and Príncipe + + + Saudi Arabia + + + Senegal + + + Serbia + + + Seychelles + + + Sierra Leone + + + Slovenia + + + Solomon Islands + + + Somalia + + + South Georgia and the South Sandwich Islands + + + Sri Lanka + + + Sudan + + + Suriname + + + Svalbard and Jan Mayen + + + Swaziland + + + Syria + + + Taiwan + + + Tajikistan + + + Tanzania + + + Thailand + + + Tokelau + + + Tonga + + + Trinidad and Tobago + + + Tunisia + + + Turkey + + + Turkmenistan + + + Turks and Caicos Islands + + + Tuvalu + + + Uganda + + + Ukraine + + + United Arab Emirates + + + Uruguay + + + Uzbekistan + + + Vanuatu + + + Venezuela + + + Vietnam + + + Virgin Islands (British) + + + Virgin Islands (U.S.) + + + Wallis and Futuna + + + Western Sahara + + + Yemen + + + Zambia + + + Zimbabwe + + + Albania + + + Afghanistan + + + Antarctica + + + Bosnia and Herzegovina + + + Bouvet Island + + + British Indian Ocean Territory + + + Bulgaria + + + Cayman Islands + + + Christmas Island + + + Cocos (Keeling) Islands + + + Cook Islands + + + French Guiana + + + French Polynesia + + + French Southern Territories + + + Åland Islands + + diff --git a/install-new/langs/de/data/gender.xml b/install-new/langs/de/data/gender.xml index cb01d320f..9f9c63786 100644 --- a/install-new/langs/de/data/gender.xml +++ b/install-new/langs/de/data/gender.xml @@ -1,6 +1,6 @@ - + - - - - \ No newline at end of file + + + + diff --git a/install-new/langs/de/data/group.xml b/install-new/langs/de/data/group.xml index ec8411b7c..7a1844e30 100644 --- a/install-new/langs/de/data/group.xml +++ b/install-new/langs/de/data/group.xml @@ -1,4 +1,6 @@ - + - - \ No newline at end of file + + + + diff --git a/install-new/langs/de/data/meta.xml b/install-new/langs/de/data/meta.xml index 25b609ffd..18017ca9e 100644 --- a/install-new/langs/de/data/meta.xml +++ b/install-new/langs/de/data/meta.xml @@ -1,153 +1,153 @@ - + - - <![CDATA[Fehler 404]]> - - - - - - <![CDATA[Verkaufshits]]> - - - - - - <![CDATA[Kontaktieren Sie uns]]> - - - - - - <![CDATA[]]> - - - - - - <![CDATA[Hersteller]]> - - - - - - <![CDATA[Neue Produkte]]> - - - - - - <![CDATA[Kennwort vergessen]]> - - - - - - <![CDATA[Angebote]]> - - - - - - <![CDATA[Sitemap]]> - - - - - - <![CDATA[Zulieferer]]> - - - - - - <![CDATA[Adresse]]> - - - - - - <![CDATA[Adressen]]> - - - - - - <![CDATA[Authentifizierung]]> - - - - - - <![CDATA[Warenkorb]]> - - - - - - <![CDATA[Discount]]> - - - - - - <![CDATA[Bestellungsverlauf]]> - - - - - - <![CDATA[Kennung]]> - - - - - - <![CDATA[Mein Konto]]> - - - - - - <![CDATA[Bestellungsverfolgung]]> - - - - - - <![CDATA[Bestellschein]]> - - - - - - <![CDATA[Bestellung]]> - - - - - - <![CDATA[Suche]]> - - - - - - <![CDATA[Shops]]> - - - - - - <![CDATA[Bestellung]]> - - - - - - <![CDATA[Auftragsverfolgung Gast]]> - - - - - \ No newline at end of file + + Fehler 404 + Seite wurde nicht gefunden + Fehler 404, nicht gefunden + seite-nicht-gefunden + + + Verkaufshits + Unsere Verkaufshits + Verkaufshits + verkaufshits + + + Kontaktieren Sie uns + Nutzen Sie unser Kontaktformular + Kontakt, Formular, E-Mail + kontaktieren-sie-uns + + + + <description>Shop powered by PrestaShop</description> + <keywords>Shop, prestashop</keywords> + <url_rewrite/> + </meta> + <meta id="manufacturer" id_shop="1"> + <title>Hersteller + Herstellerliste + Hersteller + hersteller + + + Neue Produkte + Unsere neuen Produkte + neu, Produkte + neue-Produkte + + + Kennwort vergessen + Geben Sie die E-Mailadresse ein, die Sie zum Einloggen benutzen, damit Sie eine E-Mail mit dem neuen Kennwort erhalt + vergessen, Kennwort, E-Mail, neu, Reset + kennwort-wiederherstellung + + + Angebote + Unsere Sonderangebote + besonders, Angebote + angebote + + + Sitemap + Verloren? Finden Sie, was Sie suchen + sitemap + sitemap + + + Zulieferer + Zuliefererliste + Zulieferer + zulieferer + + + Adresse + + + adresse + + + Adressen + + + adressen + + + Authentifizierung + + + authentifizierung + + + Warenkorb + + + warenkorb + + + Discount + + + discount + + + Bestellungsverlauf + + + bestellungsverlauf + + + Kennung + + + kennung + + + Mein Konto + + + mein-Konto + + + Bestellungsverfolgung + + + bestellungsverfolgung + + + Bestellschein + + + bestellschein + + + Bestellung + + + bestellung + + + Suche + + + suche + + + Shops + + + shops + + + Bestellung + + + schnell-bestellung + + + Auftragsverfolgung Gast + + + auftragsverfolgung-gast + + diff --git a/install-new/langs/de/data/order_return_state.xml b/install-new/langs/de/data/order_return_state.xml index e9d2d2ed9..5b264fdca 100644 --- a/install-new/langs/de/data/order_return_state.xml +++ b/install-new/langs/de/data/order_return_state.xml @@ -1,18 +1,18 @@ - + - - - - - - - - - - - - - - - - \ No newline at end of file + + Bestätigung wird erwartet + + + Paket wird erwartet + + + Paket erhalten + + + Rücksendung abgelehnt + + + Rücksendung beendet + + diff --git a/install-new/langs/de/data/order_state.xml b/install-new/langs/de/data/order_state.xml index 6e1e8d491..62f95dce8 100644 --- a/install-new/langs/de/data/order_state.xml +++ b/install-new/langs/de/data/order_state.xml @@ -1,51 +1,51 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + Scheckzahlung wird erwartet + + + + Zahlung eingegangen + + + + Bestellung eingegangen + + + + Versendet + + + + Erfolgreich abgeschlossen +